nix flake update and warnings fixes.

This commit is contained in:
Gabe Venberg 2024-09-28 00:04:19 +02:00
parent fd79b1e2a2
commit 7784c07a01
7 changed files with 118 additions and 113 deletions

View file

@ -10,7 +10,7 @@
package = pkgs.fira-code-nerdfont; package = pkgs.fira-code-nerdfont;
name = "FiraCode Nerd Font"; name = "FiraCode Nerd Font";
}; };
theme = "Gruvbox Dark"; themeFile = "gruvbox-dark";
settings = { settings = {
background_opacity = "0.8"; background_opacity = "0.8";
}; };

View file

@ -13,11 +13,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718194053, "lastModified": 1727447169,
"narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722217815, "lastModified": 1727359191,
"narHash": "sha256-8r5AJ3n8WEDw3rsZLALSuFQ5kJyWOcssNZvPxYLr2yc=", "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "1e6f8a7b4634fc051cc9361959bf414fcf17e094", "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719994518, "lastModified": 1726153070,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +108,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721042469, "lastModified": 1726745158,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722407237, "lastModified": 1727383923,
"narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=", "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "58cef3796271aaeabaed98884d4abaab5d9d162d", "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722082646, "lastModified": 1727003835,
"narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,11 +251,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1722332872, "lastModified": 1727437159,
"narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722253092, "lastModified": 1727464323,
"narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=", "narHash": "sha256-XhiLvnM95aNpRm3qJ9hsVV/prin4GVapn4snMN4Ol6k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "f373ad59ae5866f0f98216bd5c71526b373450d2", "rev": "4aef94d5afb4a791e5e9a3ee844c68ad01f54a14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +294,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722185531, "lastModified": 1727348695,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +310,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1721524707, "lastModified": 1725762081,
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -343,11 +343,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1722431209, "lastModified": 1727447274,
"narHash": "sha256-qBxvnoQuzhCHTej5JMw1EpjavufRgpMNP9klpO7mbI4=", "narHash": "sha256-Z/l2VSccO+gSDYp9fIg3q2sn4zjNlwTeFU0rC55CsAA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "8945b3b5e336a42972448e2f07ed5bc465a40c83", "rev": "ae2b9bd445ebe5d5342172c66ecbf60028070d32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722144272, "lastModified": 1726995581,
"narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=", "narHash": "sha256-lgsE/CTkZk9OIiFGEIrxXZQ7Feiv41dqlN7pEfTdgew=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "16565307c267ec219c2b5d3494ba66df08e7d403", "rev": "3b7dd61b365ca45380707453758a45f2e9977be3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1722114803, "lastModified": 1727423009,
"narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=", "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab", "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -452,11 +452,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721769617, "lastModified": 1727252110,
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -93,7 +93,6 @@ inputs.nixpkgs.lib.nixosSystem {
# loader.grub.enable = true; # loader.grub.enable = true;
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
supportedFilesystems.zfs = true; supportedFilesystems.zfs = true;
initrd.supportedFilesystems.zfs = true; initrd.supportedFilesystems.zfs = true;
}; };

View file

@ -8,71 +8,75 @@
programs.nixvim = { programs.nixvim = {
plugins.lualine = { plugins.lualine = {
enable = true; enable = true;
alwaysDivideMiddle = true; settings = {
iconsEnabled = true; options = {
sections = { alwaysDivideMiddle = true;
lualine_a = [ icons_enabled = true;
{name = "mode";} };
]; sections = {
lualine_b = [ lualine_a = [
{name = "branch";} "mode"
{name = "diff";} ];
{name = "diagnostics";} lualine_b = [
]; "branch"
lualine_c = [ "diff"
{ "diagnostics"
name = "filename"; ];
extraConfig = {path = 1;}; lualine_c = [
} {
]; __unkeyed = "filename";
lualine_x = [ path = 1;
{name = "encoding";} }
{name = "fileformat";} ];
{name = "filetype";} lualine_x = [
]; "encoding"
lualine_y = [ "fileformat"
{name = "progress";} "filetype"
]; ];
lualine_z = [ lualine_y = [
{name = "location";} "progress"
]; ];
}; lualine_z = [
"location"
];
};
inactiveSections = { inactiveSections = {
lualine_a = []; lualine_a = [];
lualine_b = []; lualine_b = [];
lualine_c = [{name = "filename";}]; lualine_c = ["filename"];
lualine_x = [{name = "filetype";}]; lualine_x = ["filetype"];
lualine_y = []; lualine_y = [];
lualine_z = []; lualine_z = [];
}; };
tabline = { tabline = {
lualine_a = [ lualine_a = [
{ {
name = "buffers"; __unkeyed = "buffers";
extraConfig = {mode = 4;}; mode = 4;
} }
]; ];
lualine_b = []; lualine_b = [];
lualine_c = []; lualine_c = [];
lualine_x = []; lualine_x = [];
lualine_y = []; lualine_y = [];
lualine_z = [ lualine_z = [
{ {
name = "tabs"; __unkeyed="tabs";
extraConfig = {mode = 2;}; mode = 2;
} }
]; ];
}; };
winbar = { winbar = {
lualine_a = []; lualine_a = [];
lualine_b = []; lualine_b = [];
lualine_c = []; lualine_c = [];
lualine_x = []; lualine_x = [];
lualine_y = []; lualine_y = [];
lualine_z = []; lualine_z = [];
};
}; };
}; };
}; };

View file

@ -6,6 +6,7 @@
}: { }: {
config = lib.mkIf config.user.nvim.enable { config = lib.mkIf config.user.nvim.enable {
programs.nixvim = { programs.nixvim = {
plugins.web-devicons.enable = true;
plugins.nvim-tree = { plugins.nvim-tree = {
enable = true; enable = true;
disableNetrw = true; disableNetrw = true;

View file

@ -8,7 +8,7 @@
programs.nixvim = { programs.nixvim = {
plugins.comment.enable = true; plugins.comment.enable = true;
plugins.marks.enable = true; plugins.marks.enable = true;
plugins.surround.enable = true; plugins.vim-surround.enable = true;
plugins.todo-comments.enable = true; plugins.todo-comments.enable = true;
plugins.leap = { plugins.leap = {
enable = true; enable = true;

View file

@ -6,6 +6,7 @@
}: { }: {
config = lib.mkIf config.user.nvim.enable { config = lib.mkIf config.user.nvim.enable {
programs.nixvim = { programs.nixvim = {
plugins.web-devicons.enable = true;
plugins.telescope = { plugins.telescope = {
enable = true; enable = true;
}; };