Cleaning up and fixing

system/boot.nix

@@ -56,7 +56,6 @@ in
             "systemd.show_status=auto"
             "splash"
         ];
-        bootspec.enable = true;
         resumeDevice = "/dev/disk/by-partlabel/disk-${hostname}-root";
         kernel.sysctl = {
             "net.ipv4.ip_unprivileged_port_start" = 0;
@@ -69,6 +68,9 @@ in
                 DefaultTimeoutStopSec = "5s";
             };
         };
+        services.systemd-suspend.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
+        services.systemd-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
+        services.systemd-suspend-then-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
     };
 }
 

system/hardware.nix

@@ -1,4 +1,4 @@
-{ pkgs-unstable, ... }:
+{ pkgs, ... }:
 
 {
     hardware = {
@@ -11,7 +11,7 @@
 
         opentabletdriver = {
             enable = true;
-            package = pkgs-unstable.opentabletdriver;
+            package = pkgs.opentabletdriver;
         };
         uinput.enable = true;
     };

system/packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, nix-gaming, ... }:
+{ pkgs, nix-gaming, ... }:
 
 {
     nixpkgs.config.allowUnfree = true;
@@ -34,7 +34,7 @@
         localsend # Local file sharing tool
         makima # Key remapper for Linux TODO: Figure out and configure
         mako # Notification daemon
-        pkgs-unstable.neovim # Editor
+        neovim # Editor
         nix-gaming.mo2installer
         pnpm # JavaScript package manager (used by Neovim plugins)
         tree-sitter # Incremental parsing tool for editors
@@ -42,7 +42,7 @@
         openssl # SSL/TLS toolkit
         p7zip # 7-Zip archiver
         pipewire
-        pkgs-unstable.yazi # Terminal file manager
+        yazi # Terminal file manager
         pywal16 # Image colorscheme generator
         qt6.qtwayland # qtwayland support
         ripgrep # Better grep
@@ -62,8 +62,8 @@
         v4l-utils # Video4Linux utilities TODO: Figure out why I need this
         waybar # Status bar for Hyprland
         wget # Download tool
-        pkgs-unstable.wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support
-        pkgs-unstable.winetricks # Windows compatibility tool
+        wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support
+        winetricks # Windows compatibility tool
         wl-clipboard # Wayland clipboard manager
         wlogout # Wayland logout menu
         xdg-terminal-exec # XDG terminal execution utility
@@ -88,6 +88,7 @@
     };
 
     nix.settings = {
+        trusted-users = [ "root" "chris" ];
         extra-substituters = [
             "https://nix-gaming.cachix.org"
             "https://walker.cachix.org"

system/programs.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, hostname, ... }:
+{ pkgs, hostname, ... }:
 
 {
     programs = {
@@ -13,14 +13,14 @@
         };
         hyprland = {
             enable = true;
-            package = pkgs-unstable.hyprland;
-            portalPackage = pkgs-unstable.xdg-desktop-portal-hyprland;
+            package = pkgs.hyprland;
+            portalPackage = pkgs.xdg-desktop-portal-hyprland;
             xwayland.enable = true;
             withUWSM = true;
         };
         steam = {
             enable = true;
-            package = pkgs-unstable.steam;
+            package = pkgs.steam;
             remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
             dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
             localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers

system/services.nix

@@ -1,4 +1,4 @@
-{ pkgs-unstable, ... }:
+{ pkgs, ... }:
 
 {
     services = {
@@ -10,7 +10,7 @@
         fwupd.enable = true;
         input-remapper = {
             enable = true;
-            package = pkgs-unstable.input-remapper;
+            package = pkgs.input-remapper;
         };
         geoclue2 = {
             enable = true;
@@ -32,7 +32,7 @@
                 enable = true;
                 wayland.enable = true;
                 theme = "maya";
-                package = pkgs-unstable.kdePackages.sddm;
+                package = pkgs.kdePackages.sddm;
             };
             autoLogin.enable = true;
             autoLogin.user = "chris";
@@ -45,7 +45,7 @@
             enable = true;
             settings.Login = {
                 HandleLidSwitch = "suspend";
-                HandleLidSwitchDocked = "suspend";
+                HandleLidSwitchDocked = "ignore";
             };
         };
     };

system/virtualisation.nix

@@ -1,11 +1,11 @@
-{ pkgs-unstable, ... }:
+{ pkgs, ... }:
 
 {
     virtualisation = {
         docker = {
             enable = true;
             autoPrune.enable = true;
-            package = pkgs-unstable.docker;
+            package = pkgs.docker;
         };
     };
 }