diff --git a/flake.lock b/flake.lock
index 3163f3f..76a2097 100644
--- a/flake.lock
+++ b/flake.lock
@@ -72,37 +72,18 @@
         "type": "github"
       }
     },
-    "home-manager-21_05": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1634544068,
-        "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-21.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-21_11": {
+    "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-21_11"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1637917557,
-        "narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=",
+        "lastModified": 1638267006,
+        "narHash": "sha256-heZdDlD09rnoeEiZ4wKfbXNDkO5I9qVFvX9d790h/XE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18",
+        "rev": "3e93c4e8b2b479c712b7c20a428993b459118842",
         "type": "github"
       },
       "original": {
@@ -114,7 +95,7 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1635444951,
@@ -132,7 +113,7 @@
     },
     "naersk_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1635777496,
@@ -164,22 +145,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-21_11": {
-      "locked": {
-        "lastModified": 1638239011,
-        "narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "21.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1637831627,
@@ -197,20 +162,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1635471979,
-        "narHash": "sha256-qlpiKdJ5gF7hU1TuNoz4xTsroUSrdErwovu3rD5cy2c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3f33a306a55bd7ecedf586a627063a211ffdc6f0",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1635527206,
         "narHash": "sha256-vuktnugcLNX5HFpj8nVSKgojRDYQlxtKtcYWtOveegE=",
@@ -224,23 +175,23 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1622516815,
-        "narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=",
+        "lastModified": 1638239011,
+        "narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97",
+        "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "21.05",
+        "ref": "21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1625223284,
         "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=",
@@ -256,7 +207,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1635956637,
         "narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=",
@@ -270,7 +221,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1635956637,
         "narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=",
@@ -327,11 +278,9 @@
       "inputs": {
         "darwin": "darwin",
         "deploy-rs": "deploy-rs",
-        "home-manager-21_05": "home-manager-21_05",
-        "home-manager-21_11": "home-manager-21_11",
+        "home-manager": "home-manager",
         "naersk": "naersk",
-        "nixpkgs": "nixpkgs_4",
-        "nixpkgs-21_11": "nixpkgs-21_11",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "rnix-lsp": "rnix-lsp",
@@ -357,7 +306,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1633273832,
@@ -407,7 +356,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1637534778,
diff --git a/flake.nix b/flake.nix
index 2ff2efb..08d271d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,12 @@
   description = "nki's systems";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/21.05";
-    nixpkgs-21_11.url = "github:nixos/nixpkgs/21.11";
+    nixpkgs.url = "github:nixos/nixpkgs/21.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     darwin.url = "github:lnl7/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    home-manager-21_11.url = "github:nix-community/home-manager/release-21.11";
-    home-manager-21_11.inputs.nixpkgs.follows = "nixpkgs-21_11";
-    home-manager-21_05.url = "github:nix-community/home-manager/release-21.05";
+    home-manager.url = "github:nix-community/home-manager/release-21.11";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.url = "github:Mic92/sops-nix";
     deploy-rs.url = "github:Serokell/deploy-rs";
     nur.url = "github:nix-community/NUR";
@@ -27,7 +25,7 @@
     secrets.url = "git+ssh://git@github.com/natsukagami/nix-deploy-secrets";
   };
 
-  outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager-21_11, home-manager-21_05, deploy-rs, sops-nix, nur, ... }@inputs:
+  outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager, deploy-rs, sops-nix, nur, ... }@inputs:
     let
       overlayForSystem = import ./overlay.nix inputs;
     in
@@ -37,7 +35,7 @@
         system = "aarch64-darwin";
         modules = [
           ./darwin/configuration.nix
-          home-manager-21_11.darwinModules.home-manager
+          home-manager.darwinModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
@@ -54,7 +52,7 @@
           ./modules/my-tinc
           sops-nix.nixosModules.sops
           ./nki-home/configuration.nix
-          home-manager-21_05.nixosModules.home-manager
+          home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
diff --git a/home/common.nix b/home/common.nix
index ba6471e..fede2df 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -99,15 +99,8 @@
 
     gh = {
       enable = true;
-    } // (
-      let
-        protocol = "ssh";
-      in
-      if (config.home.stateVersion == "21.05") then
-        { gitProtocol = "ssh"; }
-      else
-        { settings.git_protocol = protocol; }
-    );
+      settings.git_protocol = "ssh";
+    };
 
     git = {
       enable = true;
diff --git a/home/kakoune/kak-lsp.nix b/home/kakoune/kak-lsp.nix
index f971abf..f972b53 100644
--- a/home/kakoune/kak-lsp.nix
+++ b/home/kakoune/kak-lsp.nix
@@ -18,11 +18,7 @@ let
 
     cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
       inherit src;
-      outputHash = (
-        if pkgs.stdenv.isDarwin
-        then "sha256-U5hiEak47Dd/R7II6d+0/n3ZmT1ryDk4S+/lV2cH6HM="
-        else "0ywb9489jrb5lsycxlxzrj2khkcjhvzxbb0ckbpwwvg11r4ds240"
-      );
+      outputHash = "sha256-U5hiEak47Dd/R7II6d+0/n3ZmT1ryDk4S+/lV2cH6HM=";
     });
   });
 
diff --git a/home/modules/X11/xfce4-notifyd.nix b/home/modules/X11/xfce4-notifyd.nix
index 8ed929a..8acd107 100644
--- a/home/modules/X11/xfce4-notifyd.nix
+++ b/home/modules/X11/xfce4-notifyd.nix
@@ -8,17 +8,6 @@ in
   options.services.X11.xfce4-notifyd.enable = mkEnableOption "Notification Manager for xfce4";
 
   config = mkIf cfg.enable {
-    xdg.configFile."autostart/xfce4-notifyd.desktop" = {
-      # Remove the "OnlyShowIn" line
-      source = pkgs.runCommand "xfce4-notifyd.desktop"
-        {
-          buildInput = [ pkgs.gnused ];
-          preferLocalBuild = true;
-        } ''
-        sed "s/OnlyShowIn/# OnlyShowIn/g" \
-          < ${pkgs.xfce.xfce4-notifyd}/etc/xdg/autostart/xfce4-notifyd.desktop \
-          > $out
-      '';
-    };
+    home.packages = with pkgs; [ xfce.xfce4-notifyd ];
   };
 }
diff --git a/nki-home/configuration.nix b/nki-home/configuration.nix
index eeac310..f87250b 100644
--- a/nki-home/configuration.nix
+++ b/nki-home/configuration.nix
@@ -120,7 +120,7 @@
     pciutils
 
     ## Security stuff
-    qtkeychain
+    libsForQt5.qtkeychain
 
     ## Enable nix-flakes
     # (pkgs.writeShellScriptBin "nixFlakes" ''