From e7d3ef035a8cd5d38b1b6c8e4a230578203a7d7d Mon Sep 17 00:00:00 2001
From: Jeremy Stucki <dev@jeremystucki.ch>
Date: Wed, 27 Mar 2024 18:56:11 +0100
Subject: [PATCH] Some cleanup

---
 common/nixos-home-manager.nix              |  6 ++++++
 common/nixos.nix                           |  5 +----
 components/android.nix                     |  9 +++++++++
 components/cli.nix                         |  3 ---
 components/cpp.nix                         |  3 ++-
 components/{postgres.nix => databases.nix} |  6 ++++++
 components/dotnet.nix                      | 16 ++++++++--------
 components/jetbrains.nix                   | 10 ----------
 components/{node.nix => web.nix}           |  2 ++
 volt/common-home-manager.nix               |  2 --
 zephyr/common-home-manager.nix             |  2 --
 zephyr/home-manager.nix                    |  2 --
 12 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 components/android.nix
 rename components/{postgres.nix => databases.nix} (68%)
 delete mode 100644 components/jetbrains.nix
 rename components/{node.nix => web.nix} (62%)

diff --git a/common/nixos-home-manager.nix b/common/nixos-home-manager.nix
index 84333f5..ca400c5 100644
--- a/common/nixos-home-manager.nix
+++ b/common/nixos-home-manager.nix
@@ -4,6 +4,12 @@ let
   publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9keparNqpev2qrDO3cAiDzyTUsAAN9Mh+JLbOsdiZs";
 in
 {
+  imports = map (x: ../components + x) [
+    /android.nix
+    /databases.nix
+    /web.nix
+  ];
+
   programs.git.extraConfig = {
     commit.gpgsign = true;
     user.signingkey = publicKey;
diff --git a/common/nixos.nix b/common/nixos.nix
index efbf11e..125af64 100644
--- a/common/nixos.nix
+++ b/common/nixos.nix
@@ -62,12 +62,9 @@
       etcher
       firefox
       killall
-      nodejs
-      nodePackages.pnpm
       nvd
-      pkgs-unstable.android-studio
       pkgs-unstable.discord
-      pkgs-unstable.jetbrains.rider
+      pkgs-unstable.jetbrains.datagrip
       ruby
       screen
       slack
diff --git a/components/android.nix b/components/android.nix
new file mode 100644
index 0000000..425f5ba
--- /dev/null
+++ b/components/android.nix
@@ -0,0 +1,9 @@
+
+{ pkgs, pkgs-unstable, ... }:
+
+{
+  home.packages = with pkgs; [
+    android-tools
+    pkgs-unstable.android-studio
+  ];
+}
diff --git a/components/cli.nix b/components/cli.nix
index 6847f70..46191a0 100644
--- a/components/cli.nix
+++ b/components/cli.nix
@@ -2,7 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    android-tools
     asciinema
     bat
     caddy
@@ -20,10 +19,8 @@
     ocrmypdf
     pdftk
     pkgs-unstable.nixfmt-rfc-style
-    postgresql
     ranger
     ripgrep
-    sqlite
     tesseract
     tokei
     units
diff --git a/components/cpp.nix b/components/cpp.nix
index a02e68d..c63e52b 100644
--- a/components/cpp.nix
+++ b/components/cpp.nix
@@ -2,8 +2,9 @@
 
 {
   home.packages = with pkgs; [
-    cmake
     clang
+    cmake
+    jetbrains.clion
   ];
 
   programs.vscode.extensions = with pkgs.vscode-extensions; [
diff --git a/components/postgres.nix b/components/databases.nix
similarity index 68%
rename from components/postgres.nix
rename to components/databases.nix
index 4114236..2918c7a 100644
--- a/components/postgres.nix
+++ b/components/databases.nix
@@ -1,6 +1,12 @@
 { pkgs, ... }:
 
 {
+  home.packages = with pkgs; [
+    postgresql
+    sqlite
+    jetbrains.datagrip
+  ];
+
   home.file.".psqlrc".text = ''
     \set ON_ERROR_ROLLBACK interactive
     \set COMP_KEYWORD_CASE upper
diff --git a/components/dotnet.nix b/components/dotnet.nix
index 830fc39..d8a3477 100644
--- a/components/dotnet.nix
+++ b/components/dotnet.nix
@@ -1,18 +1,18 @@
 { pkgs, pkgs-unstable, ... }:
 
 {
-  home.packages = [
-    (
-      with pkgs;
-      with dotnetCorePackages;
-      combinePackages [
+  home.packages =
+    with pkgs;
+    with dotnetCorePackages;
+    [
+      (combinePackages [
         dotnet-sdk_6
         dotnet-aspnetcore_6
         dotnet-sdk_7
         dotnet-aspnetcore_7
         pkgs-unstable.dotnet-sdk_8
         pkgs-unstable.dotnet-aspnetcore_8
-      ]
-    )
-  ];
+      ])
+      pkgs-unstable.jetbrains.rider
+    ];
 }
diff --git a/components/jetbrains.nix b/components/jetbrains.nix
deleted file mode 100644
index afb8f06..0000000
--- a/components/jetbrains.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs.jetbrains; [
-    clion
-    datagrip
-    idea-ultimate
-    webstorm
-  ];
-}
diff --git a/components/node.nix b/components/web.nix
similarity index 62%
rename from components/node.nix
rename to components/web.nix
index fad13ea..a02dc8a 100644
--- a/components/node.nix
+++ b/components/web.nix
@@ -4,5 +4,7 @@
   home.packages = with pkgs; [
     nodejs
     yarn
+    nodePackages.pnpm
+    jetbrains.webstorm
   ];
 }
diff --git a/volt/common-home-manager.nix b/volt/common-home-manager.nix
index 961a006..2fdc537 100644
--- a/volt/common-home-manager.nix
+++ b/volt/common-home-manager.nix
@@ -10,8 +10,6 @@
     /git.nix
     #    /gnome.nix
     /haskell.nix
-    /jetbrains.nix
-    /postgres.nix
     /tex.nix
     /tmux.nix
     /typst.nix
diff --git a/zephyr/common-home-manager.nix b/zephyr/common-home-manager.nix
index 3a19a73..06f1ba4 100644
--- a/zephyr/common-home-manager.nix
+++ b/zephyr/common-home-manager.nix
@@ -10,8 +10,6 @@
     /git.nix
     #    /gnome.nix
     /haskell.nix
-    /jetbrains.nix
-    /postgres.nix
     /tex.nix
     /tmux.nix
     /typst.nix
diff --git a/zephyr/home-manager.nix b/zephyr/home-manager.nix
index c22b4a0..b6f9c47 100644
--- a/zephyr/home-manager.nix
+++ b/zephyr/home-manager.nix
@@ -12,8 +12,6 @@
     /git.nix
     /gnome.nix
     /haskell.nix
-    /jetbrains.nix
-    /node.nix
     /tex.nix
     /tmux.nix
     /typst.nix