diff --git a/baldur/hm.nix b/baldur/hm.nix
index 7f761d8..6049090 100644
--- a/baldur/hm.nix
+++ b/baldur/hm.nix
@@ -65,4 +65,6 @@
     ../hm_modules/zsh.nix
     ../hm_modules/shell_aliases.nix
   ];
+
+  home.stateVersion = "22.05";
 }
diff --git a/flake.lock b/flake.lock
index afdcc66..cc01b14 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,27 +36,6 @@
         "type": "github"
       }
     },
-    "home-manager-u": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-u"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1661573386,
-        "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nix-rice": {
       "inputs": {
         "flake-utils": [
@@ -81,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1660407119,
-        "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=",
+        "lastModified": 1662458987,
+        "narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
+        "rev": "504b32caf83986b7e6b9c79c1c13008f83290f19",
         "type": "github"
       },
       "original": {
@@ -112,11 +91,11 @@
     },
     "nixpkgs-u": {
       "locked": {
-        "lastModified": 1661628722,
-        "narHash": "sha256-oR/7NhG7pPkACToUtaaT6hH+rONE2z5/4NzjoUwEZt8=",
+        "lastModified": 1662019588,
+        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "324c8aaf25b2f2027af7798e5582ce3040a793b6",
+        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
         "type": "github"
       },
       "original": {
@@ -128,11 +107,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1661309001,
-        "narHash": "sha256-a0CDFy+TD1/csQw+Bqdk4cT//BVAvp+A4QPYbUV9LlQ=",
+        "lastModified": 1662435069,
+        "narHash": "sha256-ATmHyfXFd5jKoxVD3ozcv/JhLXKKrjgVWm0+8bFLG5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a5c89f496b91b441f5259c29bd48b62e0d265b25",
+        "rev": "d2f66009e5a82a8c09f10a477c9276a963dd0129",
         "type": "github"
       },
       "original": {
@@ -194,7 +173,6 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "home-manager-u": "home-manager-u",
         "nix-rice": "nix-rice",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
@@ -225,21 +203,6 @@
         "repo": "tex2nix",
         "type": "github"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1653893745,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 02f020d..096b3ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,10 +9,10 @@
     };
 
     nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
-    home-manager-u = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs-u";
-    };
+    # home-manager-u = {
+    #   url = "github:nix-community/home-manager";
+    #   inputs.nixpkgs.follows = "nixpkgs-u";
+    # };
 
     flake-utils.url = "github:numtide/flake-utils";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
@@ -45,7 +45,7 @@
     , nixpkgs
     , home-manager
     , nixpkgs-u
-    , home-manager-u
+      # , home-manager-u
     , flake-utils
     , nixos-hardware
     , tex2nix
@@ -104,11 +104,11 @@
         homeManagerSettings
         { home-manager.users = users; }
       ];
-      homeManagerUModules = users: [
-        home-manager-u.nixosModules.home-manager
-        homeManagerSettings
-        { home-manager.users = users; }
-      ];
+      # homeManagerUModules = users: [
+      #   home-manager-u.nixosModules.home-manager
+      #   homeManagerSettings
+      #   { home-manager.users = users; }
+      # ];
 
       odinBaseModules = [
         ./odin/hardware-configuration.nix
@@ -147,11 +147,11 @@
         ./thor/configuration.nix
       ];
       thorBuilder = { extraModules ? [ ] }:
-        nixpkgs-u.lib.nixosSystem rec {
+        nixpkgs.lib.nixosSystem rec {
           system = "x86_64-linux";
           modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
             ++ commonBaseModules ++ thorBaseModules
-            ++ (homeManagerUModules { bertof = import ./thor/hm.nix; })
+            ++ (homeManagerModules { bertof = import ./thor/hm.nix; })
             ++ extraModules;
         };
 
diff --git a/hm_modules/cava.nix b/hm_modules/cava.nix
index 1524db7..9ce0268 100644
--- a/hm_modules/cava.nix
+++ b/hm_modules/cava.nix
@@ -4,6 +4,8 @@ let
   fmtString = str: "'${str}'";
 in
 {
+  home.packages = [ pkgs.cava ];
+
   xdg.configFile."cava/config".text = lib.generators.toINI { } {
     general = {
       bar_width = 1;
diff --git a/loki/hm.nix b/loki/hm.nix
index 5550924..6b01632 100644
--- a/loki/hm.nix
+++ b/loki/hm.nix
@@ -65,4 +65,6 @@
     ../hm_modules/zsh.nix
     ../hm_modules/shell_aliases.nix
   ];
+
+  home.stateVersion = "21.11";
 }
diff --git a/odin/hm.nix b/odin/hm.nix
index 9b63a96..1c96170 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -166,4 +166,6 @@
     ../hm_modules/xidlehook.nix
     ../hm_modules/zathura.nix
   ];
+
+  home.stateVersion = "21.11";
 }
diff --git a/thor/configuration.nix b/thor/configuration.nix
index 387bd62..305e653 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -31,6 +31,7 @@ with lib; {
   };
 
   hardware = {
+    opengl.enable = true;
     bluetooth.enable = true;
     enableRedistributableFirmware = true;
     pulseaudio.enable = false;
diff --git a/thor/hm.nix b/thor/hm.nix
index fe36b23..44c9bd8 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -13,7 +13,6 @@
       bitwarden
       btop
       catgirl # IRC
-      cava
       discord
       docker-compose
       docker-machine
@@ -97,6 +96,7 @@
     ../hm_modules/alacritty.nix
     ../hm_modules/autorandr.nix
     ../hm_modules/bspwm.nix
+    ../hm_modules/cava.nix
     ../hm_modules/easyeffects.nix
     ../hm_modules/dunst.nix
     # ../hm_modules/grobi.nix
@@ -132,4 +132,6 @@
     ../hm_modules/xidlehook.nix
     ../hm_modules/zathura.nix
   ];
+
+  home.stateVersion = "21.05";
 }