flake: switch to 21.05 release on all hosts

base/gui-programs.nix

@@ -2,19 +2,20 @@
 {
   environment.systemPackages = with pkgs; [
     alacritty
-    discord
     feh
-    firefox
+    gnome.nautilus
-    element-desktop
-    gnome3.nautilus
     mpv
     pavucontrol
-    slack
-    spotify
-    tdesktop
-    teams
     thunderbird
     zathura
+
+    unstable.discord
+    unstable.firefox
+    unstable.element-desktop
+    unstable.slack
+    unstable.spotify
+    unstable.tdesktop
+    unstable.teams
   ];
 
   networking.networkmanager.enable = true;

flake.lock

@@ -19,63 +19,47 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1622145920,
+        "lastModified": 1622312560,
-        "narHash": "sha256-/tt6IApLuVcGP5auy4zjLzfm5+MBHYLS3Nauvv2U2EQ=",
+        "narHash": "sha256-xBWgiwnPaL/iZasPxw3BuvPAee/2jiToiZjKvKLs+PA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0e6c61a44092e98ba1d75b41f4f947843dc7814d",
+        "rev": "ab64dc32493996c24607eab2cae6663466ddfb8a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-21.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1621511390,
+        "lastModified": 1622449420,
-        "narHash": "sha256-isDpLGr73ejAiksS1eW0dOMjEIB+j8b1lyAN++5KmrA=",
+        "narHash": "sha256-aKDhIaJqNUy7p3urHEBC/mdIAJWckhW3Fgzmv284UHg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a7064e23973b0f3e1dd56cf4601758fedc38423c",
+        "rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-20.09",
+        "ref": "nixos-21.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1622103435,
+        "lastModified": 1622362955,
-        "narHash": "sha256-5i5mGg402AANnSRQmWVo7lqiyw3taoMwX26oslOD9c4=",
+        "narHash": "sha256-azGfd/yS4Bwh7TunIs7P8iaWRUPdcZpBuDqfJregb7E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5658fadedb748cb0bdbcb569a53bd6065a5704a9",
+        "rev": "bfdf04bd21bb99b05bb10f0de8876ad4baca48e4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable-small": {
-      "locked": {
-        "lastModified": 1622099353,
-        "narHash": "sha256-lDLpmiMDt8Su3fjxeaSyh7aWmiQg1rtcPOC+sAIvhro=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a48d4bf159076106895df685e879aff235bcbff3",
         "type": "github"
       },
       "original": {
@@ -90,8 +74,7 @@
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs-unstable": "nixpkgs-unstable"
-        "nixpkgs-unstable-small": "nixpkgs-unstable-small"
       }
     }
   },

flake.nix

@@ -5,17 +5,10 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "nixos-20.09";
+      ref = "nixos-21.05";
     };
 
     nixpkgs-unstable = {
-      type = "github";
-      owner = "NixOS";
-      repo = "nixpkgs";
-      ref = "nixos-unstable";
-    };
-
-    nixpkgs-unstable-small = {
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
@@ -33,33 +26,22 @@
       type = "github";
       owner = "nix-community";
       repo = "home-manager";
-      ref = "master";
+      ref = "release-21.05";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
   outputs = { self,
               nixpkgs,
               nixpkgs-unstable,
-              nixpkgs-unstable-small,
               emacs-overlay,
               home-manager }: {
     nixosConfigurations.poseidon = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
-      modules =
+      modules = [
-        let
-          pkgsUnstable = import nixpkgs-unstable { inherit system; };
-        in
-        [
         ./poseidon.nix
 
-          # hack to use an unstable home manager within a stable NixOS install,
+        home-manager.nixosModules.home-manager
-          # do not reproduce... at home :clown_face:
-          ({ config, utils, ... }: home-manager.nixosModules.home-manager {
-            pkgs = pkgsUnstable;
-            lib = pkgsUnstable.lib;
-            inherit config utils;
-          })
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
@@ -71,19 +53,18 @@
           nixpkgs.overlays = [
             (final: prev: {
               # packages accessible through pkgs.unstable.package
-                unstable = pkgsUnstable;
+              unstable = import nixpkgs-unstable {
-
+                inherit system;
-                bitwarden_rs = pkgsUnstable.bitwarden_rs;
+                config.allowUnfree = true;
-                bitwarden_rs-vault = pkgsUnstable.bitwarden_rs-vault;
+              };
             })
           ];
         }
       ];
     };
-    nixosConfigurations.boreal = nixpkgs-unstable.lib.nixosSystem rec {
+    nixosConfigurations.boreal = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
-      modules =
+      modules = [
-        [
         ./boreal.nix
 
         home-manager.nixosModules.home-manager
@@ -101,10 +82,12 @@
             (self: super: {
               packages = import ./pkgs { pkgs = super; };
 
-                unstable-small = import nixpkgs-unstable-small {
+              unstable = import nixpkgs-unstable {
                 inherit system;
                 config.allowUnfree = true;
               };
+
+              steam = self.unstable.steam;
             })
 
             # uncomment this to build everything from scratch, fun but takes a