feat: small improvements (#25)

- Renamed and moved settings in some plugins due to upstream changes
- Added comments to neovim settings
- Added cmdheight = 0 and mouse = "a" settings to config

config/keymaps.nix

@@ -2,54 +2,77 @@
   globals.mapleader = " ";
 
   keymaps = [
-
     {
       mode = ["n" "x"];
       key = "j";
       action = "v:count == 0 ? 'gj' : 'j'";
-      options = {expr = true; silent = true;};
+      options = {
+        expr = true;
+        silent = true;
+      };
     }
     {
       mode = ["n" "x"];
       key = "<Down>";
       action = "v:count == 0 ? 'gj' : 'j'";
-      options = {expr = true; silent = true;};
+      options = {
+        expr = true;
+        silent = true;
+      };
     }
     {
       mode = ["n" "x"];
       key = "k";
       action = "v:count == 0 ? 'gk' : 'k'";
-      options = {expr = true; silent = true;};
+      options = {
+        expr = true;
+        silent = true;
+      };
     }
     {
       mode = ["n" "x"];
       key = "<Up>";
       action = "v:count == 0 ? 'gk' : 'k'";
-      options = {expr = true; silent = true;};
+      options = {
+        expr = true;
+        silent = true;
+      };
     }
     {
       mode = "n";
       key = "<C-h>";
       action = "<C-w>h";
-      options = {desc = "Go to Left Window"; remap = true;};
+      options = {
+        desc = "Go to Left Window";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<C-j>";
       action = "<C-w>j";
-      options = {desc = "Go to Lower Window"; remap = true;};
+      options = {
+        desc = "Go to Lower Window";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<C-k>";
       action = "<C-w>k";
-      options = {desc = "Go to Upper Window"; remap = true;};
+      options = {
+        desc = "Go to Upper Window";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<C-l>";
       action = "<C-w>l";
-      options = {desc = "Go to Right Window"; remap = true;};
+      options = {
+        desc = "Go to Right Window";
+        remap = true;
+      };
     }
     {
       mode = "n";
@@ -148,37 +171,55 @@
       mode = "n";
       key = "n";
       action = "'Nn'[v:searchforward].'zv'";
-      options = {expr = true; desc = "Next Search Result";};
+      options = {
+        expr = true;
+        desc = "Next Search Result";
+      };
     }
     {
       mode = "x";
       key = "n";
       action = "'Nn'[v:searchforward]";
-      options = {expr = true; desc = "Next Search Result";};
+      options = {
+        expr = true;
+        desc = "Next Search Result";
+      };
     }
     {
       mode = "o";
       key = "n";
       action = "'Nn'[v:searchforward]";
-      options = {expr = true; desc = "Next Search Result";};
+      options = {
+        expr = true;
+        desc = "Next Search Result";
+      };
     }
     {
       mode = "n";
       key = "N";
       action = "'nN'[v:searchforward].'zv'";
-      options = {expr = true; desc = "Prev Search Result";};
+      options = {
+        expr = true;
+        desc = "Prev Search Result";
+      };
     }
     {
       mode = "x";
       key = "N";
       action = "'nN'[v:searchforward]";
-      options = {expr = true; desc = "Prev Search Result";};
+      options = {
+        expr = true;
+        desc = "Prev Search Result";
+      };
     }
     {
       mode = "o";
       key = "N";
       action = "'nN'[v:searchforward]";
-      options = {expr = true; desc = "Prev Search Result";};
+      options = {
+        expr = true;
+        desc = "Prev Search Result";
+      };
     }
     {
       mode = "n";
@@ -274,37 +315,55 @@
       mode = "n";
       key = "<leader>ww";
       action = "<C-W>p";
-      options = {desc = "Other Window"; remap = true;};
+      options = {
+        desc = "Other Window";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<leader>wd";
       action = "<C-W>c";
-      options = {desc = "Delete Window"; remap = true;};
+      options = {
+        desc = "Delete Window";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<leader>w-";
       action = "<C-W>s";
-      options = {desc = "Split Window Below"; remap = true;};
+      options = {
+        desc = "Split Window Below";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<leader>w|";
       action = "<C-W>v";
-      options = {desc = "Split Window Right"; remap = true;};
+      options = {
+        desc = "Split Window Right";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<leader>-";
       action = "<C-W>s";
-      options = {desc = "Split Window Below"; remap = true;};
+      options = {
+        desc = "Split Window Below";
+        remap = true;
+      };
     }
     {
       mode = "n";
       key = "<leader>|";
       action = "<C-W>v";
-      options = {desc = "Split Window Right"; remap = true;};
+      options = {
+        desc = "Split Window Right";
+        remap = true;
+      };
     }
     {
       mode = "n";
@@ -344,4 +403,3 @@
     }
   ];
 }
-

config/plugins/editor/todo-comments.nix

@@ -1,12 +1,14 @@
 _: {
   plugins.todo-comments = {
     enable = true;
-    colors = {
+    settings = {
-      error = ["DiagnosticError" "ErrorMsg" "#ED8796"];
+      colors = {
-      warning = ["DiagnosticWarn" "WarningMsg" "#EED49F"];
+        error = ["DiagnosticError" "ErrorMsg" "#ED8796"];
-      info = ["DiagnosticInfo" "#EED49F"];
+        warning = ["DiagnosticWarn" "WarningMsg" "#EED49F"];
-      default = ["Identifier" "#F5A97F"];
+        info = ["DiagnosticInfo" "#EED49F"];
-      test = ["Identifier" "#8AADF4"];
+        default = ["Identifier" "#F5A97F"];
+        test = ["Identifier" "#8AADF4"];
+      };
     };
   };
 }

config/plugins/lsp/conform.nix

@@ -41,128 +41,130 @@
       '';
     plugins.conform-nvim = {
       enable = true;
-      formatOnSave = ''
+      settings = {
-        function(bufnr)
+        format_on_save = ''
-          if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+          function(bufnr)
-            return
+            if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
-          end
+              return
-
-          if slow_format_filetypes[vim.bo[bufnr].filetype] then
-            return
-          end
-
-          local function on_format(err)
-            if err and err:match("timeout$") then
-              slow_format_filetypes[vim.bo[bufnr].filetype] = true
             end
+
+            if slow_format_filetypes[vim.bo[bufnr].filetype] then
+              return
+            end
+
+            local function on_format(err)
+              if err and err:match("timeout$") then
+                slow_format_filetypes[vim.bo[bufnr].filetype] = true
+              end
+            end
+
+            return { timeout_ms = 200, lsp_fallback = true }, on_format
+           end
+        '';
+
+        format_after_save = ''
+          function(bufnr)
+            if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+              return
+            end
+
+            if not slow_format_filetypes[vim.bo[bufnr].filetype] then
+              return
+            end
+
+            return { lsp_fallback = true }
           end
+        '';
+        notify_on_error = true;
+        formatters_by_ft = {
+          html = [
+            [
+              "prettierd"
+              "prettier"
+            ]
+          ];
+          css = [
+            [
+              "prettierd"
+              "prettier"
+            ]
+          ];
+          javascript = [
+            [
+              "prettierd"
+              "prettier"
+            ]
+          ];
+          typescript = [
+            [
+              "prettierd"
+              "prettier"
+            ]
+          ];
+          python = [
+            "black"
+            "isort"
+          ];
+          lua = ["stylua"];
+          nix = ["alejandra"];
+          markdown = [
+            [
+              "prettierd"
+              "prettier"
+            ]
+          ];
+          yaml = [
+            [
+              "prettierd"
+              "prettier"
+            ]
+          ];
+          terraform = ["terraform_fmt"];
+          bicep = ["bicep"];
+          bash = [
+            "shellcheck"
+            "shellharden"
+            "shfmt"
+          ];
+          json = ["jq"];
+          "_" = ["trim_whitespace"];
+        };
 
-          return { timeout_ms = 200, lsp_fallback = true }, on_format
+        formatters = {
-         end
+          black = {
-      '';
+            command = "${lib.getExe pkgs.black}";
-
+          };
-      formatAfterSave = ''
+          isort = {
-        function(bufnr)
+            command = "${lib.getExe pkgs.isort}";
-          if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+          };
-            return
+          alejandra = {
-          end
+            command = "${lib.getExe pkgs.alejandra}";
-
+          };
-          if not slow_format_filetypes[vim.bo[bufnr].filetype] then
+          jq = {
-            return
+            command = "${lib.getExe pkgs.jq}";
-          end
+          };
-
+          prettierd = {
-          return { lsp_fallback = true }
+            command = "${lib.getExe pkgs.prettierd}";
-        end
+          };
-      '';
+          stylua = {
-      notifyOnError = true;
+            command = "${lib.getExe pkgs.stylua}";
-      formattersByFt = {
+          };
-        html = [
+          shellcheck = {
-          [
+            command = "${lib.getExe pkgs.shellcheck}";
-            "prettierd"
+          };
-            "prettier"
+          shfmt = {
-          ]
+            command = "${lib.getExe pkgs.shfmt}";
-        ];
+          };
-        css = [
+          shellharden = {
-          [
+            command = "${lib.getExe pkgs.shellharden}";
-            "prettierd"
+          };
-            "prettier"
+          bicep = {
-          ]
+            command = "${lib.getExe pkgs.bicep}";
-        ];
+          };
-        javascript = [
+          #yamlfmt = {
-          [
+          #  command = "${lib.getExe pkgs.yamlfmt}";
-            "prettierd"
+          #};
-            "prettier"
-          ]
-        ];
-        typescript = [
-          [
-            "prettierd"
-            "prettier"
-          ]
-        ];
-        python = [
-          "black"
-          "isort"
-        ];
-        lua = ["stylua"];
-        nix = ["alejandra"];
-        markdown = [
-          [
-            "prettierd"
-            "prettier"
-          ]
-        ];
-        yaml = [
-          [
-            "prettierd"
-            "prettier"
-          ]
-        ];
-        terraform = ["terraform_fmt"];
-        bicep = ["bicep"];
-        bash = [
-          "shellcheck"
-          "shellharden"
-          "shfmt"
-        ];
-        json = ["jq"];
-        "_" = ["trim_whitespace"];
-      };
-
-      formatters = {
-        black = {
-          command = "${lib.getExe pkgs.black}";
         };
-        isort = {
-          command = "${lib.getExe pkgs.isort}";
-        };
-        alejandra = {
-          command = "${lib.getExe pkgs.alejandra}";
-        };
-        jq = {
-          command = "${lib.getExe pkgs.jq}";
-        };
-        prettierd = {
-          command = "${lib.getExe pkgs.prettierd}";
-        };
-        stylua = {
-          command = "${lib.getExe pkgs.stylua}";
-        };
-        shellcheck = {
-          command = "${lib.getExe pkgs.shellcheck}";
-        };
-        shfmt = {
-          command = "${lib.getExe pkgs.shfmt}";
-        };
-        shellharden = {
-          command = "${lib.getExe pkgs.shellharden}";
-        };
-        bicep = {
-          command = "${lib.getExe pkgs.bicep}";
-        };
-        #yamlfmt = {
-        #  command = "${lib.getExe pkgs.yamlfmt}";
-        #};
       };
     };
   };

config/plugins/ui/bufferline.nix

@@ -2,23 +2,28 @@
   plugins = {
     bufferline = {
       enable = true;
-      diagnostics = "nvim_lsp";
+      settings = {
-      mode = "buffers";
+        options = {
+          diagnostics = "nvim_lsp";
+          mode = "buffers";
 
-      closeIcon = " ";
+          close_icon = " ";
-      bufferCloseIcon = "󰱝 ";
+          buffer_close_icon = "󰱝 ";
-      modifiedIcon = "󰔯 ";
+          modified_icon = "󰔯 ";
 
-      offsets = [
+          offsets = [
-        {
+            {
-          filetype = "neo-tree";
+              filetype = "neo-tree";
-          text = "Neo-tree";
+              text = "Neo-tree";
-          highlight = "Directory";
+              highlight = "Directory";
-          text_align = "left";
+              text_align = "left";
-        }
+            }
-      ];
+          ];
+        };
+      };
     };
   };
+
   keymaps = [
     {
       mode = "n";

config/settings.nix

@@ -14,29 +14,78 @@
     };
 
     opts = {
+      # Show line numbers
       number = true;
+
+      # Show relative line numbers
       relativenumber = true;
+
+      # Use the system clipboard
       clipboard = "unnamedplus";
+
+      # Number of spaces that represent a <TAB>
       tabstop = 2;
       softtabstop = 2;
+
+      # Show tabline always
       showtabline = 2;
+
+      # Use spaces instead of tabs
       expandtab = true;
+
+      # Enable smart indentation
       smartindent = true;
+
+      # Number of spaces to use for each step of (auto)indent
       shiftwidth = 2;
+
+      # Enable break indent
       breakindent = true;
+
+      # Highlight the screen line of the cursor
       cursorline = true;
+
+      # Minimum number of screen lines to keep above and below the cursor
       scrolloff = 8;
+
+      # Enable mouse support
+      mouse = "a";
+
+      # Set folding method to manual
       foldmethod = "manual";
+
+      # Disable folding by default
       foldenable = false;
+
+      # Wrap long lines at a character in 'breakat'
       linebreak = true;
+
+      # Disable spell checking
       spell = false;
+
+      # Disable swap file creation
       swapfile = false;
+
+      # Time in milliseconds to wait for a mapped sequence to complete
       timeoutlen = 300;
+
+      # Enable 24-bit RGB color in the TUI
       termguicolors = true;
+
+      # Don't show mode in the command line
       showmode = false;
+
+      # Open new split below the current window
       splitbelow = true;
+
+      # Keep the screen when splitting
       splitkeep = "screen";
+
+      # Open new split to the right of the current window
       splitright = true;
+
+      # Hide command line unless needed
+      cmdheight = 0;
     };
   };
 }