update nvim config

Author: debugloop

hosts/hyperion/users/danieln/home-configuration.nix

@@ -1,6 +1,11 @@
-{flake, ...}: {
+{
+  flake,
+  inputs,
+  ...
+}: {
   imports = [
     flake.homeModules.common
     flake.homeModules.class-server
+    inputs.agenix.homeManagerModules.default
   ];
 }

hosts/lusus/users/danieln/home-configuration.nix

@@ -7,5 +7,6 @@
     flake.homeModules.common
     flake.homeModules.class-laptop
     inputs.gridx.home-module
+    inputs.agenix.homeManagerModules.default
   ];
 }

hosts/simmons/users/danieln/home-configuration.nix

@@ -1,6 +1,11 @@
-{flake, ...}: {
+{
+  flake,
+  inputs,
+  ...
+}: {
   imports = [
     flake.homeModules.common
     flake.homeModules.class-laptop
+    inputs.agenix.homeManagerModules.default
   ];
 }

modules/home/class-laptop/kitty.nix

@@ -106,8 +106,8 @@
     '';
     keybindings = {
       # os windows
-      "alt+n" = "launch --type=os-window --cwd=current";
-      "alt+r" = "set_window_title";
+      "ctrl+shift+n" = "launch --type=os-window --cwd=current";
+      "ctrl+shift+r" = "set_window_title";
 
       # clipboard
       "ctrl+shift+c" = "copy_to_clipboard";
@@ -116,30 +116,30 @@
       # scrolling
       "shift+page_up" = "scroll_page_up";
       "shift+page_down" = "scroll_page_down";
-      "alt+page_up" = "scroll_to_prompt -1";
-      "alt+page_down" = "scroll_to_prompt +1";
+      "ctrl+shift+page_up" = "scroll_to_prompt -1";
+      "ctrl+shift+page_down" = "scroll_to_prompt +1";
 
       # font size
-      "alt+plus" = "change_font_size current +2.0";
-      "alt+equal" = "change_font_size current +2.0";
-      "alt+minus" = "change_font_size current -2.0";
-      "alt+0" = "change_font_size current 0";
+      "ctrl+shift+plus" = "change_font_size current +2.0";
+      "ctrl+shift+equal" = "change_font_size current 0";
+      "ctrl+shift+minus" = "change_font_size current -2.0";
+      "ctrl+shift+0" = "change_font_size current 0";
 
       # dump output to vim
-      "alt+h" = "show_scrollback";
+      "ctrl+shift+h" = "show_scrollback";
 
       # paste things
-      "alt+g" = "kitten hints --hints-text-color=red --type hash --program -";
-      "alt+w" = "kitten hints --hints-text-color=red --type word --program -";
-      "alt+f" = "kitten hints --hints-text-color=red --type path --program -";
+      "ctrl+shift+g" = "kitten hints --alphabet=arstgmneiowfpluyxcdh,.bjvkqz --hints-text-color=red --type hash --program -";
+      "ctrl+shift+w" = "kitten hints --alphabet=arstgmneiowfpluyxcdh,.bjvkqz --hints-text-color=red --type word --program -";
+      "ctrl+shift+f" = "kitten hints --alphabet=arstgmneiowfpluyxcdh,.bjvkqz --hints-text-color=red --type path --program -";
 
       # urls
-      "alt+e" = "kitten hints --hints-text-color=red --type url --program default";
-      "alt+u" = "kitten hints --hints-text-color=red --type url --program default";
+      "ctrl+shift+e" = "kitten hints --alphabet=arstgmneiowfpluyxcdh,.bjvkqz --hints-text-color=red --type url --program default";
+      "ctrl+shift+u" = "kitten hints --alphabet=arstgmneiowfpluyxcdh,.bjvkqz --hints-text-color=red --type url --program default";
 
       # markers
-      "alt+m" = "create_marker";
-      "alt+shift+m" = "remove_marker";
+      "ctrl+shift+m" = "create_marker";
+      "ctrl+shift+shift+m" = "remove_marker";
     };
   };
 }

modules/home/common/cloud.nix

@@ -1,17 +1,28 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   home.packages = with pkgs; [
     awscli2
     gmailctl
     ssm-session-manager-plugin
     yt-dlp
   ];
 
