From 7784c07a018a3b803ee389bd1e4ee4406e9588a9 Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Sat, 28 Sep 2024 00:04:19 +0200 Subject: [PATCH] nix flake update and warnings fixes. --- configs/home-manager/kitty.nix | 2 +- flake.lock | 96 +++++++-------- hosts/cirrostratus/default.nix | 1 - modules/home-manager/nvim/lualine.nix | 128 ++++++++++---------- modules/home-manager/nvim/nvim-tree.nix | 1 + modules/home-manager/nvim/simpleplugins.nix | 2 +- modules/home-manager/nvim/telescope.nix | 1 + 7 files changed, 118 insertions(+), 113 deletions(-) diff --git a/configs/home-manager/kitty.nix b/configs/home-manager/kitty.nix index 24ae599..4dee0bf 100644 --- a/configs/home-manager/kitty.nix +++ b/configs/home-manager/kitty.nix @@ -10,7 +10,7 @@ package = pkgs.fira-code-nerdfont; name = "FiraCode Nerd Font"; }; - theme = "Gruvbox Dark"; + themeFile = "gruvbox-dark"; settings = { background_opacity = "0.8"; }; diff --git a/flake.lock b/flake.lock index 4ed27fe..0c641f3 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1718194053, - "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", "type": "github" }, "original": { @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1722217815, - "narHash": "sha256-8r5AJ3n8WEDw3rsZLALSuFQ5kJyWOcssNZvPxYLr2yc=", + "lastModified": 1727359191, + "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=", "owner": "nix-community", "repo": "disko", - "rev": "1e6f8a7b4634fc051cc9361959bf414fcf17e094", + "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700", "type": "github" }, "original": { @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1722407237, - "narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "58cef3796271aaeabaed98884d4abaab5d9d162d", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1722082646, - "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", + "lastModified": 1727003835, + "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", + "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", "type": "github" }, "original": { @@ -251,11 +251,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1727437159, + "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2", "type": "github" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1722253092, - "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=", + "lastModified": 1727464323, + "narHash": "sha256-XhiLvnM95aNpRm3qJ9hsVV/prin4GVapn4snMN4Ol6k=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2", + "rev": "4aef94d5afb4a791e5e9a3ee844c68ad01f54a14", "type": "github" }, "original": { @@ -294,11 +294,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1721524707, - "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "type": "github" }, "original": { @@ -343,11 +343,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1722431209, - "narHash": "sha256-qBxvnoQuzhCHTej5JMw1EpjavufRgpMNP9klpO7mbI4=", + "lastModified": 1727447274, + "narHash": "sha256-Z/l2VSccO+gSDYp9fIg3q2sn4zjNlwTeFU0rC55CsAA=", "owner": "nix-community", "repo": "nixvim", - "rev": "8945b3b5e336a42972448e2f07ed5bc465a40c83", + "rev": "ae2b9bd445ebe5d5342172c66ecbf60028070d32", "type": "github" }, "original": { @@ -365,11 +365,11 @@ ] }, "locked": { - "lastModified": 1722144272, - "narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=", + "lastModified": 1726995581, + "narHash": "sha256-lgsE/CTkZk9OIiFGEIrxXZQ7Feiv41dqlN7pEfTdgew=", "owner": "NuschtOS", "repo": "search", - "rev": "16565307c267ec219c2b5d3494ba66df08e7d403", + "rev": "3b7dd61b365ca45380707453758a45f2e9977be3", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1722114803, - "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=", + "lastModified": 1727423009, + "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=", "owner": "mic92", "repo": "sops-nix", - "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab", + "rev": "127a96f49ddc377be6ba76964411bab11ae27803", "type": "github" }, "original": { @@ -452,11 +452,11 @@ ] }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1727252110, + "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", "type": "github" }, "original": { diff --git a/hosts/cirrostratus/default.nix b/hosts/cirrostratus/default.nix index 6df8bfa..442b257 100644 --- a/hosts/cirrostratus/default.nix +++ b/hosts/cirrostratus/default.nix @@ -93,7 +93,6 @@ inputs.nixpkgs.lib.nixosSystem { # loader.grub.enable = true; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; - kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; supportedFilesystems.zfs = true; initrd.supportedFilesystems.zfs = true; }; diff --git a/modules/home-manager/nvim/lualine.nix b/modules/home-manager/nvim/lualine.nix index 9ff5bfd..1f629e6 100644 --- a/modules/home-manager/nvim/lualine.nix +++ b/modules/home-manager/nvim/lualine.nix @@ -8,71 +8,75 @@ programs.nixvim = { plugins.lualine = { enable = true; - alwaysDivideMiddle = true; - iconsEnabled = true; - sections = { - lualine_a = [ - {name = "mode";} - ]; - lualine_b = [ - {name = "branch";} - {name = "diff";} - {name = "diagnostics";} - ]; - lualine_c = [ - { - name = "filename"; - extraConfig = {path = 1;}; - } - ]; - lualine_x = [ - {name = "encoding";} - {name = "fileformat";} - {name = "filetype";} - ]; - lualine_y = [ - {name = "progress";} - ]; - lualine_z = [ - {name = "location";} - ]; - }; + settings = { + options = { + alwaysDivideMiddle = true; + icons_enabled = true; + }; + sections = { + lualine_a = [ + "mode" + ]; + lualine_b = [ + "branch" + "diff" + "diagnostics" + ]; + lualine_c = [ + { + __unkeyed = "filename"; + path = 1; + } + ]; + lualine_x = [ + "encoding" + "fileformat" + "filetype" + ]; + lualine_y = [ + "progress" + ]; + lualine_z = [ + "location" + ]; + }; - inactiveSections = { - lualine_a = []; - lualine_b = []; - lualine_c = [{name = "filename";}]; - lualine_x = [{name = "filetype";}]; - lualine_y = []; - lualine_z = []; - }; + inactiveSections = { + lualine_a = []; + lualine_b = []; + lualine_c = ["filename"]; + lualine_x = ["filetype"]; + lualine_y = []; + lualine_z = []; + }; - tabline = { - lualine_a = [ - { - name = "buffers"; - extraConfig = {mode = 4;}; - } - ]; - lualine_b = []; - lualine_c = []; - lualine_x = []; - lualine_y = []; - lualine_z = [ - { - name = "tabs"; - extraConfig = {mode = 2;}; - } - ]; - }; + tabline = { + lualine_a = [ + { + __unkeyed = "buffers"; + mode = 4; + } + ]; + lualine_b = []; + lualine_c = []; + lualine_x = []; + lualine_y = []; + lualine_z = [ + { + __unkeyed="tabs"; + mode = 2; + } + ]; + }; - winbar = { - lualine_a = []; - lualine_b = []; - lualine_c = []; - lualine_x = []; - lualine_y = []; - lualine_z = []; + winbar = { + lualine_a = []; + lualine_b = []; + lualine_c = []; + lualine_x = []; + lualine_y = []; + lualine_z = []; + }; }; }; }; diff --git a/modules/home-manager/nvim/nvim-tree.nix b/modules/home-manager/nvim/nvim-tree.nix index b7bb910..8bef39b 100644 --- a/modules/home-manager/nvim/nvim-tree.nix +++ b/modules/home-manager/nvim/nvim-tree.nix @@ -6,6 +6,7 @@ }: { config = lib.mkIf config.user.nvim.enable { programs.nixvim = { + plugins.web-devicons.enable = true; plugins.nvim-tree = { enable = true; disableNetrw = true; diff --git a/modules/home-manager/nvim/simpleplugins.nix b/modules/home-manager/nvim/simpleplugins.nix index 6e594ef..030df24 100644 --- a/modules/home-manager/nvim/simpleplugins.nix +++ b/modules/home-manager/nvim/simpleplugins.nix @@ -8,7 +8,7 @@ programs.nixvim = { plugins.comment.enable = true; plugins.marks.enable = true; - plugins.surround.enable = true; + plugins.vim-surround.enable = true; plugins.todo-comments.enable = true; plugins.leap = { enable = true; diff --git a/modules/home-manager/nvim/telescope.nix b/modules/home-manager/nvim/telescope.nix index 1e39d62..2febefb 100644 --- a/modules/home-manager/nvim/telescope.nix +++ b/modules/home-manager/nvim/telescope.nix @@ -6,6 +6,7 @@ }: { config = lib.mkIf config.user.nvim.enable { programs.nixvim = { + plugins.web-devicons.enable = true; plugins.telescope = { enable = true; };