diff --git a/homes/min/default.nix b/homes/min/default.nix
index 07d2106..1db54bb 100644
--- a/homes/min/default.nix
+++ b/homes/min/default.nix
@@ -1,8 +1,12 @@
 {pkgs, ...}: {
-  home.packages = [pkgs.fastfetch];
+  imports = [
+    ./git.nix
+    ./helix.nix
+    ./nh.nix
+    ./shell.nix
+  ];
 
-  programs.zsh.enable = true;
-  
+  home.packages = [pkgs.fastfetch];
 
   home.stateVersion = "24.11";
 }
diff --git a/homes/min/git.nix b/homes/min/git.nix
new file mode 100644
index 0000000..b3129bc
--- /dev/null
+++ b/homes/min/git.nix
@@ -0,0 +1,17 @@
+_: {
+  programs.git = {
+    enable = true;
+    userName = "min";
+    userEmail = "minish@riseup.net";
+
+    aliases = {
+      lol = "log --pretty=oneline --reverse";
+    };
+
+    extraConfig = {
+      gpg.format = "ssh";
+      init.defaultBranch = "main";
+      core.pager = "";
+    };
+  };
+}
diff --git a/homes/min/helix.nix b/homes/min/helix.nix
new file mode 100644
index 0000000..b3a8807
--- /dev/null
+++ b/homes/min/helix.nix
@@ -0,0 +1,14 @@
+_: {
+  programs.helix = {
+    enable = true;
+    defaultEditor = true;
+    
+    settings = {
+      theme = "autumn";
+      editor = {
+        cursor-shape.insert = "bar";
+        file-picker.hidden = "false";
+      };
+    };
+  };
+}
diff --git a/homes/min/nh.nix b/homes/min/nh.nix
new file mode 100644
index 0000000..6043ff2
--- /dev/null
+++ b/homes/min/nh.nix
@@ -0,0 +1,5 @@
+_: {
+  programs.nh = {
+    enable = true;
+  };
+}
\ No newline at end of file
diff --git a/homes/min/shell.nix b/homes/min/shell.nix
new file mode 100644
index 0000000..52ba0b9
--- /dev/null
+++ b/homes/min/shell.nix
@@ -0,0 +1,18 @@
+_: {
+  programs = {
+    zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+    };
+
+    direnv = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+    
+    zoxide.enable = true;
+    tmux.enable = true;
+  };
+}
diff --git a/hosts/mpl/audio.nix b/hosts/mpl/audio.nix
index bc8a406..f438632 100644
--- a/hosts/mpl/audio.nix
+++ b/hosts/mpl/audio.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   # Enable sound.
   services.pipewire = {
     enable = true;
diff --git a/hosts/mpl/bootloader.nix b/hosts/mpl/bootloader.nix
index 206598d..8805588 100644
--- a/hosts/mpl/bootloader.nix
+++ b/hosts/mpl/bootloader.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   # TODO: lanzaboote
   boot = {
     loader = {
diff --git a/hosts/mpl/configuration.nix b/hosts/mpl/configuration.nix
index f69976e..7b27eea 100644
--- a/hosts/mpl/configuration.nix
+++ b/hosts/mpl/configuration.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+  inputs,
+  config,
+  ...
+}: {
   imports = [
     ./audio.nix
     ./bootloader.nix
@@ -49,7 +53,10 @@
   services.pcscd.enable = true;
 
   # Home-manager
-  home-manager.users.${config.users.users.min.name} = import ../../homes/min;
+  home-manager = {
+    extraSpecialArgs = {inherit inputs;};
+    users.${config.users.users.min.name} = import ../../homes/min;
+  };
 
   system.stateVersion = "24.11";
 }
diff --git a/hosts/mpl/secrets.nix b/hosts/mpl/secrets.nix
index 3588997..aa4b195 100644
--- a/hosts/mpl/secrets.nix
+++ b/hosts/mpl/secrets.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   sops = {
     defaultSopsFile = ../../secrets/mpl.yaml;
     age.sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
diff --git a/modules/networking.nix b/modules/networking.nix
index 4eb31e4..afa9b90 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,3 +1,3 @@
-{...}: {
+_: {
   networking.nameservers = ["1.1.1.1" "1.0.0.1"];
 }