Fix things

nix/modules/home/common.nix

@@ -1,49 +1,59 @@
 { config, pkgs, lib, ... }:
 
 {
-  imports = [
+  options.dot = {
-    ./secrets.nix
+    dotfilesPath = lib.mkOption {
-    ./sh.nix
+      type = lib.types.str;
-    ./tmux.nix
+      default = "${config.home.homeDirectory}/dev/dot";
-    ./git.nix
+      description = "Absolute path to the dotfiles repository on the local machine.";
-    ./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;
-      };
     };
   };
 
-  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;
+  };
 }

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

nvim/init.lua

@@ -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')