a

flake.lock

@@ -3,63 +3,31 @@
     "home": {
       "inputs": {
         "nixpkgs": [
-          "nixos"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1648834319,
+        "lastModified": 1650059391,
-        "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
+        "narHash": "sha256-2kYYStLpPCcYToW+uZTP0jxmdR95URCret/vfpzJn4s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
+        "rev": "7add9ce2e5c517fcc4b25b3ed13e7e28cd325034",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.11",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
     },
-    "latest": {
-      "locked": {
-        "lastModified": 1649408932,
-        "narHash": "sha256-JhTW1OtS5fACcRXLqcTTQyYO5vLkO+bceCqeRms13SY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "42948b300670223ca8286aaf916bc381f66a5313",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixos": {
-      "locked": {
-        "lastModified": 1649490789,
-        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1649488242,
+        "lastModified": 1649849514,
-        "narHash": "sha256-GFahTvlMnqotZ8i1AO3J8OtVFrJe4QHcEPxpFH+DIEw=",
+        "narHash": "sha256-zQyTr2UebTKUh1KLyLtevhHsM8umPK1LfQLGUGjRjiQ=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "850308db3ef0bcc7454155063b5fec28b4ffbc8c",
+        "rev": "1a0ccdbf4583ed0fce37eea7955e8ef90f840a9f",
         "type": "github"
       },
       "original": {
@@ -83,13 +51,28 @@
         "type": "github"
       }
     },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1649986882,
+        "narHash": "sha256-cNsInUFq1MbuvaEmv8x6jetWnmAU+osMpnwKumtjksI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home": "home",
-        "latest": "latest",
-        "nixos": "nixos",
         "nixos-hardware": "nixos-hardware",
-        "nixos-persistence": "nixos-persistence"
+        "nixos-persistence": "nixos-persistence",
+        "nixpkgs": "nixpkgs"
       }
     }
   },

flake.nix

@@ -2,25 +2,23 @@
   description = "config!!!";
 
   inputs = {
-    nixos.url = "github:nixos/nixpkgs/nixos-21.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    home.url = "github:nix-community/home-manager/release-21.11";
+    home.url = "github:nix-community/home-manager/master";
-    home.inputs.nixpkgs.follows = "nixos";
+    home.inputs.nixpkgs.follows = "nixpkgs";
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
     nixos-persistence.url = "github:nix-community/impermanence";
   };
 
   outputs = inputs: let
-    lib = inputs.nixos.lib.extend (_: _: builtins);
+    lib = inputs.nixpkgs.lib.extend (_: _: builtins);
     tlib = (import ./lib lib).extend (_: prev: rec {
       makePkgs = system:
         import ./pkgs-set {
           inherit system lib;
           tlib = prev;
-          stable = inputs.nixos;
+          channel = inputs.nixpkgs;
-          unstable = inputs.latest;
         };
       genPkgs = f: prev.genSystems (system: f (makePkgs system));
     });

hosts/lungmen/default.nix

@@ -40,7 +40,7 @@
 in {
   imports = with inputs;
   with nixos-hardware.nixosModules; [
-    nixos.nixosModules.notDetected
+    nixpkgs.nixosModules.notDetected
     nixos-persistence.nixosModule
     common-pc-ssd
     common-pc

modules/base/nix.nix

@@ -20,6 +20,6 @@
     allowedUsers = ["@wheel"];
     trustedUsers = ["root" "@wheel"];
     autoOptimiseStore = true;
-    nixPath = ["nixpkgs=${inputs.latest}" "home-manager=${inputs.home}"];
+    nixPath = ["nixpkgs=${inputs.nixpkgs}" "home-manager=${inputs.home}"];
   };
 }

pkgs-set/default.nix

@@ -1,22 +1,16 @@
 {
-  stable,
+  channel,
-  unstable,
   system,
   lib,
   ...
 }: let
+  pkgs = import channel {
+    inherit system;
+    config.allowUnfree = true;
     overlays =
       lib.mapAttrsToList
       (name: _: import "${./overlays}/${name}")
       (lib.readDir ./overlays);
-  unstablePkgs = import unstable {
-    inherit system;
-    config.allowUnfree = true;
-  };
-  pkgs = import stable {
-    inherit system;
-    config.allowUnfree = true;
-    overlays = [(_: _: import ./from-unstable.nix unstablePkgs)] ++ overlays;
   };
   pkgsToExport = import ./pkgs-to-export.nix;
 in

pkgs-set/from-unstable.nix

@@ -1,15 +0,0 @@
-pkgs: {
-  inherit
-    (pkgs)
-    helix
-    alejandra
-    rnix-lsp
-    chromium
-    rofi
-    rofi-wayland
-    vscode
-    nixUnstable
-    nix-direnv
-    direnv
-    ;
-}

pkgs-set/overlays/firefox-wayland.nix

@@ -0,0 +1,3 @@
+_: prev: {
+  firefox = prev.firefox-wayland;
+}

users/patriot/default.nix

@@ -290,7 +290,7 @@ in {
           (
             steam.override
             {
-              extraLibraries = pkgs: [pkgs.pipewire];
+              extraLibraries = pkgs: with pkgs; [mimalloc pipewire vulkan-loader wayland wayland-protocols];
               extraProfile = ''
                 unset VK_ICD_FILENAMES
                 export VK_ICD_FILENAMES=${nixosConfig.environment.variables.VK_ICD_FILENAMES}'';
@@ -303,7 +303,7 @@ in {
          }))
          */
         standardnotes
-        discord-system-electron
+        #discord-system-electron
       ];
     };
     wayland.windowManager = {
@@ -415,6 +415,9 @@ in {
           set -g status off
         '';
       };
+      firefox = {
+        enable = true;
+      };
       chromium = {
         enable = true;
         package = pkgs.chromium;