flake.lock

@@ -200,11 +200,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776067740,
+        "lastModified": 1773814637,
-        "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=",
+        "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f",
+        "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1775710090,
+        "lastModified": 1773821835,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
         "type": "github"
       },
       "original": {

hosts/nate-work/default.nix

@@ -5,7 +5,7 @@ let
     system = "x86_64-linux";
     config.allowUnfree = true;
   };
-
+  isOnTheGo = builtins.elem "on-the-go" config.system.nixos.tags;
 in
 {
   imports = [
@@ -96,7 +96,7 @@ in
     enable = true;
     useNonFree = true;
     user = deskCfg.userName;
-    systemPackages = [ unstable.libreoffice ];
+    systemPackages = with pkgs; [ libreoffice ];
   };
 
   # Steam with gamescope
@@ -138,8 +138,9 @@ in
   # Nate-work session variables
   environment.sessionVariables = {
     FIREFOX_USE_SYSTEM_THEME = "true";
-    GBM_BACKEND = "nvidia-drm";
+    # For NVIDIA — only enable if not using on-the-go
-    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+    GBM_BACKEND = if isOnTheGo then "" else "nvidia-drm";
+    __GLX_VENDOR_LIBRARY_NAME = if isOnTheGo then "" else "nvidia";
   };
 
   # Nate-work extra packages
@@ -207,18 +208,80 @@ in
     };
     nvidia = {
       modesetting.enable = true;
-      powerManagement.enable = true;
+      powerManagement.enable = false;
-      powerManagement.finegrained = false;
+      powerManagement.finegrained = true;
       open = true;
       nvidiaSettings = true;
       package = config.boot.kernelPackages.nvidiaPackages.stable;
       prime = {
-        sync.enable = true;
+        offload.enable = true;
+        offload.enableOffloadCmd = true;
         intelBusId = "PCI:0:2:0";
         nvidiaBusId = "PCI:1:0:0";
       };
     };
   };
 
+  # On-the-go specialisation — disables NVIDIA GPU, uses Intel only
+  specialisation = {
+    on-the-go.configuration = {
+      system.nixos.tags = [ "on-the-go" ];
+
+      # Blacklist all NVIDIA kernel modules
+      boot.blacklistedKernelModules = [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" "nvidia_uvm" ];
+
+      # Force Intel i915 driver for 13th gen (Raptor Lake) integrated graphics
+      boot.kernelParams = [
+        "i915.force_probe=a7a0"
+        "module_blacklist=nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
+      ];
+
+      boot.extraModprobeConfig = ''
+        blacklist nouveau
+        blacklist nvidia
+        blacklist nvidia_drm
+        blacklist nvidia_modeset
+        blacklist nvidia_uvm
+        options nouveau modeset=0
+      '';
+
+      # Remove NVIDIA devices from PCI bus to save power
+      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
+        ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
+        # Remove NVIDIA Audio devices, if present
+        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}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
+      '';
+
+      # Use Intel modesetting driver only
+      services.xserver.videoDrivers = lib.mkForce [ "modesetting" ];
+
+      # Disable all NVIDIA hardware configurations
+      hardware.nvidia = {
+        prime.offload.enable = lib.mkForce false;
+        prime.offload.enableOffloadCmd = lib.mkForce false;
+        powerManagement.finegrained = lib.mkForce false;
+        prime.sync.enable = lib.mkForce false;
+      };
+
+      # Ensure Intel graphics packages are available
+      hardware.graphics.extraPackages = lib.mkForce (with pkgs; [
+        intel-vaapi-driver
+        intel-media-driver
+        vpl-gpu-rt
+      ]);
+
+      # Clear NVIDIA-specific environment variables
+      environment.sessionVariables = {
+        GBM_BACKEND = lib.mkForce "";
+        __GLX_VENDOR_LIBRARY_NAME = lib.mkForce "";
+      };
+    };
+  };
+
   system.stateVersion = "23.11";
 }

hosts/nate-work/linked-dotfiles/niri/config.kdl

@@ -444,7 +444,7 @@ binds {
     // 
 
     // Dictation
-    Mod+semicolon { spawn "hyprvoice" "toggle"; }
+    Mod+grave { spawn "hyprvoice" "toggle"; }
 
     // Notifications - Noctalia notification panel
     Mod+Shift+C { spawn "noctalia-shell" "ipc" "call" "notificationHistory" "toggle"; }

hosts/nate-work/modules/home-manager/home.nix

@@ -584,11 +584,11 @@ in
         enableUserTheming = false;
       };
       nightLight = {
-        enabled = true;
+        enabled = false;
-        forced = true;
+        forced = false;
-        autoSchedule = false;
+        autoSchedule = true;
         nightTemp = "4000";
-        dayTemp = "4000";
+        dayTemp = "6500";
         manualSunrise = "06:30";
         manualSunset = "18:30";
       };

shared/modules/home-manager/base-home.nix

@@ -69,7 +69,7 @@ in
 
     # Gnome keyring for SSH and secrets
     services.gnome-keyring.enable = true;
-    services.gnome-keyring.components = [ "secrets" ]; # ssh handled by gcr-ssh-agent (gcr 4.x)
+    services.gnome-keyring.components = [ "ssh" "secrets" ];
 
     # Bluetooth headphone controls
     services.mpris-proxy.enable = true;

shared/modules/system/noctalia-system.nix

@@ -4,10 +4,6 @@ with lib;
 
 let
   cfg = config.noctaliaSystem;
-  unstable = import inputs.nixpkgs-unstable {
-    system = "x86_64-linux";
-    config.allowUnfree = true;
-  };
 in
 {
   # Import Noctalia's NixOS module for systemd service
@@ -38,9 +34,7 @@ in
     # Required system services for Noctalia features
     # Evolution data server and Evolution - for calendar events support in Noctalia
     services.gnome.evolution-data-server.enable = mkDefault true;
-    # TODO)) switched to unstable instead of pkgs.evolution due to spam swarm build error Apr 14, 2026
+    environment.systemPackages = [ pkgs.evolution ];
-    # Can be changed back at some point to stable.
-    environment.systemPackages = [ unstable.evolution ];
 
     # NetworkManager - for wifi widget
     networking.networkmanager.enable = mkDefault true;