diff --git a/nixos/flake.lock b/flake.lock similarity index 100% rename from nixos/flake.lock rename to flake.lock diff --git a/nixos/flake.nix b/flake.nix similarity index 92% rename from nixos/flake.nix rename to flake.nix index 53487fa..b4bd66e 100644 --- a/nixos/flake.nix +++ b/flake.nix @@ -58,8 +58,8 @@ inherit system; modules = [ - ./modules - ./users + ./nixos/modules + ./nixos/users sops-nix.nixosModules.sops ({ config, pkgs, ... }: { @@ -70,8 +70,8 @@ }; hosts = { - izanagi.modules = [ ./hosts/izanagi ]; - Gitea.modules = [ ./hosts/Gitea ]; + izanagi.modules = [ ./nixos/hosts/izanagi ]; + Gitea.modules = [ ./nixos/hosts/Gitea ]; }; }; } diff --git a/nixos/modules/common/gitops.nix b/nixos/modules/common/gitops.nix index c182365..4bfaeee 100644 --- a/nixos/modules/common/gitops.nix +++ b/nixos/modules/common/gitops.nix @@ -6,7 +6,7 @@ let updateScript = pkgs.writeShellApplication { name = "homelab-gitops-update"; runtimeInputs = [ pkgs.git pkgs.nixos-rebuild pkgs.jq pkgs.coreutils ]; - text = builtins.readFile ../../../../scripts/nixos-sync.sh; + text = builtins.readFile ../../../scripts/nixos-sync.sh; }; in {