fix: move nixd config to nvim.nix

This commit is contained in:
DACHXY 2025-01-23 13:32:43 +08:00
parent 5d6f5671a6
commit d5fcc2cf5f
5 changed files with 51 additions and 36 deletions

View file

@ -40,33 +40,6 @@ return {
-- end,
-- },
nil_ls = false,
nixd = {
cmd = { "nixd" },
filetypes = { "nix" },
single_file_support = true,
root_dir = function(fname)
return util.root_pattern("flake.nix")(fname)
or vim.fs.dirname(vim.fs.find(".git", { path = fname, upward = true })[1])
end,
settings = {
nixd = {
nixpkgs = {
expr = "import <nixpkgs> { }",
},
formatting = {
command = { "nixfmt" },
},
-- options = {
-- nixos = {
-- expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.k-on.options',
-- },
-- home_manager = {
-- expr = '(builtins.getFlake ("git+file://" + toString ./.)).homeConfigurations."ruixi@k-on".options',
-- },
-- },
},
},
},
nginx_language_server = {
cmd = { "nginx-language-server" },
filetypes = { "nginx" },

View file

@ -1,6 +1,8 @@
{
lib,
pkgs,
device-name,
username,
...
}:
{
@ -244,6 +246,42 @@
end
},
-- Nix
{
"neovim/nvim-lspconfig",
opts = {
servers = {
nixd = {
cmd = { "nixd" },
filetypes = { "nix" },
single_file_support = true,
root_dir = function(fname)
return require("lspconfig.util").root_pattern("flake.nix")(fname)
or vim.fs.dirname(vim.fs.find(".git", { path = fname, upward = true })[1])
end,
settings = {
nixd = {
nixpkgs = {
expr = "import <nixpkgs> { }",
},
formatting = {
command = { "nixfmt" },
},
-- options = {
-- nixos = {
-- expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.${device-name}.options',
-- },
-- home_manager = {
-- expr = '(builtins.getFlake ("git+file://" + toString ./.)).homeConfigurations."${username}@${device-name}".options',
-- }
-- }
}
}
}
}
}
},
-- disable DAP
{ "mfussenegger/nvim-dap-python", enabled = false },
{ "mfussenegger/nvim-dap", enabled = false },

View file

@ -13,6 +13,7 @@ let
hyprcursor-size = "32";
xcursor-size = "24";
nvidia-offload-enabled = config.hardware.nvidia.prime.offload.enable;
device-name = "dn-lap";
in
{
imports = [
@ -26,7 +27,7 @@ in
];
# Overrides
networking.hostName = lib.mkForce "dn-lap";
networking.hostName = lib.mkForce device-name;
system.stateVersion = nix-version;
home-manager = {
@ -41,6 +42,7 @@ in
git-config
username
nvidia-offload-enabled
device-name
;
};
users."${username}" = {

View file

@ -16,6 +16,7 @@ let
intel-bus-id = "PCI:0:2:0";
nvidia-bus-id = "PCI:1:0:0";
nvidia-offload-enabled = config.hardware.nvidia.prime.offload.enable;
device-name = "dn-pre7780";
in
{
imports = [
@ -39,7 +40,7 @@ in
];
# Overrides
networking.hostName = lib.mkForce "dn-pre7780";
networking.hostName = lib.mkForce device-name;
system.stateVersion = nix-version;
services.wallpaperEngine.enable = lib.mkForce false;
@ -58,6 +59,7 @@ in
git-config
username
nvidia-offload-enabled
device-name
;
};
users."${username}" = {

View file

@ -13,13 +13,13 @@
enable = true;
configure = {
customRC = ''
set number
set relativenumber
set tabstop=2
set shiftwidth=2
set expandtab
nnoremap <C-s> :w<CR>
'';
set number
set relativenumber
set tabstop=2
set shiftwidth=2
set expandtab
nnoremap <C-s> :w<CR>
'';
};
};