-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
overhaul modules, move to flake module
- Loading branch information
Showing
8 changed files
with
158 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| { self, inputs, lib, ... }: | ||
|
|
||
| let inherit (builtins) attrValues; | ||
| in { | ||
| flake = let | ||
| realHostNames = [ "bastion" "voyager" "quasar" ]; | ||
|
|
||
| allNixos = import ../nixos; | ||
| allHomeManager = import ../home-manager; | ||
|
|
||
| homeCommon = [ | ||
| inputs.hyprland.homeManagerModules.default | ||
| inputs.sops-nix.homeManagerModules.sops | ||
| inputs.nix-flatpak.homeManagerModules.nix-flatpak | ||
|
|
||
| { | ||
| config = { | ||
| inherit (self.nixCfg) nix; | ||
|
|
||
| _module.args = { inherit realHostNames; }; | ||
| }; | ||
| } | ||
| ] ++ attrValues allHomeManager; | ||
|
|
||
| nixosCommon = [ | ||
| inputs.home-manager.nixosModules.home-manager | ||
| inputs.hyprland.nixosModules.default | ||
| inputs.nh.nixosModules.default | ||
| inputs.nix-flatpak.nixosModules.nix-flatpak | ||
| inputs.solaar.nixosModules.default | ||
| inputs.sops-nix.nixosModules.sops | ||
| inputs.xremap-flake.nixosModules.default | ||
|
|
||
| ../../hosts/common | ||
|
|
||
| { | ||
| config = { | ||
| inherit (self.nixCfg) nix nixpkgs; | ||
|
|
||
| _module.args = { inherit realHostNames; }; | ||
|
|
||
| home-manager = { | ||
| sharedModules = homeCommon; | ||
| useGlobalPkgs = true; | ||
| }; | ||
| }; | ||
| } | ||
| ] ++ attrValues allNixos; | ||
| in { | ||
| nixosModules = { | ||
| common = nixosCommon; | ||
|
|
||
| bastion.imports = [ | ||
| ../../hosts/bastion | ||
|
|
||
| inputs.hardware.nixosModules.common-cpu-amd | ||
| inputs.hardware.nixosModules.common-gpu-amd | ||
| inputs.hardware.nixosModules.common-pc-ssd | ||
|
|
||
| inputs.disko.nixosModules.disko | ||
| ] ++ nixosCommon; | ||
|
|
||
| voyager.imports = [ | ||
| ../../hosts/voyager | ||
|
|
||
| inputs.hardware.nixosModules.dell-xps-15-7590-nvidia | ||
| inputs.hardware.nixosModules.common-cpu-intel-cpu-only | ||
| inputs.hardware.nixosModules.common-gpu-nvidia-nonprime | ||
| inputs.hardware.nixosModules.common-pc-ssd | ||
| ] ++ nixosCommon; | ||
|
|
||
| quasar.imports = [ | ||
| ../../hosts/quasar | ||
|
|
||
| inputs.hardware.nixosModules.common-cpu-intel-cpu-only | ||
| inputs.hardware.nixosModules.common-gpu-nvidia-nonprime | ||
| inputs.hardware.nixosModules.common-pc-ssd | ||
| ] ++ nixosCommon; | ||
| } // allNixos; | ||
|
|
||
| homeManagerModules = { | ||
| common = homeCommon; | ||
|
|
||
| deck.imports = [ ../../home/gabe/deck.nix ] ++ homeCommon; | ||
| } // allNixos; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| { self, inputs, lib, ... }: | ||
|
|
||
| { | ||
| flake = { | ||
| nixCfg = { | ||
| nix = { | ||
| settings = { | ||
| trusted-users = [ "root" "@wheel" "gabe" ]; | ||
| experimental-features = [ "nix-command" "flakes" "repl-flake" ]; | ||
| substituters = [ | ||
| "https://cache.nixos.org" | ||
| "https://nix-community.cachix.org" | ||
| "https://devenv.cachix.org" | ||
| "https://gabedunn.cachix.org" | ||
| "https://hyprland.cachix.org" | ||
| ]; | ||
| trusted-public-keys = [ | ||
| "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" | ||
| "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" | ||
| "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" | ||
| "gabedunn.cachix.org-1:wLWTKadNjpr2Op3rBnDZMUmUEPPIoKG87oY4PmBP8qU=" | ||
| "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" | ||
| ]; | ||
| auto-optimise-store = lib.mkDefault true; | ||
| warn-dirty = false; | ||
| system-features = [ "kvm" "big-parallel" "nixos-test" ]; | ||
| }; | ||
| gc = { | ||
| automatic = true; | ||
| options = "--delete-older-than 5d"; | ||
| }; | ||
|
|
||
| # add each flake input as a registry | ||
| # to make nix3 commands consistent with the flake | ||
| registry = lib.mapAttrs (_: value: { flake = value; }) inputs; | ||
| }; | ||
|
|
||
| nixpkgs = { | ||
| overlays = builtins.attrValues self.overlays; | ||
| config = { | ||
| allowUnfree = true; | ||
| permittedInsecurePackages = [ "electron-25.9.0" ]; | ||
| nvidia.acceptLicense = true; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| perSystem = { config, self', inputs', pkgs, system, ... }: { | ||
| _module.args.pkgs = import inputs.nixpkgs { | ||
| inherit system; | ||
| inherit (self.nixCfg.nixpkgs) config overlays; | ||
| }; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { inputs, pkgs, lib, config, ... }: | ||
| { pkgs, lib, config, ... }: | ||
|
|
||
| let | ||
| inherit (lib) mkIf; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters