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

2023-09-10 15:23:27 +02:00 · 2023-09-10 15:23:27 +02:00 · 37a93b29ee
commit 37a93b29ee
parent 372ee5985a d6ad810568
45 changed files with 864 additions and 543 deletions
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@ -161,7 +161,7 @@ in
    # nix
    (nom-system-command "nixos-boot" "sudo nixos-rebuild boot --flake ~/.dotfiles")
    (nom-system-command "nixos-switch" "sudo nixos-rebuild switch --flake ~/.dotfiles")
-    comma
+    (nom-system-command "nixos-test" "sudo nixos-rebuild test --flake ~/.dotfiles")
    manix
    nix-index
    nix-output-monitor
--- a/modules/profiles/personal.nix
+++ b/modules/profiles/personal.nix
@ -69,5 +69,24 @@ in
          };
        };
      };
+      nix.buildMachines = [{
+        hostName = "builder";
+        systems = [ "aarch64-linux" "x86_64-linux" ];
+        protocol = "ssh-ng";
+        maxJobs = 1;
+        speedFactor = 1;
+        supportedFeatures = [ "nixos-test" "benchmark" "kvm" ];
+        mandatoryFeatures = [ ];
+      }];
+      nix.distributedBuilds = true;
+      # optional, useful when the builder has a faster internet connection than yours
+      nix.extraOptions = ''
+        builders-use-substitutes = true
+      '';
+      age.secrets."ssh-builder" = {
+        file = ../../secrets/ssh-builder.age;
+        owner = "0";
+        path = "/root/.ssh/config";
+      };
    };
 }
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@ -53,6 +53,7 @@ in
          init.defaultBranch = "main";
          merge.conflictstyle = "zdiff3";
          diff.external = getExe pkgs.difftastic;
+          push.autoSetupRemote = true;
        };
        signing = mkIf cfg.signing {
          key = "0x970C6E89EB0547A9";
--- a/modules/programs/hyprland/_config.nix
+++ b/modules/programs/hyprland/_config.nix
@ -110,28 +110,23 @@ in
      workspace_swipe = on
  }

-  # Example per-device config
-  # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-  device:epic mouse V1 {
-      sensitivity = -0.5
-  }
-
-  # Example windowrule v2
-  # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
  # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-
  # Firefox Sharing Indicator
-  ${mkRules ["float" "move 49% 40" "noborder" "nofullscreenrequest"] ["title:^(.*Sharing Indicator)$"]}
+  ${mkRules ["float" "move 49% 40" "noborder" "nofullscreenrequest"] ["title:^(.*Sharing Indicator.*)$"]}

  # Emacs
-  windowrulev2 = opaque, class:^emacs$
+  windowrulev2 = opaque, class:^(emacs)$

  # Fullscreen Applications
  ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]}

-  ${mkRules ["opaque" "noblur" "noshadow"] ["class:^jetbrains-pycharm$"]}
+  ${mkRules ["tile" "opaque"] ["class:^(neovide)$"]}

-  ${mkRules ["tile" "opaque"] ["class:^neovide$"]}
+  # fix xwayland apps
+  windowrulev2 = rounding 0, xwayland:1, floating:1
+  windowrulev2 = center, class:^(.*jetbrains.*)$, title:^(Confirm Exit|Open Project|win424|win201|splash)$
+  windowrulev2 = size 640 400, class:^(.*jetbrains.*)$, title:^(splash)$
+  ${mkRules ["opaque" "noshadow" "noblur" "noanim" "move cursor 5 5"] ["class:^(.*jetbrains-.*)$"]}

  # See https://wiki.hyprland.org/Configuring/Keywords/ for more
  $mainMod = SUPER
@ -141,9 +136,9 @@ in

  # Window binds
  bind = $mainMod       , F      , togglefloating ,
-  bind = $mainMod       , P      , pseudo         , 
+  bind = $mainMod       , P      , pseudo         ,
  bind = $mainMod       , Q      , killactive     ,
-  bind = $mainMod       , T      , togglesplit    , 
+  bind = $mainMod       , T      , togglesplit    ,
  bind = $mainMod SHIFT , F      , fullscreen     ,

  # Program binds
