From 8b2017b6b8a727b7810e749928cf7bdce30d094b Mon Sep 17 00:00:00 2001 From: Yadunand Prem Date: Wed, 14 Aug 2024 11:33:48 +0800 Subject: [PATCH] fix: move flake to root dir --- nixos/flake.lock => flake.lock | 6 +++--- nixos/flake.nix => flake.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename nixos/flake.lock => flake.lock (96%) rename nixos/flake.nix => flake.nix (89%) diff --git a/nixos/flake.lock b/flake.lock similarity index 96% rename from nixos/flake.lock rename to flake.lock index 0ba8683..45a8a34 100644 --- a/nixos/flake.lock +++ b/flake.lock @@ -142,11 +142,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723221148, - "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", + "lastModified": 1723572004, + "narHash": "sha256-U5gKtbKuPahB02iGeGHFPlKr/HqrvSsHlEDEXoVyaPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "rev": "19674872444bb3e0768249e724d99c8649c3bd78", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/flake.nix similarity index 89% rename from nixos/flake.nix rename to flake.nix index 85548ab..620e5fe 100644 --- a/nixos/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ }; }; - outputs = { flake-utils,nixpkgs, disko, agenix, nixos-generators, ... }: let + outputs = { flake-utils,nixpkgs, nixos-generators, ... }: let nodes = ["premhome-falcon-1" "premhome-falcon-2"]; in { packages = builtins.listToAttrs(map (system: { @@ -28,7 +28,7 @@ format = "iso"; system = "x86_64-linux"; modules = [ - ./proxmox/iso.nix # base configuration of the image + ./nixos/proxmox/iso.nix # base configuration of the image ]; }; }; @@ -39,7 +39,7 @@ create-vm = let pkgs = import nixpkgs { system = "x86_64-linux"; }; script-name = "create-vm"; - src = builtins.readFile ./proxmox/create-vm.sh; + src = builtins.readFile ./nixos/proxmox/create-vm.sh; script = (pkgs.writeScriptBin script-name src).overrideAttrs(old: { buildCommand = "${old.buildCommand}\n patchShebangs $out"; });