diff --git a/flake.nix b/flake.nix
index 5233fb8..4041ebc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,23 +59,25 @@
     formatter = nixpkgs.lib.genAttrs systems (system: nixpkgs.legacyPackages.${system}.alejandra);
 
     # Collection of all of our configs
-    # =========== Desktops ===========
-    crow = mkPhysicalNixOSConfig ./hosts/physical/crow;
+    nixosConfigurations = {
+      # =========== Desktops ===========
+      crow = mkPhysicalNixOSConfig ./hosts/physical/crow;
 
-    # nixosConfigurations.crow = nixpkgs.lib.nixosSystem {
-    #   system = "x86_64-linux";
-    #   modules = [
-    #     ./configuration.nix
+      # nixosConfigurations.crow = nixpkgs.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   modules = [
+      #     ./configuration.nix
 
-    #     home-manager.nixosModules.home-manager {
-    #       home-manager = {
-    #         useGlobalPkgs = true;
-    #         useUserPackages = true;
-    #         users.nest = import ./home.nix;
-    #         backupFileExtension = "backup";
-    #       };
-    #     }
-    #   ];
-    # };
+      #     home-manager.nixosModules.home-manager {
+      #       home-manager = {
+      #         useGlobalPkgs = true;
+      #         useUserPackages = true;
+      #         users.nest = import ./home.nix;
+      #         backupFileExtension = "backup";
+      #       };
+      #     }
+      #   ];
+      # };
+    };
   };
 }
diff --git a/home-manager/roles/desktop/niri/default.nix b/home-manager/roles/desktop/niri/default.nix
index fd96b1d..6611e2e 100644
--- a/home-manager/roles/desktop/niri/default.nix
+++ b/home-manager/roles/desktop/niri/default.nix
@@ -3,10 +3,9 @@
 {
   imports = [
     ../common/apps
+    ../tiling
   ];
 
-  programs.niri.enable = true;
-
   programs.zsh = {
     profileExtra = ''
       if [ -z "$WAYLAND_DISPLAY" ]  && [ "$XDG_VTNR" = 1 ]; then
@@ -14,9 +13,4 @@
       fi
     '';
   };
-
-  home.package = with pkgs; [
-    swaybg
-    mako
-  ];
 }
diff --git a/home-manager/roles/desktop/tiling/apps/default.nix b/home-manager/roles/desktop/tiling/apps/default.nix
new file mode 100644
index 0000000..c815045
--- /dev/null
+++ b/home-manager/roles/desktop/tiling/apps/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    swaybg.nix
+    swaylock.nix
+    mako.nix
+    swayidle.nix
+    quickshell.nix
+  ];
+}
diff --git a/home-manager/roles/desktop/tiling/apps/mako.nix b/home-manager/roles/desktop/tiling/apps/mako.nix
new file mode 100644
index 0000000..baa8cab
--- /dev/null
+++ b/home-manager/roles/desktop/tiling/apps/mako.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  services.mako.enable = true;
+}
diff --git a/home-manager/roles/desktop/tiling/apps/quickshell.nix b/home-manager/roles/desktop/tiling/apps/quickshell.nix
new file mode 100644
index 0000000..2c3fa6b
--- /dev/null
+++ b/home-manager/roles/desktop/tiling/apps/quickshell.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  programs.quickshell = {
+    enable = true;
+  };
+}
diff --git a/home-manager/roles/desktop/tiling/apps/swaybg.nix b/home-manager/roles/desktop/tiling/apps/swaybg.nix
new file mode 100644
index 0000000..c621de7
--- /dev/null
+++ b/home-manager/roles/desktop/tiling/apps/swaybg.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    swaybg
+  ];
+}
diff --git a/home-manager/roles/desktop/tiling/apps/swayidle.nix b/home-manager/roles/desktop/tiling/apps/swayidle.nix
new file mode 100644
index 0000000..3fa008b
--- /dev/null
+++ b/home-manager/roles/desktop/tiling/apps/swayidle.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  services.swayidle = {
+    enable = true;
+  };
+}
diff --git a/home-manager/roles/desktop/tiling/apps/swaylock.nix b/home-manager/roles/desktop/tiling/apps/swaylock.nix
new file mode 100644
index 0000000..6134d4f
--- /dev/null
+++ b/home-manager/roles/desktop/tiling/apps/swaylock.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  programs.swaylock = {
+    enable = true;
+  };
+}
diff --git a/home-manager/roles/desktop/tiling/default.nix b/home-manager/roles/desktop/tiling/default.nix
new file mode 100644
index 0000000..c95f7ea
--- /dev/null
+++ b/home-manager/roles/desktop/tiling/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./apps ];
+}
diff --git a/hosts/physical/default.nix b/hosts/physical/default.nix
index 6e0e226..3bc0bf4 100644
--- a/hosts/physical/default.nix
+++ b/hosts/physical/default.nix
@@ -41,7 +41,6 @@
     };
 
     # "Silent" boot
-    console.LogLevel = 0;
     initrd.verbose = false;
     kernelParams = [
       "quiet"
diff --git a/nixos/common/default.nix b/nixos/common/default.nix
index 7ba497d..1247e98 100644
--- a/nixos/common/default.nix
+++ b/nixos/common/default.nix
@@ -13,7 +13,7 @@
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  enviroment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
     tree
     htop
     dig
diff --git a/nixos/modules/home-manager.nix b/nixos/modules/home-manager.nix
index 4361e74..118b91e 100644
--- a/nixos/modules/home-manager.nix
+++ b/nixos/modules/home-manager.nix
@@ -11,7 +11,7 @@
       inherit inputs vars;
     };
 
-    useGlobalPackages = true;
+    useGlobalPkgs = true;
     useUserPackages = true;
 
     # Common home-manager imports
diff --git a/nixos/modules/zsh.nix b/nixos/modules/zsh.nix
index 8ff687a..8060471 100644
--- a/nixos/modules/zsh.nix
+++ b/nixos/modules/zsh.nix
@@ -1,32 +1,28 @@
-{
-  pgks,
-  ...
-}:
+{ pkgs, ... }: {
 
-{
-  environment.systemPackage = with pkgs; [
+  environment.systemPackages = with pkgs; [
     zsh
     oh-my-zsh
   ];
 
-  enviroment.variables = {
+  environment.variables = {
     NIX_FLAKE_PATH = "/etc/nixos";
   };
 
   programs.zsh = {
     enable = true;
     enableBashCompletion = true;
-    enableConpletion = true;
+    enableCompletion = true;
     autosuggestions.enable = true;
-    history.append = true;
-    history.size = 10000;
+    # history.append = true;
+    # history.size = 10000;
 
     ohMyZsh = {
       enable = true;
       theme = "bira";
       plugins = [
-        sudo
-	git
+        "sudo"
+	"git"
       ];
     };
 
diff --git a/nixos/roles/physical/desktop/niri/default.nix b/nixos/roles/physical/desktop/niri/default.nix
index 42ac2b4..9b93c2d 100644
--- a/nixos/roles/physical/desktop/niri/default.nix
+++ b/nixos/roles/physical/desktop/niri/default.nix
@@ -1,5 +1,10 @@
 { vars, pkgs, ... }: {
+  programs.niri.enable = true;
+
   security.polkit.enable = true;
+  security.pam.services.swaylock = {};
+
+  services.gnome.gnome-keyring.enable = true;
 
   services.displayManager = {
     gdm.enable = true;