aboutsummaryrefslogtreecommitdiffstats
path: root/flake/nixosConfigurations
diff options
context:
space:
mode:
authorene <ene@sils.li>2023-02-20 11:00:57 +0100
committerene <ene@sils.li>2023-02-20 11:00:57 +0100
commita6221cee0d570de1d7e23cab4e06c85584ef50f6 (patch)
tree6d59d313ea2c945755dc08a8fc70c183db46fc14 /flake/nixosConfigurations
parentFix(flake): Rebase to a good base (diff)
downloadnixos-config-a6221cee0d570de1d7e23cab4e06c85584ef50f6.zip
Feat(flake): Move the nixosConfigurations to a file
Diffstat (limited to 'flake/nixosConfigurations')
-rw-r--r--flake/nixosConfigurations/default.nix107
1 files changed, 39 insertions, 68 deletions
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index e5aa8020..562222b7 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -1,78 +1,49 @@
-# vim: ts=2
{
- system,
inputs,
+ system,
+ pkgs,
+ sysLib,
...
-}: let
- sysLib = import ../../lib {
- inherit pkgs;
- inherit (inputs) shell-library;
- };
- lib = inputs.nixpkgs.lib.extend (_: _: {
- inherit (sysLib) makeShellScriptWithLibrary;
- });
-
- inherit (inputs.nixpkgs.lib) nixosSystem;
-
- pkgs = import inputs.nixpkgs {
+}: {
+ tiamat = inputs.nixpkgs.lib.nixosSystem {
inherit system;
- config = {
- allowUnfreePredicate = pkg:
- builtins.elem (lib.getName pkg) [
- "steam"
- "steam-original"
- ];
- };
- };
- homeManagerConfig = {
- home-manager = {
- useGlobalPkgs = true;
- useUserPackages = true;
- users.soispha = import ./home-manager;
- extraSpecialArgs = {
- inherit pkgs;
- inherit
- (inputs)
- user_js
- system
- neovim_config
- impermanence
- snap-sync
- ;
- };
- };
- };
- defaultModules = [
- inputs.agenix.nixosModules.default
+ specialArgs =
+ pkgs.lib.recursiveUpdate inputs
+ sysLib;
+ modules = [
+ ../../hosts/tiamat/configuration.nix
+ inputs.agenix.nixosModules.default
- inputs.home-manager.nixosModules.home-manager
- homeManagerConfig
- ];
-in {
- # full systems
- tiamat = nixosSystem {
- inherit system;
- specialArgs = {inherit inputs pkgs;};
- modules =
- [
- ./hosts/tiamat/configuration.nix
- ]
- ++ defaultModules;
- };
- mammun = nixosSystem {
- inherit system;
- specialArgs = {inherit inputs pkgs;};
- modules =
- [
- ./hosts/mammun/configuration.nix
- ]
- ++ defaultModules;
+ inputs.home-manager.nixosModules.home-manager
+ {
+ home-manager = {
+ useGlobalPkgs = true;
+ useUserPackages = true;
+ users.soispha = import ../../home-manager;
+ extraSpecialArgs = {
+ inherit
+ pkgs
+ sysLib
+ ;
+
+ inherit
+ (inputs)
+ strip_js_comments
+ user_js
+ system
+ neovim_config
+ impermanence
+ snap-sync
+ ;
+ };
+ };
+ }
+ ];
};
- # minimal ones
- spawn = nixosSystem {
- inherit system;
+# mammun = self.outputs.nixosConfigurations.tiamat;
+ spawn = inputs.nixpkgs.lib.nixosSystem {
specialArgs = inputs;
- modules = [./hosts/spawn/configuration.nix];
+ modules = [../../hosts/spawn/configuration.nix];
};
}