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

modules/programs/nvim/default.nix

@@ -42,7 +42,6 @@ in
             nixpkgs-fmt
             nodePackages.bash-language-server
             python3Packages.python-lsp-server
-            python3Packages.ruff-lsp
             shellcheck
             shfmt
             stable.yamlfix

modules/programs/nvim/plugins/coding.nix

@@ -38,7 +38,6 @@ in
         { plugin = pkgs.vimPlugins.cmp-cmdline; }
         { plugin = pkgs.vimPlugins.cmp-nvim-lsp-signature-help; }
         { plugin = pkgs.vimPlugins.cmp-nvim-lsp; }
-        { plugin = pkgs.vimPlugins.cmp-spell; }
         {
           plugin = pkgs.vimUtils.buildVimPlugin {
             pname = "cmp-vimtex";
@@ -47,23 +46,23 @@ in
           };
         }
         { plugin = pkgs.vimPlugins.cmp_luasnip; }
-        {
-          plugin = pkgs.vimPlugins.copilot-cmp;
-          opts = { };
-          dependencies = [
-            {
-              plugin = pkgs.vimPlugins.copilot-lua;
-              opts = {
-                suggestion = { enabled = false; };
-                panel = { enabled = false; };
-              };
-              conf = /* lua */ ''
-                require("copilot").setup(opts)
-                vim.cmd("Copilot disable")
-              '';
-            }
-          ];
-        }
+        # {
+        #   plugin = pkgs.vimPlugins.copilot-cmp;
+        #   opts = { };
+        #   dependencies = [
+        #     {
+        #       plugin = pkgs.vimPlugins.copilot-lua;
+        #       opts = {
+        #         suggestion = { enabled = false; };
+        #         panel = { enabled = false; };
+        #       };
+        #       conf = /* lua */ ''
+        #         require("copilot").setup(opts)
+        #         vim.cmd("Copilot disable")
+        #       '';
+        #     }
+        #   ];
+        # }
         { plugin = pkgs.vimPlugins.friendly-snippets; }
         { plugin = pkgs.vimPlugins.lspkind-nvim; }
         {

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

@@ -2,6 +2,7 @@ local conform = require("conform")
 
 local formatters_by_ft = {
   ["*"] = { "codespell", "trim_whitespace" },
+  elixir = { "mix" },
   gleam = { "gleam" },
   go = { "gofmt" },
   json = { "jq" },

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

@@ -1,15 +1,13 @@
 require("gitsigns").setup()
-require("which-key").register({
-  ["[h"] = { "<cmd>Gitsigns prev_hunk<cr>", "Previous hunk" },
-  ["]h"] = { "<cmd>Gitsigns next_hunk<cr>", "Next hunk" },
-  ["<leader>g"] = {
-    s = { "<cmd>Gitsigns stage_hunk<cr>", "Stage hunk", mode = { "n", "v" } },
-    r = { "<cmd>Gitsigns reset_hunk<cr>", "Reset hunk", mode = { "n", "v" } },
-    S = { "<cmd>Gitsigns stage_buffer<cr>", "Stage buffer" },
-    R = { "<cmd>Gitsigns reset_buffer<cr>", "Reset buffer" },
-    u = { "<cmd>Gitsigns undo_stage_hunk<cr>", "Undo stage hunk" },
-    p = { "<cmd>Gitsigns preview_hunk_inline<cr>", "Preview hunk (inline)" },
-    P = { "<cmd>Gitsigns preview_hunk<cr>", "Preview hunk (float)" },
-  },
-  ["ih"] = { ":<C-U>Gitsigns select_hunk<cr>", "gitsigns hunk", mode = { "o", "x" } },
+require("which-key").add({
+  { "<leader>gP", "<cmd>Gitsigns preview_hunk<cr>", desc = "Preview hunk (float)" },
+  { "<leader>gR", "<cmd>Gitsigns reset_buffer<cr>", desc = "Reset buffer" },
+  { "<leader>gS", "<cmd>Gitsigns stage_buffer<cr>", desc = "Stage buffer" },
+  { "<leader>gp", "<cmd>Gitsigns preview_hunk_inline<cr>", desc = "Preview hunk (inline)" },
+  { "<leader>gu", "<cmd>Gitsigns undo_stage_hunk<cr>", desc = "Undo stage hunk" },
+  { "[h", "<cmd>Gitsigns prev_hunk<cr>", desc = "Previous hunk" },
+  { "]h", "<cmd>Gitsigns next_hunk<cr>", desc = "Next hunk" },
+  { "<leader>gr", "<cmd>Gitsigns reset_hunk<cr>", desc = "Reset hunk", mode = { "n", "v" } },
+  { "<leader>gs", "<cmd>Gitsigns stage_hunk<cr>", desc = "Stage hunk", mode = { "n", "v" } },
+  { "ih", ":<C-U>Gitsigns select_hunk<cr>", desc = "gitsigns hunk", mode = { "o", "x" } },
 })

modules/programs/nvim/plugins/lua/luasnip.lua

@@ -19,6 +19,7 @@ ls.setup({
       },
     },
   },
+  ft_func = require("luasnip.extras.filetype_functions").from_pos_or_filetype,
 })
 
 require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })

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

