nvim: updates for using nvim again~

flake.nix

@@ -234,10 +234,10 @@
                   (
                     module:
                     (
-                      { deprekages, ... }:
+                      { deprekages, nil, ... }:
                       {
                         home-manager.config =
-                          { pkgs, ... }@specialArgs: (import module) (specialArgs // { inherit deprekages; });
+                          { pkgs, ... }@specialArgs: (import module) (specialArgs // { inherit deprekages nil; });
                       }
                     )
                   )
@@ -245,10 +245,10 @@
                   (
                     module:
                     (
-                      { deprekages, ... }:
+                      { deprekages, nil, ... }:
                       {
                         home-manager.users.deprekated =
-                          { pkgs, ... }@specialArgs: (import module) (specialArgs // { inherit deprekages; });
+                          { pkgs, ... }@specialArgs: (import module) (specialArgs // { inherit deprekages nil; });
                       }
                     )
                   )

nixos/dotfiles/hm.nix

@@ -25,7 +25,10 @@
   xdg.configFile.looking-glass.source = ../../looking-glass;
 
   # neovim
-  xdg.configFile.nvim.source = ../../nvim;
+  xdg.configFile.nvim = {
+    source = ../../nvim;
+    recursive = true;
+  };
 
   # tmux
   xdg.configFile.tmux.source = ../../tmux;

nixos/dotfiles/vscode.hm.nix

@@ -1,18 +1,25 @@
 #
 # Visual Studio Code + Dance (kakoune mode) Experiments
 #
-{ pkgs, deprekages, lib, ... }:
+{
+  pkgs,
+  deprekages,
+  lib,
+  nil,
+  ...
+}:
 let
   # Simple helper to de-stringify invalid tokens.
   author = name: pkgs.vscode-extensions.${name};
 
   # Forces a package to be marked as having linux-aarch64 support.
-	forceArmLinux = pkg: pkg.overrideAttrs (prev: {
+  forceArmLinux =
+    pkg:
+    pkg.overrideAttrs (prev: {
       meta.platforms = prev.meta.platforms ++ [ "aarch64-linux" ];
     });
 in
 {
-
   programs.vscode = {
     enable = true;
 
@@ -28,9 +35,8 @@ in
       brandonkirbyson.solarized-palenight
 
       # behavior
-			#gregoire.dance
       usernamehw.errorlens
-            reykjalin.vscode-kakoune
+      asvetliakov.vscode-neovim
       editorconfig.editorconfig
 
       # general add-ons
@@ -111,6 +117,23 @@ in
       #
       "rust-analyzer.checkOnSave.command" = "clippy";
 
+      #
+      # Nix
+      #
+      "nix.enableLanguageServer" = true;
+      "nix.serverPath" = "${nil.nil}/bin/nil";
+      "nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
+      "[nix]"."editor.defaultFormatter" = "brettm12345.nixfmt-vscode";
+
+      #
+      # Neovim.
+      #
+
+      # Make it so the plugin is performant.
+      "extensions.experimental.affinity" = {
+        "asvetliakov.vscode-neovim" = 1;
+      };
+
       #
       # Spell Checking
       #
@@ -131,7 +154,6 @@ in
     #
     enableUpdateCheck = false;
     enableExtensionUpdateCheck = false;
-
     mutableExtensionsDir = false;
 
   };

nixos/hosts/trailblazer/default.nix

@@ -271,7 +271,7 @@ in
 
   boot.swraid.enable = true;
   boot.swraid.mdadmConf = ''
-    MAILADDR kate@ktemk.in
+    MAILADDR kate@deprekated.net
     ARRAY /dev/md/nixos:0 level=raid0 num-devices=2 metadata=1.2 UUID=325ee7dc:7fcc6062:635e902f:af2552dc
       devices=/dev/nvme0n1p1,/dev/nvme1n1p1
   '';

nvim/lua/config/lazy.lua

@@ -11,20 +11,26 @@ require("lazy").setup({
   spec = {
     -- add LazyVim and import its plugins
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+    { import = "lazyvim.plugins.extras.vscode" },
+
     -- import any extras modules here
     --   { import = "lazyvim.plugins.extras.lang.typescript" },
     --   { import = "lazyvim.plugins.extras.lang.json" },
     --   { import = "lazyvim.plugins.extras.ui.mini-animate" },
+
     -- import/override with your plugins
     { import = "plugins" },
   },
   defaults = {
+
     -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
     -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
     lazy = false,
+
     -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
     -- have outdated releases, which may break your Neovim install.
     version = false, -- always use the latest git commit
+
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
   install = { colorscheme = { "tokyonight", "habamax" } },

nvim/lua/plugins/theme.lua

@@ -7,7 +7,7 @@ return {
       vim.cmd([[
         colorscheme solarized8
 
-        " Make Solaried8 a biiiit darker.
+        " Make Solarized8 a biiiit darker.
         highlight Normal            guibg=#001E27
         highlight LineNR ctermfg=11 guibg=#0B262D
       ]])