From 316d877765e462c99102d6d9682223635e08fb89 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 7 Dec 2022 15:11:38 +0100 Subject: [PATCH] chore: update to NixOS 22.11 --- .gitignore | 1 + configuration.nix | 2 +- flake.lock | 34 ++++++++---- flake.nix | 4 +- home-manager/i3/default.nix | 4 -- home-manager/i3/workspaces/workspace-2.json | 58 +++------------------ home-manager/i3/workspaces/workspace-4.json | 2 +- home-manager/neovim/default.nix | 4 +- home-manager/neovim/lspconfig.lua | 26 ++++----- home-manager/neovim/treesitter.lua | 6 --- home-mandlm.nix | 3 -- 11 files changed, 52 insertions(+), 92 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a985226 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.luarc* diff --git a/configuration.nix b/configuration.nix index 112ee04..8c8c7be 100644 --- a/configuration.nix +++ b/configuration.nix @@ -115,7 +115,7 @@ keep-derivations = true ''; - autoOptimiseStore = true; + settings.auto-optimise-store = true; gc = { automatic = true; dates = "weekly"; diff --git a/flake.lock b/flake.lock index 9467c3b..3e43b0d 100644 --- a/flake.lock +++ b/flake.lock @@ -4,35 +4,36 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1670253003, + "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1669152211, - "narHash": "sha256-mBLiTNTzrtlYPHF0bL8NeGA4n8K5b35fYVdqaTIIkgc=", + "lastModified": 1670276674, + "narHash": "sha256-FqZ7b2RpoHQ/jlG6JPcCNmG/DoUPCIvyaropUDFhF3Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56ca700ceabcfa15396bcf581a1296e8e27ad677", + "rev": "52e3e80afff4b16ccb7c52e9f0f5220552f03d04", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -42,6 +43,21 @@ "home-manager": "home-manager", "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", diff --git a/flake.nix b/flake.nix index fd62266..ac3bb43 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,9 @@ { inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; + nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; home-manager = { - url = github:nix-community/home-manager/release-22.05; + url = github:nix-community/home-manager/release-22.11; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/home-manager/i3/default.nix b/home-manager/i3/default.nix index 3e3e5ff..0924db1 100644 --- a/home-manager/i3/default.nix +++ b/home-manager/i3/default.nix @@ -75,11 +75,7 @@ in { command = "element-desktop"; notification = false; } { command = "keepassxc"; 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 = "whatsapp-for-linux"; notification = false; } ]; assigns = { diff --git a/home-manager/i3/workspaces/workspace-2.json b/home-manager/i3/workspaces/workspace-2.json index ee18d46..a6d29f3 100644 --- a/home-manager/i3/workspaces/workspace-2.json +++ b/home-manager/i3/workspaces/workspace-2.json @@ -1,54 +1,10 @@ // 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", - "swallows": [ - { - "class": "^Element$" - } - ], - "type": "con" - }, - { - "name": "Whatsapp", - "swallows": [ - { - "class": "^Whatsapp-for-linux$" - } - ], - "type": "con" - } - ] + "name": "Element", + "swallows": [ + { + "class": "^Element$" + } + ], + "type": "con" } - -{ - "name": "Slack", - "swallows": [ - { - "class": "^Slack$" - } - ], - "type": "con" -} - diff --git a/home-manager/i3/workspaces/workspace-4.json b/home-manager/i3/workspaces/workspace-4.json index b41470b..108f590 100644 --- a/home-manager/i3/workspaces/workspace-4.json +++ b/home-manager/i3/workspaces/workspace-4.json @@ -3,7 +3,7 @@ "name": "Email", "swallows": [ { - "class": "^Thunderbird$" + "class": "^thunderbird$" } ], "type": "con" diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index 49fd5f9..733cc8a 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -75,7 +75,7 @@ in project-nvim auto-session - nvim-treesitter + nvim-treesitter.withAllGrammars markdown-preview-nvim # use({ "iamcco/markdown-preview.nvim", run = ":call mkdp#util#install()" }) toggleterm-nvim nvim-notify @@ -120,7 +120,7 @@ in nvim-lspconfig lsp-status-nvim rust-tools-nvim - lua-dev-nvim + neodev-nvim null-ls-nvim lsp_lines-nvim diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua index 3c77588..3f690b1 100644 --- a/home-manager/neovim/lspconfig.lua +++ b/home-manager/neovim/lspconfig.lua @@ -32,7 +32,7 @@ local on_attach = function(client, bufnr) group = augroup, buffer = bufnr, callback = function() - vim.lsp.buf.formatting_sync(nil, 3000) + vim.lsp.buf.format({ timeout_ms = 3000, async = false }) end, }) end @@ -49,8 +49,17 @@ lsp_status.config({ }) lsp_status.register_progress() -local capabilities = vim.tbl_extend("keep", vim.lsp.protocol.make_client_capabilities(), lsp_status.capabilities) -capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) +-- setup lua language server for init.nvim and nvim plugin development +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 = { ["bashls"] = {}, @@ -66,6 +75,7 @@ local servers = { }, ["pyright"] = {}, ["rnix"] = {}, + ["sumneko_lua"] = {}, ["terraformls"] = {}, ["tflint"] = {}, ["tsserver"] = {}, @@ -108,16 +118,6 @@ require("rust-tools").setup({ }, }) -local luadev = require("lua-dev").setup({ - lspconfig = { - on_attach = on_attach, - capabilities = capabilities, - }, - runtime_path = true, -}) - -lspconfig["sumneko_lua"].setup(luadev) - -- setup null-ls for markdown formatting local null_ls = require("null-ls") null_ls.setup({ diff --git a/home-manager/neovim/treesitter.lua b/home-manager/neovim/treesitter.lua index 8c259f9..a061730 100644 --- a/home-manager/neovim/treesitter.lua +++ b/home-manager/neovim/treesitter.lua @@ -1,10 +1,4 @@ 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 = { enable = true, additional_vim_regex_highlighting = false diff --git a/home-mandlm.nix b/home-mandlm.nix index 2b0bdda..0c58e34 100644 --- a/home-mandlm.nix +++ b/home-mandlm.nix @@ -17,9 +17,6 @@ gcc slack thunderbird - signal-desktop - tdesktop - whatsapp-for-linux nextcloud-client keepassxc tree