Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

modules/programs/nvim/plugins/coding.nix

@@ -7,65 +7,18 @@ with builtins;
       plugin = oil-nvim;
       lazy = false;
       opts = { };
-      dependencies = [
-        { plugin = which-key-nvim; }
-        { plugin = nvim-web-devicons; }
-      ];
+      dependencies = [{ plugin = nvim-web-devicons; }];
+    }
+    {
+      plugin = lualine-nvim;
+      opts = { };
+      dependencies = [{ plugin = nvim-web-devicons; }];
     }
     {
       plugin = mini-nvim;
       lazy = false;
       conf = readFile ./lua/mini-nvim.lua;
     }
-    {
-      plugin = trouble-nvim;
-      cmd = [ "TodoTelescope" ];
-      keys = [
-        {
-          key = "<leader>cD";
-          cmd = "<cmd>TroubleToggle document_diagnostics<cr>";
-          desc = "Document Diagnostics (Trouble)";
-        }
-        {
-          key = "<leader>cW";
-          cmd = "<cmd>TroubleToggle workspace_diagnostics<cr>";
-          desc = "Workspace Diagnostics (Trouble)";
-        }
-        { key = "<leader>cl"; cmd = "<cmd>TroubleToggle loclist<cr>"; desc = "Location List (Trouble)"; }
-        { key = "<leader>cq"; cmd = "<cmd>TroubleToggle quickfix<cr>"; desc = "Quickfix List (Trouble)"; }
-        { key = "<leader>ft"; cmd = "<cmd>TodoTelescope<cr>"; desc = "Todo"; }
-        {
-          key = "[q";
-          func = /* lua */ ''
-            function()
-              if require("trouble").is_open() then
-                require("trouble").previous({ skip_groups = true, jump = true })
-              else
-                vim.cmd.cprev()
-              end
-            end
-          '';
-          desc = "Previous trouble/quickfix item";
-        }
-        {
-          key = "]q";
-          func = /* lua */  ''
-            function()
-              if require("trouble").is_open() then
-                require("trouble").next({ skip_groups = true, jump = true })
-              else
-                vim.cmd.cnext()
-              end
-            end
-          '';
-          desc = "Next trouble/quickfix item";
-        }
-      ];
-      opts = { };
-      dependencies = [
-        { plugin = nvim-web-devicons; }
-      ];
-    }
     {
       plugin = nvim-cmp;
       keys = [
@@ -106,6 +59,7 @@ with builtins;
       conf = readFile ./lua/nvim-lspconfig.lua;
       dependencies = [
         {
+          # TODO: add all required tools to neovim or silence warnings
           plugin = pkgs.vimPlugins.null-ls-nvim.overrideAttrs (_: {
             version = lib.my.mkVersionInput inputs.none-ls-nvim;
             src = inputs.none-ls-nvim;
@@ -118,17 +72,6 @@ with builtins;
         }
         { plugin = which-key-nvim; }
         { plugin = lsp_lines-nvim; }
-        {
-          plugin = nvim-ufo;
-          conf = readFile ./lua/nvim-ufo.lua;
-          dependencies = [
-            { plugin = promise-async; }
-          ];
-        }
-        {
-          plugin = neodev-nvim;
-          conf = readFile ./lua/neodev-nvim.lua;
-        }
         {
           plugin = inc-rename-nvim;
           opts = {
@@ -174,6 +117,9 @@ with builtins;
         "GDelete"
         "GBrowse"
       ];
+      keys = [
+        { key = "<leader>gg"; cmd = "<cmd>Gedit :<cr>"; desc = "Open Status"; }
+      ];
     }
     {
       plugin = vim-tmux-navigator;
@@ -236,39 +182,6 @@ with builtins;
       event = [ "BufReadPost" "BufNewFile" ];
       opts = { };
     }
-    {
-      plugin = zen-mode-nvim;
-      keys = [
-        { key = "<leader>tz"; cmd = "<cmd>ZenMode<cr>"; desc = "Zen mode"; }
-      ];
-      conf = /* lua */ ''
-        require("zen-mode").setup({
-          plugins = {
-            tmux = {
-              enabled = true,
-            },
-          },
-        })
-      '';
-      dependencies = [
-        {
-          plugin = twilight-nvim;
-          conf = /* lua */ ''
-            require("twilight").setup({
-              context = 20,
-              expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
-                  "function",
-                  "function_definition",
-                  "if_statement",
-                  "method",
-                  "method_definition",
-                  "table",
-                },
-            })
-          '';
-        }
-      ];
-    }
     {
       plugin = conform-nvim;
       keys = [

modules/programs/nvim/plugins/lua/conform.lua

@@ -11,10 +11,19 @@ local formatters_by_ft = {
   sh = { "shfmt" },
   toml = { "taplo" },
   yaml = { "yamlfix" },
+  gleam = { "gleam" },
 }
 
 conform.setup({
   formatters_by_ft = formatters_by_ft,
+  formatters = {
+    gleam = {
+      command = "gleam",
+      args = { "format", "--stdin" },
+      stdin = true,
+      cwd = require("conform.util").root_file({ "gleam.toml" }),
+    },
+  },
 })
 
 vim.api.nvim_create_user_command("Format", function(opts)

modules/programs/nvim/plugins/lua/mini-nvim.lua

@@ -1,47 +1 @@
 require("mini.align").setup()
-require("mini.move").setup()
-
-require("mini.statusline").setup({
-  content = {
-    active = function()
-      local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
-      local git = MiniStatusline.section_git({ trunc_width = 75 })
-      local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 })
-      local filename = MiniStatusline.section_filename({ trunc_width = 140 })
-      local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 })
-      local location = MiniStatusline.section_location({ trunc_width = 75 })
-      local mode_hl_inverse = mode_hl .. "Inverse"
-      -- Usage of `MiniStatusline.combine_groups()` ensures highlighting and
-      -- correct padding with spaces between groups (accounts for 'missing'
-      -- sections, etc.)
-      return MiniStatusline.combine_groups({
-        { hl = mode_hl_inverse, strings = {} },
-        "",
-        { hl = mode_hl, strings = { mode } },
-        { hl = "MiniStatuslineDevinfo", strings = { git, diagnostics } },
-        "%<", -- Mark general truncate point
-        { hl = "MiniStatuslineFilename", strings = { filename } },
-        "%=", -- End left alignment
-        { hl = "MiniStatuslineFileinfo", strings = { fileinfo } },
-        { hl = mode_hl, strings = { location } },
-        { hl = mode_hl_inverse, strings = {} },
-        "",
-      })
-    end,
-  },
-})
-local MiniStatuslineModes = {
-  "MiniStatuslineModeInsert",
-  "MiniStatuslineModeNormal",
-  "MiniStatuslineModeReplace",
-  "MiniStatuslineModeVisual",
-  "MiniStatuslineModeCommand",
-  "MiniStatuslineModeOther",
-}
-for _, mode_hl in ipairs(MiniStatuslineModes) do
-  local hl_table = vim.api.nvim_get_hl(0, { name = mode_hl })
-  local fg = hl_table.fg
-  hl_table.fg = hl_table.bg
-  hl_table.bg = fg
-  vim.api.nvim_set_hl(0, mode_hl .. "Inverse", hl_table)
-end

modules/programs/nvim/plugins/lua/nvim-cmp.lua

@@ -28,7 +28,7 @@ cmp.setup({
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
-      elseif luasnip.jumpable(1) then
+      elseif luasnip.locally_jumpable(1) then
         luasnip.jump(1)
       else
         fallback()
@@ -37,7 +37,7 @@ cmp.setup({
     ["<S-Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_prev_item({ behavior = cmp.SelectBehavior.Select })
-      elseif luasnip.jumpable(-1) then
+      elseif luasnip.locally_jumpable(-1) then
         luasnip.jump(-1)
       else
         fallback()

modules/programs/nvim/plugins/snippets/gleam.lua

@@ -0,0 +1,120 @@
+local ls = require("luasnip")
+local s = ls.snippet
+local sn = ls.snippet_node
+local isn = ls.indent_snippet_node
+local t = ls.text_node
+local i = ls.insert_node
+local f = ls.function_node
+local c = ls.choice_node
+local d = ls.dynamic_node
+local r = ls.restore_node
+local events = require("luasnip.util.events")
+local ai = require("luasnip.nodes.absolute_indexer")
+local extras = require("luasnip.extras")
+local l = extras.lambda
+local rep = extras.rep
+local p = extras.partial
+local m = extras.match
+local n = extras.nonempty
+local dl = extras.dynamic_lambda
+local fmt = require("luasnip.extras.fmt").fmt
+local fmta = require("luasnip.extras.fmt").fmta
+local conds = require("luasnip.extras.expand_conditions")
+local postfix = require("luasnip.extras.postfix").postfix
+local types = require("luasnip.util.types")
+local parse = require("luasnip.util.parser").parse_snippet
+local ms = ls.multi_snippet
+local k = require("luasnip.nodes.key_indexer").new_key
+local matches = require("luasnip.extras.postfix").matches
+
+local case_template = [[
+case {expression} {{
+  {pattern1} -> {result1}
+  {pattern2} -> {result2}{final}
+}}
+]]
+
+local dot_case = postfix({ filetype = "gleam", trig = ".case", match_pattern = matches.line }, {
+  d(1, function(_, parent)
+    return sn(
+      1,
+      fmt(case_template, {
+        expression = t(parent.env.POSTFIX_MATCH),
+        pattern1 = i(1, "pattern"),
+        result1 = i(2, "todo"),
+        pattern2 = i(3, "_"),
+        result2 = i(4, "todo"),
+        final = i(0),
+      })
+    )
+  end),
+})
+
+local case = s(
+  { filetype = "gleam", trig = "case" },
+  fmt(case_template, {
+    expression = i(1),
+    pattern1 = i(2),
+    result1 = i(3, "todo"),
+    pattern2 = i(4, "_"),
+    result2 = i(5, "todo"),
+    final = i(0),
+  })
+)
+
+local fn_template = [[
+fn {name}({args}) -> {rtype} {{
+  {body}
+}}
+]]
+
+local fn = s(
+  { filetype = "gleam", trig = "fn" },
+  fmt(fn_template, {
+    name = i(1),
+    args = i(2),
+    rtype = i(3),
+    body = i(0),
+  })
+)
+
+local pfn = s(
+  { filetype = "gleam", trig = "pfn" },
+  fmt("pub " .. fn_template, {
+    name = i(1),
+    args = i(2),
+    rtype = i(3),
+    body = i(0),
+  })
+)
+
+local type_template = [[
+type {name} {{
+  {body}
+}}
+]]
+
+local type = s(
+  { filetype = "gleam", trig = "type" },
+  fmt(type_template, {
+    name = i(1),
+    body = i(0),
+  })
+)
+
+local ptype = s(
+  { filetype = "gleam", trig = "ptype" },
+  fmt("pub " .. type_template, {
+    name = i(1),
+    body = i(0),
+  })
+)
+
+return {
+  case,
+  dot_case,
+  fn,
+  pfn,
+  type,
+  ptype,
+}

modules/programs/nvim/plugins/treesitter.nix

@@ -65,15 +65,5 @@ with builtins;
         ];
       }
     )
-    {
-      plugin = nvim-treesitter-textsubjects;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = readFile ./lua/nvim-treesitter-textsubjects.lua;
-    }
-    {
-      plugin = nvim-treesitter-context;
-      event = [ "BufReadPost" "BufNewFile" ];
-      opts = { };
-    }
   ];
 }

modules/programs/nvim/plugins/ui.nix

@@ -16,30 +16,9 @@ with builtins;
     }
     {
       plugin = todo-comments-nvim;
-      event = [ "BufReadPost" "BufNewFile" ];
       dependencies = [{ plugin = plenary-nvim; }];
       opts = { };
     }
-    {
-      plugin = pkgs.vimPlugins.statuscol-nvim.overrideAttrs (_: {
-        version = lib.my.mkVersionInput inputs.statuscol-nvim;
-        src = inputs.statuscol-nvim;
-      });
-      event = [ "VeryLazy" ];
-      conf = readFile ./lua/statuscol-nvim.lua;
-    }
-    {
-      plugin = pkgs.vimUtils.buildVimPlugin {
-        pname = "smartcolumn-nvim";
-        version = lib.my.mkVersionInput inputs.smartcolumn-nvim;
-        src = inputs.smartcolumn-nvim;
-      };
-      event = [ "BufReadPost" "BufNewFile" ];
-      opts = {
-        colorcolumn = "120";
-        disabled_filetypes = [ "help" "text" "markdown" "dashboard" ];
-      };
-    }
     {
       plugin = dressing-nvim;
       event = [ "VeryLazy" ];