genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 01:17:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add nixpkgs-terraform, remove flox

Browse source
This commit is contained in:
Gene Liverman 2024-05-20 11:22:01 -04:00
parent 6007a1aa53
commit 0f43327044
6 changed files with 91 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

31
flake.nix
View file

@ -36,10 +36,10 @@
inputs.nixpkgs.follows ="nixpkgs";
};
flox-flake = {
url = "github:flox/flox";
# Setting the line below seems to break things... :(
# inputs.nixpkgs.follows ="nixpkgs";
nixpkgs-terraform = {
url = "github:stackbuilders/nixpkgs-terraform";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
};
compose2nix = {
@ -55,7 +55,7 @@
};
}; # end inputs
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, nix-homebrew, nix-flatpak, disko, sops-nix, compose2nix, flox-flake, genebean-omp-themes, ... }: let
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, nix-homebrew, nix-flatpak, disko, sops-nix, nixpkgs-terraform, compose2nix, genebean-omp-themes, ... }: let
# creates a macOS system config
darwinHostConfig = system: hostname: username: nix-darwin.lib.darwinSystem {
@ -65,8 +65,9 @@
allowUnfree = true;
permittedInsecurePackages = [ "python-2.7.18.7" ];
};
overlays = [ nixpkgs-terraform.overlays.default ];
};
specialArgs = { inherit inputs username hostname flox-flake; };
specialArgs = { inherit inputs username hostname; };
modules = [
nix-homebrew.darwinModules.nix-homebrew {
nix-homebrew = {
@ -95,20 +96,14 @@
# creates a nixos system config
nixosHostConfig = system: hostname: username: nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs username hostname compose2nix flox-flake;
specialArgs = { inherit inputs username hostname compose2nix;
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
overlays = [ nixpkgs-terraform.overlays.default ];
};
};
modules = [
@ -141,13 +136,7 @@
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
overlays = [ nixpkgs-terraform.overlays.default ];
};
};
modules = [