move to 21.05

flake.lock

@@ -2,22 +2,22 @@
   "nodes": {
     "root": {
       "inputs": {
-        "stable2009": "stable2009",
+        "stable2105": "stable2105",
         "unstable": "unstable"
       }
     },
-    "stable2009": {
+    "stable2105": {
       "locked": {
-        "lastModified": 1622364474,
+        "lastModified": 1622449420,
-        "narHash": "sha256-bRupByHizbCba3/AgaETL+YySowmfssqWl7+p0jwcPU=",
+        "narHash": "sha256-aKDhIaJqNUy7p3urHEBC/mdIAJWckhW3Fgzmv284UHg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eae0cabc124702e04bb2098070ca46d661543d29",
+        "rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-20.09",
+        "ref": "nixos-21.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,11 +1,11 @@
 {
   inputs.unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-  inputs.stable2009.url = "github:NixOS/nixpkgs/nixos-20.09";
+  inputs.stable2105.url = "github:NixOS/nixpkgs/nixos-21.05";
 
-  outputs = { self, unstable, stable2009 }: {
+  outputs = { self, unstable, stable2105 }: {
     nixosModule = { ... }: {
       imports = [ ./. ];
     };
-    nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable stable2009; };
+    nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable stable2105; };
   };
 }

hosts/default.nix

@@ -1,4 +1,4 @@
-{ modules, unstable, stable2009 }:
+{ modules, unstable, stable2105 }:
 let
 
   hostMetadata =
@@ -21,7 +21,7 @@ let
 in
 builtins.mapAttrs
   (n: v:
-    let pkgs = { inherit unstable stable2009; }.${v.pkgs};
+    let pkgs = { inherit unstable stable2105; }.${v.pkgs};
     in
     pkgs.lib.nixosSystem {
       inherit (v) system;

hosts/hp/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }

hosts/lenny/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }

hosts/manta/configuration.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = [ pkgs.vmware-horizon-client ];
-
-  services.tlp.enable = true;
-  services.openssh.enable = true;
-
-  networking.search = [ "bck.me" ];
-
-  sconfig = {
-    profile = "desktop";
-    gnome = true;
-    security-tools = true;
-  };
-
-  boot = {
-    loader.systemd-boot.enable = true;
-    loader.efi.canTouchEfiVariables = true;
-    initrd.luks.devices.cryptroot = { device = "/dev/disk/by-partlabel/_root"; allowDiscards = true; };
-  };
-
-  fileSystems = {
-    "/" = { device = "/dev/mapper/cryptroot"; fsType = "btrfs"; options = [ "subvol=/os" "compress=zstd" "discard" ]; };
-    "/home" = { device = "/dev/mapper/cryptroot"; fsType = "btrfs"; options = [ "subvol=/home" "compress=zstd" "discard" ]; };
-    "/boot" = { device = "/dev/disk/by-partlabel/_esp"; fsType = "vfat"; };
-  };
-
-  system.stateVersion = "20.09";
-}

hosts/manta/default.nix

@@ -1,5 +0,0 @@
-{
-  pkgs = "unstable";
-  system = "x86_64-linux";
-  hardware = "physical";
-}

hosts/neo/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }

hosts/tosh/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }

modules/gnome.nix

@@ -12,7 +12,7 @@ in
       libinput.enable = true;
       displayManager.gdm.enable = true;
       displayManager.gdm.autoSuspend = false;
-      desktopManager.gnome3.enable = true;
+      desktopManager.gnome.enable = true;
     };
 
     environment.systemPackages = with pkgs; [