@@ -9,13 +9,10 @@ cmp.setup({
       maxwidth = 50, -- prevent the popup from showing more than provided characters
       ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
       symbol_map = {
-        Copilot = "",
+        -- Copilot = "",
       },
     }),
   },
-  enabled = function()
-    return not luasnip.jumpable(1)
-  end,
   snippet = {
     -- REQUIRED - you must specify a snippet engine
     expand = function(args)
@@ -49,6 +46,8 @@ cmp.setup({
     ["<C-n>"] = cmp.mapping(function(fallback)
       if luasnip.choice_active() then
         luasnip.change_choice(1)
+      elseif luasnip.locally_jumpable(1) then
+        luasnip.jump(1)
       else
         fallback()
       end
@@ -56,6 +55,8 @@ cmp.setup({
     ["<C-p>"] = cmp.mapping(function(fallback)
       if luasnip.choice_active() then
         luasnip.change_choice(-1)
+      elseif luasnip.locally_jumpable(-1) then
+        luasnip.jump(-1)
       else
         fallback()
       end
@@ -66,7 +67,7 @@ cmp.setup({
     { priority = 1, name = "buffer" },
     { priority = 1, name = "spell" },
     { priority = 2, name = "nvim_lsp" },
-    { priority = 3, name = "copilot" },
+    -- { priority = 3, name = "copilot" },
     { priority = 3, name = "nvim_lsp_signature_help" },
     { priority = 4, name = "luasnip" },
     { priority = 4, name = "vimtex" },

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

@@ -21,76 +21,80 @@ capabilities.didChangeWatchedFiles = {
 
 local lspconfig = require("lspconfig")
 local on_attach_def = function(client, bufnr)
-  require("which-key").register({
-    K = {
-      vim.lsp.buf.hover,
-      "Hover",
+  require("which-key").add({
+    { "<leader>c", buffer = bufnr, group = "code" },
+    {
+      "<leader>cr",
+      function()
+        return ":IncRename " .. vim.fn.expand("<cword>")
+      end,
+      buffer = bufnr,
+      desc = "Rename",
+      expr = true,
+      replace_keycodes = false,
     },
-    ["<leader>"] = {
-      c = {
-        name = "code",
-        c = { require("actions-preview").code_actions, "Code action", mode = { "v", "n" } },
-        r = {
-          function()
-            return ":IncRename " .. vim.fn.expand("<cword>")
-          end,
-          "Rename",
-          expr = true,
-        },
-        f = {
-          function()
-            vim.lsp.buf.format({ async = true })
-          end,
-          "Format (lsp)",
-          mode = { "n", "v" },
-        },
-      },
-      t = {
-        l = {
-          function()
-            lsp_lines.toggle()
-            if vim.diagnostic.is_enabled() then
-              vim.diagnostic.disable()
-            else
-              vim.diagnostic.enable()
-            end
-          end,
-          "LSP lines",
-        },
-        i = {
-          function()
-            vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
-          end,
-          "LSP inlay hints",
-        },
-      },
+    {
+      "<leader>ti",
+      function()
+        vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
+      end,
+      buffer = bufnr,
+      desc = "LSP inlay hints",
     },
-    g = {
-      d = {
-        function()
-          require("telescope.builtin").lsp_definitions({ reuse_win = true })
-        end,
-        "Goto definition",
-      },
-      t = {
-        function()
-          require("telescope.builtin").lsp_type_definitions({ reuse_win = true })
-        end,
-        "Goto type definition",
-      },
-      r = { "<cmd>Telescope lsp_references<cr>", "Goto references" },
-      D = { vim.lsp.buf.declaration, "Goto declaration" },
-      I = { "<cmd>Telescope lsp_implementations<cr>", "Goto implementation" },
-      K = { vim.lsp.buf.signature_help, "Signature help" },
+    {
+      "<leader>tl",
+      function()
+        lsp_lines.toggle()
+        if vim.diagnostic.is_disabled() then
+          vim.diagnostic.enable()
+        else
+          vim.diagnostic.disable()
+        end
+      end,
+      buffer = bufnr,
+      desc = "LSP lines",
     },
-    ["["] = {
-      d = { vim.diagnostic.goto_prev, "Previous diagnostic" },
+    { "K", vim.lsp.buf.hover, buffer = bufnr, desc = "Hover" },
+    { "[d", vim.diagnostic.goto_prev, buffer = bufnr, desc = "Previous diagnostic" },
+    { "]d", vim.diagnostic.goto_next, buffer = bufnr, desc = "Next diagnostic" },
+    { "gD", vim.lsp.buf.declaration, buffer = bufnr, desc = "Goto declaration" },
+    { "gI", "<cmd>Telescope lsp_implementations<cr>", buffer = bufnr, desc = "Goto implementation" },
+    { "gK", vim.lsp.buf.signature_help, buffer = bufnr, desc = "Signature help" },
+    {
+      "gd",
+      function()
+        require("telescope.builtin").lsp_definitions({ reuse_win = true })
+      end,
+      buffer = bufnr,
+      desc = "Goto definition",
     },
-    ["]"] = {
-      d = { vim.diagnostic.goto_next, "Next diagnostic" },
-    },
-  }, { buffer = bufnr, silent = true })
+    { "gr", "<cmd>Telescope lsp_references<cr>", buffer = bufnr, desc = "Goto references" },
+    {
+      "gt",
 
+      function()
+        require("telescope.builtin").lsp_type_definitions({ reuse_win = true })
+      end,
+      buffer = bufnr,
+      desc = "Goto type definition",
+    },
+    {
+      "<leader>cc",
+      require("actions-preview").code_actions,
+      buffer = bufnr,
+      desc = "Code action",
+      mode = { "n", "v" },
+    },
+    {
+      "<leader>cf",
+      function()
+        vim.lsp.buf.format({ async = true })
+      end,
+      buffer = bufnr,
+      desc = "Format (lsp)",
+      mode = { "n", "v" },
+    },
+  })
   if client.server_capabilities.inlayHintProvider then
     local slow_lsp_servers = {
       "rust_analyzer",
@@ -124,7 +128,7 @@ local servers = {
   "gleam",
   "gopls",
   "pylsp",
-  "ruff_lsp",
+  "ruff",
   "templ",
   "typst_lsp",
 }
@@ -132,6 +136,10 @@ for _, lsp in ipairs(servers) do
   lspconfig_setup(lsp, {})
 end
 
+lspconfig_setup("elixirls", {
+  cmd = { "elixir-ls" },
+})
+
 lspconfig_setup("nil_ls", {
   settings = {
     flake = {

modules/programs/nvim/plugins/lua/which-key-nvim.lua

@@ -2,60 +2,50 @@ vim.o.timeout = true
 vim.o.timeoutlen = 500
 
 -- Delete
-require("which-key").register({
-  d = {
-    name = "delete",
-    b = { "<cmd>bd<cr>", "Delete buffer" },
-    w = { "<C-w>c", "Delete window" },
-  },
-}, { prefix = "<leader>" })
+require("which-key").add({
+  { "<leader>d", group = "delete" },
+  { "<leader>db", "<cmd>bd<cr>", desc = "Delete buffer" },
+  { "<leader>dw", "<C-w>c", desc = "Delete window" },
+})
 
 -- buffer
-require("which-key").register({
-  ["["] = {
-    b = { "<cmd>bprevious<cr>", "Previous buffer" },
-  },
-  ["]"] = {
-    b = { "<cmd>bnext<cr>", "Next buffer" },
-  },
+require("which-key").add({
+  { "[b", "<cmd>bprevious<cr>", desc = "Previous buffer" },
+  { "]b", "<cmd>bnext<cr>", desc = "Next buffer" },
 })
 
 -- window
-require("which-key").register({
-  w = {
-    name = "window",
-    ["|"] = { "<C-w>v", "Split window horizontally" },
-    ["-"] = { "<C-w>s", "Split window vertically" },
-    w = { "<C-w>w", "Switch window" },
-  },
-}, { prefix = "<leader>" })
+require("which-key").add({
+  { "<leader>w", group = "window" },
+  { "<leader>w-", "<C-w>s", desc = "Split window vertically" },
+  { "<leader>ww", "<C-w>w", desc = "Switch window" },
+  { "<leader>w|", "<C-w>v", desc = "Split window horizontally" },
+})
 
 -- better descriptions for navigation
-require("which-key").register({
-  ["<leader>"] = {
-    f = { name = "file/find" },
-    g = { name = "git" },
-    c = { name = "code" },
-    s = { name = "search" },
-    t = { name = "toggle" },
-  },
-  ["["] = { name = "prev" },
-  ["]"] = { name = "next" },
-  g = { name = "goto" },
+require("which-key").add({
+  { "<leader>c", group = "code" },
+  { "<leader>f", group = "file/find" },
+  { "<leader>g", group = "git" },
+  { "<leader>s", group = "search" },
+  { "<leader>t", group = "toggle" },
+  { "[", group = "prev" },
+  { "]", group = "next" },
+  { "g", group = "goto" },
 })
 
 -- Clear search with <esc>
-require("which-key").register({
-  ["<esc>"] = { "<cmd>noh<cr><esc>", "Escape and clear hlsearch", mode = { "n", "i" } },
+require("which-key").add({
+  { "<esc>", "<cmd>noh<cr><esc>", desc = "Escape and clear hlsearch", mode = { "i", "n" } },
 })
 
 -- better indenting
-require("which-key").register({
-  ["<"] = { "<gv", "Shift left" },
-  [">"] = { ">gv", "Shift right" },
-}, { mode = "v" })
+require("which-key").add({
+  { "<", "<gv", desc = "Shift left", mode = "v" },
+  { ">", ">gv", desc = "Shift right", mode = "v" },
+})
 
 -- better yank in visual mode
-require("which-key").register({
-  y = { "ygv<esc>", "Yank" },
-}, { mode = "v" })
+require("which-key").add({
+  { "y", "ygv<esc>", desc = "Yank", mode = "v" },
+})

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

@@ -0,0 +1,46 @@
+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 def_template = [[
+def {fname}({args}) do
+  {final}
+end
+]]
+
+local def = s(
+  "def",
+  fmt(def_template, {
+    fname = i(1, "fname"),
+    args = i(2),
+    final = i(3),
+  }, { priority = 1001 })
+)
+
+return {
+  def,
+}

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

@@ -0,0 +1,138 @@
+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 pe = s(
+  "pe",
+  fmt("<%= {final} %>", {
+    final = i(1),
+  }, { priority = 1001 })
+)
+
+local ln = s(
+  "ln",
+  fmt(
+    [[
+<.link navigate={{~p"{path}"}}">{final}</.link>
+]],
+    { path = i(1, "/"), final = i(2) },
+    { priority = 1001 }
+  )
+)
+
+local lp = s(
+  "lp",
+  fmt(
+    [[
+<.link patch={{~p"{path}"}}">{final}</.link>
+]],
+    { path = i(1, "/"), final = i(2) },
+    { priority = 1001 }
+  )
+)
+
+local if_ = s(
+  "if",
+  fmt("<%= if {condition} do %>{final}<% end %>", { condition = i(1, "condition"), final = i(2) }, { priority = 1001 })
+)
+
+local ife = s(
+  "ife",
+  fmt(
+    [[
+<%= if {condition} do %>
+  {when}
+<% else %>
+  {final}
+<% end %>"
+    ]],
+    { condition = i(1, "condition"), when = i(2), final = i(3) },
+    { priority = 1001 }
+  )
+)
+
+local for_ = s(
+  "for",
+  fmt(
+    [[
+<%= for {item} <- {list} do %>
+  {final}
+<% end %>
+    ]],
+    { item = i(1, "item"), list = i(2, "items"), final = i(3) },
+    { priority = 1001 }
+  )
+)
+
+local lc =
+  s("lc", fmt("<.live_component module={{{module}}} id={{{id}}} />", { module = i(1), id = i(2) }, { priority = 1001 }))
+
+local slot = s(
+  "slot",
+  fmt("<:slot>{final}</:slot>", {
+    final = i(1),
+  }, { priority = 1001 })
+)
+
+local socketp = s(
+  "socketp",
+  fmt(
+    [[
+socket =
+  socket
+  |> {final}
+]],
+    { final = i(1) },
+    { priority = 1001 }
+  )
+)
+
+local fl = s(
+  "fl",
+  fmt(
+    [[
+<{elem} :for={{{item} <- {list}}} class="{class}">
+  {final}
+</{elem}>
+]],
+    { elem = i(1, "div"), item = i(2, "item"), list = i(3, "items"), class = i(4), final = i(5) },
+    { priority = 1001, repeat_duplicates = true }
+  )
+)
+
+return {
+  pe,
+  ln,
+  lp,
+  if_,
+  ife,
+  for_,
+  lc,
+  slot,
+  socketp,
+  fl,
+}

modules/programs/nvim/plugins/treesitter.nix

@@ -1,16 +1,17 @@
-{ pkgs, ... }:
+{ pkgs, inputs, lib, ... }:
 
 {
   config.home-manager.users.moritz.programs.neovim.lazy.plugins = [
     (
       let
+        nvim-treesitter = pkgs.vimPlugins.nvim-treesitter;
         parserDir = pkgs.symlinkJoin {
           name = "tresitter-grammars-all";
-          paths = pkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies;
+          paths = nvim-treesitter.withAllGrammars.dependencies;
         };
       in
       {
-        plugin = pkgs.vimPlugins.nvim-treesitter;
+        plugin = nvim-treesitter;
         event = [ "BufReadPost" "BufNewFile" ];
         opts = {
           sync_install = false;
@@ -51,12 +52,10 @@
             };
         };
         conf =
-          ''
-            local final_opts = vim.tbl_deep_extend("keep", opts, { parser_install_dir = "${parserDir}" })
-            require('nvim-treesitter.configs').setup(final_opts)
-          '';
-        init = ''
-          vim.opt.runtimepath:prepend("${parserDir}")
+          /* lua */ ''
+          vim.opt.runtimepath:append("${parserDir}")
+          local final_opts = vim.tbl_deep_extend("keep", opts, { parser_install_dir = "${parserDir}" })
+          require('nvim-treesitter.configs').setup(final_opts)
         '';
         priority = 100;
         dependencies = [

modules/programs/nvim/plugins/ui.nix

@@ -1,33 +1,35 @@
 { pkgs, lib, inputs, ... }:
 
-with builtins;
+let
+  inherit (lib) readFile;
+in
 {
-  config.home-manager.users.moritz.programs.neovim.lazy.plugins = with pkgs.vimPlugins; [
+  config.home-manager.users.moritz.programs.neovim.lazy.plugins = [
     {
-      plugin = which-key-nvim;
+      plugin = pkgs.vimPlugins.which-key-nvim;
       lazy = false;
       conf = readFile ./lua/which-key-nvim.lua;
     }
     {
-      plugin = catppuccin-nvim;
+      plugin = pkgs.vimPlugins.catppuccin-nvim;
       conf = readFile ./lua/catppuccin-nvim.lua;
       lazy = false;
       priority = 99;
     }
     {
-      plugin = todo-comments-nvim;
-      dependencies = [{ plugin = plenary-nvim; }];
+      plugin = pkgs.vimPlugins.todo-comments-nvim;
+      dependencies = [{ plugin = pkgs.vimPlugins.plenary-nvim; }];
       opts = { };
     }
     {
-      plugin = dressing-nvim;
+      plugin = pkgs.vimPlugins.dressing-nvim;
       event = [ "VeryLazy" ];
     }
     {
-      plugin = gitsigns-nvim;
+      plugin = pkgs.vimPlugins.gitsigns-nvim;
       event = [ "BufReadPost" "BufNewFile" ];
       conf = readFile ./lua/gitsigns-nvim.lua;
-      dependencies = [{ plugin = which-key-nvim; }];
+      dependencies = [{ plugin = pkgs.vimPlugins.which-key-nvim; }];
     }
     {
       plugin = pkgs.vimUtils.buildVimPlugin {
@@ -38,8 +40,8 @@ with builtins;
       cmd = [ "Hawtkeys" "HawtkeysAll" "HawtkeysDupes" ];
       opts = { };
       dependencies = [
-        { plugin = plenary-nvim; }
-        { plugin = nvim-treesitter; }
+        { plugin = pkgs.vimPlugins.plenary-nvim; }
+        { plugin = pkgs.vimPlugins.nvim-treesitter; }
       ];
     }
     {