diff --git a/flake.lock b/flake.lock index 5a980c0..0fcd6a0 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1714761715, - "narHash": "sha256-93OkwjiNGhmT0k2kAOeHC9bPoeH0jBfNHMMs3QCNWOw=", + "lastModified": 1716688162, + "narHash": "sha256-1xu1nlkWn25TEcs5c7vAnPOsOO+NAjpiTNNdJoQhAgo=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "22885edd30aa5c1be2998213996596fe2536c7ea", + "rev": "af4a31c72fea81abb6317f268f487312680258b7", "type": "github" }, "original": { @@ -33,22 +33,21 @@ "flake-parts" ], "nixos-generators": "nixos-generators", + "nixos-images": "nixos-images", "nixpkgs": [ "nixpkgs" ], - "sops-nix": [ - "sops-nix" - ], + "sops-nix": "sops-nix", "treefmt-nix": [ "treefmt-nix" ] }, "locked": { - "lastModified": 1714488864, - "narHash": "sha256-Z9x9FtQUOEAa655hMMDuZGbQBOEk/P0wwn99C2diOY8=", + "lastModified": 1716889250, + "narHash": "sha256-CkHMbl67d83o3FhABmMExK0lVvipGPxojSQZMN80tfY=", "ref": "refs/heads/main", - "rev": "480bb396ed2a080472df5ba6887b5b91a278a7a5", - "revCount": 2652, + "rev": "418e9937cbf8ba08557bf421d85b79bce69b3ca5", + "revCount": 2880, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -65,31 +64,11 @@ ] }, "locked": { - "lastModified": 1712356478, - "narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=", + "lastModified": 1716394172, + "narHash": "sha256-B+pNhV8GFeCj9/MoH+qtGqKbgv6fU4hGaw2+NoYYtB0=", "owner": "nix-community", "repo": "disko", - "rev": "0a17298c0d96190ef3be729d594ba202b9c53beb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "disko_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714405407, - "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", - "owner": "nix-community", - "repo": "disko", - "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", + "rev": "23c63fb09334c3e8958b57e2ddc3870b75b9111d", "type": "github" }, "original": { @@ -120,11 +99,11 @@ }, "nixlib": { "locked": { - "lastModified": 1711846064, - "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -133,6 +112,22 @@ "type": "github" } }, + "nixos-2311": { + "locked": { + "lastModified": 1715818734, + "narHash": "sha256-WvAJWCwPj/6quKcsgsvQYyZRxV8ho/yUzj0HZQ34DVU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "95742536dc6debb5a8b8b78b27001c38f369f1e7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-generators": { "inputs": { "nixlib": "nixlib", @@ -142,11 +137,11 @@ ] }, "locked": { - "lastModified": 1712191720, - "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=", + "lastModified": 1716123454, + "narHash": "sha256-U2o4UPM/UsEyIX2p11+YEQgR9HY3PmjZ2mRl/x5e4xo=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a", + "rev": "a63e0c83dd83fe28cc571b97129e13373436bd82", "type": "github" }, "original": { @@ -155,6 +150,28 @@ "type": "github" } }, + "nixos-images": { + "inputs": { + "nixos-2311": "nixos-2311", + "nixos-unstable": [ + "clan-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716132123, + "narHash": "sha256-rATSWbPaKQfZGaemu0tHL2xfCzVIVwpuTjk+KSBC+k4=", + "owner": "nix-community", + "repo": "nixos-images", + "rev": "8c9cab8c44434c12dafc465fbf61a710c5bceb08", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-images", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1714314149, @@ -175,10 +192,8 @@ "inputs": { "buildbot-nix": "buildbot-nix", "clan-core": "clan-core", - "disko": "disko_2", "flake-parts": "flake-parts", "nixpkgs": "nixpkgs", - "sops-nix": "sops-nix", "srvos": "srvos", "treefmt-nix": "treefmt-nix" } @@ -186,16 +201,19 @@ "sops-nix": { "inputs": { "nixpkgs": [ + "clan-core", "nixpkgs" ], - "nixpkgs-stable": [] + "nixpkgs-stable": [ + "clan-core" + ] }, "locked": { - "lastModified": 1713892811, - "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "lastModified": 1716087663, + "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", + "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 374f524..cca84d4 100644 --- a/flake.nix +++ b/flake.nix @@ -13,13 +13,6 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; - - sops-nix.url = "github:Mic92/sops-nix"; - sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - sops-nix.inputs.nixpkgs-stable.follows = ""; - srvos.url = "github:numtide/srvos"; # Use the version of nixpkgs that has been tested to work with SrvOS srvos.inputs.nixpkgs.follows = "nixpkgs"; @@ -28,7 +21,6 @@ clan-core.inputs.flake-parts.follows = "flake-parts"; clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.treefmt-nix.follows = "treefmt-nix"; - clan-core.inputs.sops-nix.follows = "sops-nix"; buildbot-nix.url = "github:Mic92/buildbot-nix"; buildbot-nix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/single-disk.nix b/modules/single-disk.nix deleted file mode 100644 index 0cb20bf..0000000 --- a/modules/single-disk.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ self, ... }: -let - partitions = { - grub = { - name = "grub"; - size = "1M"; - type = "ef02"; - }; - esp = { - name = "ESP"; - type = "EF00"; - size = "500M"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "filesystem"; - # We use xfs because it has support for compression and has a quite good performance for databases - format = "xfs"; - mountpoint = "/"; - }; - }; - }; -in -{ - imports = [ - self.inputs.disko.nixosModules.disko - ]; - disko.devices = { - disk.sda = { - type = "disk"; - device = "/dev/sda"; - content = { - type = "gpt"; - inherit partitions; - }; - }; - }; -} diff --git a/modules/xfs-lvm-crypto-raid.nix b/modules/xfs-lvm-crypto-raid.nix deleted file mode 100644 index 3b2bd42..0000000 --- a/modules/xfs-lvm-crypto-raid.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ self, lib, ... }: - -let - disk = index: { - type = "disk"; - device = "/dev/nvme${toString index}n1"; - content = { - type = "gpt"; - partitions = - # systemd only wants to have one /boot partition - # should we rsync? - (lib.optionalAttrs (index == 0) { - boot = { - type = "EF00"; - size = "1G"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - }) // { - root = { - size = "100%"; - content = { - type = "luks"; - name = "crypted${toString index}"; - keyFile = "/tmp/secret.key"; - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; - }; -in -{ - imports = [ - self.inputs.disko.nixosModules.disko - ]; - - boot.initrd.kernelModules = [ - "xhci_pci" - "ahci" - "sd_mod" - "nvme" - "dm-raid" - "dm-integrity" - ]; - - disko.devices = { - disk = { - nvme0n1 = disk 0; - nvme1n1 = disk 1; - }; - - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "95%FREE"; - lvm_type = "raid1"; - extraArgs = [ - "--raidintegrity" - "y" - ]; - content = { - type = "filesystem"; - format = "xfs"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - }; - }; - }; - }; -} diff --git a/modules/zfs-crypto-raid.nix b/modules/zfs-crypto-raid.nix index ee016fd..7a3bd3c 100644 --- a/modules/zfs-crypto-raid.nix +++ b/modules/zfs-crypto-raid.nix @@ -27,10 +27,6 @@ let }; in { - imports = [ - self.inputs.disko.nixosModules.disko - ]; - networking.hostId = "8425e349"; boot.initrd.postDeviceCommands = ''