diff --git a/config/nix/home.nix b/config/nix/common/home.nix
similarity index 95%
rename from config/nix/home.nix
rename to config/nix/common/home.nix
index d7c4f401..458d53b6 100644
--- a/config/nix/home.nix
+++ b/config/nix/common/home.nix
@@ -7,7 +7,7 @@
 
 }:
 let
-  start-tmux = (import ./scripts/start-tmux.nix) pkgs;
+  start-tmux = (import ../scripts/start-tmux.nix) pkgs;
 in
 # https://mipmip.github.io/home-manager-option-search/
 {
@@ -20,7 +20,7 @@ in
     # Include the results of the hardware scan.
     ./tmux.nix
     ./wezterm.nix
-    ./hyprland.nix
+    ../linux/hyprland.nix
   ];
 
   programs = {
@@ -149,6 +149,7 @@ in
 
     packages = [
       pkgs.macchina
+      pkgs.ripgrep
       pkgs.alejandra
       # pkgs.neovim-nightly
       pkgs.cachix
@@ -171,8 +172,8 @@ in
     ];
 
     file = {
-      ".config/tmux/sessions".source = ../tmux/sessions;
-      ".config/nvim".source = ../nvim;
+      ".config/tmux/sessions".source = ../../tmux/sessions;
+      ".config/nvim".source = ../../nvim;
 
       # # You can also set the file content immediately.
       # ".gradle/gradle.properties".text = ''
diff --git a/config/nix/tmux.nix b/config/nix/common/tmux.nix
similarity index 100%
rename from config/nix/tmux.nix
rename to config/nix/common/tmux.nix
diff --git a/config/nix/wezterm.nix b/config/nix/common/wezterm.nix
similarity index 100%
rename from config/nix/wezterm.nix
rename to config/nix/common/wezterm.nix
diff --git a/config/nix/darwin.nix b/config/nix/darwin/default.nix
similarity index 98%
rename from config/nix/darwin.nix
rename to config/nix/darwin/default.nix
index 39c621e5..6b8acfaf 100644
--- a/config/nix/darwin.nix
+++ b/config/nix/darwin/default.nix
@@ -25,6 +25,8 @@
     package = pkgs.nix;
   };
 
+  security.pam.enableSudoTouchIdAuth = true;
+
   programs.bash.enable = true;
   programs.zsh.enable = true;
   programs.fish.enable = true;
diff --git a/config/nix/skhd.nix b/config/nix/darwin/skhd.nix
similarity index 100%
rename from config/nix/skhd.nix
rename to config/nix/darwin/skhd.nix
diff --git a/config/nix/yabai.nix b/config/nix/darwin/yabai.nix
similarity index 100%
rename from config/nix/yabai.nix
rename to config/nix/darwin/yabai.nix
diff --git a/config/nix/flake.nix b/config/nix/flake.nix
index f05c3e27..f7e84ab1 100644
--- a/config/nix/flake.nix
+++ b/config/nix/flake.nix
@@ -83,7 +83,7 @@
                 nix-darwin.lib.darwinSystem {
                   inherit pkgs;
                   modules = [
-                    ./darwin.nix
+                    ./darwin
                     home-manager.darwinModules.home-manager
                     {
                       home-manager = {
@@ -93,7 +93,7 @@
                           inherit device;
                           inherit overlays;
                         };
-                        users.${device.user}.imports = [ ./home.nix ];
+                        users.${device.user}.imports = [ ./common/home.nix ];
                       };
                     }
                   ];
diff --git a/config/nix/hyprland.nix b/config/nix/linux/hyprland.nix
similarity index 100%
rename from config/nix/hyprland.nix
rename to config/nix/linux/hyprland.nix