From 2fbabfb771dcb17ad97ab69a8277a89dfea3f822 Mon Sep 17 00:00:00 2001
From: Martin Pander <git@pander-on.de>
Date: Tue, 10 Feb 2026 22:14:17 +0100
Subject: [PATCH] Fix things

---
 nix/modules/home/common.nix | 92 ++++++++++++++++++++-----------------
 nix/modules/home/nvim.nix   |  2 +-
 nvim/init.lua               |  7 ---
 3 files changed, 52 insertions(+), 49 deletions(-)
 delete mode 100644 nvim/init.lua

diff --git a/nix/modules/home/common.nix b/nix/modules/home/common.nix
index f45ff1b..419b4d4 100644
--- a/nix/modules/home/common.nix
+++ b/nix/modules/home/common.nix
@@ -1,49 +1,59 @@
 { config, pkgs, lib, ... }:
 
 {
-  imports = [
-    ./secrets.nix
-    ./sh.nix
-    ./tmux.nix
-    ./git.nix
-    ./dev.nix
-    ./nvim.nix
-    ./task.nix
-  ];
-
-  home.packages = with pkgs; [
-    nerd-fonts.fira-code
-    nil # Nix LSP
-
-    # Language servers
-    yaml-language-server
-    marksman
-    pkgs.unstable.dockerfile-language-server  # Use unstable for latest LSP features
-
-    # Secrets management
-    sops
-    age
-  ];
-
-  programs.ssh = {
-    enable = true;
-    enableDefaultConfig = false;
-    includes = [ "config.local" ];
-    matchBlocks = {
-      "*" = {
-        addKeysToAgent = "yes";
-      };
-
-      "git.pander.me" = {
-        hostname = "git.pander.me";
-        user = "git";
-        identityFile = "~/.ssh/private_git";
-        port = 2222;
-      };
+  options.dot = {
+    dotfilesPath = lib.mkOption {
+      type = lib.types.str;
+      default = "${config.home.homeDirectory}/dev/dot";
+      description = "Absolute path to the dotfiles repository on the local machine.";
     };
   };
 
-  news.display = "silent";
+  config = {
+    imports = [
+      ./secrets.nix
+      ./sh.nix
+      ./tmux.nix
+      ./git.nix
+      ./dev.nix
+      ./nvim.nix
+      ./task.nix
+    ];
 
-  programs.home-manager.enable = true;
+    home.packages = with pkgs; [
+      nerd-fonts.fira-code
+      nil # Nix LSP
+
+      # Language servers
+      yaml-language-server
+      marksman
+      pkgs.unstable.dockerfile-language-server  # Use unstable for latest LSP features
+
+      # Secrets management
+      sops
+      age
+    ];
+
+    programs.ssh = {
+      enable = true;
+      enableDefaultConfig = false;
+      includes = [ "config.local" ];
+      matchBlocks = {
+        "*" = {
+          addKeysToAgent = "yes";
+        };
+
+        "git.pander.me" = {
+          hostname = "git.pander.me";
+          user = "git";
+          identityFile = "~/.ssh/private_git";
+          port = 2222;
+        };
+      };
+    };
+
+    news.display = "silent";
+
+    programs.home-manager.enable = true;
+  };
 }
diff --git a/nix/modules/home/nvim.nix b/nix/modules/home/nvim.nix
index 88be1e5..edb77af 100644
--- a/nix/modules/home/nvim.nix
+++ b/nix/modules/home/nvim.nix
@@ -92,7 +92,7 @@ in
 
     # Symlink the nvim/lua directory to ~/.config/nvim/lua
     # This allows for editing the lua modules without a nix rebuild
-    xdg.configFile."nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/dot/nvim/lua";
+    xdg.configFile."nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "${config.dot.dotfilesPath}/nvim/lua";
 
     home.packages = with pkgs; [
       nodejs-slim
diff --git a/nvim/init.lua b/nvim/init.lua
deleted file mode 100644
index 44fae22..0000000
--- a/nvim/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
--- init.lua
--- This file is managed by Nix, but requires standard Lua modules from the lua/ directory
-
-require('base')
-require('keymaps')
-require('plugins')
-require('filetype')