From f00f85074b076f1f75688cfea755817e4f4f64fe Mon Sep 17 00:00:00 2001
From: SebastianStork <git@sstork.dev>
Date: Thu, 5 Feb 2026 21:02:47 +0100
Subject: [PATCH] Concentrate all dev shells in one file

---
 flake-parts/dev-shells.nix                | 44 +++++++++++++++++++++++
 flake-parts/nebula.nix                    | 20 -----------
 flake-parts/{sops.nix => sops-config.nix} | 29 +--------------
 3 files changed, 45 insertions(+), 48 deletions(-)
 create mode 100644 flake-parts/dev-shells.nix
 delete mode 100644 flake-parts/nebula.nix
 rename flake-parts/{sops.nix => sops-config.nix} (64%)

diff --git a/flake-parts/dev-shells.nix b/flake-parts/dev-shells.nix
new file mode 100644
index 0000000..6d8ac6a
--- /dev/null
+++ b/flake-parts/dev-shells.nix
@@ -0,0 +1,44 @@
+_: {
+  perSystem =
+    { self', pkgs, ... }:
+    {
+      devShells = {
+        sops = pkgs.mkShellNoCC {
+          packages = [
+            pkgs.sops
+            pkgs.age
+            pkgs.ssh-to-age
+            pkgs.bitwarden-cli
+          ];
+
+          shellHook = ''
+            if ! declare -px BW_SESSION >/dev/null 2>&1; then
+              BW_SESSION="$(bw unlock --raw || bw login --raw)"
+              export BW_SESSION
+            fi
+            if ! declare -px SOPS_AGE_KEY >/dev/null 2>&1; then
+              SOPS_AGE_KEY="$(bw get notes 'admin age-key')"
+              export SOPS_AGE_KEY
+            fi
+            SOPS_CONFIG="${self'.packages.sops-config}"
+            export SOPS_CONFIG
+          '';
+        };
+
+        nebula = pkgs.mkShellNoCC {
+          packages = [
+            pkgs.nebula
+            pkgs.bitwarden-cli
+            self'.packages.nebula-regen-host-cert
+          ];
+
+          shellHook = ''
+            if ! declare -px BW_SESSION >/dev/null 2>&1; then
+              BW_SESSION="$(bw unlock --raw || bw login --raw)"
+              export BW_SESSION
+            fi
+          '';
+        };
+      };
+    };
+}
diff --git a/flake-parts/nebula.nix b/flake-parts/nebula.nix
deleted file mode 100644
index b1b9791..0000000
--- a/flake-parts/nebula.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-_: {
-  perSystem =
-    { self', pkgs, ... }:
-    {
-      devShells.nebula = pkgs.mkShellNoCC {
-        packages = [
-          pkgs.nebula
-          pkgs.bitwarden-cli
-          self'.packages.nebula-regen-host-cert
-        ];
-
-        shellHook = ''
-          if ! declare -px BW_SESSION >/dev/null 2>&1; then
-            BW_SESSION="$(bw unlock --raw || bw login --raw)"
-            export BW_SESSION
-          fi
-        '';
-      };
-    };
-}
diff --git a/flake-parts/sops.nix b/flake-parts/sops-config.nix
similarity index 64%
rename from flake-parts/sops.nix
rename to flake-parts/sops-config.nix
index 2022158..1d9f167 100644
--- a/flake-parts/sops.nix
+++ b/flake-parts/sops-config.nix
@@ -1,12 +1,7 @@
 { self, ... }:
 {
   perSystem =
-    {
-      self',
-      pkgs,
-      lib,
-      ...
-    }:
+    { pkgs, lib, ... }:
     {
       packages.sops-config =
         let
@@ -42,27 +37,5 @@
         pkgs.runCommand "sops.yaml" { buildInputs = [ pkgs.yj ]; } ''
           echo '${jsonConfig}' | yj -jy > $out
         '';
-
-      devShells.sops = pkgs.mkShellNoCC {
-        packages = [
-          pkgs.sops
-          pkgs.age
-          pkgs.ssh-to-age
-        ];
-
-        nativeBuildInputs = [ pkgs.bitwarden-cli ];
-        shellHook = ''
-          if ! declare -px BW_SESSION >/dev/null 2>&1; then
-            BW_SESSION="$(bw unlock --raw || bw login --raw)"
-            export BW_SESSION
-          fi
-          if ! declare -px SOPS_AGE_KEY >/dev/null 2>&1; then
-            SOPS_AGE_KEY="$(bw get notes 'admin age-key')"
-            export SOPS_AGE_KEY
-          fi
-          SOPS_CONFIG="${self'.packages.sops-config}"
-          export SOPS_CONFIG
-        '';
-      };
     };
 }