+  age.secrets.gh-token.file = ../../../secrets/gh-token.age;
+
   programs = {
     rbw.enable = true;
-    tmate.enable = true;
-    granted.enable = true;
     gh = {
       enable = true;
+      package = let
+        gh-wrapped = pkgs.writeShellScriptBin "gh" ''
+          export GITHUB_TOKEN="$(cat ${config.age.secrets.gh-token.path})"
+          ${pkgs.gh}/bin/gh "''${@}"
+        '';
+      in
+        gh-wrapped;
       settings = {
         version = 1;
         git_protocol = "ssh";

modules/home/common/default.nix

@@ -17,6 +17,8 @@
     ./starship.nix
   ];
 
+  age.identityPaths = ["/home/danieln/.ssh/agenix"];
+
   home = {
     username = "danieln";
     homeDirectory = "/home/danieln";

modules/home/common/fish.nix

@@ -43,7 +43,8 @@
     '';
     shellAbbrs = {
       g = "git";
-      v = "vim";
+      h = "history --show-time='%F %T ' search";
+      e = "vim";
       d = "dlv --headless -l 'localhost:2345' debug";
     };
     functions = {
@@ -86,6 +87,30 @@
           commandline -f repaint'
         '';
       };
+      down-or-search = {
+        body = ''
+          if commandline --search-mode
+            commandline -f history-search-forward
+            return
+          end
+
+          if commandline --paging-mode
+            commandline -f down-line
+            return
+          end
+
+          set -l lineno (commandline -L)
+          set -l line_count (count (commandline))
+
+          switch $lineno
+            case $line_count
+              commandline -f history-search-forward or complete
+
+            case \'*\'
+              commandline -f down-line
+          end
+        '';
+      };
     };
     shellAliases = {
       ag = "rg";

modules/home/common/nvim/after/queries/go/textobjects.scm

@@ -1,11 +1,11 @@
 ;; extends
 
-; standalone variadic parameter
-(parameter_list
-  ("," @_start
-  .)?
-  (variadic_parameter_declaration) @parameter.inner
-  (#make-range! "parameter.outer" @_start @parameter.inner))
+; ; standalone variadic parameter
+; (parameter_list
+;   ("," @_start
+;   .)?
+;   (variadic_parameter_declaration) @parameter.inner
+;   (#make-range! "parameter.outer" @_start @parameter.inner))
 
 (function_declaration (identifier)  @function.name)
 (method_declaration (field_identifier)  @function.name)
@@ -15,3 +15,9 @@
 	.
 	(method_declaration) @def
 ) @function.all
+
+(
+	((comment)*) @doc
+	.
+	(function_declaration) @def
+) @function.all

modules/home/common/nvim/default.nix

@@ -16,15 +16,7 @@
     MANPAGER = "nvim +Man!";
   };
 
-  xdg.configFile = let
-    treesitterParsers = pkgs.symlinkJoin {
-      name = "treesitter-parsers";
-      paths = pkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies;
-      # paths = builtins.filter
-      #   (x: (builtins.parseDrvName x.name).name != "vimplugin-treesitter-grammar-javascript")
-      #   pkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies;
-    };
-  in {
+  xdg.configFile = {
     # "nvim/init.lua".source = ./init.lua;
     # "nvim/lua".source = ./lua;
     # "nvim/ftplugin".source = ./ftplugin;
@@ -34,16 +26,13 @@
     "nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/modules/home/common/nvim/lua";
     "nvim/ftplugin".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/modules/home/common/nvim/ftplugin";
     "nvim/after".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/modules/home/common/nvim/after";
-
-    "nvim/parser".source = "${treesitterParsers}/parser"; # treesitter master only
   };
 
   xdg.dataFile = let
     vimPlugins = builtins.listToAttrs (
       lib.lists.forEach [
         "blink-cmp"
         "conform-nvim"
-        "diffview-nvim"
         "friendly-snippets"
         "kanagawa-nvim"
         "lazy-nvim"
@@ -53,14 +42,6 @@
         "nvim-dap"
         # "nvim-dap-view" # not in nixpkgs
         "nvim-lint"
-        "nvim-treesitter" # uses master
-        "nvim-treesitter-context"
-        "nvim-treesitter-textobjects" # uses master
-        "quicker-nvim"
-        "snacks-nvim"
-        # "amp-nvim"
-        "copilot-lua"
-        "claudecode-nvim"
       ]
       (
         name: {
@@ -104,35 +85,38 @@
         }
       )
     );
+    treesitterParsers = pkgs.symlinkJoin {
+      name = "treesitter-parsers";
+      paths = pkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies;
+      # paths = builtins.filter
+      #   (x: (builtins.parseDrvName x.name).name != "vimplugin-treesitter-grammar-javascript")
+      #   pkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies;
+    };
+    treesitter = pkgs.fetchFromGitHub {
+      owner = "nvim-treesitter";
+      repo = "nvim-treesitter";
+      rev = "main";
+      sha256 = "sha256-kPB4KyhE0+mNfanTIzc4O+4wvw/u8lyHTHoQ368KWXI=";
+    };
   in
     {
-      "nvim/nixpkgs/fzf" = {
-        source = "${pkgs.fzf}/share/vim-plugins/fzf";
-      };
-
       # treesitter main parsers:
-      # "nvim/site/queries" = {
-      #   source = "${pkgs.vimPlugins.nvim-treesitter.withAllGrammars}/queries";
-      # };
-      # "nvim/site/parser".source = "${treesitterParsers}/parser";
+      "nvim/site/queries" = {
+        source = "${treesitter}/runtime/queries";
+      };
+      "nvim/site/parser".source = "${treesitterParsers}/parser";
 
-      # for switching to treesitter main:
-      # "nvim/nixpkgs/nvim-treesitter-textobjects" = {
-      #   source = pkgs.fetchFromGitHub {
-      #     owner = "nvim-treesitter";
-      #     repo = "nvim-treesitter-textobjects";
-      #     rev = "main";
-      #     sha256 = "sha256-sJdKVaGNXW4HEi6NXEqUhelr8T7/M216m7bPKHAd1do=";
-      #   };
-      # };
-      # "nvim/nixpkgs/nvim-treesitter" = {
-      #   source = pkgs.fetchFromGitHub {
-      #     owner = "nvim-treesitter";
-      #     repo = "nvim-treesitter";
-      #     rev = "main";
-      #     sha256 = "sha256-m3ShsTug4wSee89K+GaTKodC1cWsskR35y9SjDtVRgU=";
-      #   };
-      # };
+      "nvim/nixpkgs/nvim-treesitter-textobjects" = {
+        source = pkgs.fetchFromGitHub {
+          owner = "nvim-treesitter";
+          repo = "nvim-treesitter-textobjects";
+          rev = "main";
+          sha256 = "sha256-jjKT3bZHwZIVDsTw4m7cJm9G2JW8lUXasKTaiGzT0Ag=";
+        };
+      };
+      "nvim/nixpkgs/nvim-treesitter" = {
+        source = treesitter;
+      };
     }
     // vimPlugins // miniPlugins;
 }

modules/home/common/nvim/lua/aucmd.lua

@@ -43,6 +43,10 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
   pattern = "*",
   callback = function()
     vim.cmd("clearjumps")
+    if vim.fn.argc() > 1 then
+      vim.cmd.blast()
+      vim.cmd.bfirst()
+    end
   end,
 })
 
@@ -104,34 +108,34 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
 vim.api.nvim_create_autocmd({ "BufRead" }, {
   group = vim.api.nvim_create_augroup("add_autocmd_on_buf_enter", { clear = true }),
   pattern = { "*" },
-  callback = function(_)
+  callback = function(openEvent)
     if vim.o.filetype == "gitcommit" then
       vim.cmd.normal("1G0") -- discard any position there might be on file
       return -- skip the usual things
     end
     -- mark as persisted
     vim.api.nvim_create_autocmd({ "InsertEnter", "BufModifiedSet" }, {
-      buffer = 0,
-      once = true,
-      callback = function(_)
-        vim.fn.setbufvar(0, "bufpersist", 1)
-      end,
-    })
-    -- go to last loc when focusing a buffer the first time
-    vim.api.nvim_create_autocmd("BufWinEnter", {
-      buffer = 0,
+      buffer = openEvent.buf,
       once = true,
-      callback = function(_)
-        local mark = vim.api.nvim_buf_get_mark(0, '"')
-        local lcount = vim.api.nvim_buf_line_count(0)
-        if mark[1] > 0 and mark[1] < lcount then
-          pcall(vim.api.nvim_win_set_cursor, 0, mark)
-        end
+      callback = function(event)
+        vim.fn.setbufvar(event.buf, "bufpersist", 1)
       end,
     })
   end,
 })
 
+-- go to last loc when focusing a buffer the first time
+vim.api.nvim_create_autocmd("BufReadPost", {
+  group = vim.api.nvim_create_augroup("restore_position", { clear = true }),
+  callback = function(event)
+    local mark = vim.api.nvim_buf_get_mark(event.buf, '"')
+    local lcount = vim.api.nvim_buf_line_count(event.buf)
+    if mark[1] > 0 and mark[1] < lcount then
+      pcall(vim.api.nvim_win_set_cursor, 0, mark)
+    end
+  end,
+})
+
 -- terminals
 vim.api.nvim_create_autocmd("TermOpen", {
   group = vim.api.nvim_create_augroup("on_term_open", { clear = true }),