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,6 +1,7 @@
 _: {
   plugins.todo-comments = {
     enable = true;
+    settings = {
       colors = {
         error = ["DiagnosticError" "ErrorMsg" "#ED8796"];
         warning = ["DiagnosticWarn" "WarningMsg" "#EED49F"];
@@ -9,4 +10,5 @@ _: {
         test = ["Identifier" "#8AADF4"];
       };
     };
+  };
 }

config/plugins/lsp/conform.nix

@@ -41,7 +41,8 @@
       '';
     plugins.conform-nvim = {
       enable = true;
-      formatOnSave = ''
+      settings = {
+        format_on_save = ''
           function(bufnr)
             if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
               return
@@ -61,7 +62,7 @@
            end
         '';
 
-      formatAfterSave = ''
+        format_after_save = ''
           function(bufnr)
             if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
               return
@@ -74,8 +75,8 @@
             return { lsp_fallback = true }
           end
         '';
-      notifyOnError = true;
-      formattersByFt = {
+        notify_on_error = true;
+        formatters_by_ft = {
           html = [
             [
               "prettierd"
@@ -166,4 +167,5 @@
         };
       };
     };
+  };
 }

config/plugins/ui/bufferline.nix

@@ -2,12 +2,14 @@
   plugins = {
     bufferline = {
       enable = true;
+      settings = {
+        options = {
           diagnostics = "nvim_lsp";
           mode = "buffers";
 
-      closeIcon = " ";
-      bufferCloseIcon = "󰱝 ";
-      modifiedIcon = "󰔯 ";
+          close_icon = " ";
+          buffer_close_icon = "󰱝 ";
+          modified_icon = "󰔯 ";
 
           offsets = [
             {
@@ -19,6 +21,9 @@
           ];
         };
       };
+    };
+  };
+
   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;
     };
   };
 }