From d8f1a22cb4840e744588943c9e6e50fcc112d92c Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Mon, 5 Feb 2024 21:05:01 +0100
Subject: [PATCH] Move common packages from home-manager to nixos

For some admin packages it makes more sense to have them available to all
systems and users.
---
 home-manager/modules/common/default.nix             | 12 ------------
 .../modules/services/desktop-base/default.nix       |  3 ---
 home-manager/profiles/management.nix                |  2 +-
 home-manager/profiles/work-wsl.nix                  | 13 ++++++++++---
 modules/misc/common/default.nix                     |  7 +++++++
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/home-manager/modules/common/default.nix b/home-manager/modules/common/default.nix
index 2b05833..a2cc76d 100644
--- a/home-manager/modules/common/default.nix
+++ b/home-manager/modules/common/default.nix
@@ -76,17 +76,5 @@
       ls = "ls -lhF";
       btm = "btm --color default-light";
     };
-    packages = with pkgs; [
-      bottom
-      git
-      highlight
-      killall
-      ncdu
-      unstable.nixfmt-rfc-style
-      nmon
-      tree
-      unzip
-      wget
-    ];
   };
 }
diff --git a/home-manager/modules/services/desktop-base/default.nix b/home-manager/modules/services/desktop-base/default.nix
index a125eda..a892b0a 100644
--- a/home-manager/modules/services/desktop-base/default.nix
+++ b/home-manager/modules/services/desktop-base/default.nix
@@ -35,12 +35,9 @@ in
       };
     };
     home.packages = with pkgs; [
-      docker-compose
       meld
       nitrogen
       libreoffice-fresh
-      nodePackages.prettier # formatting files
-      nodePackages.prettier-plugin-toml
       remmina
     ];
     # raw config files
diff --git a/home-manager/profiles/management.nix b/home-manager/profiles/management.nix
index f4b14a6..f155d26 100644
--- a/home-manager/profiles/management.nix
+++ b/home-manager/profiles/management.nix
@@ -6,8 +6,8 @@
     packages = with pkgs; [
       docker-compose
       exercism
+      git
       nodePackages.prettier # formatting files
-      xclip
     ];
     shellAliases = {
       unlock-luks = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o User=root";
diff --git a/home-manager/profiles/work-wsl.nix b/home-manager/profiles/work-wsl.nix
index 83f7382..68f6958 100644
--- a/home-manager/profiles/work-wsl.nix
+++ b/home-manager/profiles/work-wsl.nix
@@ -22,11 +22,18 @@
       PATH = "$PATH:$HOME/.local/bin";
     };
     packages = with pkgs; [
-      keychain
-      unstable.nixfmt-rfc-style
-      mosh
+      bottom
       gyre-fonts
+      highlight
+      keychain
+      killall
+      mosh
+      ncdu
+      nmon
       source-code-pro
+      tree
+      unzip
+      wget
     ];
   };
   nix = {
diff --git a/modules/misc/common/default.nix b/modules/misc/common/default.nix
index 251f81d..478ce88 100644
--- a/modules/misc/common/default.nix
+++ b/modules/misc/common/default.nix
@@ -81,8 +81,15 @@
     };
     systemPackages = [
       pkgs.bottom
+      pkgs.highlight
+      pkgs.killall
       pkgs.man-pages
+      pkgs.ncdu
+      pkgs.nmon
+      pkgs.tree
+      pkgs.unzip
       pkgs.vim
+      pkgs.wget
     ];
   };
   # Disable the root user