flake update

8 files changed, 123 insertions, 62 deletions

diff --git a/flake.lock b/flake.lock
index 40dd120..bba0daa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -383,11 +383,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775457580,
-        "narHash": "sha256-ikws/ssAmG20AGrEwBuwspwPlkubJu34mB+Uz2fJBJs=",
+        "lastModified": 1775622785,
+        "narHash": "sha256-/yFxO+7oS1SymDfJ2iVO7K5vJKcYfe9XGIJ+quLqz0Q=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5de7dbd151b0bd65d45785553d4a22d832733ffc",
+        "rev": "527e47b78fe67213072f706bf933a9705a8c4974",
         "type": "github"
       },
       "original": {
@@ -691,11 +691,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775509337,
-        "narHash": "sha256-4A9wTWQoSVfZ30ImJMlTH8yVI5kWuq4e7YpDwMg/uoI=",
+        "lastModified": 1775628196,
+        "narHash": "sha256-C9H4CHXo/yMEiYYi2BcUwCreCOqsF1DaMR2gimduPNE=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "ee86daca4f8f3d28ea2f9adbcaa74158bffc41e6",
+        "rev": "79ca5eedb2f68e2681eba7523acd43a12c3225d1",
         "type": "github"
       },
       "original": {
@@ -707,11 +707,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1775432805,
-        "narHash": "sha256-CV2RUUsR9quFbeqTHPrdpO9+2/u7ZXxof0JuGSpOe4o=",
+        "lastModified": 1775605133,
+        "narHash": "sha256-QBi9quAM8C1ja7pu/lOZPkOP57/sbjA5Q+JJ/yNR81o=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "13faa0ef847135b3c295560b6e5fdd83aff4b2a4",
+        "rev": "de674491800c0ecb6f6658512829a3d21c47fe5f",
         "type": "github"
       },
       "original": {
@@ -732,11 +732,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1775457047,
-        "narHash": "sha256-HXWISaieWkm+zcZkBbqDgu6yxlFX3JHxnVRv7mBH8Og=",
+        "lastModified": 1775637310,
+        "narHash": "sha256-LYm11N3gAH8bnQcU+/bIyeE1YAFOUuaJ5LQQgI1VB3E=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "b9f29e2ade937c5fc8ae2d3fe8c026698c32c044",
+        "rev": "15223527082d596609717cacf10a8b2d51c8787d",
         "type": "github"
       },
       "original": {
@@ -765,11 +765,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1775389417,
-        "narHash": "sha256-6hFJBpP31H97upBDHJVPsm++io+9pjgApbXfxD0dCFo=",
+        "lastModified": 1775561155,
+        "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "d1a0380eed224363749f1704ca3ff2ab1690b7f2",
+        "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1",
         "type": "github"
       },
       "original": {
@@ -786,11 +786,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775109269,
-        "narHash": "sha256-LQo7CnK7iaq6iIiOLqoKrAtk3QaDQrH8nYrG8OjZXNA=",
+        "lastModified": 1775632307,
+        "narHash": "sha256-zT06wZQL4f0p60l4OjBqE4gnU7zd+CHU01GLrOanTzQ=",
         "owner": "powerofthe69",
         "repo": "nix-gaming-edge",
-        "rev": "13774b662c7e445c8fab8499278227b849499349",
+        "rev": "83a6eea6181f7848ceeac0b65fee89200233a703",
         "type": "github"
       },
       "original": {
@@ -848,11 +848,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1775305101,
-        "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=",
+        "lastModified": 1775525138,
+        "narHash": "sha256-BQb70+B378ECLO8iQT3P/b1hCC5/CJVHZdeulY8futc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "36a601196c4ebf49e035270e10b2d103fe39076b",
+        "rev": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1775525138,
+        "narHash": "sha256-BQb70+B378ECLO8iQT3P/b1hCC5/CJVHZdeulY8futc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d96b37bbeb9840f1c0ebfe90585ef5067b69bbb3",
         "type": "github"
       },
       "original": {
@@ -864,11 +880,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1775036866,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
         "type": "github"
       },
       "original": {
@@ -928,11 +944,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1775424406,
-        "narHash": "sha256-ENSQFUK6zs4C5brC4MlrNRM2Krn8OsHdoxPLtezhFyU=",
+        "lastModified": 1775567832,
+        "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "3ffc800a01cbd1f2e68e78b527bb7d56078c6351",
+        "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970",
         "type": "github"
       },
       "original": {
@@ -1035,6 +1051,7 @@
         "nix-gaming-edge": "nix-gaming-edge",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-stable": "nixpkgs-stable_2",
         "nixvim": "nixvim",
         "nvf": "nvf",
         "omnisearch": "omnisearch",
@@ -1128,11 +1145,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1775224332,
-        "narHash": "sha256-gYbb2zzwWhE83XTjr1fNn+z2nwY3P8GrrCOdxIuCoOw=",
+        "lastModified": 1775630794,
+        "narHash": "sha256-Njq83xACSD8HTP7slV6KGHJAXb4AHp1fyua8W8KKxJ8=",
         "owner": "gabm",
         "repo": "Satty",
-        "rev": "5443eb2c5209618107efd1a51ecc9fc31d7467fe",
+        "rev": "c1a9d2125e19073059d144c15ed7713226016cea",
         "type": "github"
       },
       "original": {
@@ -1171,11 +1188,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775365543,
-        "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
+        "lastModified": 1775619836,
+        "narHash": "sha256-VcC/+MMMldwQKcST2y/QTndGLusSxjeUvYwFwzZKKko=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
+        "rev": "de5f2d596eb896a5728afcd15f823f59cb9ecfdb",
         "type": "github"
       },
       "original": {
@@ -1318,11 +1335,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774943664,
-        "narHash": "sha256-ADGHtKZ+iqqax8T63Sy47r8Uvmz/smj2sMf8pOyn9gk=",
+        "lastModified": 1775558724,
+        "narHash": "sha256-tjZmQ+H9osk0MA7LB/JBCO8K+dzqNmxdjU2mbVRUsQ8=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "1e965ccce06faf9515d0570329c12f7245d958ed",
+        "rev": "202ae4bd5f2d8865704761211b3004d2fcd2d7d8",
         "type": "github"
       },
       "original": {
@@ -1390,11 +1407,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1775460738,
-        "narHash": "sha256-ctf4O2KQVyQX3XnxFfroF7E4b57Hmt2yUBsTHis9mBs=",
+        "lastModified": 1775531191,
+        "narHash": "sha256-dyGsew/ULeVLbWWnMIHvAoYA3je0ywMgXDSzLAfwdNw=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "354cdef9072b251babe4dcb7cd154f5981ea468c",
+        "rev": "f6408656b42c3c370e4b61cb27490a93afcae4a7",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 1c16c1d..4fd7b8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
 
+    # Hardware and gaming
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     openmw-nix = {
@@ -16,11 +18,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    omnisearch = {
-      url = "git+https://git.bwaaa.monster/omnisearch";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
+    # System Utilities
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -36,6 +34,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # UI and apps
     niri = {
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -56,6 +55,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Editors
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -71,8 +76,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    spicetify-nix = {
-      url = "github:Gerg-L/spicetify-nix";
+    # Other
+    omnisearch = {
+      url = "git+https://git.bwaaa.monster/omnisearch";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -88,21 +94,33 @@
   };
 
   outputs =
-    { self, nixpkgs, ... }@inputs:
+    {
+      self,
+      nixpkgs,
+      nixpkgs-stable,
+      ...
+    }@inputs:
     let
       mkHost =
         {
           hostname,
           user ? "adam",
+          isStable ? false,
           path ? ./hosts/${hostname}/configuration.nix,
         }:
-        nixpkgs.lib.nixosSystem {
+        let
+          basePkgs = if isStable then nixpkgs-stable else nixpkgs;
+          actualPath = if path != null then path else ./hosts/${hostname}/configuration.nix;
+        in
+        basePkgs.lib.nixosSystem {
           specialArgs = {
             inherit inputs;
             username = user;
+            pkgs-unstable = import inputs.nixpkgs { config.allowUnfree = true; };
+            pkgs-stable = import inputs.nixpkgs-stable { config.allowUnfree = true; };
           };
           modules = [
-            path
+            actualPath
             { networking.hostName = hostname; }
           ];
         };
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 47f2704..1f31a46 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -23,6 +23,7 @@
       drivers = {
         enable = true;
         cpu = "amd";
+        kernel = "zen";
         graphics = {
           enable = true;
           version = "git";
@@ -60,6 +61,10 @@
         enable = true;
         enableBrowser = true;
       };
+      tor = {
+        enable = true;
+        enableBrowser = true;
+      };
       files = {
         enable = true;
         localsend.enable = true;
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 9b373db..3764937 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -77,14 +77,17 @@ in
       })
 
       (lib.mkIf (cfg.graphics.enable && cfg.graphics.amdgpu.enable) {
-        services.lact.enable = true;
-        hardware.amdgpu = {
-          initrd.enable = true;
-          overdrive.enable = true;
+        services = {
+          lact.enable = true;
+          hardware.openrgb.enable = true;
+        };
+        hardware = {
+          amdgpu = {
+            initrd.enable = true;
+            overdrive.enable = true;
+          };
+          graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ];
         };
-        hardware.graphics.extraPackages = with pkgs; [
-          rocmPackages.clr.icd
-        ];
       })
       (lib.mkIf (cfg.graphics.enable && cfg.graphics.version == "git") {
         nixpkgs.overlays = [ inputs.nix-gaming-edge.overlays.mesa-git ];
diff --git a/os/core/security.nix b/os/core/security.nix
index afd6297..fd518c0 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -100,6 +100,7 @@ in
 
         environment.systemPackages = with pkgs; [
           veracrypt
+          gocryptfs
           keepassxc
         ];
       }
diff --git a/os/core/users.nix b/os/core/users.nix
index 86c015c..4bd0221 100644
--- a/os/core/users.nix
+++ b/os/core/users.nix
@@ -21,7 +21,11 @@ in
           hashedPasswordFile = config.sops.secrets.user_password.path;
           shell = pkgs.fish;
           extraGroups = lib.mkMerge [
-            [ "wheel" ]
+            [
+              "wheel"
+              "input"
+              "uinput"
+            ]
 
             (lib.mkIf (config.os.core.drivers.graphics.enable or false) [
               "video"
@@ -30,7 +34,6 @@ in
             (lib.mkIf (config.os.core.network.enable or false) [ "networkmanager" ])
             (lib.mkIf (config.os.srv.virtualization.enable or false) [ "libvirtd" ])
             (lib.mkIf (config.os.srv.docker.enable or false) [ "docker" ])
-            (lib.mkIf (config.os.srv.autoclicker.enable or false) [ "input" ])
           ];
         };
         root.hashedPasswordFile = config.sops.secrets.root_password.path;
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index a8bba78..5de2e26 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -40,6 +40,7 @@ in
       home-manager.users.${username}.hm.soft.mangohud.enable = true;
 
       environment.systemPackages = with pkgs; [
+        theclicker
         ludusavi
         protonplus
       ];
diff --git a/os/srv/tor.nix b/os/srv/tor.nix
index a33f486..08c8152 100644
--- a/os/srv/tor.nix
+++ b/os/srv/tor.nix
@@ -1,15 +1,28 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 let
   cfg = config.os.srv.tor;
 in
 {
-  options.os.srv.tor.enable = lib.mkEnableOption "enables tor services and browser";
-
-  config = lib.mkIf cfg.enable {
-
+  options.os.srv.tor = {
+    enable = lib.mkEnableOption "enables tor services";
+    enableBrowser = lib.mkEnableOption "enables the tor browser";
   };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      services.tor = {
+        enable = true;
+      };
+    })
+    (lib.mkIf cfg.enableBrowser {
+      environment.systemPackages = with pkgs; [
+        tor-browser
+      ];
+    })
+  ];
 }