From eb0d6a1274f98de0448a9ddb466e2e30d1721895 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 20 Oct 2024 21:11:51 +0200 Subject: ... --- _sources/generated.json | 20 ++--- _sources/generated.nix | 20 ++--- flake.lock | 150 +++++++++++++----------------------- hosts/sif/default.nix | 13 ---- hosts/surtr/prometheus/default.nix | 2 +- hosts/surtr/vpn/default.nix | 1 - hosts/vidhar/default.nix | 2 +- hosts/vidhar/prometheus/default.nix | 2 +- hosts/vidhar/samba.nix | 32 ++++---- overlays/waybar.nix | 9 ++- system-profiles/bcachefs.nix | 5 +- system-profiles/networkmanager.nix | 4 +- system-profiles/zfs.nix | 9 ++- 13 files changed, 110 insertions(+), 159 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 0c6662c8..d27b0387 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -28,11 +28,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-0qcs0Cuq72u6yVa5aEtdMC9SpfiwN9HPC6szERT3TJI=", + "sha256": "sha256-NHwYD3gWxXg5UC03uLk8o30rI9YvBoE8yFydHGEPK7s=", "type": "tarball", - "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.2.tar.gz" + "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.3.tar.gz" }, - "version": "2024.2" + "version": "2024.3" }, "bpf-examples": { "cargoLocks": null, @@ -105,11 +105,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=", + "sha256": "sha256-k8i+UQjj5fxV7tj+zfw7cl8d6pZ9DDokRsVgcIc3wqI=", "type": "tarball", - "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz" + "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.15.tar.gz" }, - "version": "2.14" + "version": "2.15" }, "mpv-autosave": { "cargoLocks": null, @@ -367,7 +367,7 @@ }, "v4l2loopback": { "cargoLocks": null, - "date": "2024-05-24", + "date": "2024-09-12", "extract": null, "name": "v4l2loopback", "passthru": null, @@ -379,12 +379,12 @@ "name": null, "owner": "umlaeute", "repo": "v4l2loopback", - "rev": "2d44c2f3a33844dfd9928dc536288283289bbc34", - "sha256": "sha256-6YWF1zM9glDTnJNVxlNWWqqkD0Z6sNscOoGTJsU6iCQ=", + "rev": "e34bc188f1099b82b76352df017ae4f6f37c20ea", + "sha256": "sha256-PnqpGhUfLpPvXDMH1h/9qH6or//LObGl4SKgm4i2Md8=", "sparseCheckout": [], "type": "github" }, - "version": "2d44c2f3a33844dfd9928dc536288283289bbc34" + "version": "e34bc188f1099b82b76352df017ae4f6f37c20ea" }, "xcompose": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 8c3074ab..edd35298 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -18,10 +18,10 @@ }; batman-adv = { pname = "batman-adv"; - version = "2024.2"; + version = "2024.3"; src = fetchTarball { - url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.2.tar.gz"; - sha256 = "sha256-0qcs0Cuq72u6yVa5aEtdMC9SpfiwN9HPC6szERT3TJI="; + url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.3.tar.gz"; + sha256 = "sha256-NHwYD3gWxXg5UC03uLk8o30rI9YvBoE8yFydHGEPK7s="; }; }; bpf-examples = { @@ -61,10 +61,10 @@ }; lesspipe = { pname = "lesspipe"; - version = "2.14"; + version = "2.15"; src = fetchTarball { - url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz"; - sha256 = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc="; + url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.15.tar.gz"; + sha256 = "sha256-k8i+UQjj5fxV7tj+zfw7cl8d6pZ9DDokRsVgcIc3wqI="; }; }; mpv-autosave = { @@ -226,15 +226,15 @@ }; v4l2loopback = { pname = "v4l2loopback"; - version = "2d44c2f3a33844dfd9928dc536288283289bbc34"; + version = "e34bc188f1099b82b76352df017ae4f6f37c20ea"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "2d44c2f3a33844dfd9928dc536288283289bbc34"; + rev = "e34bc188f1099b82b76352df017ae4f6f37c20ea"; fetchSubmodules = true; - sha256 = "sha256-6YWF1zM9glDTnJNVxlNWWqqkD0Z6sNscOoGTJsU6iCQ="; + sha256 = "sha256-PnqpGhUfLpPvXDMH1h/9qH6or//LObGl4SKgm4i2Md8="; }; - date = "2024-05-24"; + date = "2024-09-12"; }; xcompose = { pname = "xcompose"; diff --git a/flake.lock b/flake.lock index df28d666..2158ef8d 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,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": { @@ -99,11 +99,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1690933134, - "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -220,29 +220,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "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": { @@ -252,7 +234,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -298,11 +280,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -377,11 +359,11 @@ }, "impermanence": { "locked": { - "lastModified": 1725690722, - "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", + "lastModified": 1729068498, + "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=", "owner": "nix-community", "repo": "impermanence", - "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", + "rev": "e337457502571b23e449bf42153d7faa10c0a562", "type": "github" }, "original": { @@ -411,11 +393,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", "type": "github" }, "original": { @@ -431,11 +413,11 @@ ] }, "locked": { - "lastModified": 1725765290, - "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", + "lastModified": 1729394935, + "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "642275444c5a9defce57219c944b3179bf2adaa9", + "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", "type": "github" }, "original": { @@ -467,11 +449,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1729417461, + "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b", "type": "github" }, "original": { @@ -527,20 +509,14 @@ }, "nixpkgs-lib_2": { "locked": { - "dir": "lib", - "lastModified": 1690881714, - "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e1960bc196baf6881340d53dccb203a951745a2", - "type": "github" + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "nixpkgs-lib_3": { @@ -643,11 +619,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -709,15 +685,15 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725532428, - "narHash": "sha256-dCfawQDwpukcwQw++Cn/3LIh/RZMmH+k3fm91Oc5Pf0=", + "lastModified": 1729173771, + "narHash": "sha256-rT2Vz1kFSj+NKHetVY7PJUACX+qBETdnuPSklzFKCsc=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "a313fd7169ae43ecd1a2ea2f1e4899fe3edba4d2", + "rev": "e67cc181b5bdf5aa46f1340fa9acd3910f6fb122", "type": "github" }, "original": { @@ -751,7 +727,6 @@ "pre-commit-hooks-nix_2": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", "gitignore": "gitignore_2", "nixpkgs": [ "ca-util", @@ -763,11 +738,11 @@ ] }, "locked": { - "lastModified": 1691256628, - "narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3139c4d1f7732cab89f06492bdd4677b877e3785", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { @@ -779,7 +754,7 @@ "pre-commit-hooks-nix_3": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore_3", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_3" @@ -831,7 +806,7 @@ "deploy-rs": "deploy-rs", "flake-compat": "flake-compat_3", "flake-registry": "flake-registry", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "home-manager": "home-manager", "home-manager-eostre": "home-manager-eostre", "impermanence": "impermanence", @@ -859,11 +834,11 @@ ] }, "locked": { - "lastModified": 1725922448, - "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", + "lastModified": 1729394972, + "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cede1a08039178ac12957733e97ab1006c6b6892", + "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", "type": "github" }, "original": { @@ -889,21 +864,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -925,11 +885,11 @@ ] }, "locked": { - "lastModified": 1719749022, - "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -948,11 +908,11 @@ ] }, "locked": { - "lastModified": 1724184562, - "narHash": "sha256-qCfALJV/Q895MsUBdGa1cHUodaUFOzww4jcGiXTuFw4=", + "lastModified": 1726229884, + "narHash": "sha256-Yaii3DHMwNNfZK+G9BomA8yXPKWFb6jtYcARHg0zkSo=", "owner": "gkleen", "repo": "Waybar", - "rev": "e883333d19da8f577b0ad37d1c3a28784ff2539f", + "rev": "7cedd9cd55e1b14f69e2889ccb66dd87b0ce57d1", "type": "github" }, "original": { diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index e81205b3..e71ee4ec 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix @@ -646,19 +646,6 @@ in { environment.sessionVariables."GTK_USE_PORTAL" = "1"; xdg.portal = { enable = true; - # gtkUsePortal = true; - config.preferred.default = "gtk"; - extraPortals = let - gtk-portal = pkgs.xdg-desktop-portal-gtk.overrideAttrs (oldAttrs: { - postFixup = '' - ${oldAttrs.postFixup or ""} - - ${pkgs.gnused}/bin/sed -ri \ - 's|UseIn=gnome|UseIn=gnome;none+xmonad|' \ - $out/share/xdg-desktop-portal/portals/gtk.portal - ''; - }); - in [ gtk-portal ]; }; environment.persistence."/.bcachefs" = { diff --git a/hosts/surtr/prometheus/default.nix b/hosts/surtr/prometheus/default.nix index 0f0cf586..5a58aa92 100644 --- a/hosts/surtr/prometheus/default.nix +++ b/hosts/surtr/prometheus/default.nix @@ -22,7 +22,7 @@ in { }; unbound = { enable = true; - controlInterface = "/run/unbound/unbound.ctl"; + unbound.host = "unix:///run/unbound/unbound.ctl"; group = config.services.unbound.group; }; wireguard = { diff --git a/hosts/surtr/vpn/default.nix b/hosts/surtr/vpn/default.nix index 3f7483bd..1bdcf74e 100644 --- a/hosts/surtr/vpn/default.nix +++ b/hosts/surtr/vpn/default.nix @@ -34,7 +34,6 @@ in { }; environment = { - noXlibs = true; systemPackages = with pkgs; [ wireguard-tools ]; }; diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix index 78f305f8..42a9e80d 100644 --- a/hosts/vidhar/default.nix +++ b/hosts/vidhar/default.nix @@ -136,7 +136,7 @@ with lib; wantedBy = ["basic.target"]; serviceConfig = { ExecStart = pkgs.writeShellScript "limit-pstate-start" '' - echo 80 > /sys/devices/system/cpu/intel_pstate/max_perf_pct + echo 60 > /sys/devices/system/cpu/intel_pstate/max_perf_pct ''; RemainAfterExit = true; ExecStop = pkgs.writeShellScript "limit-pstate-stop" '' diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix index 3e938933..d368ad52 100644 --- a/hosts/vidhar/prometheus/default.nix +++ b/hosts/vidhar/prometheus/default.nix @@ -40,7 +40,7 @@ in { }; unbound = { enable = true; - controlInterface = "/run/unbound/unbound.ctl"; + unbound.host = "unix:///run/unbound/unbound.ctl"; group = config.services.unbound.group; }; wireguard = { diff --git a/hosts/vidhar/samba.nix b/hosts/vidhar/samba.nix index 89d9f12e..58fd435c 100644 --- a/hosts/vidhar/samba.nix +++ b/hosts/vidhar/samba.nix @@ -3,22 +3,22 @@ config = { services.samba = { enable = true; - securityType = "user"; - extraConfig = '' - domain master = yes - workgroup = WORKGROUP - load printers = no - printing = bsd - printcap name = /dev/null - disable spoolss = yes - guest account = nobody - bind interfaces only = yes - interfaces = lo lan - server signing = mandatory - server min protocol = SMB3 - server smb encrypt = required - ''; - shares = { + settings = { + global = { + security = "user"; + "domain master" = true; + workgroup = "WORKGROUP"; + "load printers" = false; + printing = "bsd"; + "printcap name" = "/dev/null"; + "disable spoolss" = true; + "guest account" = "nobody"; + "bind interfaces only" = true; + interfaces = ["lo" "lan"]; + "server signing" = "mandatory"; + "server min protocol" = "SMB3"; + "server smb encrypt" = "required"; + }; homes = { comment = "Home directory for %S"; path = "/home/%S"; diff --git a/overlays/waybar.nix b/overlays/waybar.nix index 20f37255..4a1e89a2 100644 --- a/overlays/waybar.nix +++ b/overlays/waybar.nix @@ -1,3 +1,10 @@ { final, prev, flakeInputs, ... }: -flakeInputs.waybar.overlays.default final prev +(prev.lib.composeExtensions + (final: prev: { + waybar = prev.waybar.overrideAttrs (oldAttrs: { + patches = []; + }); + }) + flakeInputs.waybar.overlays.default +) final prev diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix index 65de9f7e..f9f048b9 100644 --- a/system-profiles/bcachefs.nix +++ b/system-profiles/bcachefs.nix @@ -1,7 +1,6 @@ -{ config, pkgs, ... } : { +{ pkgs, ... } : { config = { - boot.supportedFilesystems = [ "bcachefs" ]; - + boot.supportedFilesystems.bcachefs = true; environment.systemPackages = with pkgs; [ bcachefs-tools ]; }; } diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix index bc5fd5ff..335b5653 100644 --- a/system-profiles/networkmanager.nix +++ b/system-profiles/networkmanager.nix @@ -10,7 +10,7 @@ with lib; dhcp = "internal"; dns = mkForce "dnsmasq"; logLevel = "INFO"; - settings.connectivity.url = "https://online.yggdrasil.li"; + settings.connectivity.url = "https://online.yggdrasil.li"; }; }; @@ -18,7 +18,5 @@ with lib; systemd.services."systemd-networkd-wait-online".enable = mkForce false; services.resolved.enable = false; - - environment.noXlibs = false; }; } diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix index 148cbb7b..49386363 100644 --- a/system-profiles/zfs.nix +++ b/system-profiles/zfs.nix @@ -1,9 +1,10 @@ -{ config, pkgs, ... } : { +{ pkgs, lib, ... } : { config = { boot = { - kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; - supportedFilesystems = [ "zfs" ]; - zfs.package = pkgs.zfs_unstable; + kernelPackages = pkgs.linuxPackages_6_10; + zfs.package = pkgs.zfs_2_2; + + supportedFilesystems.zfs = true; }; environment.systemPackages = with pkgs; [ httm ]; -- cgit v1.2.3