updated to use new shed module schema

modules/home/programs/git.nix

@@ -14,6 +14,11 @@
         alias = {
           draft = "!if git rev-parse > /dev/null 2>&1; then echo \"$1\" >> $(git rev-parse --git-dir)/DRAFT_MSG; else exit 1; fi #";
         };
+        safe = {
+          directory = [
+            "/home/pagedmov/mnt/net"
+          ];
+        };
         core.pager = "delta";
         interactive.diffFilter = "delta --color-only";
         delta.navigate = "true";

modules/home/programs/nixvim/autocmd.nix

@@ -21,6 +21,31 @@
         pattern = [ "*" ];
         desc = "Start the floaterm window";
       }
+      {
+        pattern = [ "qf" ];
+        event = [ "FileType" ];
+        callback = {
+          __raw = /* lua */ ''
+            function()
+              vim.keymap.set("n", "<CR>", "<CR>", { buffer = true })
+            end'';
+        };
+      }
+      {
+        pattern = [ "nix" ];
+        event = [ "FileType" ];
+        callback = {
+          __raw = /* lua */ ''
+            function()
+              require("otter").activate(
+                { "bash", "lua", "python" },
+                true, -- completions
+                true, -- diagnostics
+                nil
+              )
+            end'';
+        };
+      }
     ];
   };
 }

modules/home/programs/nixvim/default.nix

@@ -1,14 +1,6 @@
 { env, config, pkgs, host, self, ... }: {
   programs.nixvim = {
     nixpkgs.useGlobalPackages = true;
-    extraPackages = [
-      pkgs.cargo
-      pkgs.rustc
-      pkgs.clippy
-      pkgs.rustup
-      pkgs.rust-analyzer
-      pkgs.nerd-fonts.envy-code-r
-    ];
   };
   imports = [ ./plugins ./options.nix ./keymaps.nix ./autocmd.nix ];
 }

modules/home/programs/nixvim/keymaps.nix

@@ -36,6 +36,11 @@
         key = "<S-Tab>";
         mode = "n";
       }
+      {
+        action = "zA";
+        key = "<CR>";
+        mode = "n";
+      }
       {
         action = "<C-w>w";
         key = "<Tab>";

modules/home/programs/nixvim/options.nix

@@ -30,7 +30,7 @@ in {
       virtual_text = true;
       signs = false;
     };
-    extraConfigLua = ''
+    extraConfigLua = /* lua */ ''
       if vim.g.started_by_firenvim == true then
       	vim.o.laststatus = 0
       end
@@ -59,6 +59,7 @@ in {
       vim.opt.termguicolors = true
       vim.opt.ruler = true
       vim.opt.scrolloff = 6
+      vim.opt.foldlevelstart = 99
       vim.opt.undofile = true
       vim.opt.foldmethod = "manual"
       vim.opt.wrap = true
@@ -67,8 +68,17 @@ in {
       vim.opt.breakat = " \t!@*-+;:,./?"
       vim.opt.guifont = "EnvyCodeR Nerd Font Mono:h18"
 
-      vim.g.mapleader = "!"
+      vim.g.mapleader = " "
       vim.g.rust_recommended_style = 0
+
+      vim.treesitter.query.set("nix", "injections", [[
+        ;; extends
+        ((comment) @injection.language
+          .
+          (indented_string_expression
+            (string_fragment) @injection.content)
+          (#gsub! @injection.language "^%s*/%*%s*(%S+)%s*%*/.*$" "%1"))
+      ]])
     '';
   };
 }

modules/home/programs/nixvim/plugins/default.nix

@@ -2,6 +2,8 @@
 
 {
   imports = [
+    ./otter.nix
+    ./treesitter.nix
     ./alpha.nix
     ./haskell.nix
     ./vim-matchup.nix

modules/home/programs/nixvim/plugins/otter.nix

@@ -0,0 +1,10 @@
+{
+  programs.nixvim = {
+    plugins.otter = {
+      enable = true;
+      settings = {
+        handle_leading_whitespace = true;
+      };
+    };
+  };
+}

modules/home/programs/nixvim/plugins/treesitter.nix

@@ -0,0 +1,16 @@
+{
+  programs.nixvim = {
+    plugins.treesitter = {
+      enable = true;
+      folding = {
+        enable = true;
+      };
+      indent = {
+        enable = true;
+      };
+      highlight = {
+        enable = true;
+      };
+    };
+  };
+}