chore: update lockfile and nvim

flake.nix

@@ -7,8 +7,6 @@
     flake-utils.url = "github:numtide/flake-utils";
     flake-parts.url = "github:hercules-ci/flake-parts";
 
-    yazi.url = "github:sxyazi/yazi";
-
     helix.url = "github:helix-editor/helix";
 
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";

home-modules/fish/default.nix

@@ -91,6 +91,7 @@ in
         gcm = "git commit -S -m";
         gp = "git push";
         glog = "git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
+        convert = "magick";
       };
       shellInit = ''
         touch $XDG_CONFIG_HOME/.curlrc

home-modules/helix/default.nix

@@ -267,7 +267,7 @@
           command = "tailwindcss-language-server";
           args = [ "--stdio" ];
         };
-        typescript-language-server = with nodePackages; {
+        typescript-language-server = with nodePackages_latest; {
           config = {
             hostInfo = "helix";
             documentFormatting = false;

home-modules/neovim/default.nix

@@ -25,12 +25,13 @@
     match = { };
     files = { };
     globals = { };
-    extraFiles = { };
     localOpts = { };
+    extraFiles = { };
     globalOpts = { };
     extraConfigVim = "";
     extraConfigLuaPre = "";
     extraConfigLuaPost = "";
+    luaLoader.enable = true;
     extraPackages = with pkgs; [ ];
     extraLuaPackages = with pkgs; [ ];
     extraPython3Packages = p: with p; [ ];
@@ -46,6 +47,10 @@
       colorbuddy-nvim
       nvim-web-devicons
       nvim-colorizer-lua
+      # https://github.com/tzachar/highlight-undo.nvim
+      highlight-undo-nvim
+      # https://github.com/brenoprata10/nvim-highlight-colors
+      nvim-highlight-colors
     ];
     plugins = {
       cmp.enable = true;
@@ -67,7 +72,6 @@
       navbuddy.enable = true;
       gitsigns.enable = true;
       diffview.enable = true;
-      coq-nvim.enable = true;
       lightline.enable = true;
       which-key.enable = true;
       ts-autotag.enable = true;
@@ -114,14 +118,14 @@
       lsp = import ./plugins/lsp.nix;
       lint = import ./plugins/lint.nix;
       noice = import ./plugins/noice.nix;
-      # coq-nvim = import ./plugins/coq.nix;
+      coq-nvim = import ./plugins/coq.nix;
       barbar = import ./plugins/barbar.nix;
       fidget = import ./plugins/fidget.nix;
       notify = import ./plugins/notify.nix;
       lspsaga = import ./plugins/lspsaga.nix;
       fzf-lua = import ./plugins/fzf-lua.nix;
       lualine = import ./plugins/lualine.nix;
-      none-ls = import ./plugins/none-ls.nix;
+      # none-ls = import ./plugins/none-ls.nix;
       neo-tree = import ./plugins/neo-tree.nix;
       neoscroll = import ./plugins/neoscroll.nix;
       telescope = import ./plugins/telescope.nix;

home-modules/neovim/extra-config.lua

@@ -8,3 +8,24 @@ telescope.setup {
 }
 
 require("telescope").load_extension("lazygit")
+
+require('nvim-highlight-colors').setup({})
+
+require('highlight-undo').setup({
+  duration = 300,
+  undo = {
+    hlgroup = 'HighlightUndo',
+    mode = 'n',
+    lhs = 'u',
+    map = 'undo',
+    opts = {}
+  },
+  redo = {
+    hlgroup = 'HighlightRedo',
+    mode = 'n',
+    lhs = '<C-r>',
+    map = 'redo',
+    opts = {}
+  },
+  highlight_for_count = true,
+})

home-modules/neovim/plugins/coq.nix

@@ -2,7 +2,7 @@
 # https://github.com/ms-jpq/coq_nvim
 {
   enable = true;
-  # installArtifacts = true;
+  installArtifacts = true;
   settings = {
     # auto_start = true;
     # xdg path

home-modules/neovim/plugins/lsp.nix

@@ -1,7 +1,11 @@
 # https://nix-community.github.io/nixvim/plugins/lsp/index.html
+# { pkgs, ... }:
 {
   enable = true;
   # servers = {
+  # bashls = {
+  #   package = pkgs.nodePackages_latest.bash-language-server;
+  # };
   #   astro.enable = true;
   #   svelte.enable = true;
   #   tsserver.enable = true;

home-modules/neovim/plugins/none-ls.nix

@@ -7,7 +7,7 @@
       statix.enable = true;
       gitsigns.enable = true;
       gitrebase.enable = true;
-      ts_node_action.enable = true;
+      # ts_node_action.enable = true;
     };
     diagnostics = {
       statix.enable = true;

modules/configuration.nix

@@ -79,6 +79,7 @@ with lib;
         nix-diff
         starship
         nix-init
+        localsend
         tailscale
         superfile
         fastfetch
@@ -98,13 +99,14 @@ with lib;
         cspell
         fnlfmt
         statix
+        devenv
         deadnix
         gotools
         proselint
+        cloudflared
         nixpkgs-fmt
         openscad-lsp
         nixfmt-rfc-style
-        bash-language-server
         yaml-language-server
         # delve
         # revive
@@ -122,6 +124,7 @@ with lib;
         vscode-css-languageserver-bin
         vscode-html-languageserver-bin
         nodePackages_latest.typescript
+        nodePackages.bash-language-server
       ];
 
     variables = {

nixos.nix

@@ -15,7 +15,7 @@ nixpkgs.lib.nixosSystem rec {
   modules = [
     { nixpkgs.overlays = overlays; }
     ./modules/configuration.nix
-    ./modules/tailscale.nix
+    # ./modules/tailscale.nix
     ./modules/orbstack.nix
     ./modules/nixpkgs.nix
     ./modules/users.nix
@@ -34,7 +34,6 @@ nixpkgs.lib.nixosSystem rec {
             { home.stateVersion = "23.05"; }
             inputs.nixvim.homeManagerModules.nixvim
             ./home-modules/fish
-            ./home-modules/yazi
             ./home-modules/helix
             ./home-modules/zellij
             ./home-modules/neovim