switch some flake inputs from specialArgs to host imports

flake.lock

@@ -47,33 +47,32 @@
         "vdf-src": "vdf-src"
       },
       "locked": {
-        "lastModified": 1786443600,
+        "lastModified": 1786889528,
-        "narHash": "sha256-YNq3EhUlQq+dnkpiVFHKgdw3a5HIFLnSQy5TMpxrVCM=",
+        "narHash": "sha256-MfZ0j7ZjeeRvaPm9SdRiij94uBzQfLaIR2DM4Td9clo=",
-        "owner": "UltimatePlayer97",
+        "owner": "KeksNino",
         "repo": "ASSella-nix",
-        "rev": "a4f8b5d64b4e181f69ae7aa79188da34e487ff5a",
+        "rev": "7aaf76cb6fe00860a5a96d3414d3b573c1d5fc24",
         "type": "github"
       },
       "original": {
-        "owner": "UltimatePlayer97",
+        "owner": "KeksNino",
         "repo": "ASSella-nix",
-        "rev": "a4f8b5d64b4e181f69ae7aa79188da34e487ff5a",
         "type": "github"
       }
     },
     "assella-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1786287819,
+        "lastModified": 1786832902,
-        "narHash": "sha256-2J9MjmbNg+uhuxKIAT9IpOp4A6AxA1tDt2UZKlAJaH0=",
+        "narHash": "sha256-LKYwBILHqHHy9txqLek6UjpsmVRoscbiStU6qY72+Iw=",
         "owner": "niwia",
         "repo": "ASSella",
-        "rev": "b0b323d89d0a727ac4448ff95f5021a7811908cc",
+        "rev": "8a9968aaaab60075a342d073b5d8525bad4a4235",
         "type": "github"
       },
       "original": {
         "owner": "niwia",
-        "ref": "v2.5.8",
+        "ref": "v2.6.0",
         "repo": "ASSella",
         "type": "github"
       }
@@ -137,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782949081,
+        "lastModified": 1785627969,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
         "type": "github"
       },
       "original": {
@@ -186,24 +185,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -256,11 +237,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785958398,
+        "lastModified": 1786719456,
-        "narHash": "sha256-5r/JgsoNMTx+qIh83WkxpujEKBR7PF5ssnh5vYCuSAw=",
+        "narHash": "sha256-B74DLQs/VjlqyhnnX3tguWwghqJHWSJX30TKZuAljIg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a7c70cc290290f373f50cd820403833d250459ac",
+        "rev": "83b7606dcf44abe3a94b86e8bb2b3355d22e8797",
         "type": "github"
       },
       "original": {
@@ -277,11 +258,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785531816,
+        "lastModified": 1786719456,
-        "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=",
+        "narHash": "sha256-B74DLQs/VjlqyhnnX3tguWwghqJHWSJX30TKZuAljIg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe",
+        "rev": "83b7606dcf44abe3a94b86e8bb2b3355d22e8797",
         "type": "github"
       },
       "original": {
@@ -667,11 +648,11 @@
       },
       "locked": {
         "dir": "packages/nix",
-        "lastModified": 1785944047,
+        "lastModified": 1786390927,
-        "narHash": "sha256-5J7dUkGh2cxuAuwalNnNoX1NvuFGkqiGYDU5gg4tkHE=",
+        "narHash": "sha256-rG9VwNR5bZIOzjYRjuY0SRqfx37spn0QQywPgITszQY=",
         "owner": "SteamClientHomebrew",
         "repo": "Millennium",
-        "rev": "1b61200b88b7479f8f9c1788364092f2cf270b20",
+        "rev": "816514f939ce8696ae8262b4e0c2123f593db08c",
         "type": "github"
       },
       "original": {
@@ -698,6 +679,24 @@
         "type": "github"
       }
     },
