From 8198522f64f13b027fb2df4fb4821e073b5dcf84 Mon Sep 17 00:00:00 2001 From: voidarc Date: Wed, 29 Jul 2026 17:28:36 +0100 Subject: [PATCH] fixed disko configuration --- flake.lock | 131 +++++++++++------- flake.nix | 3 + .../hosts/server02/_disk-config.nix | 0 modules/hosts/server02/default.nix | 8 +- .../hosts/server02/server02Configuration.nix | 5 +- 5 files changed, 96 insertions(+), 51 deletions(-) rename disk-config.nix => modules/hosts/server02/_disk-config.nix (100%) diff --git a/flake.lock b/flake.lock index 2b87425..24139a1 100644 --- a/flake.lock +++ b/flake.lock @@ -91,7 +91,7 @@ }, "davinci": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-pinned": "nixpkgs-pinned" }, "locked": { @@ -108,6 +108,24 @@ "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci" } }, + "disko": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", + "owner": "nix-community", + "repo": "disko", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -390,7 +408,7 @@ "hyprland": { "inputs": { "hyprland": "hyprland_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "otter-launcher": "otter-launcher", "woomer": "woomer", "wrappers": "wrappers", @@ -510,7 +528,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" @@ -760,7 +778,7 @@ "gotify-desktop": "gotify-desktop", "hyprland": "hyprland", "import-tree": "import-tree_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nvim": "nvim", "omnisearch": "omnisearch", "otter-launcher": "otter-launcher_2", @@ -772,11 +790,11 @@ "wshowkeys": "wshowkeys_2" }, "locked": { - "lastModified": 1785265150, - "narHash": "sha256-xoQZ4Zh4L7V9XnIAe31hRnXK3EHqwh9PalGR+qzRWEs=", + "lastModified": 1785342374, + "narHash": "sha256-3fGpdwex/FYwWgIF5W+HpqzgeZlA/nHFyOS/As8RtSI=", "ref": "dendritic", - "rev": "7a3d2fee77eabeac7d010dcc3e002dc0613b2961", - "revCount": 216, + "rev": "5f7fc8ea058501c5df25d653d3aebe5643110494", + "revCount": 218, "type": "git", "url": "https://git.voidarc.co.uk/voidarc/nixos.git" }, @@ -788,16 +806,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782233679, - "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=", + "lastModified": 1780930886, + "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "667d5cf1c59585031d743c78b394b0a647537c35", + "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -879,6 +897,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -894,7 +928,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1780336545, "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", @@ -910,7 +944,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1785133411, "narHash": "sha256-Yjv0WEg39KRYS0rBdTbu6Fc/or/ihAKk13W9sQ6VWd0=", @@ -927,6 +961,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1782233679, + "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "667d5cf1c59585031d743c78b394b0a647537c35", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1784356753, "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", @@ -942,7 +992,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1785090369, "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", @@ -958,7 +1008,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1782175435, "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", @@ -974,7 +1024,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1773734432, "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", @@ -990,7 +1040,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1785104993, "narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=", @@ -1006,7 +1056,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1782467914, "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", @@ -1022,7 +1072,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1780336545, "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", @@ -1038,25 +1088,9 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvim": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "wrappers": "wrappers_2" }, "locked": { @@ -1171,11 +1205,11 @@ "quickshell": { "flake": false, "locked": { - "lastModified": 1783436659, - "narHash": "sha256-rh0BJlcRM8nFet9aYIaZMxe7M6BMNJOrSgJi3cPQ+Tc=", + "lastModified": 1785316762, + "narHash": "sha256-YDCoSJbBsugRcugBSh4mgwaQkz51RbMEjMxPgZPsNoA=", "ref": "refs/heads/main", - "rev": "68d4240fcbc605ee36a0e71797c04c0ac33f3e19", - "revCount": 25, + "rev": "afbe360b080f349d27359b8507ce429aaa5a5a7e", + "revCount": 26, "type": "git", "url": "https://git.voidarc.co.uk/voidarc/quickshell" }, @@ -1186,15 +1220,16 @@ }, "root": { "inputs": { + "disko": "disko", "flake-parts": "flake-parts", "import-tree": "import-tree", "nix-config": "nix-config", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" } }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1784438913, @@ -1212,7 +1247,7 @@ }, "sls-steam": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1785224226, @@ -1407,7 +1442,7 @@ "woomer": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "systems": "systems_4" }, "locked": { @@ -1449,7 +1484,7 @@ }, "wrappers": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1785177581, @@ -1467,7 +1502,7 @@ }, "wrappers_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1782135443, @@ -1485,7 +1520,7 @@ }, "wrappers_3": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1782135443, diff --git a/flake.nix b/flake.nix index 4f4e60f..288f3d7 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,9 @@ # flake parts flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; + + # Disko + disko.url = "github:nix-community/disko"; }; outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); diff --git a/disk-config.nix b/modules/hosts/server02/_disk-config.nix similarity index 100% rename from disk-config.nix rename to modules/hosts/server02/_disk-config.nix diff --git a/modules/hosts/server02/default.nix b/modules/hosts/server02/default.nix index fd480ec..ae398d6 100644 --- a/modules/hosts/server02/default.nix +++ b/modules/hosts/server02/default.nix @@ -4,6 +4,7 @@ ... }: { flake.nixosConfigurations.server02 = inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; modules = with self.nixosModules; [ server02Configuration @@ -12,7 +13,10 @@ ++ (with inputs.nix-config.nixosModules; [ nvim git - zsh - ]); + # zsh + ]) + ++ [ + inputs.disko.nixosModules.disko + ]; }; } diff --git a/modules/hosts/server02/server02Configuration.nix b/modules/hosts/server02/server02Configuration.nix index 16c5387..4c22864 100644 --- a/modules/hosts/server02/server02Configuration.nix +++ b/modules/hosts/server02/server02Configuration.nix @@ -3,6 +3,9 @@ networking = { hostName = "server02"; }; - imports = [./_hardware-configuration.nix]; + imports = [ + # ./_hardware-configuration.nix + ./_disk-config.nix + ]; }; }