--- a/modules/programs/nix.nix
+++ b/modules/programs/nix.nix
@ -24,6 +24,8 @@ in
  };

  config.nix = {
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+
    package = pkgs.nix-super;

    extraOptions = "experimental-features = nix-command flakes";
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@ -1,57 +1,90 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
+{ config, lib, pkgs, ... }:

 with lib;
 let
  cfg = config.my.programs.nvim;
-  boolToString = bool: if bool then "true" else "false";
-  quote = str: ''"${toString str}"'';
-  id = x: x;
-  listToString = sep: f: list: ''{ ${concatStringsSep sep (map f list)} }'';
-  listToStringOneLine = listToString ", ";
-  listToStringMultiLine' = listToString ",\n" id;
+  toLua = value: with builtins;
+    if value == null then "nil" else
+    if isBool value then boolToString value else
+    if isInt value || isFloat value then toString value else
+    if isString value then string value else
+    if isAttrs value then attrs value else
+    if isList value then list value else
+    abort "should never happen (value = ${value})";
+
+  string = str: ''"${toString str}"'';
+  attrs = set:
+    let
+      toKeyword = name: value: "${name} = ${toLua value}";
+      keywords = concatStringsSep ", " (mapAttrsToList toKeyword set);
+    in
+    "{ " + keywords + " }";
+
+  listContent = values: concatStringsSep ", " (map toLua values);
+  list = values: "{ " + listContent values + " }";
+
+  luaList = values: "{" + (concatStringsSep ", " values) + "}";
+
  keybinding = { key, cmd, func, mode, desc }:
    let
      cmdString =
-        if cmd != null
-        then quote cmd
-        else
-          (
-            if func != null
-            then func
-            else abort "Either cmd or function must be set"
-          );
-      descString = optionalString (desc != null) "desc = ${quote desc},";
+        if cmd != null then toLua cmd else
+        if func != null then func else
+        abort "Either cmd or function must be set";
+      descString = optionalString (desc != null) "desc = ${toLua desc},";
    in
-    ''{ ${quote key}, ${cmdString}, mode = ${quote mode}, ${descString} }'';
+    ''{ ${toLua key}, ${cmdString}, mode = ${toLua mode}, ${descString} }'';
+
  lazySpecFromPlugin =
-    { plugin, dependencies, init, conf, lazy, event, enabled, cmd, ft, priority, keys }:
-    listToStringMultiLine'
+    { cmd
+    , conf
+    , dependencies
+    , enabled
+    , event
+    , ft
+    , init
+    , keys
+    , lazy
+    , opts
+    , plugin
+    , priority
+    }:
+
+    luaList
      ([
-        "dir = ${quote plugin}"
-        "name = ${quote (getName plugin)}"
+        "dir = ${string plugin}"
+        "name = ${toLua (getName plugin)}"
      ]
-      ++ (optional (lazy != null) "lazy = ${boolToString lazy}")
-      ++ (optional (!enabled) "enabled = ${boolToString enabled}")
-      ++ (optional (dependencies != [ ]) "dependencies = ${listToStringMultiLine' (map lazySpecFromPlugin dependencies)}")
-      ++ (optional (init != null) "init = function(plugin)\n${toString init}\nend")
-      ++ (optional (conf != null) "config = function(plugin, opts)\n${toString conf}\nend")
-      ++ (optional (keys != [ ]) "keys = ${listToStringMultiLine' (map keybinding keys)}")
-      ++ (optional (event != [ ]) "event = ${listToStringOneLine quote event}")
-      ++ (optional (cmd != [ ]) "cmd = ${listToStringOneLine quote cmd}")
-      ++ (optional (ft != [ ]) "ft = ${listToStringOneLine quote ft}")
-      ++ (optional (priority != null) "priority = ${toString priority}")
+      ++ (optional (opts != null) "opts = ${toLua opts}")
+      ++ (optional (lazy != null) "lazy = ${toLua lazy}")
+      ++ (optional (!enabled) "enabled = ${toLua enabled}")
+      ++ (optional (dependencies != [ ]) "dependencies = ${luaList (map lazySpecFromPlugin dependencies)}")
+      ++ (optional (init != null) "init = function(plugin)\n${init}\nend")
+      ++ (optional (conf != null) "config = function(plugin, opts)\n${conf}\nend")
+      ++ (optional (keys != [ ]) "keys = ${luaList (map keybinding keys)}")
+      ++ (optional (event != [ ]) "event = ${toLua event}")
+      ++ (optional (cmd != [ ]) "cmd = ${toLua cmd}")
+      ++ (optional (ft != [ ]) "ft = ${toLua ft}")
+      ++ (optional (priority != null) "priority = ${toLua priority}")
      );
-  lazySpecs = listToStringMultiLine' (map lazySpecFromPlugin cfg.plugins);
+  lazySpecs = luaList (map lazySpecFromPlugin cfg.plugins);
  lazy = /* lua */ ''
    require("lazy").setup(${lazySpecs})
  '';
+
+  initLua =
+    let
+      text = lib.concatLines [ (builtins.readFile ./options.lua) lazy ];
+    in
+    pkgs.runCommand "init.lua" { inherit text; } ''
+      touch $out
+      echo -n "$text" > $out
+      ${getExe pkgs.stylua} $out
+    '';
+
 in
 {
-  imports = [ ./plugins ];
+  imports = lib.my.listModulesRec ./plugins;

  options.my.programs.nvim = {
    enable = mkEnableOption "nvim";
@ -71,6 +104,27 @@ in
                  Lua function to be executed when the plugin is loaded.
                '';
              };
+              opts = mkOption {
+                type =
+                  let
+                    valueType = nullOr
+                      (oneOf [
+                        str
+                        bool
+                        int
+                        float
+                        (listOf valueType)
+                        (attrsOf valueType)
+                      ]) // {
+                      description = "Lua value";
+                    };
+                  in
+                  nullOr (attrsOf valueType);
+                default = null;
+                description = ''
+                  Lua table to be passed to te plugin config function.
+                '';
+              };
              dependencies = mkOption {
                type = listOf sub;
                default = [ ];
@ -161,8 +215,8 @@ in
                      '';
                    };
                    mode = mkOption {
-                      type = str;
-                      default = "n";
+                      type = listOf str;
+                      default = [ "n" ];
                      description = ''
                        Mode to bind the key in.
                      '';
@ -195,17 +249,9 @@ in
          else neovide
        )
      ];
