wip - fixes to import and config location

modules/nixos/flatpak.nix

@@ -1,9 +0,0 @@
-{
-    config,
-    lib,
-    pkgs,
-    ...
-}:
-{
-    services.flatpak.enable = true;
-}

modules/nixos/gdm.nix

@@ -1,45 +0,0 @@
-{
-    config,
-    lib,
-    pkgs,
-    ...
-}:
-{
-    # this actually does not enable xorg, but it is required for GDM
-    services.xserver.enable = true;
-    services.xserver.displayManager.gdm.enable = true;
-    services.xserver.desktopManager.gnome.enable = true;
-    # here we set wayland to be used
-    services.xserver.displayManager.gdm.wayland = true;
-
-
-    ## Slim down the gnome dependencies
-    environment.gnome.excludePackages = (with pkgs; [
-        gnome-photos
-        gnome-tour
-        geary
-        gedit
-        tali
-        gnome-music
-        cheese
-        epiphany
-        gnome-calendar
-        gnome-maps
-        simple-scan
-        yelp
-        gnome-disk-utility
-        gnome-notes
-        gnome-weather
-        gnome-secrets
-        gnome-characters
-        gnome-font-viewer
-        gnome-system-monitor
-        gnome-text-editor
-        gnome-connections
-        gnome-clocks
-        baobab
-        gnome-contacts
-        gnome-logs
-    ]);
-
-}

modules/nixos/hyprland.nix

@@ -5,31 +5,21 @@
   ...
 }:
 {
-  programs.uwsm.enable = true;
-
+  # Use hyprland as the main desktop environment but use gdm as desktop manager
   programs.hyprland = {
     enable = true;
     xwayland.enable = false;
-    withUWSM = true;
   };
 
-  # launch hyprland on login
-  # systemd.services.hyprland = {
-  #   description = "Hyprland";
-  #   wantedBy = [ "graphical.target" ];
-  #   after = [ "display-manager.service" ];
-  #   serviceConfig = {
-  #     Type = "simple";
-  #     ExecStart = "${pkgs.hyprland}/bin/hyprland";
-  #     Restart = "always";
-  #     RestartSec = "5";
-  #     User = config.var.username;
-  #   };
-  # };
 
-  environment.systemPackages = with pkgs; [
-    waybar  
-  ];
+  services.displayManager = {
+    defaultSession = "hyprland";
+  };
+
+  services.xserver.displayManager.gdm = {
+    enable = true;
+    wayland = true;
+  };
 
 
 }

modules/nixos/networking.nix

@@ -0,0 +1,4 @@
+{lib, ...}:{
+  networking.networkmanager.enable = true;
+  networking.networkmanager.wifi.powersave = lib.mkDefault true;
+}

modules/nixos/nvidia.nix

@@ -47,12 +47,12 @@
 
 
   # In the global configuration, we blacklist the nouveau driver and load the nvidia driver
-  boot.extraModprobeConfig = lib.mkDefault ''
+  boot.extraModprobeConfig = ''
     blacklist nouveau
     options nouveau modeset=0
   '';
   
-  services.udev.extraRules = lib.mkDefault ''
+  services.udev.extraRules = ''
     # Remove NVIDIA USB xHCI Host Controller devices, if present
     ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
     # Remove NVIDIA USB Type-C UCSI devices, if present
@@ -61,10 +61,12 @@
     ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
     # Remove NVIDIA VGA/3D controller devices
     ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", ATTR{power/control}="auto", ATTR{remove}="1"
-    # Remove the whole bridge responsible for the VGA/3D controller
-    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{class}=="0x060400", ATTR{power/control}="auto", ATTR{remove}="1"
   '';
 
+
+    # # Remove the whole bridge responsible for the VGA/3D controller
+    # ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{class}=="0x060400", ATTR{power/control}="auto", ATTR{remove}="1"
+
   # # somehow the udev rules are not enough to prevent the nouveau driver from loading
   # # Also unload remove the bus by id manually
   # # unload 0000:01:00.1 and 0000:01:00.0
@@ -86,5 +88,9 @@
 
   
 
-  boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ];
+  boot.blacklistedKernelModules = [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ];
 }
+
+
+# Warning: used to have
+# lib.mkdDefault