From 5eb25c3a6d2217bbc3b0303c1db90b4559d8142a Mon Sep 17 00:00:00 2001 From: Soispha Date: Wed, 28 Jun 2023 10:43:05 +0200 Subject: Feat(disko): Squash Commit --- flake/default.nix | 20 ++++++++++++-------- flake/nixosConfigurations/default.nix | 8 +++++++- 2 files changed, 19 insertions(+), 9 deletions(-) (limited to 'flake') diff --git a/flake/default.nix b/flake/default.nix index 6a3622a1..6e70428b 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -12,6 +12,7 @@ agenix, ragenix, serverphone, + disko, # external dependencies neovim_config, user_js, @@ -38,10 +39,10 @@ pkgs sysLib # extra information - + system # bins - + video_pause yambar_cpu yambar_memory @@ -51,12 +52,12 @@ shell_library flake_update # external deps - + user_js neovim_config snap-sync # modules - + impermanence ; }; @@ -70,6 +71,8 @@ serverphone.nixosModules.default + disko.nixosModules.default + home-manager.nixosModules.home-manager homeManagerConfig @@ -89,11 +92,11 @@ in { nixpkgs sysLib # configs - + defaultModules defaultSpecialArgs # bins - + video_pause yambar_cpu yambar_memory @@ -103,17 +106,18 @@ in { shell_library flake_update # external deps - + user_js neovim_config snap-sync templates # modules - + impermanence home-manager agenix serverphone + disko ; }; packages."${system}" = import ./packages { diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index d8667673..e521a5ab 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -25,6 +25,7 @@ home-manager, agenix, serverphone, + disko, ... }: let generateHost = name: { @@ -39,7 +40,12 @@ ++ defaultModules; }; }; - hosts = ["tiamat" "mammun" "apzu" "lahmu"]; + hosts = [ + "tiamat" + #"mammun" + "apzu" + #"lahmu" + ]; generatedHosts = builtins.listToAttrs (builtins.map generateHost hosts); in generatedHosts -- cgit 1.4.1