modules/home-manager/programs/hyprland/default.nix

@@ -233,13 +233,11 @@ in
           # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
           rounding = 8
-
-          blur {
-            enabled = true
-            size = 8
-            passes = 1
-            new_optimizations = true
-          }
+          # FIXME: Check these deprecations.
+          #blur = yes
+          #blur_size = 3
+          #blur_passes = 1
+          #blur_new_optimizations = on
 
           shadow {
             enabled = true

modules/home-manager/programs/neovim/default.nix

@@ -153,7 +153,15 @@ in
 
       substituteInPlace $out \
         --replace-fail "{hostname}" "${config.programs.neovim.nixd.hostname}" \
-        --replace-fail "{location}" "${config.programs.neovim.nixd.location}"
+        --replace-fail "{location}" "${config.programs.neovim.nixd.location}" \
+        --replace-fail "{pkgs.vue-language-server}" "${pkgs.vue-language-server}"
+    '';
+
+    xdg.configFile."nvim/lua/polish.lua".source = pkgs.runCommand "polish.lua" { } ''
+      cp ${./polish.lua} $out
+
+      substituteInPlace $out \
+        --replace-fail "{pkgs.vscode-extensions.ms-vscode.cpptools}" "${pkgs.vscode-extensions.ms-vscode.cpptools}" \
     '';
   };
 }

modules/home-manager/programs/neovim/ftplugin/cs.lua

@@ -122,7 +122,7 @@ function M:start()
 
   vim.fn.setenv("DOTNET_ENVIRONMENT", "Development")
 
-  local debugger_path = vim.fn.get_nix_store "netcoredbg" .. "/bin/netcoredbg"
+  local debugger_path = vim.fn.getnixpath "netcoredbg" .. "/bin/netcoredbg"
 
   local dap = require "dap"
 

modules/home-manager/programs/neovim/init.lua

@@ -3,21 +3,17 @@
 local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
 if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
   -- stylua: ignore
-  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable",
-    lazypath })
+  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
 end
 vim.opt.rtp:prepend(lazypath)
 
 -- validate that lazy is available
 if not pcall(require, "lazy") then
   -- stylua: ignore
