summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-01-12 21:46:24 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-01-12 21:46:43 +0100
commitd75d0895fa329a265a296e37390e4fba8a312d7d (patch)
treed5225195c1973a224ac7715c6a5bdb5c8855e9bc
parent42b25e8ef134f39433ba1693b62bc29f0c572ad1 (diff)
downloadnixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar
nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar.gz
nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar.bz2
nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.tar.xz
nixos-d75d0895fa329a265a296e37390e4fba8a312d7d.zip
...
-rw-r--r--accounts/gkleen@vidhar.nix4
-rw-r--r--flake.lock24
-rw-r--r--hosts/surtr/default.nix10
-rw-r--r--hosts/surtr/tls.nix2
-rw-r--r--hosts/vidhar/default.nix6
-rw-r--r--installer.nix7
-rw-r--r--system-profiles/zfs.nix7
7 files changed, 24 insertions, 36 deletions
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 @@
1{ flake, pkgs, userName, config, ... }: { 1{ flake, pkgs, userName, config, ... }: {
2 imports = with flake.nixosModules.userProfiles.${userName}; [
3 feeds
4 ];
5
6 config = { 2 config = {
7 users.users.${userName} = { 3 users.users.${userName} = {
8 uid = 1000; 4 uid = 1000;
diff --git a/flake.lock b/flake.lock
index b438e94b..6f0f1e51 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
9 "utils": "utils" 9 "utils": "utils"
10 }, 10 },
11 "locked": { 11 "locked": {
12 "lastModified": 1638665590, 12 "lastModified": 1641976303,
13 "narHash": "sha256-nhtfL3z4TizWHemyZvgLvq11FhYX5Ya4ke+t6Np5PKQ=", 13 "narHash": "sha256-RrGWgT68L7hRc8NaFpqk10sh8wjEnEdFKkYzJYUS/h4=",
14 "owner": "serokell", 14 "owner": "serokell",
15 "repo": "deploy-rs", 15 "repo": "deploy-rs",
16 "rev": "715e92a13018bc1745fb680b5860af0c5641026a", 16 "rev": "584ec123d358a6490156595b510c2e786f8886f8",
17 "type": "github" 17 "type": "github"
18 }, 18 },
19 "original": { 19 "original": {
@@ -46,11 +46,11 @@
46 ] 46 ]
47 }, 47 },
48 "locked": { 48 "locked": {
49 "lastModified": 1640126586, 49 "lastModified": 1641937533,
50 "narHash": "sha256-Brja0wQZFSl+hduOcBfE/oVPs0QattbILSMHC7/9fEg=", 50 "narHash": "sha256-IJbR1nNV6v/ruWv9iUFi9/qa8tFLmMhbVjzvhSWCWJY=",
51 "owner": "nix-community", 51 "owner": "nix-community",
52 "repo": "home-manager", 52 "repo": "home-manager",
53 "rev": "1b03a8ab7af9385b70b7d7c319c4a31a58c5cfa5", 53 "rev": "d07df8d9a80a4a34ea881bee7860ae437c5d44a5",
54 "type": "github" 54 "type": "github"
55 }, 55 },
56 "original": { 56 "original": {
@@ -62,11 +62,11 @@
62 }, 62 },
63 "nixpkgs": { 63 "nixpkgs": {
64 "locked": { 64 "locked": {
65 "lastModified": 1640173269, 65 "lastModified": 1642017906,
66 "narHash": "sha256-/fzNf9IcaLdGb7LRJ9HTJYDEwlzHKhs02mj2bPJByhU=", 66 "narHash": "sha256-qicriHsA1+b51krim6Pg5fkQ6XIbE7y37GAWGDzzkGY=",
67 "owner": "NixOS", 67 "owner": "NixOS",
68 "repo": "nixpkgs", 68 "repo": "nixpkgs",
69 "rev": "d4c6319803ecfa09d86b8e136722fad7566675d6", 69 "rev": "82727b33e6466c2dea12cb0d5e7315e752f599e0",
70 "type": "github" 70 "type": "github"
71 }, 71 },
72 "original": { 72 "original": {
@@ -91,11 +91,11 @@
91 ] 91 ]
92 }, 92 },
93 "locked": { 93 "locked": {
94 "lastModified": 1638821683, 94 "lastModified": 1641374494,
95 "narHash": "sha256-oyqALhGijy2ZQxFSACrcC+Z8MzYLiomKCr9FQXVZ47U=", 95 "narHash": "sha256-a56G6Um43+0+n+yNYhRCh/mSvDdRVzQHSKcFaDEB9/8=",
96 "owner": "Mic92", 96 "owner": "Mic92",
97 "repo": "sops-nix", 97 "repo": "sops-nix",
98 "rev": "afe00100b16648c1d79e62926caacac561df93a5", 98 "rev": "7edb4b080023ef12f39262a3aa7aab31015a7a0e",
99 "type": "github" 99 "type": "github"
100 }, 100 },
101 "original": { 101 "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 @@
1{ flake, pkgs, lib, ... }: 1{ flake, pkgs, lib, ... }:
2{ 2{
3 imports = with flake.nixosModules.systemProfiles; [ 3 imports = with flake.nixosModules.systemProfiles; [
4 qemu-guest openssh rebuild-machines ./zfs.nix ./dns ./tls.nix 4 qemu-guest openssh rebuild-machines zfs
5 ./zfs.nix ./dns ./tls.nix
5 ]; 6 ];
6 7
7 config = { 8 config = {
@@ -19,15 +20,10 @@
19 device = "/dev/vda"; 20 device = "/dev/vda";
20 }; 21 };
21 22
22 kernelPackages = pkgs.linuxPackages_latest;
23 23
24 tmpOnTmpfs = true; 24 tmpOnTmpfs = true;
25 25
26 supportedFilesystems = [ "zfs" ]; 26 zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
27 zfs = {
28 enableUnstable = true;
29 devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id
30 };
31 27
32 kernelModules = ["ptp_kvm"]; 28 kernelModules = ["ptp_kvm"];
33 }; 29 };
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 {
56 security.acme = { 56 security.acme = {
57 acceptTerms = true; 57 acceptTerms = true;
58 preliminarySelfsigned = true; # DNS challenge is slow 58 preliminarySelfsigned = true; # DNS challenge is slow
59 email = "phikeebaogobaegh@141.li"; 59 defaults.email = "phikeebaogobaegh@141.li";
60 certs = 60 certs =
61 let 61 let
62 domainAttrset = domain: { 62 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 @@
22 device = "/dev/disk/by-id/ata-SuperMicro_SSD_SMC0515D95019BDF4083"; 22 device = "/dev/disk/by-id/ata-SuperMicro_SSD_SMC0515D95019BDF4083";
23 }; 23 };
24 24
25 kernelPackages = pkgs.linuxPackages_latest;
26 kernelModules = [ "kvm-intel" ]; 25 kernelModules = [ "kvm-intel" ];
27 26
28 kernelParams = [ 27 kernelParams = [
@@ -50,11 +49,6 @@
50 49
51 network.flushBeforeStage2 = false; 50 network.flushBeforeStage2 = false;
52 }; 51 };
53
54 supportedFilesystems = [ "zfs" ];
55 zfs = {
56 enableUnstable = true;
57 };
58 }; 52 };
59 53
60 fileSystems = { 54 fileSystems = {
diff --git a/installer.nix b/installer.nix
index 5fe58494..310105b8 100644
--- a/installer.nix
+++ b/installer.nix
@@ -1,14 +1,9 @@
1{ flake, pkgs, ... }: { 1{ flake, pkgs, ... }: {
2 imports = with flake.nixosModules.systemProfiles; [ 2 imports = with flake.nixosModules.systemProfiles; [
3 default-locale 3 default-locale zfs
4 ]; 4 ];
5 5
6 config = { 6 config = {
7 boot = {
8 kernelPackages = pkgs.linuxPackages_latest;
9 zfs.enableUnstable = true;
10 };
11
12 networking.wireless.enable = false; 7 networking.wireless.enable = false;
13 8
14 networking.firewall = { 9 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 @@
1{ pkgs, ... } : {
2 config.boot = {
3 kernelPackages = pkgs.linuxPackages_5_15;
4 supportedFilesystems = [ "zfs" ];
5 zfs.enableUnstable = true;
6 };
7}