diff --git a/flake.lock b/flake.lock
index de2a262..e1826e6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -301,24 +301,63 @@
     },
     "home-manager-cosmic": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "home-manager": "home-manager_2",
+        "home-manager-cosmic": "home-manager-cosmic_2"
       },
       "locked": {
-        "lastModified": 1729339643,
-        "narHash": "sha256-NNJ9s0axzL2XRsqTF8Zx/OzjW7LngWwMbSeHOCXukbk=",
+        "lastModified": 1729637091,
+        "narHash": "sha256-nrzQMU4Y+ASKzCzugapaexKxhNXvFLrFmqPcLR0H7Yk=",
         "owner": "tristanbeedell",
-        "repo": "home-manager",
-        "rev": "4e0f341e97b8a70be8a396d3778efbd8209e302e",
+        "repo": "hm-cosmic",
+        "rev": "0a12abbd1b52142d187cddb9050a0a7a14297b09",
         "type": "github"
       },
       "original": {
+        "owner": "tristanbeedell",
+        "ref": "master",
+        "repo": "hm-cosmic",
+        "type": "github"
+      }
+    },
+    "home-manager-cosmic_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1729633506,
+        "narHash": "sha256-DWJBRqIgR+oziSk38bZTFoMEvrSKREOc61BRyOHgmh8=",
         "owner": "tristanbeedell",
         "repo": "home-manager",
-        "rev": "4e0f341e97b8a70be8a396d3778efbd8209e302e",
+        "rev": "b826bf8c1d5e3e9600d6dc92563c661f97f60f71",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tristanbeedell",
+        "ref": "cosmic",
+        "repo": "home-manager",
         "type": "github"
       }
     },
     "home-manager_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1729551526,
+        "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_3": {
       "inputs": {
         "nixpkgs": [
           "nixvim",
@@ -339,7 +378,7 @@
         "type": "github"
       }
     },
-    "home-manager_3": {
+    "home-manager_4": {
       "inputs": {
         "nixpkgs": [
           "stylix",
@@ -406,11 +445,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722185531,
-        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
         "type": "github"
       },
       "original": {
@@ -453,6 +492,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1727122398,
         "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
@@ -467,7 +522,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1725534445,
         "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
@@ -483,7 +538,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1725194671,
         "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
@@ -505,7 +560,7 @@
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager_3",
         "nix-darwin": "nix-darwin",
         "nixpkgs": [
           "nixpkgs"
@@ -554,7 +609,7 @@
         "home-manager": "home-manager",
         "home-manager-cosmic": "home-manager-cosmic",
         "nixos-cosmic": "nixos-cosmic",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
@@ -583,7 +638,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
@@ -609,8 +664,8 @@
         "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_2",
         "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_4",
+        "home-manager": "home-manager_4",
+        "nixpkgs": "nixpkgs_5",
         "systems": "systems_2",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
diff --git a/flake.nix b/flake.nix
index e393d31..29e8252 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    home-manager-cosmic.url = "github:tristanbeedell/home-manager/4e0f341e97b8a70be8a396d3778efbd8209e302e";
+    home-manager-cosmic.url = "github:tristanbeedell/hm-cosmic/master";
     stylix.url = "github:danth/stylix";
     sops-nix.url = "github:Mic92/sops-nix";
     nixos-cosmic = {
diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix
index 93060ee..b287c5e 100644
--- a/home/desktop/cosmic/default.nix
+++ b/home/desktop/cosmic/default.nix
@@ -15,6 +15,8 @@ in {
       Super.       "l" = Actions.Focus "Right";
       Super.       "j" = Actions.Focus "Down";
       Super.       "k" = Actions.Focus "Up";
+      Super.       "u" = Actions.Focus "Out";
+      Super.       "i" = Actions.Focus "In";
       Super.Shift. "h" = Actions.Move "Left";
       Super.Shift. "l" = Actions.Move "Right";
       Super.Shift. "j" = Actions.Move "Down";
@@ -73,13 +75,14 @@ in {
         };
       };
     };
-    settings = {
-      "com.system76.CosmicComp".options = {
-        autotile = true;
-        active_hint = true;
-        focus_follows_cursor = true;
-        focus_follows_cursor_delay = 0;
-        cursor_follows_focus = true;
+    comp.settings = {
+      autotile = true;
+      active_hint = true;
+      focus_follows_cursor = true;
+      focus_follows_cursor_delay = 0;
+      cursor_follows_focus = true;
+      workspaces = {
+        workspace_layout = "Horizontal";
       };
     };
   };
diff --git a/nixos/programs/cosmic.nix b/nixos/programs/cosmic.nix
index 8028081..140334e 100644
--- a/nixos/programs/cosmic.nix
+++ b/nixos/programs/cosmic.nix
@@ -14,7 +14,7 @@
   services.displayManager.cosmic-greeter.enable = true;
   services.system76-scheduler.enable = true;
   home-manager.users.${config.user}.imports = [
-    (import "${inputs.home-manager-cosmic}/modules/programs/cosmic/.")
+    (inputs.home-manager-cosmic.homeManagerModules.cosmic)
     ../../home/desktop/cosmic/.
   ];
 }