diff --git a/.gitattributes b/.gitattributes index 3f7c38fe..19b2e17b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ *.jpg filter=lfs diff=lfs merge=lfs -text *.webp filter=lfs diff=lfs merge=lfs -text *.efi filter=lfs diff=lfs merge=lfs -text +flake/branch.nix merge=ours diff --git a/flake.nix b/flake.nix index 64b08db5..b39a1992 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,7 @@ nixosConfigurations = import ./flake/nixos.nix { inherit inputs localLib; }; overlays.default = final: prev: { localPackages = (import ./packages { inherit localLib; pkgs = final; topInputs = inputs; }); }; - config = { archive = false; branch = "production"; }; + config.branch = import ./flake/branch.nix; devShells.x86_64-linux = import ./flake/dev.nix { inherit inputs; }; src = import ./flake/src.nix { inherit inputs; }; }; diff --git a/flake/branch.nix b/flake/branch.nix new file mode 100644 index 00000000..c5fa4672 --- /dev/null +++ b/flake/branch.nix @@ -0,0 +1 @@ +"next" diff --git a/modules/system/nix.nix b/modules/system/nix.nix index 4353a92a..834e5109 100644 --- a/modules/system/nix.nix +++ b/modules/system/nix.nix @@ -84,7 +84,7 @@ inputs: ++ (with inputs.config.nixos.system.nixpkgs; if march == null then [] else [ "gccarch-exact-${march}" ]); } # includeBuildDependencies - { system.includeBuildDependencies = inputs.topInputs.self.config.archive; } + { system.includeBuildDependencies = inputs.topInputs.self.config.branch == "archive"; } # substituters { nix.settings.substituters = inputs.lib.mkMerge