aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-10-21 00:21:30 -0700
committerMark Nipper <nipsy@bitgnome.net>2024-10-21 00:21:30 -0700
commit2c43679382b40ccdff7eacf3a5dffdacf4dfd43e (patch)
treeda71537dfefa0dd2b60f265a3227d66e57665ede
parentbf1aa621b70c5f5ad1d75d7ffeb836387cf53e00 (diff)
downloadnix-2c43679382b40ccdff7eacf3a5dffdacf4dfd43e.tar
nix-2c43679382b40ccdff7eacf3a5dffdacf4dfd43e.tar.gz
nix-2c43679382b40ccdff7eacf3a5dffdacf4dfd43e.tar.bz2
nix-2c43679382b40ccdff7eacf3a5dffdacf4dfd43e.tar.lz
nix-2c43679382b40ccdff7eacf3a5dffdacf4dfd43e.tar.xz
nix-2c43679382b40ccdff7eacf3a5dffdacf4dfd43e.tar.zst
nix-2c43679382b40ccdff7eacf3a5dffdacf4dfd43e.zip
Attempt to clean up flake
-rw-r--r--flake.nix100
1 files changed, 76 insertions, 24 deletions
diff --git a/flake.nix b/flake.nix
index ef8e092..e263287 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,14 +30,26 @@
};
- outputs = inputs@{ home-manager-stable, home-manager-unstable, nixos-hardware, nixpkgs-stable, nixpkgs-unstable, sops-nix, ... }: rec {
+ outputs = inputs@{ home-manager-stable, home-manager-unstable, nixos-hardware, nixpkgs-stable, nixpkgs-unstable, sops-nix, ... }: {
nixosConfigurations = {
- arrakis = nixpkgs-unstable.lib.nixosSystem {
- pkgs = pkgs-unstable;
- #specialArgs = { inherit inputs; };
+ arrakis = nixpkgs-unstable.lib.nixosSystem rec {
system = "x86_64-linux";
+
+ specialArgs = {
+ pkgs = import nixpkgs-unstable {
+ inherit system;
+ config.allowUnfree = true;
+ overlays = [(import ./pkgs)];
+ };
+
+ pkgs-stable = import nixpkgs-stable {
+ inherit system;
+ config.allowUnfree = true;
+ };
+ };
+
modules = [
./hosts/arrakis
home-manager-unstable.nixosModules.home-manager {
@@ -49,10 +61,22 @@
];
};
- darkstar = nixpkgs-unstable.lib.nixosSystem {
- pkgs = pkgs-unstable;
- #specialArgs = { inherit inputs; };
+ darkstar = nixpkgs-unstable.lib.nixosSystem rec {
system = "x86_64-linux";
+
+ specialArgs = {
+ pkgs = import nixpkgs-unstable {
+ inherit system;
+ config.allowUnfree = true;
+ overlays = [(import ./pkgs)];
+ };
+
+ pkgs-stable = import nixpkgs-stable {
+ inherit system;
+ config.allowUnfree = true;
+ };
+ };
+
modules = [
./hosts/darkstar
home-manager-unstable.nixosModules.home-manager {
@@ -63,10 +87,22 @@
];
};
- ginaz = nixpkgs-unstable.lib.nixosSystem {
- pkgs = pkgs-unstable;
- #specialArgs = { inherit inputs; };
+ ginaz = nixpkgs-unstable.lib.nixosSystem rec {
system = "x86_64-linux";
+
+ specialArgs = {
+ pkgs = import nixpkgs-unstable {
+ inherit system;
+ config.allowUnfree = true;
+ overlays = [(import ./pkgs)];
+ };
+
+ pkgs-stable = import nixpkgs-stable {
+ inherit system;
+ config.allowUnfree = true;
+ };
+ };
+
modules = [
./hosts/ginaz
home-manager-unstable.nixosModules.home-manager {
@@ -79,9 +115,22 @@
];
};
- kaitain = nixpkgs-unstable.lib.nixosSystem {
- pkgs = pkgs-unstable;
+ kaitain = nixpkgs-unstable.lib.nixosSystem rec {
system = "x86_64-linux";
+
+ specialArgs = {
+ pkgs = import nixpkgs-unstable {
+ inherit system;
+ config.allowUnfree = true;
+ overlays = [(import ./pkgs)];
+ };
+
+ pkgs-stable = import nixpkgs-stable {
+ inherit system;
+ config.allowUnfree = true;
+ };
+ };
+
modules = [
./hosts/kaitain
home-manager-unstable.nixosModules.home-manager {
@@ -91,9 +140,22 @@
];
};
- richese = nixpkgs-unstable.lib.nixosSystem {
- pkgs = pkgs-unstable;
+ richese = nixpkgs-unstable.lib.nixosSystem rec {
system = "x86_64-linux";
+
+ specialArgs = {
+ pkgs = import nixpkgs-unstable {
+ inherit system;
+ config.allowUnfree = true;
+ overlays = [(import ./pkgs)];
+ };
+
+ pkgs-stable = import nixpkgs-stable {
+ inherit system;
+ config.allowUnfree = true;
+ };
+ };
+
modules = [
./hosts/richese
home-manager-unstable.nixosModules.home-manager {
@@ -102,19 +164,9 @@
}
];
};
- };
- pkgs-stable = import nixpkgs-stable {
- system = "x86_64-linux";
- config.allowUnfree = true;
- overlays = [(import ./pkgs)];
};
- pkgs-unstable = import nixpkgs-unstable {
- system = "x86_64-linux";
- config.allowUnfree = true;
- overlays = [(import ./pkgs)];
- };
};
}