diff --git a/bin b/bin new file mode 120000 index 0000000..528dc4e --- /dev/null +++ b/bin @@ -0,0 +1 @@ +scripts \ No newline at end of file diff --git a/misc/.gitkeep b/misc/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/misc/nix/nix.custom.conf b/misc/nix/nix.custom.conf new file mode 100644 index 0000000..f8f7ae6 --- /dev/null +++ b/misc/nix/nix.custom.conf @@ -0,0 +1,11 @@ +# Technically shared/meta-configs.nix but as a seperate conf file +# since we use Determinate Nix on our systems. +experimental-features = auto-allocate-uids ca-derivations cgroups configurable-impure-env daemon-trust-override dynamic-derivations fetch-closure fetch-tree flakes git-hashing impure-derivations local-overlay-store mounted-ssh-store nix-command no-url-literals parse-toml-timestamps pipe-operators read-only-local-store recursive-nix verified-fetches + +trusted-users = root gildedguy ajhalili2006 nixos + +allowed-users = gildedguy ajhalili2006 nixos + +trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw= ajhalili2006-nixos-builds.cachix.org-1:fA8HXvGR1i792D+CxL2iW/TQzUcyoW7zPUmC9Q4mQLg= andreijiroh-dev.cachix.org-1:7Jd0STdBOLiNu5fiA+AKwcMqQD2PA1j9zLDGyDkuyBo= recaptime-dev.cachix.org-1:b0UBO1zONf6ceTIoR06AKhgid4ZOl5kxB/gOIdZ9J6g= + +trusted-substituters = https://devenv.cachix.org https://andreijiroh-dev.cachix.org https://ajhalili2006-nixos-builds.cachix.org https://recaptime-dev.cachix.org \ No newline at end of file diff --git a/script/deploy-config b/scripts/deploy-config similarity index 100% rename from script/deploy-config rename to scripts/deploy-config diff --git a/shared/meta-configs.nix b/shared/meta-configs.nix index 70b7ce5..771a85c 100644 --- a/shared/meta-configs.nix +++ b/shared/meta-configs.nix @@ -3,6 +3,9 @@ { config, pkgs, lib, ... }: +let + flake = builtins.getFlake (toString ./.); +in { # Adopted from https://fnordig.de/til/nix/home-manager-allow-unfree.html, # but we'll also enable it system-wide too. @@ -82,4 +85,10 @@ ]; }; }; + + # Needed since Determinate Nix manages the main config file for system. + environment.etc."nix/nix.custom.conf" = { + source = "${flake}/misc/nix/nix.custom.conf"; + mode = "0644"; + }; }