chore: update to NixOS 22.11
parent
ad6f8e5233
commit
d3958130b8
|
@ -115,7 +115,7 @@
|
||||||
keep-derivations = true
|
keep-derivations = true
|
||||||
'';
|
'';
|
||||||
|
|
||||||
autoOptimiseStore = true;
|
settings.auto-optimise-store = true;
|
||||||
gc = {
|
gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
dates = "weekly";
|
dates = "weekly";
|
||||||
|
|
34
flake.lock
34
flake.lock
|
@ -4,35 +4,36 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
],
|
||||||
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667907331,
|
"lastModified": 1670253003,
|
||||||
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
|
"narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
|
"rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-22.05",
|
"ref": "release-22.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1669152211,
|
"lastModified": 1670276674,
|
||||||
"narHash": "sha256-mBLiTNTzrtlYPHF0bL8NeGA4n8K5b35fYVdqaTIIkgc=",
|
"narHash": "sha256-FqZ7b2RpoHQ/jlG6JPcCNmG/DoUPCIvyaropUDFhF3Q=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "56ca700ceabcfa15396bcf581a1296e8e27ad677",
|
"rev": "52e3e80afff4b16ccb7c52e9f0f5220552f03d04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-22.05",
|
"ref": "nixos-22.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -42,6 +43,21 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1667395993,
|
||||||
|
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05;
|
nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11;
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = github:nix-community/home-manager/release-22.05;
|
url = github:nix-community/home-manager/release-22.11;
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -75,11 +75,7 @@ in
|
||||||
{ command = "element-desktop"; notification = false; }
|
{ command = "element-desktop"; notification = false; }
|
||||||
{ command = "keepassxc"; notification = false; }
|
{ command = "keepassxc"; notification = false; }
|
||||||
{ command = "nextcloud"; notification = false; }
|
{ command = "nextcloud"; notification = false; }
|
||||||
{ command = "signal-desktop"; notification = false; }
|
|
||||||
{ command = "slack"; notification = false; }
|
|
||||||
{ command = "telegram-desktop"; notification = false; }
|
|
||||||
{ command = "thunderbird"; notification = false; }
|
{ command = "thunderbird"; notification = false; }
|
||||||
{ command = "whatsapp-for-linux"; notification = false; }
|
|
||||||
];
|
];
|
||||||
|
|
||||||
assigns = {
|
assigns = {
|
||||||
|
|
|
@ -1,27 +1,5 @@
|
||||||
// vim:ts=4:sw=4:et
|
// vim:ts=4:sw=4:et
|
||||||
{
|
{
|
||||||
"layout": "tabbed",
|
|
||||||
"type": "con",
|
|
||||||
"nodes": [
|
|
||||||
{
|
|
||||||
"name": "Telegram",
|
|
||||||
"swallows": [
|
|
||||||
{
|
|
||||||
"class": "^TelegramDesktop$"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "con"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Signal",
|
|
||||||
"swallows": [
|
|
||||||
{
|
|
||||||
"class": "^Signal$"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "con"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Element",
|
"name": "Element",
|
||||||
"swallows": [
|
"swallows": [
|
||||||
{
|
{
|
||||||
|
@ -29,26 +7,4 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"type": "con"
|
"type": "con"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Whatsapp",
|
|
||||||
"swallows": [
|
|
||||||
{
|
|
||||||
"class": "^Whatsapp-for-linux$"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "con"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Slack",
|
|
||||||
"swallows": [
|
|
||||||
{
|
|
||||||
"class": "^Slack$"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "con"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"name": "Email",
|
"name": "Email",
|
||||||
"swallows": [
|
"swallows": [
|
||||||
{
|
{
|
||||||
"class": "^Thunderbird$"
|
"class": "^thunderbird$"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"type": "con"
|
"type": "con"
|
||||||
|
|
|
@ -75,7 +75,7 @@ in
|
||||||
project-nvim
|
project-nvim
|
||||||
auto-session
|
auto-session
|
||||||
|
|
||||||
nvim-treesitter
|
nvim-treesitter.withAllGrammars
|
||||||
markdown-preview-nvim # use({ "iamcco/markdown-preview.nvim", run = ":call mkdp#util#install()" })
|
markdown-preview-nvim # use({ "iamcco/markdown-preview.nvim", run = ":call mkdp#util#install()" })
|
||||||
toggleterm-nvim
|
toggleterm-nvim
|
||||||
nvim-notify
|
nvim-notify
|
||||||
|
@ -120,7 +120,7 @@ in
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
lsp-status-nvim
|
lsp-status-nvim
|
||||||
rust-tools-nvim
|
rust-tools-nvim
|
||||||
lua-dev-nvim
|
neodev-nvim
|
||||||
null-ls-nvim
|
null-ls-nvim
|
||||||
lsp_lines-nvim
|
lsp_lines-nvim
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ local on_attach = function(client, bufnr)
|
||||||
group = augroup,
|
group = augroup,
|
||||||
buffer = bufnr,
|
buffer = bufnr,
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.lsp.buf.formatting_sync(nil, 3000)
|
vim.lsp.buf.format({ timeout_ms = 3000, async = false })
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
@ -49,8 +49,17 @@ lsp_status.config({
|
||||||
})
|
})
|
||||||
lsp_status.register_progress()
|
lsp_status.register_progress()
|
||||||
|
|
||||||
local capabilities = vim.tbl_extend("keep", vim.lsp.protocol.make_client_capabilities(), lsp_status.capabilities)
|
-- setup lua language server for init.nvim and nvim plugin development
|
||||||
capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
|
require("neodev").setup({
|
||||||
|
override = function(root_dir, library)
|
||||||
|
if require("neodev.util").has_file(root_dir, "/etc/nixos") then
|
||||||
|
library.enabled = true
|
||||||
|
library.plugins = true
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.capabilities)
|
||||||
|
|
||||||
local servers = {
|
local servers = {
|
||||||
["bashls"] = {},
|
["bashls"] = {},
|
||||||
|
@ -66,6 +75,7 @@ local servers = {
|
||||||
},
|
},
|
||||||
["pyright"] = {},
|
["pyright"] = {},
|
||||||
["rnix"] = {},
|
["rnix"] = {},
|
||||||
|
["sumneko_lua"] = {},
|
||||||
["terraformls"] = {},
|
["terraformls"] = {},
|
||||||
["tflint"] = {},
|
["tflint"] = {},
|
||||||
["tsserver"] = {},
|
["tsserver"] = {},
|
||||||
|
|
|
@ -1,10 +1,4 @@
|
||||||
require('nvim-treesitter.configs').setup({
|
require('nvim-treesitter.configs').setup({
|
||||||
ensure_installed = {
|
|
||||||
"bash", "c", "cpp", "css", "dockerfile", "hcl", "html", "javascript",
|
|
||||||
"json", "latex", "lua", "markdown", "nix", "python", "rust", "svelte",
|
|
||||||
"toml", "tsx", "typescript", "vim", "vue", "yaml"
|
|
||||||
},
|
|
||||||
auto_install = true,
|
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
additional_vim_regex_highlighting = false
|
additional_vim_regex_highlighting = false
|
||||||
|
|
Loading…
Reference in New Issue