+    "musnix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1777848538,
+        "narHash": "sha256-Dj51C0NWsglqRrCpdmMr2nFiYacFOid1Tor4H9yG2HY=",
+        "owner": "musnix",
+        "repo": "musnix",
+        "rev": "8548782f0d1d0928daa3fffde8a008f72219a3f3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "musnix",
+        "repo": "musnix",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1767983141,
@@ -759,11 +758,11 @@
     },
     "nixpkgs-patcher": {
       "locked": {
-        "lastModified": 1781789965,
+        "lastModified": 1786578629,
-        "narHash": "sha256-ZRlWPq2Qms6KbesJrj7cUe2GN7s8BZISfp9ZbrCi2x0=",
+        "narHash": "sha256-oGghYTSoPQkTmFdQNQUmNxIcd6xMJ0VxwKRtVIa0hmY=",
         "owner": "gepbird",
         "repo": "nixpkgs-patcher",
-        "rev": "d2abed2b94b7955e05b4e2e8a9b8ac45597ecf94",
+        "rev": "59ecdb2d3783c2b1fd27e595b3f11411a5db730c",
         "type": "github"
       },
       "original": {
@@ -806,11 +805,27 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1785971067,
+        "lastModified": 1777268161,
-        "narHash": "sha256-fEVOOBW0RQ8OyIMhemdnglUYIdeBP5O9GwD2xlgprzs=",
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "66b7412b208c2bdee25124755a7b45f06d7971c0",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1786820742,
+        "narHash": "sha256-NqFjXL1rR+G++M7tsEaJynI9MqpQpMGazpI/4VAHe9I=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3de07e001d8c15051c9484eb0c0b2350e24d1d3b",
         "type": "github"
       },
       "original": {
@@ -819,13 +834,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
-        "lastModified": 1784555310,
+        "lastModified": 1786348146,
-        "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=",
+        "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493",
+        "rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
         "type": "github"
       },
       "original": {
@@ -835,7 +850,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1767026758,
         "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=",
@@ -851,29 +866,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1783279667,
-        "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1785454630,
+        "lastModified": 1786599213,
-        "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=",
+        "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746",
+        "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4",
         "type": "github"
       },
       "original": {
@@ -886,15 +885,15 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1785763201,
+        "lastModified": 1786577888,
-        "narHash": "sha256-wA373y/B9orM3HatLu9oS+Ke5lmdZyBl/bdjd2gLMq4=",
+        "narHash": "sha256-EVSCHLGozO2S4d14WianQ9JiU9tpPgdFv9uD74/xqeQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c7be49306b23a952c0151cf4bbeacd944ed82f2a",
+        "rev": "738351a7813be094fb00fce1a149bcc25e936c36",
         "type": "github"
       },
       "original": {
@@ -935,38 +934,17 @@
         "home-manager": "home-manager",
         "hyprsplit": "hyprsplit",
         "millennium": "millennium",
+        "musnix": "musnix",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-patch-xdg-desktop-portal": "nixpkgs-patch-xdg-desktop-portal",
         "nixpkgs-patcher": "nixpkgs-patcher",
         "nixvim": "nixvim",
         "sls-steam": "sls-steam",
         "xremap-flake": "xremap-flake",
-        "yazi": "yazi",
         "zen-browser": "zen-browser"
       }
     },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "yazi",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1783320166,
