hosts/wizlap/home-manager.nix

@@ -112,6 +112,9 @@
 
     # Enable ollama support
     ollama.enable = true;
+
+    # Set the hostname for nixd in neovim
+    nixd.hostname = "wizlap";
   };
 
   # Add monitor configuration to hyprland

modules/neovim/README.md

@@ -4,14 +4,16 @@ The module extends `programs.neovim`.
 
 ## Module options
 
-### programs.neovim.flakePath
+### programs.neovim.nixd.hostname
+
+By default [nixd] is enabled, you **need** to pass the current machine's
+hostname that is used to generate your system.
+
+### programs.neovim.nixd.location
 
 The location of your system's flake, [nixd] will execute an expression defined in the LSP's configuration that reads
 the flake's contents to evaluate [NixOS] and [Home Manager] options.
 
-This setting is optional since other programs might force you to set the `FLAKE` environment variable; if this is not
-set by the time you open [neovim] it will spout an error, impeding critical plugins from starting.
-
 ### programs.neovim.ollama.enable
 
 Whether to add an [ollama] package to be used with [ollama.nvim](https://github.com/nomnivore/ollama.nvim).

modules/neovim/default.nix

@@ -25,11 +25,20 @@ let
 in
 {
   options.programs.neovim = {
-    flakePath = mkOption {
+    nixd = {
-      default = null;
+      hostname = mkOption {
-      description = "The path to your flake, this will be the value of the `FLAKE` environment variable.";
+        default = "wizdesk";
-      example = "~/.config/nix";
+        description = "Your NixOS hostname, needed for nixd lsp.";
-      type = types.nullOr types.str;
+        example = "nixos";
+        type = types.str;
+      };
+
+      location = mkOption {
+        default = "git+file:///home/wizardlink/.system";
+        description = "Path to your flake location, prepend 'file:///' to it and 'git+' before that if using git.";
+        example = "git+file:///home/wizardlink/.system";
+        type = types.str;
+      };
     };
 
     ollama = {
@@ -48,14 +57,10 @@ in
   };
 
   config = {
-    home.sessionVariables =
+    home.sessionVariables = {
-      {
+      EDITOR = "nvim";
-        EDITOR = "nvim";
+      MANPAGER = "nvim +Man!";
-        MANPAGER = "nvim +Man!";
+    };
-      }
-      // lib.optionalAttrs (config.programs.neovim.flakePath != null) {
-        FLAKE = config.programs.neovim.flakePath;
-      };
 
     programs.neovim = {
       withNodeJs = true;
@@ -152,6 +157,14 @@ in
       source = ./ftplugin;
     };
 
+    xdg.configFile."nvim/lua/plugins/astrolsp.lua".source = pkgs.runCommand "astrolsp.lua" { } ''
+      cp ${./lsp.lua} $out
+
+      substituteInPlace $out \
+        --replace-fail "{hostname}" "${config.programs.neovim.nixd.hostname}" \
+        --replace-fail "{location}" "${config.programs.neovim.nixd.location}"
+    '';
+
     xdg.dataFile."nvim/lazy/blink.cmp/target/release/libblink_cmp_fuzzy.so" = {
       recursive = true;
       source = "${blink-cmp.packages.${pkgs.system}.blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.so";

modules/neovim/lsp.lua

@@ -9,9 +9,6 @@ return {
   ---@param opts AstroLSPOpts
   ---@return AstroLSPOpts
   opts = function(_, opts)
-    local system_flake_path = vim.fn.getenv "FLAKE" or error "FLAKE environment variable must be set."
-    local hostname = vim.fn.hostname()
-
     ---@type AstroLSPOpts
     local lsp_options = {
       -- Configuration table of features provided by AstroLSP
@@ -87,23 +84,15 @@ return {
           settings = {
             nixd = {
               nixpkgs = {
-                expr = "import (builtins.getFlake (" .. system_flake_path .. ")).inputs.nixpkgs { }",
+                expr = "import (builtins.getFlake ({location})).inputs.nixpkgs { }",
               },
               options = {
                 nixos = {
-                  expr = "(builtins.getFlake ("
+                  expr = '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options',
-                      .. system_flake_path
-                      .. ")).nixosConfigurations."
-                      .. hostname
-                      .. ".options",
                 },
                 home_manager = {
-                  expr = "(builtins.getFlake ("
+                  expr =
-                      .. system_flake_path
+                  '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options.home-manager.users.type.getSubOptions []',
-                      .. ")).nixosConfigurations."
-                      .. hostname
-                      .. ".options"
-                      .. ".home-manager.users.type.getSubOptions []",
                 },
               },
             },

modules/neovim/lua/plugins/roslyn-nvim.lua

@@ -7,15 +7,9 @@ return {
     dependencies = {
       {
         "tris203/rzls.nvim",
-        ---@return rzls.Config
         opts = function(_, opts)
-          local has_astrolsp, astrolsp = pcall(require, "astrolsp")
-          local has_blink, blink = pcall(require, "blink-cmp")
-
           opts = {
-            capabilities = has_blink and blink.get_lsp_capabilities({}, true)
+            capabilities = vim.lsp.protocol.make_client_capabilities(),
-                or vim.lsp.protocol.make_client_capabilities(),
-            on_attach = has_astrolsp and astrolsp.on_attach or nil,
             path = vim.fn.get_nix_store "rzls" .. "/bin/rzls",
           }
 
@@ -24,25 +18,24 @@ return {
       },
     },
     opts = function(_, opts)
-      local has_astrolsp, astrolsp = pcall(require, "astrolsp")
       local rzlspath = vim.fn.get_nix_store "rzls"
+      require("roslyn.config").get()
 
       opts = {
+        exe = "Microsoft.CodeAnalysis.LanguageServer",
+        args = {
+          "--stdio",
+          "--logLevel=Information",
+          "--extensionLogDirectory=" .. vim.fs.dirname(vim.lsp.get_log_path()),
+          "--razorSourceGenerator=" .. rzlspath .. "/lib/rzls/Microsoft.CodeAnalysis.Razor.Compiler.dll",
+          "--razorDesignTimePath="
+          .. rzlspath
+          .. "/lib/rzls/Targets/Microsoft.NET.Sdk.Razor.DesignTime.targets",
+        },
         ---@type vim.lsp.ClientConfig
         ---@diagnostic disable-next-line: missing-fields
         config = {
-          cmd = {
-            "Microsoft.CodeAnalysis.LanguageServer",
-            "--stdio",
-            "--logLevel=Information",
-            "--extensionLogDirectory=" .. vim.fs.dirname(vim.lsp.get_log_path()),
-            "--razorSourceGenerator=" .. rzlspath .. "/lib/rzls/Microsoft.CodeAnalysis.Razor.Compiler.dll",
-            "--razorDesignTimePath="
-            .. rzlspath
-            .. "/lib/rzls/Targets/Microsoft.NET.Sdk.Razor.DesignTime.targets",
-          },
           handlers = require "rzls.roslyn_handlers",
-          on_attach = has_astrolsp and astrolsp.on_attach or nil,
           settings = {
             ["csharp|inlay_hints"] = {
               csharp_enable_inlay_hints_for_implicit_object_creation = true,

modules/template/home-manager.nix

@@ -85,6 +85,14 @@
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  # Enable Neovim, pre-configured by `linuxware`.
+  programs.neovim = {
-  programs.neovim.enable = true;
+    # Enable Neovim, pre-configured by `linuxware`.
+    enable = true;
+
+    # Configure nixd
+    nixd = {
+      hostname = "your-hostname-here";
+      location = "your-flake-location-here";
+    };
+  };
 }