WIP

modules/nixvim/autocommands/default.nix

@@ -23,43 +23,51 @@ in {
     ];
 
   autoCmd = [
-    (autocmds.mk' ["FocusGained" "TermClose" "TermLeave"] "checktime" (mkRaw ''
+    (autocmds.mk' ["FocusGained" "TermClose" "TermLeave"] "checktime" (mkRaw
-      function()
+      # lua
-        if vim.o.buftype ~= "nofile" then
+      ''
-          vim.cmd("checktime")
+        function()
+          if vim.o.buftype ~= "nofile" then
+            vim.cmd("checktime")
+          end
         end
-      end
+      '') "Check if file needs to be reloaded when changed")
-    '') "Check if file needs to be reloaded when changed")
 
-    (autocmds.mk' ["TextYankPost"] "highlight_yank" (mkRaw ''
+    (autocmds.mk' ["TextYankPost"] "highlight_yank" (mkRaw
-      function()
+      # lua
-        (vim.hl or vim.highlight).on_yank()
+      ''
-      end
+        function()
-    '') "Highlight on yank")
+          (vim.hl or vim.highlight).on_yank()
-
-    (autocmds.mk' ["VimResized"] "resize_splits" (mkRaw ''
-      function()
-        local current_tab = vim.fn.tabpagenr()
-        vim.cmd("tabdo wincmd =")
-        vim.cmd("tabnext " .. current_tab)
-      end
-    '') "Resize splits on window resize")
-
-    (autocmds.mk' ["BufReadPost"] "last_loc" (mkRaw ''
-      function(event)
-        local exclude = { "gitcommit" }
-        local buf = event.buf
-        if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].marleyvim_last_loc then
-          return
         end
-        vim.b[buf].marleyvim_last_loc = true
+      '') "Highlight on yank")
-        local mark = vim.api.nvim_buf_get_mark(buf, '"')
+
-        local lcount = vim.api.nvim_buf_line_count(buf)
+    (autocmds.mk' ["VimResized"] "resize_splits" (mkRaw
-        if mark[1] > 0 and mark[1] <= lcount then
+      # lua
-          pcall(vim.api.nvim_win_set_cursor, 0, mark)
+      ''
+        function()
+          local current_tab = vim.fn.tabpagenr()
+          vim.cmd("tabdo wincmd =")
+          vim.cmd("tabnext " .. current_tab)
         end
-      end
+      '') "Resize splits on window resize")
-    '') "Go to last location when opening a buffer")
+
+    (autocmds.mk' ["BufReadPost"] "last_loc" (mkRaw
+      # lua
+      ''
+        function(event)
+          local exclude = { "gitcommit" }
+          local buf = event.buf
+          if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].marleyvim_last_loc then
+            return
+          end
+          vim.b[buf].marleyvim_last_loc = true
+          local mark = vim.api.nvim_buf_get_mark(buf, '"')
+          local lcount = vim.api.nvim_buf_line_count(buf)
+          if mark[1] > 0 and mark[1] <= lcount then
+            pcall(vim.api.nvim_win_set_cursor, 0, mark)
+          end
+        end
+      '') "Go to last location when opening a buffer")
 
     (autocmds.mk ["FileType"] "close_with_q" [
         "PlenaryTestPopup"
@@ -78,27 +86,31 @@ in {
         "spectre_panel"
         "startuptime"
         "tsplayground"
-      ] (mkRaw ''
+      ] (mkRaw
+        # lua
+        ''
+          function(event)
+            vim.bo[event.buf].buflisted = false
+            vim.schedule(function()
+              vim.keymap.set("n", "q", function()
+                vim.cmd("close")
+                pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
+              end, {
+                buffer = event.buf,
+                silent = true,
+                desc = "Quit buffer",
+              })
+            end)
+          end
+        '') "Close some filetypes with <q>")
+
+    (autocmds.mk ["FileType"] "man_unlisted" ["man"] (mkRaw
+      # lua
+      ''
         function(event)
           vim.bo[event.buf].buflisted = false
-          vim.schedule(function()
-            vim.keymap.set("n", "q", function()
-              vim.cmd("close")
-              pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
-            end, {
-              buffer = event.buf,
-              silent = true,
-              desc = "Quit buffer",
-            })
-          end)
         end
-      '') "Close some filetypes with <q>")
+      '') "Easy-close man files")
-
-    (autocmds.mk ["FileType"] "man_unlisted" ["man"] (mkRaw ''
-      function(event)
-        vim.bo[event.buf].buflisted = false
-      end
-    '') "Easy-close man files")
 
     (autocmds.mk ["FileType"] "wrap_spell" [
         "text"
@@ -106,27 +118,33 @@ in {
         "typst"
         "gitcommit"
         "markdown"
-      ] (mkRaw ''
+      ] (mkRaw
+        # lua
+        ''
+          function()
+            vim.opt_local.wrap = true
+            vim.opt_local.spell = true
+          end
+        '') "Wrap & check spelling in text files")
+
+    (autocmds.mk ["FileType"] "json_conceal" ["json" "jsonc" "json5"] (mkRaw
+      # lua
+      ''
         function()
-          vim.opt_local.wrap = true
+          vim.opt_local.conceallevel = 0
-          vim.opt_local.spell = true
         end
-      '') "Wrap & check spelling in text files")
+      '') "Fix conceallevel for json files")
 
