less

flake.nix

@@ -2,6 +2,7 @@
   description = "jana's server infrastructure";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/5d9ea8caac0dda3bc216047d29943b8a59e431b7";
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -29,7 +30,7 @@
     # home
     nixvim = {
       url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
     t.url = "github:jdonszelmann/t-rs";
     dumpasm.url = "github:jdonszelmann/dumpasm";
@@ -71,18 +72,21 @@
     vimium-options.url = "github:uimataso/vimium-nixos";
   };
   outputs =
-    { nixpkgs
-    , flake-utils
-    , sops-nix
-    , vpn-confinement
-    , deploy-rs
-    , ...
+    {
+      nixpkgs,
+      nixpkgs-unstable,
+      flake-utils,
+      sops-nix,
+      vpn-confinement,
+      deploy-rs,
+      ...
     }@inputs:
     let
       custom = pkgs: import ./pkgs/custom.nix (inputs // { inherit pkgs; });
-      pkgsForSystem =
-        system:
-        import nixpkgs {
+
+      pkgsForSystemShared =
+        np: system:
+        import np {
           inherit system;
           config.allowUnfree = true;
           overlays = [
@@ -91,7 +95,9 @@
             })
           ];
         };
-      configs = import ./config.nix (inputs // { inherit pkgsForSystem; });
+      pkgsForSystem = pkgsForSystemShared nixpkgs;
+      unstablePkgsForSystem = pkgsForSystemShared nixpkgs-unstable;
+      configs = import ./config.nix (inputs // { inherit pkgsForSystem unstablePkgsForSystem; });
     in
     (configs.configs [
       {