-        "narHash": "sha256-l7C/OsjcnWDOk2K3ssj+SBduwL67LashjBqis9+t468=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "20ee15370c9256669d66968b89ee20a4b0a4e673",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "sls-steam": {
       "inputs": {
         "nixpkgs": [
@@ -1051,21 +1029,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "vdf-src": {
       "flake": false,
       "locked": {
@@ -1151,7 +1114,7 @@
       "inputs": {
         "crane": "crane",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "xremap": "xremap"
       },
       "locked": {
@@ -1168,37 +1131,17 @@
         "type": "github"
       }
     },
-    "yazi": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_7",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1785901437,
-        "narHash": "sha256-t+gpoQMePLd2YWvvGV8ervuWVdza38I+CNkb2rrBL7U=",
-        "owner": "sxyazi",
-        "repo": "yazi",
-        "rev": "689e0e3319aa1ce3fd73d29e2e96cc538488392c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sxyazi",
-        "repo": "yazi",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1785915548,
+        "lastModified": 1786764320,
-        "narHash": "sha256-uF+QIxu7hhxKgzh7ai2uWVmeiqJYDC1C4fJ4P/IFZ/k=",
+        "narHash": "sha256-FO8IkyM+S1nFHPetg20r+EsLicLPuh+yy5WKqxG20JI=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "a7504841b8869ef5950c1b71f062ca51ca724a02",
+        "rev": "a19fe7e45d173d5e455771d7ecce9bbd02a9598f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -29,7 +29,7 @@
       flake = false;
     };
     assella = {
-      url = "github:UltimatePlayer97/ASSella-nix/a4f8b5d64b4e181f69ae7aa79188da34e487ff5a";
+      url = "github:KeksNino/ASSella-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -61,9 +61,6 @@
           inherit (inputs)
             sls-steam
             bcdl-free
-            xremap-flake
-            nixvim
-            nix-flatpak
             ;
         };
         nixpkgsPatcher.inputs = inputs;
@@ -75,6 +72,9 @@
           ./modules/desktop/flatpak.nix
           home-manager.nixosModules.home-manager
           gsr-ui.nixosModules.default
+          xremap-flake.nixosModules.default
+          nixvim.nixosModules.nixvim
+          nix-flatpak.nixosModules.nix-flatpak
           {
             nixpkgs.overlays = [
               millennium.overlays.default
@@ -84,10 +84,13 @@
               assella.packages.${system}.default
             ];
 
-            home-manager.users.user = import ./hosts/desktop/home-manager/home.nix;
+            home-manager.users.user.imports = [
+              ./hosts/desktop/home-manager/home.nix
+              zen-browser.homeModules.beta
+            ];
 
             home-manager.extraSpecialArgs = {
-              inherit zen-browser hyprsplit;
+              inherit hyprsplit;
             };
 
             programs.gpu-screen-recorder = {

hosts/desktop/configuration.nix

@@ -169,6 +169,7 @@
       ]);
   };
 
+  security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -177,7 +178,6 @@
     jack.enable = true;
     extraConfig.pipewire."92-no-crackling" = {
       "context.properties" = {
-        "pulse.min.req" = 48000;
         "default.clock.quantum" = 2048;
         "default.clock.min-quantum" = 256;
         "default.clock.max-quantum" = 4096;
@@ -200,8 +200,6 @@
     }
   ];
 
-  security.rtkit.enable = true;
-
   system.stateVersion = "24.11";
   system.autoUpgrade.enable = false;
   system.autoUpgrade.allowReboot = true;

hosts/desktop/home-manager/home.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   config,
-  zen-browser,
   ...
 }:
 {
@@ -12,7 +11,6 @@
     ../../../modules/home/hyprland
     ../../../modules/home/kitty.nix
     ../../../modules/programs/qutebrowser.nix
-    zen-browser.homeModules.beta
   ];
 
   home.username = "user";
@@ -58,6 +56,9 @@
   programs.zen-browser = {
     enable = true;
     setAsDefaultBrowser = true;
+    # profiles.default.settings = {
+    #   browser.tabs.allowTabDetach = false;
+    # };
   };
 
   programs.rbw = {

modules/desktop/flatpak.nix

@@ -1,9 +1,4 @@
-{ nix-flatpak, ... }:
 {
-  imports = [
-    nix-flatpak.nixosModules.nix-flatpak
-  ];
-
   services.flatpak.remotes = [
     {
       name = "cloudredirect";

modules/desktop/xremap.nix

@@ -1,9 +1,4 @@
-{ xremap-flake, ... }:
 {
-  imports = [
-    xremap-flake.nixosModules.default
-  ];
-
   services.xremap.enable = true;
   services.xremap.withHypr = true;
 

modules/programs/nixvim/neovim.nix

@@ -1,12 +1,10 @@
 {
-  nixvim,
   pkgs,
   config,
   ...
 }:
 {
   imports = [
-    nixvim.nixosModules.nixvim
     ./plugins
     ./keymaps.nix
     ./lsp.nix

modules/shell.nix

@@ -14,7 +14,7 @@
       ff = "fastfetch";
       grep = "grep -i";
       rg = "rg -i";
-      hyprland = "start-hyprland";
+      h = "start-hyprland";
       mv = "mv -v";
       n = "nvim";
       py = "uv run";