update

modules/home-manager/email/default.nix

@@ -60,6 +60,13 @@
     khard = {
       enable = true;
     };
+    neomutt = {
+      enable = true;
+      vimKeys = true;
+      sidebar = {
+        enable = true;
+      };
+    };
   };
 
   accounts = {
@@ -73,6 +80,9 @@
         aerc = {
           enable = true;
         };
+        neomutt = {
+          enable = true;
+        };
         mbsync = {
           enable = true;
           create = "both";
@@ -96,6 +106,7 @@
         };
         notmuch = {
           enable = true;
+          neomutt.enable = true;
         };
       };
     };

modules/home-manager/git/default.nix

@@ -10,6 +10,54 @@
     diff-so-fancy = {
       enable = true;
     };
+    extraConfig = {
+      column = {
+        ui = "auto";
+      };
+      branch = {
+        sort = "-committerdate";
+      };
+      tag = {
+        sort = "version:refname";
+      };
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemonicPrefix = "true";
+        renames = "true";
+      };
+      push = {
+        default = "simple";
+        autoSetupRemote = "true";
+        followTags = "true";
+      };
+      fetch = {
+        prune = "true";
+        pruneTags = "true";
+        all = "true";
+      };
+      help = {
+        autocorrect = "prompt";
+      };
+      commit = {
+        verbose = "true";
+      };
+      rerere = {
+        enabled = "true";
+        autoupdate = "true";
+      };
+      rebase = {
+        autoSquash = "true";
+        autoStash = "true";
+        autoRefs = "true";
+      };
+      merge = {
+        conflictstyle = "zdiff3";
+      };
+      pull = {
+        rebase = "true";
+      };
+    };
     includes = [
       {
         condition = "gitdir:~/dev/work/";

modules/home-manager/kitty/default.nix

@@ -6,10 +6,14 @@
   programs.kitty = {
     enable = true;
     font = {
-      name = "JetBrainsMono Nerd Font Mono";
+      name = "PragmataPro Mono Liga";
       size = 12;
-      package = pkgs.nerd-fonts.jetbrains-mono;
     };
+    # font = {
+    #   name = "JetBrainsMono Nerd Font Mono";
+    #   size = 12;
+    #   package = pkgs.nerd-fonts.jetbrains-mono;
+    # };
     shellIntegration = {
       enableZshIntegration = true;
     };

modules/home-manager/nixvim/default.nix

@@ -38,6 +38,11 @@ lib,
       laststatus = 3;
       swapfile = false;
 
+      tabstop = 4;
+      softtabstop = 0;
+      shiftwidth = 4;
+      expandtab = true;
+
       breakindent = true;
       undofile = true;
       ignorecase = true;
@@ -464,25 +469,25 @@ lib,
       lsp = {
         enable = true;
         servers = {
-          nixd = {
-            enable = true;
-            settings = {
-              nixpkgs = {
-                expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).inputs.nixpkgs { }";
-              };
-              formatting = {
-                command = ["alejandra"];
-              };
-              options = {
-                nixos = {
-                  expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.desktop.options";
-                };
-                nix-darwin = {
-                  expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.macbook.options";
-                };
-              };
-            };
-          };
+          # nixd = {
+          #   enable = true;
+          #   settings = {
+          #     nixpkgs = {
+          #       expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).inputs.nixpkgs { }";
+          #     };
+          #     formatting = {
+          #       command = ["alejandra"];
+          #     };
+          #     options = {
+          #       nixos = {
+          #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.desktop.options";
+          #       };
+          #       nix-darwin = {
+          #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.macbook.options";
+          #       };
+          #     };
+          #   };
+          # };
           ts_ls = {
             enable = true;
           };
@@ -495,9 +500,9 @@ lib,
           cssls = {
             enable = true;
           };
-          stylelint_lsp = {
-            enable = true;
-          };
+          # stylelint_lsp = {
+          #   enable = true;
+          # };
           volar = {
             enable = true;
             tslsIntegration = true;
@@ -508,6 +513,9 @@ lib,
           gopls = {
             enable = true;
           };
+          golangci_lint_ls = {
+            enable = true;
+          };
           bashls = {
             enable = true;
           };
@@ -530,23 +538,26 @@ lib,
           };
         };
       };
-      neotest = {
-        enable = true;
-        adapters = {
-          jest = {
-            enable = true;
-          };
-          go = {
-            enable = true;
-          };
-        };
-      };
+      # neotest = {
+      #   enable = true;
+      #   adapters = {
+      #     jest = {
+      #       enable = true;
+      #     };
+      #     go = {
+      #       enable = true;
+      #     };
+      #   };
+      # };
       nvim-jdtls = {
         enable = true;
         cmd = [
           (lib.getExe pkgs.jdt-language-server)
         ];
       };
+      markdown-preview = {
+        enable = true;
+      };
     };
   };
 }