mandlm
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: mandlm:4c14041ca73bfbe9f78c6034d7f9afce2ffc66cb
Branches Tags
mandlm:main
..
compare: mandlm:f12de71a006309a456bfbf621612fd96a6b5eddb
Branches Tags
mandlm:main

No commits in common. "4c14041ca73bfbe9f78c6034d7f9afce2ffc66cb" and "f12de71a006309a456bfbf621612fd96a6b5eddb" have entirely different histories.
4c14041ca7 ... f12de71a00

3 changed files with 19 additions and 24 deletions
Show Stats Expand all files Collapse all files

18
flake.lock
View File

@ -8,11 +8,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1677757546,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,11 +24,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1681091990, "lastModified": 1677779205,
"narHash": "sha256-ifIzhksUBZKp5WgCuoVhDY32qaEplXp7khzrB6zkaFc=", "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ea96b4af6148114421fda90df33cf236ff5ecf1d", "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1681036984, "lastModified": 1678654296,
"narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=", "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4", "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
home-manager/neovim/default.nix
View File

@ -49,7 +49,7 @@ in
xclip xclip
# language servers # language servers
lua-language-server sumneko-lua-language-server
rnix-lsp rnix-lsp
terraform-ls terraform-ls
tflint tflint
@ -62,7 +62,7 @@ in
nodePackages.typescript-language-server nodePackages.typescript-language-server
nodePackages.typescript nodePackages.typescript
nodePackages.dockerfile-language-server-nodejs nodePackages.dockerfile-language-server-nodejs
nodePackages.vscode-langservers-extracted nodePackages.vscode-html-languageserver-bin
lldb lldb
vscode-extensions.vadimcn.vscode-lldb vscode-extensions.vadimcn.vscode-lldb
]; ];
@ -105,7 +105,6 @@ in
vim-illuminate vim-illuminate
registers-nvim registers-nvim
pre-commit-nvim pre-commit-nvim
vim-surround
# git # git
gitsigns-nvim gitsigns-nvim

18
home-manager/neovim/lspconfig.lua
View File

@ -6,13 +6,9 @@ local on_attach = function(client, bufnr)
end end
local function format_buffer() local function format_buffer()
vim.lsp.buf.format({ vim.lsp.buf.format({ timeout_ms = 3000, async = false, filter = function(formatter)
timeout_ms = 3000,
async = false,
filter = function(formatter)
return formatter.name ~= "tsserver" and formatter.name ~= "volar" return formatter.name ~= "tsserver" and formatter.name ~= "volar"
end end })
})
end end
local telescope = require("telescope.builtin") local telescope = require("telescope.builtin")
@ -54,10 +50,10 @@ lsp_status.register_progress()
-- setup lua language server for init.nvim and nvim plugin development -- setup lua language server for init.nvim and nvim plugin development
require("neodev").setup({ require("neodev").setup({
override = function(root_dir, options) override = function(root_dir, library)
if require("neodev.util").has_file(root_dir, "/etc/nixos") then if require("neodev.util").has_file(root_dir, "/etc/nixos") then
options.enabled = true library.enabled = true
options.plugins = true library.plugins = true
end end
end, end,
}) })
@ -67,8 +63,6 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.cap
local servers = { local servers = {
["bashls"] = {}, ["bashls"] = {},
["dockerls"] = {}, ["dockerls"] = {},
["jsonls"] = {},
["lua_ls"] = {},
["pylsp"] = { ["pylsp"] = {
pylsp = { pylsp = {
plugins = { plugins = {
@ -80,6 +74,7 @@ local servers = {
}, },
["pyright"] = {}, ["pyright"] = {},
["rnix"] = {}, ["rnix"] = {},
["sumneko_lua"] = {},
["terraformls"] = {}, ["terraformls"] = {},
["tflint"] = {}, ["tflint"] = {},
["tsserver"] = {}, ["tsserver"] = {},
@ -135,6 +130,7 @@ null_ls.setup({
null_ls.builtins.diagnostics.eslint_d, null_ls.builtins.diagnostics.eslint_d,
null_ls.builtins.diagnostics.tsc, null_ls.builtins.diagnostics.tsc,
}, },
on_attach = on_attach, on_attach = on_attach,
}) })