-    (autocmds.mk ["FileType"] "json_conceal" ["json" "jsonc" "json5"] (mkRaw ''
+    (autocmds.mk' ["BufWritePre"] "auto_create_dir" (mkRaw
-      function()
+      # lua
-        vim.opt_local.conceallevel = 0
+      ''
-      end
+        function(event)
-    '') "Fix conceallevel for json files")
+          if event.match:match("^%w%w+:[\\/][\\/]") then
-
+            return
-    (autocmds.mk' ["BufWritePre"] "auto_create_dir" (mkRaw ''
+          end
-      function(event)
+          local file = vim.uv.fs_realpath(event.match) or event.match
-        if event.match:match("^%w%w+:[\\/][\\/]") then
+          vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
-          return
         end
-        local file = vim.uv.fs_realpath(event.match) or event.match
+      '') "Auto create missing parent dirs when saving")
-        vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
-      end
-    '') "Auto create missing parent dirs when saving")
   ];
 }

modules/nixvim/keymaps/default.nix

@@ -165,9 +165,9 @@ in {
     # Diagnostics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     ++ [
       (keys.mk ["n"] "<LEADER>cd" (
-        mkRaw ''
+        mkRaw
-          function() vim.diagnostic.open_float() end
+        # lua
-        ''
+        "function() vim.diagnostic.open_float() end"
       ) "Line Diagnostics")
     ]
     ++ (
@@ -200,11 +200,13 @@ in {
           cmd = toLower dir;
           sev = sevs."${key}".key;
         in
-          keys.mk ["n"] kmap (
+          keys.mk ["n"] kmap
-            mkRaw ''
+          (
-              function() vim.diagnostic.goto_${cmd}({ severity = ${sev} }) end
+            mkRaw
-            ''
+            # lua
-          ) "${dir} ${sevs."${key}".desc}"
+            "function() vim.diagnostic.goto_${cmd}({ severity = ${sev} }) end"
+          )
+          "${dir} ${sevs."${key}".desc}"
       )
       {
         dir = ["Next" "Prev"];

modules/nixvim/plugins/ui/bufferline/default.nix

@@ -3,20 +3,27 @@
   helpers,
   ...
 }: let
-  inherit (lib) flatten mapAttrsToList map;
-  inherit (lib.marleyvim) icons keys autocmds;
   inherit (helpers) mkRaw;
+  inherit (lib) flatten mapAttrsToList map;
+  inherit (lib.marleyvim) icons keys;
 in {
   plugins.bufferline = {
     enable = true;
 
     settings = {
       options = {
-        close_command.__raw = "function(n) Snacks.bufdelete(n) end";
+        close_command =
-        right_mouse_command.__raw = "function(n) Snacks.bufdelete(n) end";
+          mkRaw
+          # lua
+          "function(n) Snacks.bufdelete(n) end";
+        right_mouse_command =
+          mkRaw
+          # lua
+          "function(n) Snacks.bufdelete(n) end";
 
         diagnostics = "nvim_lsp";
-        diagnostics_indicator.__raw =
+        diagnostics_indicator =
+          mkRaw
           # lua
           ''
             function(_, _, diag)
@@ -25,42 +32,10 @@ in {
               return vim.trim(ret)
             end
           '';
-
-        always_show_bufferline = true;
-
-        offsets = [
-          {
-            filetype = "neo-tree";
-            text = "Explorer";
-            highlight = "Directory";
-            text_align = "left";
-          }
-        ];
-
-        get_element_icon.__raw = ''
-          function(elem)
-            local icon, hl, _ =
-              require('mini.icons').get('filetype', elem.filetype)
-            return icon, hl
-          end
-        '';
       };
     };
   };
 
-  autoGroups.marleyos_bufferline.clear = true;
-  autoCmd = [
-    (autocmds.mk' ["BufAdd" "BufDelete"] "bufferline" (
-      mkRaw ''
-        function()
-          vim.schedule(function()
-            pcall(nvim_bufferline)
-          end)
-        end
-      ''
-    ) "Fix bufferline when restoring a session")
-  ];
-
   keymaps =
     [
       (keys.mk ["n"] "<LEADER>bp" "<CMD>BufferLineTogglePin<CR>" "Toggle Pin")

modules/nixvim/plugins/ui/mini.icons/default.nix

@@ -1,8 +0,0 @@
-_: {
-  plugins.mini = {
-    enable = true;
-
-    mockDevIcons = true;
-    modules.icons = {};
-  };
-}

modules/nixvim/plugins/util/snacks/default.nix

@@ -23,62 +23,62 @@ in {
 
   keymaps = [
     (keys.mk ["n"] "<LEADER>un" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.notifier.hide() end
+      # lua
-      ''
+      "function() Snacks.notifier.hide() end"
     ) "Dismiss All Notifications")
 
     (keys.mk ["n"] "<LEADER>bd" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.bufdelete() end
+      # lua
-      ''
+      "function() Snacks.bufdelete() end"
     ) "Delete Buffer")
 
     (keys.mk ["n"] "<LEADER>bo" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.bufdelete.other() end
+      # lua
-      ''
+      "function() Snacks.bufdelete.other() end"
     ) "Delete Other Buffers")
 
     # LazyGit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     (keys.mk ["n"] "<LEADER>gg" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.lazygit() end
+      # lua
-      ''
+      "function() Snacks.lazygit() end"
     ) "Lazygit")
 
     (keys.mk ["n"] "<LEADER>gf" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.lazygit.log_file() end
+      # lua
-      ''
+      "function() Snacks.lazygit.log_file() end"
     ) "Lazygit Current File History")
 
     (keys.mk ["n"] "<LEADER>gl" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.lazygit.log() end
+      # lua
-      ''
+      "function() Snacks.lazygit.log() end"
     ) "Lazygit Log")
 
     # Git - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     (keys.mk ["n"] "<LEADER>gb" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.git.blame_line() end
+      # lua
-      ''
+      "function() Snacks.git.blame_line() end"
     ) "Git Blame Line")
 
     (keys.mk ["n" "x"] "<LEADER>gB" (
-      mkRaw ''
+      mkRaw
-        function() Snacks.gitbrowse() end
+      # lua
-      ''
+      "function() Snacks.gitbrowse() end"
     ) "Git Browse (open)")
 
-    (keys.mk ["n" "x"] "<LEADER>gY" (
+    (keys.mk ["n" "x"] "<LEADER>gY" (mkRaw
-      mkRaw ''
+      # lua
+      ''
         function()
           Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end })
         end
-      ''
+      '') "Git Browse (copy)")
-    ) "Git Browse (copy)")
   ];
 
   # Toggles - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -