diff --git a/common/global/nix.nix b/common/global/nix.nix index 77780ee..eb822c1 100644 --- a/common/global/nix.nix +++ b/common/global/nix.nix @@ -15,17 +15,14 @@ in ]; trusted-substituters = [ "https://cache.nixos.org" - "https://cache.tmmworkshop.com" "https://nix-community.cachix.org" ]; substituters = [ "https://cache.nixos.org/?priority=2&want-mass-query=true" - "https://cache.tmmworkshop.com/?priority=2&want-mass-query=true" "https://nix-community.cachix.org/?priority=10&want-mass-query=true" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; auto-optimise-store = lib.mkDefault true; diff --git a/common/optional/tmmworkshop_cache.nix b/common/optional/tmmworkshop_cache.nix new file mode 100644 index 0000000..f5b5a63 --- /dev/null +++ b/common/optional/tmmworkshop_cache.nix @@ -0,0 +1,7 @@ +{ + nix.settings = { + trusted-substituters = [ "http://cache.tmmworkshop.com" ]; + substituters = [ "http://cache.tmmworkshop.com/?priority=1&want-mass-query=true" ]; + trusted-public-keys = [ "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA=" ]; + }; +} diff --git a/flake.nix b/flake.nix index afbf2ff..531100c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,10 @@ nixConfig = { extra-substituters = [ "https://cache.nixos.org/?priority=2&want-mass-query=true" - "https://cache.tmmworkshop.com/?priority=2&want-mass-query=true" "https://nix-community.cachix.org/?priority=10&want-mass-query=true" ]; extra-trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" # cspell:disable-line - "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA=" # cspell:disable-line "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # cspell:disable-line "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU=" # cspell:disable-line ]; diff --git a/users/richie/home/cli/zsh.nix b/users/richie/home/cli/zsh.nix index 4b6a5e9..32246b3 100644 --- a/users/richie/home/cli/zsh.nix +++ b/users/richie/home/cli/zsh.nix @@ -25,6 +25,7 @@ "rspace" = "'for f in *\ *; do mv \"$f\" \"\${f// /_}\"; done'"; "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/dotfiles#$HOST"; + "rebuild_backup" = "sudo nixos-rebuild switch --flake /home/richie/dotfiles#$HOST --option substituters 'https://nix-community.cachix.org' --option trusted-public-keys 'cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY='"; "nix-test" = "nixos-rebuild test --flake /home/richie/dotfiles"; }; };