changes for nixos 24.05

6 files changed, 32 insertions, 32 deletions

diff --git a/flake.nix b/flake.nix
index 80b20d2..68495fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -246,7 +246,7 @@
           ./modules/nixos/services.nix
           ./modules/nixos/tailscale.nix
           ./modules/nixos/steam.nix
-          ./modules/nixos/sway.nix
+          # ./modules/nixos/sway.nix
           ./modules/nixos/system-packages.nix
 
           # ./home-manager/home.nix
@@ -323,7 +323,7 @@
           ./modules/nixos/services.nix
           ./modules/nixos/tailscale.nix
           ./modules/nixos/steam.nix
-          ./modules/nixos/sway.nix
+          # ./modules/nixos/sway.nix
           ./modules/nixos/system-packages.nix
         ];
       };
diff --git a/machines/doretta/configuration.nix b/machines/doretta/configuration.nix
index 4f53d25..cf93e95 100644
--- a/machines/doretta/configuration.nix
+++ b/machines/doretta/configuration.nix
@@ -43,7 +43,7 @@
 
   # Enable the Plasma 5 Desktop Environment.
   services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  # services.xserver.desktopManager.plasma5.enable = true;
   
   # Enable CUPS to print documents.
   # services.printing.enable = true;
diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index 1935df5..868e6a6 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -31,7 +31,7 @@
   };
 
   # services.xserver.videoDrivers = [ "nvidia" ];
-  services.xserver.displayManager.sddm.autoNumlock = true;
+  services.displayManager.sddm.autoNumlock = true;
   hardware.opengl = {
     enable = true;
     # if hardware.opengl.driSupport is enabled, mesa is installed and provides Vulkan of supported hardware.
@@ -75,12 +75,12 @@
 
 
   # # Enable the Plasma 5 Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.displayManager.sddm.enable = true;
+  # services.xserver.desktopManager.plasma5.enable = true;
   
 
   # Configure keymap in X11
-  services.xserver.layout = "us";
+  services.xserver.xkb.layout = "us";
   # services.xserver.xkbOptions = "eurosign:e,caps:escape";
 
   # Enable CUPS to print documents.
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index de630f2..793ce4c 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -8,6 +8,14 @@
   services = {
     gvfs.enable = true; # Mount, trash, and other fucntionalities
     tumbler.enable = true; # thumbnail support for images
+    displayManager = {
+      defaultSession = "hyprland";
+      # lightdm.enable = false;
+      # gdm = {
+      #   enable = true;
+      #   wayland = true;
+      # };
+    };
     xserver = {
       enable = true;
 
@@ -15,14 +23,6 @@
         xterm.enable = false;
       };
 
-      displayManager = {
-        defaultSession = "hyprland";
-        lightdm.enable = false;
-        # gdm = {
-        #   enable = true;
-        #   wayland = true;
-        # };
-      };
     };
   };
   nix.settings = {
diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix
index f80f353..d0ec1fe 100644
--- a/modules/nixos/services.nix
+++ b/modules/nixos/services.nix
@@ -10,25 +10,25 @@
 
     fstrim.enable = true;
 
-    # localtimed.enable = true;
-    xserver = {
-      # Enable the X11 windowing system.
-      enable = true;
+    # Enable touchpad support (enabled default in most desktopManager).
+    libinput.enable = true;
 
-      # Enable touchpad support (enabled default in most desktopManager).
-      libinput.enable = true;
-      
-      # Enable the Plasma 5 Desktop Environment.
-      desktopManager.plasma5.enable = true;
-      displayManager = {
-        sddm = {
-          enable = true;
-          autoNumlock = true;
-        };
-        # defaultSession = "plasmawayland";
+    displayManager = {
+      sddm = {
+        enable = true;
+        autoNumlock = true;
       };
+      # defaultSession = "plasmawayland";
     };
 
+    # localtimed.enable = true;
+
+    # Enable the Plasma 6 Desktop Environment.
+    desktopManager.plasma6.enable = true;
+
+    # Enable the X11 windowing system.
+    xserver.enable = true;
+
     # Enable CUPS to print documents.
     printing = {
       enable = true;
@@ -36,7 +36,7 @@
     };
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       # for a WiFi printer
       openFirewall = true;
     };
diff --git a/modules/users/defin.nix b/modules/users/defin.nix
index fdb9cbc..b51d6b9 100644
--- a/modules/users/defin.nix
+++ b/modules/users/defin.nix
@@ -29,7 +29,7 @@
   };
 
   nix.settings.trusted-users = [ "@builders" ];
-  security.pam.enableSSHAgentAuth = true;
+  security.pam.sshAgentAuth.enable = true;
   # I can't think of a better spot to put this rn.
   services.openssh = {
     ports = [ 22 2200 ]; # needed because isp blocks ssh over 22