From c0161445b6a14255cf75f09e17ba28f49ed5f5b1 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Sun, 2 Jun 2024 15:12:39 -0600
Subject: changes for nixos 24.05

---
 modules/nixos/hyprland.nix | 16 ++++++++--------
 modules/nixos/services.nix | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'modules/nixos')

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;
     };
-- 
cgit v1.2.3