From d75d0895fa329a265a296e37390e4fba8a312d7d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 12 Jan 2022 21:46:24 +0100 Subject: ... --- accounts/gkleen@vidhar.nix | 4 ---- flake.lock | 24 ++++++++++++------------ hosts/surtr/default.nix | 10 +++------- hosts/surtr/tls.nix | 2 +- hosts/vidhar/default.nix | 6 ------ installer.nix | 7 +------ system-profiles/zfs.nix | 7 +++++++ 7 files changed, 24 insertions(+), 36 deletions(-) create mode 100644 system-profiles/zfs.nix diff --git a/accounts/gkleen@vidhar.nix b/accounts/gkleen@vidhar.nix index b0465229..ac521533 100644 --- a/accounts/gkleen@vidhar.nix +++ b/accounts/gkleen@vidhar.nix @@ -1,8 +1,4 @@ { flake, pkgs, userName, config, ... }: { - imports = with flake.nixosModules.userProfiles.${userName}; [ - feeds - ]; - config = { users.users.${userName} = { uid = 1000; diff --git a/flake.lock b/flake.lock index b438e94b..6f0f1e51 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1638665590, - "narHash": "sha256-nhtfL3z4TizWHemyZvgLvq11FhYX5Ya4ke+t6Np5PKQ=", + "lastModified": 1641976303, + "narHash": "sha256-RrGWgT68L7hRc8NaFpqk10sh8wjEnEdFKkYzJYUS/h4=", "owner": "serokell", "repo": "deploy-rs", - "rev": "715e92a13018bc1745fb680b5860af0c5641026a", + "rev": "584ec123d358a6490156595b510c2e786f8886f8", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1640126586, - "narHash": "sha256-Brja0wQZFSl+hduOcBfE/oVPs0QattbILSMHC7/9fEg=", + "lastModified": 1641937533, + "narHash": "sha256-IJbR1nNV6v/ruWv9iUFi9/qa8tFLmMhbVjzvhSWCWJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1b03a8ab7af9385b70b7d7c319c4a31a58c5cfa5", + "rev": "d07df8d9a80a4a34ea881bee7860ae437c5d44a5", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1640173269, - "narHash": "sha256-/fzNf9IcaLdGb7LRJ9HTJYDEwlzHKhs02mj2bPJByhU=", + "lastModified": 1642017906, + "narHash": "sha256-qicriHsA1+b51krim6Pg5fkQ6XIbE7y37GAWGDzzkGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4c6319803ecfa09d86b8e136722fad7566675d6", + "rev": "82727b33e6466c2dea12cb0d5e7315e752f599e0", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1638821683, - "narHash": "sha256-oyqALhGijy2ZQxFSACrcC+Z8MzYLiomKCr9FQXVZ47U=", + "lastModified": 1641374494, + "narHash": "sha256-a56G6Um43+0+n+yNYhRCh/mSvDdRVzQHSKcFaDEB9/8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "afe00100b16648c1d79e62926caacac561df93a5", + "rev": "7edb4b080023ef12f39262a3aa7aab31015a7a0e", "type": "github" }, "original": { diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix index da8b82f7..8554d112 100644 --- a/hosts/surtr/default.nix +++ b/hosts/surtr/default.nix @@ -1,7 +1,8 @@ { flake, pkgs, lib, ... }: { imports = with flake.nixosModules.systemProfiles; [ - qemu-guest openssh rebuild-machines ./zfs.nix ./dns ./tls.nix + qemu-guest openssh rebuild-machines zfs + ./zfs.nix ./dns ./tls.nix ]; config = { @@ -19,15 +20,10 @@ device = "/dev/vda"; }; - kernelPackages = pkgs.linuxPackages_latest; tmpOnTmpfs = true; - supportedFilesystems = [ "zfs" ]; - zfs = { - enableUnstable = true; - devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id - }; + zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id kernelModules = ["ptp_kvm"]; }; diff --git a/hosts/surtr/tls.nix b/hosts/surtr/tls.nix index e05cbdd9..6a1d6f84 100644 --- a/hosts/surtr/tls.nix +++ b/hosts/surtr/tls.nix @@ -56,7 +56,7 @@ in { security.acme = { acceptTerms = true; preliminarySelfsigned = true; # DNS challenge is slow - email = "phikeebaogobaegh@141.li"; + defaults.email = "phikeebaogobaegh@141.li"; certs = let domainAttrset = domain: { diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix index 47afc9fe..395476bf 100644 --- a/hosts/vidhar/default.nix +++ b/hosts/vidhar/default.nix @@ -22,7 +22,6 @@ device = "/dev/disk/by-id/ata-SuperMicro_SSD_SMC0515D95019BDF4083"; }; - kernelPackages = pkgs.linuxPackages_latest; kernelModules = [ "kvm-intel" ]; kernelParams = [ @@ -50,11 +49,6 @@ network.flushBeforeStage2 = false; }; - - supportedFilesystems = [ "zfs" ]; - zfs = { - enableUnstable = true; - }; }; fileSystems = { diff --git a/installer.nix b/installer.nix index 5fe58494..310105b8 100644 --- a/installer.nix +++ b/installer.nix @@ -1,14 +1,9 @@ { flake, pkgs, ... }: { imports = with flake.nixosModules.systemProfiles; [ - default-locale + default-locale zfs ]; config = { - boot = { - kernelPackages = pkgs.linuxPackages_latest; - zfs.enableUnstable = true; - }; - networking.wireless.enable = false; networking.firewall = { diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix new file mode 100644 index 00000000..5703f7ed --- /dev/null +++ b/system-profiles/zfs.nix @@ -0,0 +1,7 @@ +{ pkgs, ... } : { + config.boot = { + kernelPackages = pkgs.linuxPackages_5_15; + supportedFilesystems = [ "zfs" ]; + zfs.enableUnstable = true; + }; +} -- cgit v1.2.3