updates

modules/home/apps/tools/bat/default.nix

@@ -14,11 +14,11 @@ in {
   };
 
   config = mkIf cfg.enable {
+    catppuccin.bat.enable = true;
+
     programs.bat = {
       enable = true;
 
-      catppuccin.enable = true;
-
       config = {
         pager = "less -FR";
       };

modules/home/apps/tools/git/default.nix

@@ -17,11 +17,18 @@ in {
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [zsh-forgit gitflow];
+    home.packages = with pkgs; [
+      zsh-forgit
+      gitflow
+    ];
+
+    programs.delta = {
+      enable = true;
+      enableGitIntegration = true;
+    };
+
     programs.git = {
       enable = true;
-      userName = "zack";
-      userEmail = "hi@zoeys.computer";
       ignores = [
         ".cache/"
         ".DS_Store"
@@ -38,8 +45,15 @@ in {
         key = cfg.signingKey;
         signByDefault = cfg.signByDefault;
       };
-      extraConfig = {
-        init = {defaultBranch = "main";};
+      lfs.enable = true;
+      settings = {
+        user = {
+          name = "zack";
+          email = "hi@zoeys.computer";
+        };
+        init = {
+          defaultBranch = "main";
+        };
         delta = {
           options.map-styles = "bold purple => syntax #ca9ee6, bold cyan => syntax #8caaee";
           line-numbers = true;
@@ -64,34 +78,30 @@ in {
           smtpencryption = "ssl";
           smtpserverport = 465;
         };
-      };
-      lfs.enable = true;
-      delta.enable = true;
-      aliases = {
-        essa = "push --force";
-        co = "checkout";
-        fuck = "commit --amend -m";
-        c = "commit -m";
-        ca = "commit -am";
-        forgor = "commit --amend --no-edit";
-        graph = "log --all --decorate --graph --oneline";
-        oops = "checkout --";
-        l = "log";
-        r = "rebase";
-        s = "status --short";
-        ss = "status";
-        d = "diff";
-        ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
-        pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
-        af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
-        st = "status";
-        br = "branch";
-        df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
-        hist = ''
-          log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
-        llog = ''
-          log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
-        edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
+        alias = {
+          essa = "push --force";
+          co = "checkout";
+          fuck = "commit --amend -m";
+          c = "commit -m";
+          ca = "commit -am";
+          forgor = "commit --amend --no-edit";
+          graph = "log --all --decorate --graph --oneline";
+          oops = "checkout --";
+          l = "log";
+          r = "rebase";
+          s = "status --short";
+          ss = "status";
+          d = "diff";
+          ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
+          pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
+          af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
+          st = "status";
+          br = "branch";
+          df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
+          hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
+          llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
+          edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
+        };
       };
     };
   };

modules/home/apps/tools/neovim/config/lazyvim.json

@@ -14,6 +14,7 @@
     "lazyvim.plugins.extras.lang.svelte",
     "lazyvim.plugins.extras.lang.tailwind",
     "lazyvim.plugins.extras.lang.go",
+    "lazyvim.plugins.extras.lang.php",
     "lazyvim.plugins.extras.lang.typescript",
     "lazyvim.plugins.extras.test.core",
     "lazyvim.plugins.extras.util.rest",

modules/home/apps/tools/neovim/config/lua/config/options.lua

@@ -3,12 +3,9 @@
 -- Add any additional options here
 
 if vim.g.neovide then
-  -- Put anything you want to happen only in Neovide here
   vim.o.guifont = "Iosevka,Noto_Color_Emoji:h14:b"
 end
 
--- in this case.
-vim.g.lazyvim_blink_main = true
 vim.g.snacks_animate = false
 vim.o.termguicolors = true
 
@@ -18,7 +15,6 @@ vim.diagnostic.config({
   float = { border = "none" },
 })
 
--- Use crisp single-line borders in LSP handlers
 local border = "none"
 local handlers = vim.lsp.handlers
 handlers["textDocument/hover"] = vim.lsp.with(handlers.hover, { border = border })

modules/home/apps/tools/neovim/config/lua/plugins/core.lua

@@ -2,17 +2,13 @@ return {
   {
     "LazyVim/LazyVim",
     opts = {
-      colorscheme = "catppuccin-mocha",
+      colorscheme = "catppuccin",
       news = { lazyvim = false },
     },
   },
   {
     "catppuccin",
     opts = function(_, opts)
-      local module = require("catppuccin.groups.integrations.bufferline")
-      if module then
-        module.get = module.get_theme
-      end
       opts.transparent_background = true
       opts.flavour = "mocha"
       opts.no_bold = true

modules/home/apps/tools/neovim/config/lua/plugins/mini.ai.lua

@@ -1,4 +1,4 @@
 return {
-  "echasnovski/mini.ai",
+  "nvim-mini/mini.ai",
   version = false,
 }

modules/home/apps/tools/neovim/default.nix

@@ -27,15 +27,20 @@ with lib.custom; let
   in
     result;
 
-  pluginList = plugins: strings.concatMapStrings (plugin: "  [\"${sanitizePluginName plugin.name}\"] = \"${plugin.outPath}\",\n") plugins;
+  pluginList = plugins:
+    strings.concatMapStrings (
+      plugin: "  [\"${sanitizePluginName plugin.name}\"] = \"${plugin.outPath}\",\n"
+    )
+    plugins;
 in {
   options.apps.tools.neovim = with types; {
     enable = mkBoolOpt false "Enable Neovim";
   };
 
   config = mkIf cfg.enable {
+    catppuccin.nvim.enable = false;
+
     programs.neovim = {
-      catppuccin.enable = false;
       enable = true;
       defaultEditor = true;
       package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
@@ -55,22 +60,21 @@ in {
         # LSP
         lua-language-server
         nixd
-        (pkgs.rust-bin.selectLatestNightlyWith
-          (toolchain: toolchain.default))
         rust-analyzer
         nodePackages.typescript-language-server
         #nodePackages.astro-language-server
         nodePackages.bash-language-server
         nodePackages.svelte-language-server
         tailwindcss-language-server
+        vtsls
         taplo
         docker-compose-language-service
-        dockerfile-language-server-nodejs
+        dockerfile-language-server
         haskellPackages.hadolint
         shellcheck
         markdownlint-cli2
         shfmt
-        sqlfluff
+        # sqlfluff
         go
 
         tailwindcss-language-server
@@ -88,7 +92,6 @@ in {
         fswatch # File watcher utility, replacing libuv.fs_event for neovim 10.0
         sqlite
         postgresql
-        mongosh
         # vscode-extensions.vadimcn.vscode-lldb.adapter
       ];
       plugins = with pkgs.vimPlugins; [