diff --git a/desktop/plasma.nix b/desktop/plasma.nix
index 12b2c0e..8eabc20 100644
--- a/desktop/plasma.nix
+++ b/desktop/plasma.nix
@@ -4,10 +4,7 @@
   services.xserver.enable = true;
 
   # Use GDM because SDDM and LightDM suck.
-  services.xserver.displayManager = {
-    gdm.enable = true;
-    lightdm.enable = false;
-  };
+  # Deprecated services.xserver.displayManager removed - using services.displayManager below
 
   services.displayManager.gdm.enable = true;
   services.displayManager.sddm.enable = false;
@@ -17,7 +14,7 @@
   programs.dconf.enable = true;
   programs.kdeconnect.enable = true;
   hardware.bluetooth.enable = true;
-  
+
   environment.systemPackages = with pkgs; [
     kdePackages.spectacle
     arc-theme        # Desktop theme
@@ -26,7 +23,7 @@
     firefox          # Web browser
   ];
 
-  # GNUPG Stuff 
+  # GNUPG Stuff
   services.pcscd.enable = true;
   programs.gnupg.agent = {
     enable = true;
diff --git a/flake.nix b/flake.nix
index cc1eceb..c010bf8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,12 +22,14 @@
 
   outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, plasma-manager, octofriend }:
     let
-      system = "x86_64-linux";
+      localSystem = {
+        system = "x86_64-linux";
+      };
 
 
     commonSpecialArgs = {
       pkgs-unstable = import nixpkgs-unstable {
-        inherit system;
+        inherit (localSystem) system;
         config.allowUnfree = true;
       };
 
@@ -35,7 +37,7 @@
     };
 
     mkSystem = { modules, hardware ? [] }: nixpkgs.lib.nixosSystem {
-      inherit system;
+      inherit (localSystem) system;
       specialArgs = commonSpecialArgs;
       modules = [
         home-manager.nixosModules.home-manager
diff --git a/systems/framework.nix b/systems/framework.nix
index 0c498f3..95c6ccb 100644
--- a/systems/framework.nix
+++ b/systems/framework.nix
@@ -47,11 +47,15 @@
 
 # Logind lid-switch configuration
   services.logind = {
-    lidSwitch = "suspend-then-hibernate";
-    lidSwitchDocked = "ignore"; # Prevent suspend when connected to a dock
-    lidSwitchExternalPower = "ignore";
-    powerKey = "poweroff";
-    suspendKey = "ignore"; # Optional: configure behavior for the suspend key
+    settings = {
+      Login = {
+        HandleLidSwitch = "suspend-then-hibernate";
+        HandleLidSwitchDocked = "ignore"; # Prevent suspend when connected to a dock
+        HandleLidSwitchExternalPower = "ignore";
+        HandlePowerKey = "poweroff";
+        HandleSuspendKey = "ignore"; # Optional: configure behavior for the suspend key
+      };
+    };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/users/aksutter.nix b/users/aksutter.nix
index 930b86f..7342a6a 100644
--- a/users/aksutter.nix
+++ b/users/aksutter.nix
@@ -12,7 +12,7 @@
       git
       nextcloud-client
       vlc
-      pinentry
+      pinentry-gnome3
       arc-theme
       zoom-us
       libreoffice-qt
@@ -40,9 +40,11 @@
 
       programs.git = {
         enable = true;
-        userName  = "Akalia Sutter";
-        userEmail = "aksutter@symbiotip.com";
-        extraConfig = {
+        settings = {
+          user = {
+            name = "Akalia Sutter";
+            email = "aksutter@symbiotip.com";
+          };
           core.editor = "nano";
           credential.helper = "cache";
         };
@@ -63,7 +65,7 @@
           jnoortheen.nix-ide
         ];
       };
-      
+
       programs.firefox = {
         enable = true;
         package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
@@ -89,7 +91,7 @@
               SkipOnboarding = true;
             };
           };
-        };     
+        };
         profiles = {
           aksutter = {
             id = 0;
diff --git a/users/isutter.nix b/users/isutter.nix
index eb4998d..4c3d3dc 100644
--- a/users/isutter.nix
+++ b/users/isutter.nix
@@ -12,7 +12,7 @@
       git
       nextcloud-client
       vlc
-      pinentry
+      pinentry-gnome3
       arc-theme
       zoom-us
       libreoffice-qt
@@ -40,9 +40,11 @@
 
       programs.git = {
         enable = true;
-        userName  = "Isis Sutter";
-        userEmail = "isutter@symbiotip.com";
-        extraConfig = {
+        settings = {
+          user = {
+            name = "Isis Sutter";
+            email = "isutter@symbiotip.com";
+          };
           core.editor = "nano";
           credential.helper = "cache";
         };
@@ -63,7 +65,7 @@
           jnoortheen.nix-ide
         ];
       };
-      
+
       programs.firefox = {
         enable = true;
         package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
@@ -89,7 +91,7 @@
               SkipOnboarding = true;
             };
           };
-        };     
+        };
         profiles = {
           isutter = {
             id = 0;
diff --git a/users/jsutter.nix b/users/jsutter.nix
index add2457..a7a1f8b 100644
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -39,9 +39,11 @@
 
       programs.git = {
         enable = true;
-        userName  = "Julian Sutter";
-        userEmail = "jsutter@symbiotip.com";
-        extraConfig = {
+        settings = {
+          user = {
+            name = "Julian Sutter";
+            email = "jsutter@symbiotip.com";
+          };
           core.editor = "nano";
           credential.helper = "store";
           init.defaultBranch = "main";
@@ -136,7 +138,7 @@
           theme = "terminalparty";
         };
       };
-      
+
       programs.lsd = {
         enable = true;
       };
@@ -168,7 +170,7 @@
               SkipOnboarding = true;
             };
           };
-        };     
+        };
         profiles = {
           jsutter = {
             id = 0;