From a97a749a5f5716292a64393c56a097fd73fef023 Mon Sep 17 00:00:00 2001 From: blaknull Date: Sat, 19 Oct 2024 12:19:25 -0500 Subject: [PATCH] add flake support to iso --- flake.lock | 22 +++++++++++----------- flake.nix | 12 ++++++------ result | 1 - system/configuration/live/flake.nix | 7 +++++++ 4 files changed, 24 insertions(+), 18 deletions(-) delete mode 120000 result diff --git a/flake.lock b/flake.lock index 657e68b..f1f0907 100644 --- a/flake.lock +++ b/flake.lock @@ -1027,11 +1027,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-Hz1a2OgtlwgdQhI6hiUvityjVURsoY6oXkXq25RyiBM=", - "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/home", + "path": "/nix/store/04x3c5633xarfkwir8nfw7xpfr753d85-source/home", "type": "path" }, "original": { - "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/home", + "path": "/nix/store/04x3c5633xarfkwir8nfw7xpfr753d85-source/home", "type": "path" } }, @@ -1417,11 +1417,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", - "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/packages", + "path": "/nix/store/a7qk24659bxc2abjyb3mj6q8z3m27x39-source/packages", "type": "path" }, "original": { - "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/packages", + "path": "/nix/store/a7qk24659bxc2abjyb3mj6q8z3m27x39-source/packages", "type": "path" } }, @@ -1507,11 +1507,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=", - "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/programs", + "path": "/nix/store/a7qk24659bxc2abjyb3mj6q8z3m27x39-source/programs", "type": "path" }, "original": { - "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/programs", + "path": "/nix/store/a7qk24659bxc2abjyb3mj6q8z3m27x39-source/programs", "type": "path" } }, @@ -1638,11 +1638,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-z2Uyh8lc8Mi5hPUGqRw1wVnTKNwGsG75CCZ8gZ2LKwk=", - "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/services", + "path": "/nix/store/a7qk24659bxc2abjyb3mj6q8z3m27x39-source/services", "type": "path" }, "original": { - "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/services", + "path": "/nix/store/a7qk24659bxc2abjyb3mj6q8z3m27x39-source/services", "type": "path" } }, @@ -1657,12 +1657,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-zCuXOk2uNhjduhm2aqSymCImHRy8ceJxRlYV+oAQ3mk=", - "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/system", + "narHash": "sha256-uMh/6vNaS8xs1sdRmB64M88TrtJAP5VhsKcMCGYinP4=", + "path": "/nix/store/04x3c5633xarfkwir8nfw7xpfr753d85-source/system", "type": "path" }, "original": { - "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/system", + "path": "/nix/store/04x3c5633xarfkwir8nfw7xpfr753d85-source/system", "type": "path" } }, diff --git a/flake.nix b/flake.nix index 9e734a8..5c639bb 100644 --- a/flake.nix +++ b/flake.nix @@ -75,12 +75,12 @@ ]; environment.etc = { - "nixos/disko/default.nix".source = "./system/disko/default.nix"; - "nixos/disko/disko.nix".source = "./system/disko/disko.nix"; - "nixos/disko/disko_bonus.nix".source = "./system/disko/disko_bonus.nix"; - "nixos/disko/impermanent.nix".source = "./system/disko/impermanent.nix"; - "nixos/impermanence/default.nix".source = "./system/impermanence/default.nix"; - "nixos/flake.nix".source = "./system/configuration/live/flake.nix"; + "nixos/disko/default.nix".source = ./system/disko/default.nix; + "nixos/disko/disko.nix".source = ./system/disko/disko.nix; + "nixos/disko/disko_bonus.nix".source = ./system/disko/disko_bonus.nix; + "nixos/disko/impermanent.nix".source = ./system/disko/impermanent.nix; + "nixos/impermanence/default.nix".source = ./system/impermanence/default.nix; + "nixos/flake.nix".source = ./system/configuration/live/flake.nix; }; services.openssh = { diff --git a/result b/result deleted file mode 120000 index 800eb50..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/frjkwfcll6yckrvv2n95swd98zp6qz4k-nixos-24.05.20241009.d51c286-x86_64-linux.iso \ No newline at end of file diff --git a/system/configuration/live/flake.nix b/system/configuration/live/flake.nix index dfca66c..d7ee5cb 100644 --- a/system/configuration/live/flake.nix +++ b/system/configuration/live/flake.nix @@ -46,6 +46,13 @@ impermanent = true; }; + + nix.settings = { + experimental-features = [ "nix-command" "flakes" ]; + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; + networking = { hostName = "homebox"; nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];