aboutsummaryrefslogtreecommitdiffstats
path: root/flake
diff options
context:
space:
mode:
authorSoispha <soispha@vhack.eu>2023-06-28 10:43:05 +0200
committerSoispha <soispha@vhack.eu>2023-07-10 16:44:09 +0200
commit5eb25c3a6d2217bbc3b0303c1db90b4559d8142a (patch)
tree2e441df85dcfac1ac1be8c762d177923bd757d58 /flake
parentFeat(flake): Add disko module (diff)
downloadnixos-config-5eb25c3a6d2217bbc3b0303c1db90b4559d8142a.zip
Feat(disko): Squash Commit
Diffstat (limited to '')
-rw-r--r--flake.nix8
-rw-r--r--flake/default.nix20
-rw-r--r--flake/nixosConfigurations/default.nix8
3 files changed, 24 insertions, 12 deletions
diff --git a/flake.nix b/flake.nix
index 2d42d25d..bc360e74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -213,6 +213,7 @@
agenix,
ragenix,
serverphone,
+ disko,
# external dependencies
neovim_config,
user_js,
@@ -245,21 +246,22 @@
sysLib
nixpkgs
# modules
-
+
home-manager
nixos-generators
impermanence
agenix
ragenix
serverphone
+ disko
# external dependencies
-
+
neovim_config
user_js
snap-sync
templates
# my binaries
-
+
video_pause
strip_js_comments
generate_firefox_extensions
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