Merge branch 'main' into add-mini-nvim

.github/FUNDING.yml

@@ -1,4 +1 @@
 github: NotAShelf
-ko_fi: NotAShelf
-liberapay: NotAShelf
-

docs/release-notes/rl-0.8.md

@@ -26,6 +26,11 @@
 
 - Deprecate rnix-lsp as it has been abandoned and archived upstream.
 
+- Hardcoded indentation values for the Nix language module have been removed. To
+  replicate previous behaviour, you must either consolidate Nix indentation in
+  your Editorconfig configuration, or use an autocommand to set indentation
+  values for buffers with the Nix filetype.
+
 [amadaluzia](https://github.com/amadaluzia):
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
@@ -104,8 +109,10 @@
 [tomasguinzburg](https://github.com/tomasguinzburg):
 
 [solargraph]: https://github.com/castwide/solargraph
+[gbprod/nord.nvim]: https://github.com/gbprod/nord.nvim
 
 - Add Ruby support under `vim.languages.ruby` using [solargraph].
+- Add `nord` theme from [gbprod/nord.nvim].
 
 [thamenato](https://github.com/thamenato):
 

flake.lock

@@ -1737,6 +1737,22 @@
         "type": "github"
       }
     },
+    "plugin-nord": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1737019140,
+        "narHash": "sha256-ZhDS7Y90DKp+jkUqcoQRf/zHy4DVgSDQXrnl3sBYJXs=",
+        "owner": "gbprod",
+        "repo": "nord.nvim",
+        "rev": "b0f3ed242fd8e5bafa7231367821d46c6c835dd8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gbprod",
+        "repo": "nord.nvim",
+        "type": "github"
+      }
+    },
     "plugin-nui-nvim": {
       "flake": false,
       "locked": {
@@ -2822,6 +2838,7 @@
         "plugin-new-file-template-nvim": "plugin-new-file-template-nvim",
         "plugin-noice-nvim": "plugin-noice-nvim",
         "plugin-none-ls": "plugin-none-ls",
+        "plugin-nord": "plugin-nord",
         "plugin-nui-nvim": "plugin-nui-nvim",
         "plugin-nvim-autopairs": "plugin-nvim-autopairs",
         "plugin-nvim-bufferline-lua": "plugin-nvim-bufferline-lua",

flake.nix

@@ -5,7 +5,7 @@
     self,
     ...
   } @ inputs: let
-    # call the extedended library with `inputs`
+    # call the extended library with `inputs`
     # inputs is used to get the original standard library, and to pass inputs to the plugin autodiscovery function
     lib = import ./lib/stdlib-extended.nix inputs;
   in
@@ -419,6 +419,11 @@
       flake = false;
     };
 
+    plugin-nord = {
+      url = "github:gbprod/nord.nvim";
+      flake = false;
+    };
+
     # Rust crates
     plugin-crates-nvim = {
       url = "github:Saecki/crates.nvim";

modules/plugins/languages/nix.nix

@@ -187,17 +187,6 @@ in {
           '';
         }
       ];
-      vim.pluginRC.nix = ''
-        vim.api.nvim_create_autocmd("FileType", {
-          pattern = "nix",
-          callback = function(opts)
-            local bo = vim.bo[opts.buf]
-            bo.tabstop = 2
-            bo.shiftwidth = 2
-            bo.softtabstop = 2
-          end
-        })
-      '';
     }
 
     (mkIf cfg.treesitter.enable {

modules/plugins/statusline/lualine/supported_themes.nix

@@ -4,4 +4,5 @@
   "catppuccin"
   "oxocarbon"
   "gruvbox"
+  "nord"
 ]

modules/plugins/theme/supported-themes.nix

@@ -185,4 +185,14 @@ in {
     '';
     styles = ["main" "moon" "dawn"];
   };
+  nord = {
+    setup = {transparent ? false, ...}: ''
+      require("nord").setup({
+        transparent = ${boolToString transparent},
+        search = "vscode", -- [vim|vscode]
+      })
+
+      vim.cmd.colorscheme("nord")
+    '';
+  };
 }