-      xdg.configFile."nvim/init.lua" = {
-        source =
-          let
-            text = lib.concatLines [ (builtins.readFile ./options.lua) lazy ];
-          in
-          pkgs.runCommand "init.lua" { inherit text; } ''
-            touch $out
-            echo -n "$text" > $out
-            ${getExe pkgs.stylua} $out
-          '';
-      };
+
+      xdg.configFile."nvim/init.lua".source = initLua;
+
      programs.neovim = {
        enable = true;
        package = pkgs.neovim-nightly;
--- a/modules/programs/nvim/plugins/codeium-vim.lua
+++ b/modules/programs/nvim/plugins/codeium-vim.lua
@ -1,2 +0,0 @@
-- dont show ghost text
-vim.g.codeium_render = false
--- a/modules/programs/nvim/plugins/coding.nix
+++ b/modules/programs/nvim/plugins/coding.nix
@ -0,0 +1,305 @@
+{ pkgs, ... }:
+
+with builtins;
+{
+  config.my.programs.nvim.plugins = with pkgs.vimPlugins; [
+    {
+      plugin = formatter-nvim;
+      cmd = [ "Format" "Fmt" ];
+      keys = [
+        {
+          key = "=";
+          cmd = "<cmd>Format<cr>";
+          desc = "format (formatter)";
+        }
+      ];
+      conf = readFile ./lua/formatter-nvim.lua;
+    }
+    {
+      plugin = oil-nvim;
+      lazy = false;
+      opts = { };
+      dependencies = [
+        { plugin = which-key-nvim; }
+        { plugin = nvim-web-devicons; }
+      ];
+    }
+    {
+      plugin = mini-nvim;
+      lazy = false;
+      conf = readFile ./lua/mini-nvim.lua;
+    }
+    {
+      plugin = trouble-nvim;
+      keys = [
+        { key = "<leader>xx"; cmd = "<cmd>TroubleToggle document_diagnostics<cr>"; desc = "Document Diagnostics (Trouble)"; }
+        { key = "<leader>xX"; cmd = "<cmd>TroubleToggle workspace_diagnostics<cr>"; desc = "Workspace Diagnostics (Troule)"; }
+        { key = "<leader>xl"; cmd = "<cmd>TroubleToggle loclist<cr>"; desc = "Location List (Trouble)"; }
+        { key = "<leader>xq"; cmd = "<cmd>TroubleToggle quickfix<cr>"; desc = "Quickfix List (Trouble)"; }
+        { key = "<leader>xt"; cmd = "<cmd>TodoTrouble<cr>"; desc = "Todo (Trouble)"; }
+        { key = "<leader>xT"; cmd = "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>"; desc = "Todo/Fix/Fixme (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 = which-key-nvim; }
+        { plugin = nvim-web-devicons; }
+      ];
+    }
+    {
+      plugin = nvim-cmp;
+      conf = readFile ./lua/nvim-cmp.lua;
+      event = [ "InsertEnter" ];
+      dependencies = [
+        {
+          plugin = nvim-autopairs;
+          opts = { };
+        }
+        { plugin = cmp-async-path; }
+        { plugin = cmp-buffer; }
+        { plugin = cmp-cmdline; }
+        { plugin = cmp-nvim-lsp; }
+        { plugin = cmp_luasnip; }
+        {
+          plugin = codeium-nvim;
+          opts = { };
+        }
+        { plugin = friendly-snippets; }
+        { plugin = lspkind-nvim; }
+        { plugin = luasnip; }
+      ];
+    }
+    {
+      plugin = direnv-vim;
+      lazy = false;
+    }
+    {
+      plugin = nvim-lspconfig;
+      event = [ "BufRead" "BufNewFile" ];
+      conf = readFile ./lua/nvim-lspconfig.lua;
+      dependencies = [
+        { plugin = lsp_signature-nvim; }
+        {
+          plugin = null-ls-nvim;
+          conf = readFile ./lua/null-ls-nvim.lua;
+          dependencies = [
+            { plugin = which-key-nvim; }
+            { plugin = plenary-nvim; }
+          ];
+        }
+        { 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 = {
+            input_buffer_type = "dressing";
+          };
+          dependencies = [
+            { plugin = dressing-nvim; }
+          ];
+        }
+        { plugin = actions-preview-nvim; }
+      ];
+    }
+    {
+      plugin = vim-fugitive;
+      cmd = [
+        "G"
+        "Git"
+        "Ggrep"
+        "Glgrep"
+        "Gclog"
+        "Gllog"
+        "Gcd"
+        "Glcd"
+        "Gedit"
+        "Gsplit"
+        "Gvsplit"
+        "Gtabedit"
+        "Gpedit"
+        "Gdrop"
+        "Gread"
+        "Gwrite"
+        "Gwq"
+        "Gdiffsplit"
+        "Gvdiffsplit"
+        "GMove"
+        "GRename"
+        "GDelete"
+        "GBrowse"
+      ];
+    }
+    {
+      plugin = vim-tmux-navigator;
+      event = [ "VeryLazy" ];
+    }
+    {
+      plugin = nvim-lastplace;
+      event = [ "BufReadPost" "BufNewFile" ];
+      opts = {
+        lastplace_ignore_buftype = [ "quickfix" "nofile" "help" ];
+        lastplace_ignore_filetype = [ "gitcommit" "gitrebase" "svn" "hgcommit" ];
+        lastplace_open_folds = true;
+      };
+    }
+    {
+      plugin = telescope-nvim;
+      cmd = [ "Telescope" ];
+      conf = builtins.readFile ./lua/telescope.lua;
+      keys = [
+        { key = "<leader>ff"; cmd = "<cmd>Telescope find_files<cr>"; desc = "Find files"; }
+        { key = "<leader>fb"; cmd = "<cmd>Telescope buffers<cr>"; desc = "Find buffers"; }
+        { key = "<leader>fl"; cmd = "<cmd>Telescope current_buffer_fuzzy_find<cr>"; desc = "Search lines"; }
+        { key = "<leader>fg"; cmd = "<cmd>Telescope live_grep<cr>"; desc = "Live grep"; }
+        { key = "<leader>fh"; cmd = "<cmd>Telescope help_tags<cr>"; desc = "Help tags"; }
+      ];
+      dependencies = [
+        { plugin = plenary-nvim; }
+        { plugin = which-key-nvim; }
+        { plugin = telescope-fzf-native-nvim; }
+      ];
+    }
+    {
+      plugin = vim-startuptime;
+      cmd = [ "StartupTime" ];
+      conf = readFile ./lua/vim-startuptime.lua;
+    }
+    {
+      plugin = typst-vim;
+      ft = [ "typst" "typ" ];
+    }
+    {
+      plugin = comment-nvim;
+      event = [ "BufReadPost" "BufNewFile" ];
+      opts = { };
+    }
+    {
+      plugin = telekasten-nvim;
+      dependencies = [
+        { plugin = telescope-nvim; }
+        { plugin = which-key-nvim; }
+        {
+          plugin = markdown-preview-nvim;
+          ft = [ "md" ];
+        }
+      ];
+      cmd = [ "Telekasten" ];
+      keys = [
+        { key = "<leader>z"; cmd = "<cmd>Telekasten<cr>"; desc = "zettelkasten"; }
+      ];
+      conf = builtins.readFile ./lua/zettelkasten-nvim.lua;
+    }
+    {
+      plugin = nvim-surround;
+      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 = refactoring-nvim;
+      keys = [
+        { key = "<leader>re"; cmd = ": Refactor eextract "; desc = "Extract"; mode = [ "x" ]; }
+        { key = "<leader>rf"; cmd = ": Refactor extract_to_file "; desc = "Extract to file"; mode = [ "x" ]; }
+        { key = "<leader>rv"; cmd = ": Refactor extract_var "; desc = "Extract variable"; mode = [ "x" ]; }
+        { key = "<leader>ri"; cmd = ": Refactor inline_var"; desc = "Inline variable"; mode = [ "n" "x" ]; }
+        { key = "<leader>rI"; cmd = ": Refactor inline_func"; desc = "Inline function"; mode = [ "n" "x" ]; }
+        { key = "<leader>rb"; cmd = ": Refactor extract_block"; desc = "Extract block"; mode = [ "n" ]; }
+        { key = "<leader>rbf"; cmd = ": Refactor extract_block_to_file"; desc = "Extract block to file"; mode = [ "n" ]; }
+      ];
+      dependencies = [
+        { plugin = which-key-nvim; }
+        { plugin = plenary-nvim; }
+        { plugin = nvim-lspconfig; }
+      ];
+      init = /* lua */ ''
+        require("which-key").register({
+          ["<leader>r"] = {
+            name = "refactoring",
+          },
+        })
+      '';
+      opts = { };
+    }
+    {
+      plugin = harpoon;
+      keys = [
+        { key = "<leader>ha"; cmd = "<cmd>lua require('harpoon.mark').add_file()<cr>"; desc = "Add file"; }
+        { key = "<leader>hh"; cmd = "<cmd>lua require('harpoon.ui').toggle_quick_menu()<cr>"; desc = "Harpoon"; }
+        { key = "<leader>h1"; cmd = "<cmd>lua require('harpoon.ui').nav_file(1)<cr>"; desc = "Harpoon file 1"; }
+        { key = "<leader>h2"; cmd = "<cmd>lua require('harpoon.ui').nav_file(2)<cr>"; desc = "Harpoon file 2"; }
+        { key = "<leader>h3"; cmd = "<cmd>lua require('harpoon.ui').nav_file(3)<cr>"; desc = "Harpoon file 3"; }
+        { key = "<leader>h4"; cmd = "<cmd>lua require('harpoon.ui').nav_file(4)<cr>"; desc = "Harpoon file 4"; }
+      ];
+      opts = { };
+    }
+  ];
+}
--- a/modules/programs/nvim/plugins/copilot-lua.lua
+++ b/modules/programs/nvim/plugins/copilot-lua.lua
@ -1,5 +0,0 @@
-require("copilot").setup({
-  suggestion = { enabled = false },
-  panel = { enabled = false },
-})
-vim.cmd("Copilot disable")
--- a/modules/programs/nvim/plugins/coq-nvim.lua
+++ b/modules/programs/nvim/plugins/coq-nvim.lua
@ -1,6 +0,0 @@
-vim.g.coq_settings = {
-  auto_start = "shut-up",
-  keymap = {
-    jump_to_mark = "<c-n>",
-  },
-}
--- a/modules/programs/nvim/plugins/coq-thirdparty.lua
+++ b/modules/programs/nvim/plugins/coq-thirdparty.lua
@ -1,4 +0,0 @@
-require("coq_3p")({
-  { src = "orgmode", short_name = "ORG" },
-  { src = "codeium", short_name = "COD" },
-})
--- a/modules/programs/nvim/plugins/default.nix
+++ b/modules/programs/nvim/plugins/default.nix
@ -1,295 +0,0 @@
-{ lib, pkgs, ... }:
-
-with builtins;
-{
-  config.my.programs.nvim.plugins = with pkgs.vimPlugins; [
-    {
-      plugin = which-key-nvim;
-      lazy = false;
-      conf = readFile ./which-key-nvim.lua;
-    }
-    {
-      plugin = catppuccin-nvim;
-      conf = readFile ./catppuccin-nvim.lua;
-      lazy = false;
-      priority = 99;
-    }
-    {
-      plugin = formatter-nvim;
-      keys = [
-        { key = "="; cmd = "<cmd>Format<cr>"; desc = "format (formatter)"; }
-      ];
-      conf = readFile ./formatter-nvim.lua;
-    }
-    {
-      plugin = oil-nvim;
-      lazy = false;
-      conf = readFile ./oil-nvim.lua;
-      dependencies = [
-        { plugin = which-key-nvim; }
-        { plugin = nvim-web-devicons; }
-      ];
-    }
-    {
-      plugin = mini-nvim;
-      lazy = false;
-      conf = readFile ./mini-nvim.lua;
-    }
-    {
-      plugin = trouble-nvim;
-      keys = [
-        { key = "<leader>xx"; cmd = "<cmd>TroubleToggle document_diagnostics<cr>"; desc = "Document Diagnostics (Trouble)"; }
-        { key = "<leader>xX"; cmd = "<cmd>TroubleToggle workspace_diagnostics<cr>"; desc = "Workspace Diagnostics (Troule)"; }
-        { key = "<leader>xl"; cmd = "<cmd>TroubleToggle loclist<cr>"; desc = "Location List (Trouble)"; }
-        { key = "<leader>xq"; cmd = "<cmd>TroubleToggle quickfix<cr>"; desc = "Quickfix List (Trouble)"; }
-        { key = "<leader>xt"; cmd = "<cmd>TodoTrouble<cr>"; desc = "Todo (Trouble)"; }
-        { key = "<leader>xT"; cmd = "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>"; desc = "Todo/Fix/Fixme (Trouble)"; }
-        { key = "<leader>st"; 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";
-        }
-      ];
-      conf = readFile ./trouble-nvim.lua;
-      dependencies = [
-        { plugin = which-key-nvim; }
-        { plugin = nvim-web-devicons; }
-      ];
-    }
-    {
-      plugin = todo-comments-nvim;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = readFile ./todo-comments-nvim.lua;
-      dependencies = [{ plugin = plenary-nvim; }];
-    }
-    {
-      plugin = direnv-vim;
-      lazy = false;
-    }
-    {
-      plugin = nvim-treesitter;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf =
-        let
-          parserDir = pkgs.symlinkJoin {
-            name = "tresitter-grammars-all";
-            paths = lib.attrValues (lib.filterAttrs (_: builtins.isAttrs) nvim-treesitter-parsers);
-          };
-        in
-        readFile ./nvim-treesitter.lua + ''
-          vim.opt.runtimepath:append("${parserDir}")
-
-          require'nvim-treesitter.configs'.setup {
-            parser_install_dir = "${parserDir}",
-          }
-        '';
-      dependencies = [
-        { plugin = nvim-ts-context-commentstring; }
-        {
-          plugin = orgmode;
-          conf = readFile ./orgmode.lua;
-        }
-      ];
-    }
-    {
-      plugin = nvim-lspconfig;
-      event = [ "BufRead" "BufNewFile" ];
-      conf = readFile ./nvim-lspconfig.lua;
-      dependencies = [
-        {
-          plugin = null-ls-nvim;
-          conf = readFile ./null-ls-nvim.lua;
-          dependencies = [
-            { plugin = which-key-nvim; }
-            { plugin = plenary-nvim; }
-          ];
-        }
-        { plugin = which-key-nvim; }
-        { plugin = lsp_lines-nvim; }
-        {
-          plugin = nvim-ufo;
-          conf = readFile ./nvim-ufo.lua;
-          dependencies = [
-            { plugin = promise-async; }
-          ];
-        }
-        {
-          plugin = neodev-nvim;
-          conf = readFile ./neodev-nvim.lua;
-        }
-        {
-          plugin = inc-rename-nvim;
-          conf = /* lua */ ''
-            require("inc_rename").setup {
-              input_buffer_type = "dressing",
-            }
-          '';
-          dependencies = [
-            {
-              plugin = dressing-nvim;
-            }
-          ];
-        }
-      ];
-    }
-    {
-      plugin = statuscol-nvim;
-      event = [ "VeryLazy" ];
-      conf = readFile ./statuscol-nvim.lua;
-    }
-    {
-      plugin = vim-fugitive;
-      event = [ "VeryLazy" ];
-    }
-    {
-      plugin = vim-tmux-navigator;
-      event = [ "VeryLazy" ];
-    }
-    {
-      plugin = gitsigns-nvim;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = readFile ./gitsigns-nvim.lua;
-      dependencies = [{ plugin = which-key-nvim; }];
-    }
-    {
-      plugin = nvim-lastplace;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = readFile ./nvim-lastplace.lua;
-    }
-    {
-      plugin = nvim-treesitter-textsubjects;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = readFile ./nvim-treesitter-textsubjects.lua;
-    }
-    {
-      plugin = smartcolumn-nvim;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = readFile ./smartcolumn-nvim.lua;
-    }
-    {
-      plugin = telescope-nvim;
-      cmd = [ "Telescope" ];
-      conf = builtins.readFile ./telescope.lua;
-      keys = [
-        { key = "<leader>ff"; cmd = "<cmd>Telescope find_files<cr>"; desc = "Find files"; }
-        { key = "<leader>fb"; cmd = "<cmd>Telescope buffers<cr>"; desc = "Find buffers"; }
-        { key = "<leader>fr"; cmd = "<cmd>Telescope oldfiles<cr>"; desc = "Find recent files"; }
-        { key = "<leader>sl"; cmd = "<cmd>Telescope current_buffer_fuzzy_find<cr>"; desc = "Search lines"; }
-        { key = "<leader>sg"; cmd = "<cmd>Telescope live_grep<cr>"; desc = "Live grep"; }
-        { key = "<leader>sc"; cmd = "<cmd>Telescope command_history<cr>"; desc = "Command history"; }
-        { key = "<leader>sC"; cmd = "<cmd>Telescope commands<cr>"; desc = "Commands"; }
-        { key = "<leader>sd"; cmd = "<cmd>Telescope diagnostics<cr>"; desc = "Diagnostics"; }
-        { key = "<leader>sh"; cmd = "<cmd>Telescope help_tags<cr>"; desc = "Help tags"; }
-        { key = "<leader>sk"; cmd = "<cmd>Telescope keymaps<cr>"; desc = "Keymaps"; }
-        { key = "<leader>ss"; cmd = "<cmd>Telescope lsp_document_symbols<cr>"; desc = "Symbols (Document)"; }
-        { key = "<leader>sS"; cmd = "<cmd>Telescope lsp_workspace_symbols<cr>"; desc = "Symbols (Workspace)"; }
-      ];
-      dependencies = [
-        { plugin = plenary-nvim; }
-        { plugin = which-key-nvim; }
-        { plugin = telescope-fzf-native-nvim; }
-      ];
-    }
-    {
-      plugin = vim-startuptime;
-      cmd = [ "StartupTime" ];
-      conf = readFile ./vim-startuptime.lua;
-    }
-    {
-      plugin = typst-vim;
-      ft = [ "typst" "typ" ];
-    }
-    {
-      plugin = comment-nvim;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = /* lua */ ''
-        require("Comment").setup()
-      '';
-    }
-    {
-      plugin = telekasten-nvim;
-      dependencies = [
-        { plugin = telescope-nvim; }
-        { plugin = which-key-nvim; }
-      ];
-      cmd = [ "Telekasten" ];
-      keys = [
-        { key = "<leader>z"; cmd = "<cmd>Telekasten<cr>"; desc = "zettelkasten"; }
-      ];
-      conf = builtins.readFile ./zettelkasten-nvim.lua;
-    }
-    {
-      plugin = markdown-preview-nvim;
-      ft = [ "md" ];
-    }
-    {
-      plugin = coq_nvim;
-      event = [ "BufReadPost" "BufNewFile" ];
-      init = builtins.readFile ./coq-nvim.lua;
-      dependencies = [
-        {
-          plugin = coq-thirdparty;
-          conf = builtins.readFile ./coq-thirdparty.lua;
-          dependencies = [
-            {
-              plugin = codeium-vim;
-              init = builtins.readFile ./codeium-vim.lua;
-            }
-          ];
-        }
-        {
-          plugin = coq-artifacts;
-        }
-      ];
-    }
-    {
-      plugin = nvim-surround;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = /* lua */ ''
-        require("nvim-surround").setup({})
-      '';
-    }
-    {
-      plugin = nvim-treesitter-context;
-      event = [ "BufReadPost" "BufNewFile" ];
-      conf = /* lua */ ''
-        require("treesitter-context").setup({})
-      '';
-    }
-    {
-      plugin = dressing-nvim;
-      event = [ "VeryLazy" ];
-    }
-    {
-      plugin = hmts-nvim;
-      ft = [ "nix" ];
-    }
-    {
-      plugin = zen-mode-nvim;
-      keys = [
-        { key = "<leader>tz"; cmd = "<cmd>ZenMode<cr>"; desc = "Zen mode"; }
-      ];
-      dependencies = [
-        { plugin = twilight-nvim; }
-      ];
-    }
-  ];
-}
--- a/modules/programs/nvim/plugins/lua/catppuccin-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/catppuccin-nvim.lua
--- a/modules/programs/nvim/plugins/lua/formatter-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/formatter-nvim.lua
--- a/modules/programs/nvim/plugins/lua/gitsigns-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/gitsigns-nvim.lua
--- a/modules/programs/nvim/plugins/lua/mini-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/mini-nvim.lua
@ -1,6 +1,5 @@
 require("mini.align").setup()
 require("mini.move").setup()
-require("mini.pairs").setup()
 require("mini.starter").setup()

 require("mini.statusline").setup({
--- a/modules/programs/nvim/plugins/lua/neodev-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/neodev-nvim.lua
--- a/modules/programs/nvim/plugins/lua/noice-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/noice-nvim.lua
--- a/modules/programs/nvim/plugins/lua/null-ls-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/null-ls-nvim.lua
@ -3,7 +3,6 @@ local null_ls = require("null-ls")
 null_ls.setup({
  sources = {
    -- Code actions
-    null_ls.builtins.code_actions.gitsigns,
    null_ls.builtins.code_actions.shellcheck,
    null_ls.builtins.code_actions.statix,
    -- Completion
--- a/modules/programs/nvim/plugins/lua/nvim-cmp.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-cmp.lua
@ -0,0 +1,114 @@
+local cmp = require("cmp")
+local luasnip = require("luasnip")
+require("luasnip.loaders.from_vscode").lazy_load()
+
+cmp.setup({
+  formatting = {
+    format = require("lspkind").cmp_format({
+      mode = "symbol", -- show only symbol annotations
+      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 = {
+        Codeium = "",
+      },
+    }),
+  },
+  snippet = {
+    -- REQUIRED - you must specify a snippet engine
+    expand = function(args)
+      require("luasnip").lsp_expand(args.body)
+    end,
+  },
+  mapping = cmp.mapping.preset.insert({
+    ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+    ["<C-Space>"] = cmp.mapping.complete(),
+    ["<C-e>"] = cmp.mapping.abort(),
+    ["<CR>"] = cmp.mapping.confirm({ select = true }),
+    ["<Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif luasnip.expand_or_jumpable() then
+        luasnip.expand_or_jump()
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+    ["<S-Tab>"] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif luasnip.jumpable(-1) then
+        luasnip.jump(-1)
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+  }),
+  sources = {
+    { name = "async_path", priority = 1 },
+    { name = "buffer", priority = 1 },
+    { name = "luasnip", priority = 2 },
+    { name = "codeium", priority = 3 },
+    { name = "nvim_lsp", priority = 4 },
+  },
+})
+
+-- Set configuration for specific filetype.
+cmp.setup.filetype("gitcommit", {
+  sources = cmp.config.sources({
+    { name = "buffer" },
+  }),
+})
+
+-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline({ "/", "?" }, {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = "buffer" },
+  },
+})
+
+-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(":", {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = "async_path" },
+  }, {
+    { name = "cmdline" },
+  }),
+  enabled = function()
+    -- Set of commands where cmp will be disabled
+    local disabled = {
+      IncRename = true,
+    }
+    -- Get first word of cmdline
+    local cmd = vim.fn.getcmdline():match("%S+")
+    -- Return true if cmd isn't disabled
+    -- else call/return cmp.close(), which returns false
+    return not disabled[cmd] or cmp.close()
+  end,
+})
+-- If you want insert `(` after select function or method item
+local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+local handlers = require("nvim-autopairs.completion.handlers")
+
+cmp.event:on(
+  "confirm_done",
+  cmp_autopairs.on_confirm_done({
+    filetypes = {
+      -- "*" is a alias to all filetypes
+      ["*"] = {
+        ["("] = {
+          kind = {
+            cmp.lsp.CompletionItemKind.Function,
+            cmp.lsp.CompletionItemKind.Method,
+          },
+          handler = handlers["*"],
+        },
+      },
+      -- Disable for functional languages
+      haskell = false,
+      nix = false,
+    },
+  })
+)
--- a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
@ -5,8 +5,9 @@ vim.diagnostic.config({
  virtual_text = false,
 })

-local capabilities = vim.lsp.protocol.make_client_capabilities()
-- NOTE for nvim-ufo
+-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
 -- Tell the server the capability of foldingRange,
 -- Neovim hasn't added foldingRange to default capabilities, users must add it manually
 capabilities.textDocument.foldingRange = {
@ -34,7 +35,7 @@ local on_attach_def = function(client, bufnr)
      l = {
        name = "lsp",
        d = { vim.diagnostic.open_float, "Open diagnostic window" },
-        c = { vim.lsp.buf.code_action, "Code action" },
+        c = { require("actions-preview").code_actions, "Code action", mode = { "v", "n" } },
        r = {
          function()
            return ":IncRename " .. vim.fn.expand("<cword>")
@ -51,7 +52,17 @@ local on_attach_def = function(client, bufnr)
        },
      },
      t = {
-        l = { lsp_lines.toggle, "LSP lines" },
+        l = {
+          function()
+            lsp_lines.toggle()
+            if vim.diagnostic.is_disabled() then
+              vim.diagnostic.enable()
+            else
+              vim.diagnostic.disable()
+            end
+          end,
+          "LSP lines",
+        },
        i = {
          function()
            vim.lsp.inlay_hint(bufnr, nil)
@ -95,11 +106,21 @@ local on_attach_def = function(client, bufnr)
      vim.lsp.inlay_hint(bufnr, true)
    end, timeout)
  end
+
+  require("lsp_signature").on_attach({
+    bind = true, -- This is mandatory, otherwise border config won't get registered.
+    handler_opts = {
+      border = "rounded",
+    },
+  }, bufnr)
 end

 local lspconfig_default_options = {
  on_attach = on_attach_def,
  capabilities = capabilities,
+  flags = {
+    debounce_text_changes = 100,
+  },
 }

 ---function to add default options to lspconfig
@ -107,9 +128,8 @@ local lspconfig_default_options = {
 ---@param options table
 ---@return nil
 local function lspconfig_setup(lsp, options)
-  local coq_options = require("coq").lsp_ensure_capabilities({})
-  local merged_options = vim.tbl_deep_extend("force", coq_options, lspconfig_default_options, options)
-  lspconfig[lsp].setup(merged_options)
+  local final_options = vim.tbl_deep_extend("force", lspconfig_default_options, options)
+  lspconfig[lsp].setup(final_options)
 end

 local servers = {
--- a/modules/programs/nvim/plugins/lua/nvim-treesitter-textsubjects.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-treesitter-textsubjects.lua
--- a/modules/programs/nvim/plugins/lua/nvim-treesitter.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-treesitter.lua
@ -0,0 +1,10 @@
+require("nvim-treesitter.configs").setup({
+  sync_install = false,
+  auto_install = false,
+  highlight = {
+    enable = true,
+  },
+  context_commentstring = {
+    enable = true,
+  },
+})
--- a/modules/programs/nvim/plugins/lua/nvim-ufo.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-ufo.lua
--- a/modules/programs/nvim/plugins/lua/statuscol-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/statuscol-nvim.lua
--- a/modules/programs/nvim/plugins/lua/telescope.lua
+++ b/modules/programs/nvim/plugins/lua/telescope.lua
--- a/modules/programs/nvim/plugins/lua/vim-startuptime.lua
+++ b/modules/programs/nvim/plugins/lua/vim-startuptime.lua
--- a/modules/programs/nvim/plugins/lua/which-key-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/which-key-nvim.lua
@ -1,14 +1,16 @@
 vim.o.timeout = true
 vim.o.timeoutlen = 500

-- buffer
+-- Delete
 require("which-key").register({
-  b = {
-    name = "buffer",
-    b = { "<cmd>Telescope buffers<cr>", "List buffers" },
-    d = { "<cmd>bd<cr>", "Delete buffer" },
+  d = {
+    name = "delete",
+    b = { "<cmd>bd<cr>", "Delete buffer" },
+    w = { "<C-w>c", "Delete window" },
  },
 }, { prefix = "<leader>" })
+
+-- buffer
 require("which-key").register({
  ["["] = {
    b = { "<cmd>bprevious<cr>", "Previous buffer" },
@ -25,26 +27,6 @@ require("which-key").register({
    ["|"] = { "<C-w>v", "Split window horizontally" },
    ["-"] = { "<C-w>s", "Split window vertically" },
    w = { "<C-w>w", "Switch window" },
-    d = { "<C-w>c", "Delete window" },
-  },
-}, { prefix = "<leader>" })
-
-- tab
-require("which-key").register({
-  ["<tab>"] = {
-    name = "tab",
-    ["<tab>"] = { "<cmd>tabnew<cr>", "New tab" },
-    n = { "<cmd>tabnext<cr>", "Next tab" },
-    p = { "<cmd>tabprevious<cr>", "Previous tab" },
-    d = { "<cmd>tabclose<cr>", "Close tab" },
-  },
-}, { prefix = "<leader>" })
-
-- file
-require("which-key").register({
-  f = {
-    name = "file/find",
-    n = { "<cmd>enew<cr>", "New file" },
  },
 }, { prefix = "<leader>" })

--- a/modules/programs/nvim/plugins/lua/zettelkasten-nvim.lua
+++ b/modules/programs/nvim/plugins/lua/zettelkasten-nvim.lua
--- a/modules/programs/nvim/plugins/nvim-lastplace.lua
+++ b/modules/programs/nvim/plugins/nvim-lastplace.lua
@ -1,5 +0,0 @@
-require("nvim-lastplace").setup({
-  lastplace_ignore_buftype = { "quickfix", "nofile", "help" },
-  lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" },
-  lastplace_open_folds = true,
-})
--- a/modules/programs/nvim/plugins/nvim-treesitter.lua
+++ b/modules/programs/nvim/plugins/nvim-treesitter.lua
@ -1,15 +0,0 @@
-- Load custom treesitter grammar for org filetype
-require("orgmode").setup_ts_grammar()
-require("nvim-treesitter.configs").setup({
-  sync_install = false,
-  auto_install = false,
-  highlight = {
-    enable = true,
-    -- Required for spellcheck, some LaTex highlights and
-    -- code block highlights that do not have ts grammar
-    additional_vim_regex_highlighting = { "org" },
-  },
-  context_commentstring = {
-    enable = true,
-  },
-})
--- a/modules/programs/nvim/plugins/oil-nvim.lua
+++ b/modules/programs/nvim/plugins/oil-nvim.lua
@ -1,4 +0,0 @@
-require("oil").setup()
-require("which-key").register({
-  d = { require("oil").toggle_float, "Directory (oil)" },
-}, { prefix = "<leader>t" })
--- a/modules/programs/nvim/plugins/orgmode.lua
+++ b/modules/programs/nvim/plugins/orgmode.lua
@ -1,4 +0,0 @@
-require("orgmode").setup({
-  org_agenda_files = { "~/Notes/org" },
-  org_default_notes_file = "~/Notes/org/refile.org",
-})
--- a/modules/programs/nvim/plugins/smartcolumn-nvim.lua
+++ b/modules/programs/nvim/plugins/smartcolumn-nvim.lua
@ -1,4 +0,0 @@
-require("smartcolumn").setup({
-  colorcolumn = "120",
-  disabled_filetypes = { "help", "text", "markdown", "dashboard" },
-})
--- a/modules/programs/nvim/plugins/todo-comments-nvim.lua
+++ b/modules/programs/nvim/plugins/todo-comments-nvim.lua
@ -1 +0,0 @@
-require("todo-comments").setup()
--- a/modules/programs/nvim/plugins/treesitter.nix
+++ b/modules/programs/nvim/plugins/treesitter.nix
@ -0,0 +1,42 @@
+{ lib, pkgs, ... }:
+
+with builtins;
+{
+  config.my.programs.nvim.plugins = with pkgs.vimPlugins; [
+    {
+      plugin = nvim-treesitter;
+      event = [ "BufReadPost" "BufNewFile" ];
+      conf =
+        let
+          parserDir = pkgs.symlinkJoin {
+            name = "tresitter-grammars-all";
+            paths = lib.attrValues (lib.filterAttrs (_: builtins.isAttrs) nvim-treesitter-parsers);
+          };
+        in
+        readFile ./lua/nvim-treesitter.lua + ''
+          vim.opt.runtimepath:append("${parserDir}")
+
+          require'nvim-treesitter.configs'.setup {
+            parser_install_dir = "${parserDir}",
+          }
+        '';
+      dependencies = [
+        { plugin = nvim-ts-context-commentstring; }
+      ];
+    }
+    {
+      plugin = nvim-treesitter-textsubjects;
+      event = [ "BufReadPost" "BufNewFile" ];
+      conf = readFile ./lua/nvim-treesitter-textsubjects.lua;
+    }
+    {
+      plugin = nvim-treesitter-context;
+      event = [ "BufReadPost" "BufNewFile" ];
+      opts = { };
+    }
+    {
+      plugin = hmts-nvim;
+      ft = [ "nix" ];
+    }
+  ];
+}
--- a/modules/programs/nvim/plugins/trouble-nvim.lua
+++ b/modules/programs/nvim/plugins/trouble-nvim.lua
@ -1 +0,0 @@
-require("trouble").setup()
--- a/modules/programs/nvim/plugins/ui.nix
+++ b/modules/programs/nvim/plugins/ui.nix
@ -0,0 +1,47 @@
+{ pkgs, ... }:
+
+with builtins;
+{
+  config.my.programs.nvim.plugins = with pkgs.vimPlugins; [
+    {
+      plugin = which-key-nvim;
+      lazy = false;
+      conf = readFile ./lua/which-key-nvim.lua;
+    }
+    {
+      plugin = catppuccin-nvim;
+      conf = readFile ./lua/catppuccin-nvim.lua;
+      lazy = false;
+      priority = 99;
+    }
+    {
+      plugin = todo-comments-nvim;
+      event = [ "BufReadPost" "BufNewFile" ];
+      dependencies = [{ plugin = plenary-nvim; }];
+      opts = { };
+    }
+    {
+      plugin = statuscol-nvim;
+      event = [ "VeryLazy" ];
+      conf = readFile ./lua/statuscol-nvim.lua;
+    }
+    {
+      plugin = smartcolumn-nvim;
+      event = [ "BufReadPost" "BufNewFile" ];
+      opts = {
+        colorcolumn = "120";
+        disabled_filetypes = [ "help" "text" "markdown" "dashboard" ];
+      };
+    }
+    {
+      plugin = dressing-nvim;
+      event = [ "VeryLazy" ];
+    }
+    {
+      plugin = gitsigns-nvim;
+      event = [ "BufReadPost" "BufNewFile" ];
+      conf = readFile ./lua/gitsigns-nvim.lua;
+      dependencies = [{ plugin = which-key-nvim; }];
+    }
+  ];
+}