From d0d201cf54dba4c53e583aaf6e5a83d8a4603c4d Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Tue, 1 Jun 2021 10:09:39 -0400
Subject: [PATCH] move to 21.05

---
 flake.lock                    | 12 ++++++------
 flake.nix                     |  6 +++---
 hosts/default.nix             |  4 ++--
 hosts/hp/default.nix          |  2 +-
 hosts/lenny/default.nix       |  2 +-
 hosts/manta/configuration.nix | 29 -----------------------------
 hosts/manta/default.nix       |  5 -----
 hosts/neo/default.nix         |  2 +-
 hosts/tosh/default.nix        |  2 +-
 modules/gnome.nix             |  2 +-
 10 files changed, 16 insertions(+), 50 deletions(-)
 delete mode 100644 hosts/manta/configuration.nix
 delete mode 100644 hosts/manta/default.nix

diff --git a/flake.lock b/flake.lock
index a5297c4..2353a98 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,22 +2,22 @@
   "nodes": {
     "root": {
       "inputs": {
-        "stable2009": "stable2009",
+        "stable2105": "stable2105",
         "unstable": "unstable"
       }
     },
-    "stable2009": {
+    "stable2105": {
       "locked": {
-        "lastModified": 1622364474,
-        "narHash": "sha256-bRupByHizbCba3/AgaETL+YySowmfssqWl7+p0jwcPU=",
+        "lastModified": 1622449420,
+        "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"
       }
diff --git a/flake.nix b/flake.nix
index a16d851..506fc5b 100644
--- a/flake.nix
+++ b/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; };
   };
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index edeab21..b285e3d 100644
--- a/hosts/default.nix
+++ b/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;
diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix
index d00154b..7d82025 100644
--- a/hosts/hp/default.nix
+++ b/hosts/hp/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }
diff --git a/hosts/lenny/default.nix b/hosts/lenny/default.nix
index d00154b..7d82025 100644
--- a/hosts/lenny/default.nix
+++ b/hosts/lenny/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }
diff --git a/hosts/manta/configuration.nix b/hosts/manta/configuration.nix
deleted file mode 100644
index 02ff02d..0000000
--- a/hosts/manta/configuration.nix
+++ /dev/null
@@ -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";
-}
diff --git a/hosts/manta/default.nix b/hosts/manta/default.nix
deleted file mode 100644
index d00154b..0000000
--- a/hosts/manta/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  pkgs = "unstable";
-  system = "x86_64-linux";
-  hardware = "physical";
-}
diff --git a/hosts/neo/default.nix b/hosts/neo/default.nix
index d00154b..7d82025 100644
--- a/hosts/neo/default.nix
+++ b/hosts/neo/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }
diff --git a/hosts/tosh/default.nix b/hosts/tosh/default.nix
index d00154b..7d82025 100644
--- a/hosts/tosh/default.nix
+++ b/hosts/tosh/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "unstable";
+  pkgs = "stable2105";
   system = "x86_64-linux";
   hardware = "physical";
 }
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 85af00b..9e48e6c 100644
--- a/modules/gnome.nix
+++ b/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; [