nvim: add nixd

DanNixon · Oct 22, 2023 · 4751b41 · 4751b41
1 parent e6a1e98
commit 4751b41
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 56 deletions.
diff --git a/configurations/maya/home-manager/default.nix b/configurations/maya/home-manager/default.nix
@@ -1,68 +1,70 @@
 {
   inputs,
   outputs,
-}:
-inputs.home-manager.lib.homeManagerConfiguration {
-  pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-  extraSpecialArgs = {inherit inputs outputs;};
+}: let
+  pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux;
+in
+  inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
+    extraSpecialArgs = {inherit inputs outputs pkgs-unstable;};
 
-  modules = [
-    ../../../modules/home-manager/terminal_environment
-    ../../../modules/home-manager/borgmatic.nix
-    ../../../modules/home-manager/media.nix
-    ../../../modules/home-manager/development.nix
-    ../../../modules/home-manager/email
-    ../../../modules/home-manager/desktop_environment
+    modules = [
+      ../../../modules/home-manager/terminal_environment
+      ../../../modules/home-manager/borgmatic.nix
+      ../../../modules/home-manager/media.nix
+      ../../../modules/home-manager/development.nix
+      ../../../modules/home-manager/email
+      ../../../modules/home-manager/desktop_environment
 
-    ({pkgs, ...}: {
-      programs.borgmatic.backups."main" = {
-        location = {
-          sourceDirectories = [
-            "/home/dan/docs"
-            "/home/dan/phone"
-            "/home/dan/tombs"
-          ];
-          repositories = ["[email protected]:repo"];
+      ({pkgs, ...}: {
+        programs.borgmatic.backups."main" = {
+          location = {
+            sourceDirectories = [
+              "/home/dan/docs"
+              "/home/dan/phone"
+              "/home/dan/tombs"
+            ];
+            repositories = ["[email protected]:repo"];
+          };
+          storage.encryptionPasscommand = "pass borg/maya/passphrase";
         };
-        storage.encryptionPasscommand = "pass borg/maya/passphrase";
-      };
 
-      wayland.windowManager.sway.config.output = {
-        DP-1 = {
-          enable = "";
-          bg = "~/.local/share/wallpaper.png fill";
-          scale = "1.5";
+        wayland.windowManager.sway.config.output = {
+          DP-1 = {
+            enable = "";
+            bg = "~/.local/share/wallpaper.png fill";
+            scale = "1.5";
+          };
         };
-      };
 
-      home.file.wallpaper = {
-        source = ./wallpaper.png;
-        target = ".local/share/wallpaper.png";
-      };
+        home.file.wallpaper = {
+          source = ./wallpaper.png;
+          target = ".local/share/wallpaper.png";
+        };
 
-      programs.i3status-rust.bars.main.blocks = [
-        {
-          block = "sound";
-          driver = "pulseaudio";
-          device_kind = "sink";
-        }
-        {
-          block = "sound";
-          driver = "pulseaudio";
-          device_kind = "source";
-        }
-        {
-          block = "time";
-          interval = 1;
-          format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') ";
-        }
-      ];
+        programs.i3status-rust.bars.main.blocks = [
+          {
+            block = "sound";
+            driver = "pulseaudio";
+            device_kind = "sink";
+          }
+          {
+            block = "sound";
+            driver = "pulseaudio";
+            device_kind = "source";
+          }
+          {
+            block = "time";
+            interval = 1;
+            format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M:%S') ";
+          }
+        ];
 
-      services.mpd.enable = true;
+        services.mpd.enable = true;
 
-      home.packages = with pkgs; [
-        inputs.satori.packages.${system}.satorictl
-      ];
-    })
-  ];
-}
+        home.packages = with pkgs; [
+          inputs.satori.packages.${system}.satorictl
+        ];
+      })
+    ];
+  }
diff --git a/modules/home-manager/terminal_environment/neovim.nix b/modules/home-manager/terminal_environment/neovim.nix
@@ -2,14 +2,18 @@
   inputs,
   config,
   pkgs,
+  pkgs-unstable,
   ...
 }: {
   programs.neovim = {
     enable = true;
     defaultEditor = true;
+
     extraPackages = [
       pkgs.universal-ctags
+      pkgs-unstable.nixd
     ];
+
     plugins = [
       # Colour scheme
       (pkgs.vimPlugins.base16-vim.overrideAttrs (
@@ -79,6 +83,7 @@
       pkgs.vimPlugins.vim-nftables
       pkgs.vimPlugins.ron-vim
     ];
+
     extraConfig = ''
       set nocompatible
       set encoding=utf-8
@@ -117,6 +122,7 @@
 
       " Language server config
       let g:LanguageClient_serverCommands = {
+            \ 'nix': ['nixd'],
             \ 'rust': ['rust-analyzer'],
       \ }