-  vim.api.nvim_echo(
-    { { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } },
-    true, {})
+  vim.api.nvim_echo({ { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {})
 	vim.fn.getchar()
 	vim.cmd.quit()
 end
 
-require "util"
 require "lazy_setup"
 require "polish"

modules/home-manager/programs/neovim/lsp.lua

@@ -6,11 +6,8 @@
 ---@type LazySpec
 return {
   "AstroNvim/astrolsp",
-  ---@param opts AstroLSPOpts
-  ---@return AstroLSPOpts
-  opts = function(_, opts)
   ---@type AstroLSPOpts
-    local lsp_options = {
+  opts = {
     -- Configuration table of features provided by AstroLSP
     features = {
       autoformat = true,   -- enable or disable auto formatting on start
@@ -107,8 +104,7 @@ return {
               globalPlugins = {
                 {
                   name = "@vue/typescript-plugin",
-                    location = vim.fn.get_nix_store "vue-language-server"
-                        .. "/lib/node_modules/@vue/language-server",
+                  location = "{pkgs.vue-language-server}/lib/node_modules/@vue/language-server",
                   languages = { "vue" },
                   configNamespace = "typescript",
                   enableForWorkspaceTypeScriptVersions = true,
@@ -201,10 +197,5 @@ return {
       -- this would disable semanticTokensProvider for all clients
       -- client.server_capabilities.semanticTokensProvider = nil
     end,
-    }
-
-    opts = vim.tbl_deep_extend("force", opts, lsp_options)
-
-    return opts
-  end,
+  },
 }

modules/home-manager/programs/neovim/lua/plugins/nix-store.lua

@@ -1,9 +0,0 @@
----@type LazySpec
-return {
-  "wizardlink/nix-store.nvim",
-  priority = 999999,
-  lazy = false,
-  opts = {
-    allow_unfree = true,
-  },
-}

modules/home-manager/programs/neovim/lua/plugins/none-ls.lua

@@ -53,7 +53,9 @@ return {
       null_ls.builtins.formatting.nixfmt,
       null_ls.builtins.formatting.stylua,
       --deno_fmt,
-      null_ls.builtins.formatting.prettierd,
+      null_ls.builtins.formatting.prettierd.with {
+        extra_filetypes = { "razor" },
+      },
 
       null_ls.builtins.code_actions.statix,
 

modules/home-manager/programs/neovim/lua/plugins/nvim-dap.lua

@@ -1,84 +0,0 @@
----@type LazySpec
-return {
-  "mfussenegger/nvim-dap",
-  config = function()
-    local dap = require "dap"
-
-    ---@type dap.Adapter
-    dap.adapters.codelldb = {
-      port = "${port}",
-      type = "server",
-      executable = {
-        command = "codelldb",
-        args = { "--port", "${port}" },
-      },
-    }
-
-    ---@type dap.Configuration[]
-    dap.configurations.rust = {
-      {
-        name = "Launch file",
-        type = "codelldb",
-        request = "launch",
-        program = function()
-          return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-        end,
-        cwd = "${workspaceFolder}",
-        stopOnEntry = false,
-      },
-    }
-
-    ---@type dap.Adapter
-    dap.adapters.cppdbg = {
-      id = "cppdbg",
-      type = "executable",
-      command = vim.fn.get_nix_store "vscode-extensions.ms-vscode.cpptools"
-          .. "/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7",
-    }
-
-    ---@type dap.Configuration[]
-    dap.configurations.cpp = {
-      {
-        name = "Launch file",
-        type = "cppdbg",
-        request = "launch",
-        program = function()
-          return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-        end,
-        cwd = "${workspaceFolder}",
-        stopAtEntry = true,
-      },
-      {
-        name = "Attach to gdbserver :1234",
-        type = "cppdbg",
-        request = "launch",
-        MIMode = "gdb",
-        miDebuggerServerAddress = "localhost:1234",
-        miDebuggerPath = "/usr/bin/gdb",
-        cwd = "${workspaceFolder}",
-        program = function()
-          return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-        end,
-      },
-    }
-    dap.configurations.c = dap.configurations.cpp
-
-    ---@type dap.Adapter
-    dap.adapters.godot = {
-      type = "server",
-      host = "127.0.0.1",
-      port = 6006,
-    }
-
-    ---@type dap.Configuration[]
-    dap.configurations.gdscript = {
-      {
-        name = "Launch scene",
-        type = "godot",
-        request = "launch",
-        project = "${workspaceFolder}",
-        scene = "current",
-      },
-    }
-  end,
-}

modules/home-manager/programs/neovim/lua/plugins/roslyn-nvim.lua

@@ -7,18 +7,16 @@ return {
     dependencies = {
       {
         "tris203/rzls.nvim",
-        opts = function(_, opts)
-          opts = {
-            capabilities = vim.lsp.protocol.make_client_capabilities(),
-            path = vim.fn.get_nix_store "rzls" .. "/bin/rzls",
+        config = function()
+          ---@diagnostic disable-next-line: missing-fields
+          require("rzls").setup {
+            path = vim.fn.getnixpath "rzls" .. "/bin/rzls",
           }
-
-          return opts
         end,
       },
     },
     opts = function(_, opts)
-      local rzlspath = vim.fn.get_nix_store "rzls"
+      local rzlspath = vim.fn.getnixpath "rzls"
       require("roslyn.config").get()
 
       opts = {

modules/home-manager/programs/neovim/lua/polish.lua

@@ -1,16 +0,0 @@
--- This will run last in the setup process and is a good place to configure
--- things like custom filetypes. This just pure lua so anything that doesn't
--- fit in the normal config locations above can go here
-
--- Set up custom filetypes
-vim.filetype.add {
-  extension = {
-    foo = "fooscript",
-  },
-  filename = {
-    ["Foofile"] = "fooscript",
-  },
-  pattern = {
-    ["~/%.config/foo/.*"] = "fooscript",
-  },
-}

modules/home-manager/programs/neovim/lua/util.lua

@@ -1,31 +0,0 @@
---- Helper function to allow me to run commands grabbed
---- by the current selection.
---- @param isLua boolean
---- @return string
-vim.fn.runcmdonmark = function(isLua)
-  local beginRow, beginCol = unpack(vim.api.nvim_buf_get_mark(0, "<"))
-  local endRow, endCol = unpack(vim.api.nvim_buf_get_mark(0, ">"))
-
-  if beginRow == nil or beginCol == nil or endRow == nil or endCol == nil then
-    return ""
-  end
-
-  local text = table.concat(
-    vim.tbl_map(function(incoming)
-      return vim.trim(incoming)
-    end, vim.api.nvim_buf_get_text(0, beginRow - 1, beginCol, endRow - 1, endCol + 1, {})),
-    " "
-  )
-
-  vim.notify("Running expression: " .. text, vim.log.levels.INFO)
-
-  return vim.api.nvim_cmd(
-    vim.api.nvim_parse_cmd((isLua == true and ":lua " or "") .. text, {}) --[[@as vim.api.keyset.cmd]],
-    {}
-  )
-end
-
---- Register the function as a command as well, to facilitate things.
-vim.api.nvim_create_user_command("RunCmdOnMark", function(opts)
-  vim.fn.runcmdonmark((opts.args == "v:false" or opts.args == "false") and false or true)
-end, { range = true, nargs = "?" })

modules/home-manager/programs/neovim/polish.lua

@@ -0,0 +1,162 @@
+-- This will run last in the setup process and is a good place to configure
+-- things like custom filetypes. This just pure lua so anything that doesn't
+-- fit in the normal config locations above can go here
+
+-- Set up custom filetypes
+vim.filetype.add {
+  extension = {
+    foo = "fooscript",
+  },
+  filename = {
+    ["Foofile"] = "fooscript",
+  },
+  pattern = {
+    ["~/%.config/foo/.*"] = "fooscript",
+  },
+}
+
+--- Define PackageOutput
+--- @enum PackageOutput
+local PACKAGEOUTPUT = {
+  out = 0,
+  lib = 1,
+}
+
+--- Get the store path of a package
+--- @param packagename NixSearchExceptions | string
+--- @param packageoutput PackageOutput?
+--- @return string | nil
+vim.fn.getnixpath = function(packagename, packageoutput)
+  ---@enum (key) NixSearchExceptions
+  local exceptions = {}
+
+  return vim.split(
+    vim.api.nvim_cmd(
+      vim.api.nvim_parse_cmd(
+        string.format(
+          "silent !nix eval --raw --expr 'with import <nixpkgs> { }; (%s).%s' --impure",
+          exceptions[packagename] or packagename,
+          (packageoutput == PACKAGEOUTPUT.out or packageoutput == nil) and "outPath"
+          or string.format("lib.getLib %s", packagename)
+        ),
+        {}
+      ) --[[@as vim.api.keyset.cmd]],
+      {
+        output = true,
+      }
+    ),
+    "\n"
+  )[3]
+end
+
+--- Helper function to allow me to run commands grabbed
+--- by the current selection.
+--- @param isLua boolean
+--- @return string
+vim.fn.runcmdonmark = function(isLua)
+  local beginRow, beginCol = unpack(vim.api.nvim_buf_get_mark(0, "<"))
+  local endRow, endCol = unpack(vim.api.nvim_buf_get_mark(0, ">"))
+
+  if beginRow == nil or beginCol == nil or endRow == nil or endCol == nil then
+    return ""
+  end
+
+  local text = table.concat(
+    vim.tbl_map(function(incoming)
+      return vim.trim(incoming)
+    end, vim.api.nvim_buf_get_text(0, beginRow - 1, beginCol, endRow - 1, endCol + 1, {})),
+    " "
+  )
+
+  vim.notify("Running expression: " .. text, vim.log.levels.INFO)
+
+  return vim.api.nvim_cmd(
+    vim.api.nvim_parse_cmd((isLua == true and ":lua " or "") .. text, {}) --[[@as vim.api.keyset.cmd]],
+    {}
+  )
+end
+
+--- Register the function as a command as well, to facilitate things.
+vim.api.nvim_create_user_command("RunCmdOnMark", function(opts)
+  vim.fn.runcmdonmark((opts.args == "v:false" or opts.args == "false") and false or true)
+end, { range = true, nargs = "?" })
+
+local dap = require "dap"
+
+---@type dap.Adapter
+dap.adapters.codelldb = {
+  port = "${port}",
+  type = "server",
+  executable = {
+    command = "codelldb",
+    args = { "--port", "${port}" },
+  },
+}
+
+---@type dap.Adapter
+dap.adapters.cppdbg = {
+  id = "cppdbg",
+  type = "executable",
+  command =
+  "{pkgs.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7",
+}
+
+---@type dap.Adapter
+dap.adapters.godot = {
+  type = "server",
+  host = "127.0.0.1",
+  port = 6006,
+}
+
+---@type dap.Configuration[]
+dap.configurations.rust = {
+  {
+    name = "Launch file",
+    type = "codelldb",
+    request = "launch",
+    program = function()
+      return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+    end,
+    cwd = "${workspaceFolder}",
+    stopOnEntry = false,
+  },
+}
+
+---@type dap.Configuration[]
+dap.configurations.cpp = {
+  {
+    name = "Launch file",
+    type = "cppdbg",
+    request = "launch",
+    program = function()
+      return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+    end,
+    cwd = "${workspaceFolder}",
+    stopAtEntry = true,
+  },
+  {
+    name = "Attach to gdbserver :1234",
+    type = "cppdbg",
+    request = "launch",
+    MIMode = "gdb",
+    miDebuggerServerAddress = "localhost:1234",
+    miDebuggerPath = "/usr/bin/gdb",
+    cwd = "${workspaceFolder}",
+    program = function()
+      return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+    end,
+  },
+}
+
+dap.configurations.c = dap.configurations.cpp
+
+---@type dap.Configuration[]
+dap.configurations.gdscript = {
+  {
+    name = "Launch scene",
+    type = "godot",
+    request = "launch",
+    project = "${workspaceFolder}",
+    scene = "current",
+  },
+}

specific/desktop/home-manager.nix

@@ -126,6 +126,7 @@
 
     # Enable ollama support
     ollama.enable = true;
+    ollama.type = "cpu";
   };
 
   modules.hyprland = {