From 0863fa0dfbac579dee898acb887be9640cefb3eb Mon Sep 17 00:00:00 2001 From: macronova Date: Mon, 26 Feb 2024 21:06:48 -0800 Subject: [PATCH] Update disko --- common/constants.nix | 4 +++- flake.lock | 42 +++++++++++++++++------------------ linux/blitzar/disko.nix | 1 - linux/comet/tailscale.nix | 4 +++- linux/nebula/disko.nix | 5 +++-- linux/nebula/jellyfin.nix | 1 + linux/nebula/tailscale.nix | 4 +++- linux/nebula/zfs.nix | 4 +++- linux/singularity/default.nix | 4 +++- 9 files changed, 40 insertions(+), 29 deletions(-) diff --git a/common/constants.nix b/common/constants.nix index 87dfb08..3feeed1 100644 --- a/common/constants.nix +++ b/common/constants.nix @@ -1,4 +1,6 @@ -{ config, lib, ... }: with lib; { +{ config, lib, ... }: + +with lib; { options.constants = { domain = mkOption { type = types.str; diff --git a/flake.lock b/flake.lock index bc33c14..5285851 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1708564520, - "narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=", + "lastModified": 1708910350, + "narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=", "owner": "nix-community", "repo": "disko", - "rev": "23d308f0059955e3719efc81a34d1fc0369fbb74", + "rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1708591310, - "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708501555, - "narHash": "sha256-zJaF0RkdIPbh8LTmnpW/E7tZYpqIE+MePzlWwUNob4c=", + "lastModified": 1708815994, + "narHash": "sha256-hL7N/ut2Xu0NaDxDMsw2HagAjgDskToGiyZOWriiLYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b50a77c03d640716296021ad58950b1bb0345799", + "rev": "9a9dae8f6319600fa9aebde37f340975cab4b8c0", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1708210246, - "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", + "lastModified": 1708819810, + "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", + "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1708655239, - "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1708151420, - "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "lastModified": 1708751719, + "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "type": "github" }, "original": { @@ -339,11 +339,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708500294, - "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", + "lastModified": 1708987867, + "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", + "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "type": "github" }, "original": { diff --git a/linux/blitzar/disko.nix b/linux/blitzar/disko.nix index c80d22c..a4e41cb 100644 --- a/linux/blitzar/disko.nix +++ b/linux/blitzar/disko.nix @@ -9,7 +9,6 @@ type = "gpt"; partitions = { esp = { - label = "esp"; size = "2G"; type = "ef00"; content = { diff --git a/linux/comet/tailscale.nix b/linux/comet/tailscale.nix index bc7601f..e175a8d 100644 --- a/linux/comet/tailscale.nix +++ b/linux/comet/tailscale.nix @@ -1,4 +1,6 @@ -{ ... }: { +{ ... }: + +{ services.tailscale = { enable = true; port = 12765; diff --git a/linux/nebula/disko.nix b/linux/nebula/disko.nix index 58a922e..4a28119 100644 --- a/linux/nebula/disko.nix +++ b/linux/nebula/disko.nix @@ -1,4 +1,6 @@ -{ ... }: { +{ ... }: + +{ disko.devices = { # Partition the physical disk disk.storage = { @@ -7,7 +9,6 @@ type = "gpt"; partitions = { esp = { - label = "esp"; size = "1G"; type = "ef00"; content = { diff --git a/linux/nebula/jellyfin.nix b/linux/nebula/jellyfin.nix index 7c21c0f..2dc4e20 100644 --- a/linux/nebula/jellyfin.nix +++ b/linux/nebula/jellyfin.nix @@ -1,4 +1,5 @@ { config, ... }: + { hardware.opengl.enable = true; diff --git a/linux/nebula/tailscale.nix b/linux/nebula/tailscale.nix index caaa2e8..ceab916 100644 --- a/linux/nebula/tailscale.nix +++ b/linux/nebula/tailscale.nix @@ -1,4 +1,6 @@ -{ ... }: { +{ ... }: + +{ services.tailscale = { enable = true; port = 25555; diff --git a/linux/nebula/zfs.nix b/linux/nebula/zfs.nix index a6165a2..35d7371 100644 --- a/linux/nebula/zfs.nix +++ b/linux/nebula/zfs.nix @@ -1,4 +1,6 @@ -{ config, ... }: { +{ config, ... }: + +{ boot = { kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; diff --git a/linux/singularity/default.nix b/linux/singularity/default.nix index 70e71ce..89c49bf 100644 --- a/linux/singularity/default.nix +++ b/linux/singularity/default.nix @@ -1,4 +1,6 @@ -{ inputs, ... }: { +{ inputs, ... }: + +{ imports = [ inputs.mailserver.nixosModule ./caddy.nix