diff --git a/flake.nix b/flake.nix index 629be47..a2b6ca1 100644 --- a/flake.nix +++ b/flake.nix @@ -56,11 +56,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs-terraform = { - url = "github:stackbuilders/nixpkgs-terraform"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - simple-nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; inputs.nixpkgs-25_05.follows = "nixpkgs"; @@ -86,7 +81,6 @@ allowUnfree = true; permittedInsecurePackages = [ "olm-3.2.16" "electron-21.4.4" ]; }; - overlays = [ inputs.nixpkgs-terraform.overlays.default ]; }; } // additionalSpecialArgs; modules = [ diff --git a/lib/nixpkgs-settings.nix b/lib/nixpkgs-settings.nix index e1dd13e..6255854 100644 --- a/lib/nixpkgs-settings.nix +++ b/lib/nixpkgs-settings.nix @@ -8,6 +8,5 @@ "python3.12-ecdsa-0.19.1" ]; }; - overlays = [ inputs.nixpkgs-terraform.overlays.default ]; }; } diff --git a/modules/hosts/darwin/default.nix b/modules/hosts/darwin/default.nix index 41076ed..7f3e7e5 100644 --- a/modules/hosts/darwin/default.nix +++ b/modules/hosts/darwin/default.nix @@ -107,13 +107,11 @@ "https://cache.nixos.org" # default one "https://cache.flox.dev" "https://cache.thalheim.io" - "https://nixpkgs-terraform.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" # default one "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" "cache.thalheim.io-1:R7msbosLEZKrxk/lKxf9BTjOOH7Ax3H0Qj0/6wiHOgc=" - "nixpkgs-terraform.cachix.org-1:8Sit092rIdAVENA3ZVeH9hzSiqI/jng6JiCrQ1Dmusw=" ]; trusted-users = [ "@admin" "${username}" ]; }; diff --git a/modules/hosts/darwin/mightymac/default.nix b/modules/hosts/darwin/mightymac/default.nix index f70a9a1..6e8afac 100644 --- a/modules/hosts/darwin/mightymac/default.nix +++ b/modules/hosts/darwin/mightymac/default.nix @@ -11,7 +11,6 @@ #reposurgeon # Nix is a major version behind brew rpiboot step-cli - # terraform-versions."1.5.7" terraformer ]; }; diff --git a/modules/hosts/nixos/default.nix b/modules/hosts/nixos/default.nix index f7a0465..0e53261 100644 --- a/modules/hosts/nixos/default.nix +++ b/modules/hosts/nixos/default.nix @@ -53,14 +53,12 @@ "https://cache.flox.dev" "https://cache.thalheim.io" "https://cosmic.cachix.org/" - "https://nixpkgs-terraform.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" # default one "cache.thalheim.io-1:R7msbosLEZKrxk/lKxf9BTjOOH7Ax3H0Qj0/6wiHOgc=" "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" - "nixpkgs-terraform.cachix.org-1:8Sit092rIdAVENA3ZVeH9hzSiqI/jng6JiCrQ1Dmusw=" ]; trusted-users = [ "${username}" ]; };