refactor: rename common directory to modules

hosts/laptop/home.nix

@@ -1,4 +1,5 @@
 {
+  self,
   config,
   pkgs,
   lib,
@@ -16,9 +17,8 @@
     ./home-manager/scripts
     ./home-manager/aider-chat.nix
     ./home-manager/aichat.nix
-    ../../common/home-manager/git
-    ../../common/home-manager/neovim
-    ../../common/home-manager/shell
+    ../../modules/home-manager/git
+    ../../modules/home-manager/shell
     inputs.nix-secrets.homeManagerModule
     inputs.numen.homeManagerModule
   ];
@@ -60,7 +60,9 @@
     # fonts
     font-awesome
     nerd-fonts.dejavu-sans-mono
+    self.packages.${pkgs.system}.nvim
   ];
+  home.sessionVariables.EDITOR = "nvim";
 
   systemd.user.startServices = true;
   gtk = {

hosts/wsl/home.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  self,
+  config,
+  pkgs,
+  ...
+}:
 let
   regula = pkgs.stdenv.mkDerivation {
     name = "regula";
@@ -33,13 +38,10 @@ let
 in
 {
   imports = [
-    ../../common/home-manager/neovim
-    ../../common/home-manager/shell
-    ../../common/home-manager/git
+    ../../modules/home-manager/shell
+    ../../modules/home-manager/git
   ];
 
-  my.programs.neovim.plugins.avante.enable = false;
-
   nixpkgs.config.allowUnfree = true;
 
   programs = {
@@ -70,6 +72,7 @@ in
   services.ssh-agent.enable = true;
 
   home = {
+    sessionVariables.EDITOR = "nvim";
     packages = with pkgs; [
       golangci-lint
       kubectl
@@ -91,6 +94,10 @@ in
       docker-compose
       awscli2
       open-policy-agent
+
+      (self.packages.${pkgs.system}.nvim.extend {
+        plugins.avante.enable = false;
+      })
     ];
     # Home Manager needs a bit of information about you and the paths it should
     # manage.

nvim/avante.nix

@@ -1,6 +1,7 @@
+{ lib, ... }:
 {
   plugins.avante = {
-    enable = true;
+    enable = lib.mkDefault true;
     settings = {
       claude = {
         api_key_name = "cmd:cat /run/agenix/anthropic-api-key";