refactor(flake): actually make use of the asterisms

airone01 · Dec 5, 2024 · ed0d7ab · ed0d7ab
1 parent f5aa1db
commit ed0d7ab
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 127 deletions.
diff --git a/asterisms/base.nix b/asterisms/base.nix
@@ -0,0 +1,20 @@
+{stars, ...}: {
+  # Imports for the base asterism (profile)
+  imports = with stars; [
+    # Network core
+    core-direnv
+    core-sops
+    core-unfree
+
+    # Dev core
+    dev-core
+    dev-garnix
+
+    # Hardware settings
+    hard-graphics
+    hard-nvidia
+
+    # airone01-specific
+    r1-git
+  ];
+}
diff --git a/asterisms/default.nix b/asterisms/default.nix
diff --git a/asterisms/desktop.nix b/asterisms/desktop.nix
@@ -0,0 +1,32 @@
+{stars, ...}: {
+  imports = with stars; [
+    # Asterism-unspecific stuff
+    ./base.nix
+
+    # CLI tools/apps
+    cli-btop
+    cli-eza
+    cli-nvim
+    cli-oh-my-posh
+    cli-zellij
+    cli-zsh
+
+    # GUI tools/apps
+    gui-cursor
+    gui-gnome
+    gui-kitty
+    gui-firefox
+    gui-steam
+
+    # Core components
+    core-docker
+    core-font
+    core-gh
+    core-pipewire
+
+    # Networking
+    net-network-manager
+
+    #dev-rust # TODO: Move to direnv
+  ];
+}
diff --git a/asterisms/server.nix b/asterisms/server.nix
@@ -0,0 +1,15 @@
+{stars, ...}: {
+  imports = with stars; [
+    # Asterism-unspecific stuff
+    ./base.nix
+
+    # CLI tools/apps
+    cli-btop
+    cli-eza
+    cli-zellij
+    cli-zsh
+
+    # Core components
+    core-gh
+  ];
+}
diff --git a/constellations/cassiopeia/configuration.nix b/constellations/cassiopeia/configuration.nix
@@ -10,38 +10,13 @@
   time.timeZone = "Europe/Paris";
 
   imports = with stars; [
+    ../../asterisms/desktop.nix
+
     boot-plymouth
-    cli-btop
-    cli-eza
-    cli-nvim
-    cli-oh-my-posh
-    cli-zellij
-    cli-zsh
-    core-direnv
-    core-docker
-    core-font
-    core-gh
-    core-pipewire
-    core-sops
-    core-unfree
-    dev-core
-    dev-garnix
-    dev-rust
-    gui-cursor # cannot allow unfree since pkgs is passed to NixOS, hence not available yet.
-    #   See https://discourse.nixos.org/t/allowunfree-doesnt-work-with-flake-managed-system/21798/4
-    #   See https://github.com/NixOS/nixpkgs/issues/191910
-    gui-gnome
-    gui-kitty
-    gui-firefox
-    #gui-schizofox
-    gui-steam
-    hard-graphics
-    hard-nvidia
     kbd-fr
-    net-network-manager
-    r1-git
   ];
 
+  # TODO: move that to its own star, and handle secrets with sops
   home-manager.users.${config.stars.mainUser}.home.packages = with pkgs; [mullvad-vpn];
   services.mullvad-vpn.enable = true;
 }
diff --git a/constellations/cetus/configuration.nix b/constellations/cetus/configuration.nix
@@ -5,18 +5,6 @@
   time.timeZone = "Europe/Paris";
 
   imports = with stars; [
-    cli-btop
-    cli-eza
-    cli-oh-my-posh
-    cli-zellij
-    cli-zsh
-    core-docker
-    core-font
-    core-gh
-    core-sops
-    core-unfree
-    dev-core
-    dev-garnix
-    r1-git
+    ../../asterisms/server.nix
   ];
 }
diff --git a/constellations/hercules/configuration.nix b/constellations/hercules/configuration.nix
@@ -5,19 +5,8 @@
   time.timeZone = "Europe/Paris";
 
   imports = with stars; [
-    cli-btop
-    cli-eza
-    cli-oh-my-posh
-    cli-zellij
-    cli-zsh
-    core-docker
-    core-font
-    core-gh
-    core-sops
-    core-unfree
-    dev-core
-    dev-garnix
-    r1-git
+    ../../asterisms/server.nix
+
     srv-hydra
     srv-gitea
     srv-traefik

diff --git a/constellations/ursamajor/configuration.nix b/constellations/ursamajor/configuration.nix
@@ -1,5 +1,4 @@
 _: {
-  # hostname
   networking.hostName = "ursamajor";
   stars.mainUser = "nixos";