From 62df0d1cd424c8e739d8d6bce6211d3b9da59386 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Tue, 30 Jan 2024 12:03:29 +0100
Subject: [PATCH] Refactor a bit by adding globally shared packages in one file

---
 nixos/desktop/configuration.nix         | 20 ++++------------
 nixos/hosts/queen/configuration.nix     | 15 +++---------
 nixos/hosts/wheatley/configuration.nix  |  5 ++++
 nixos/shared/packages/configuration.nix | 31 +++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 28 deletions(-)
 create mode 100644 nixos/shared/packages/configuration.nix

diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix
index fb74b83..ba92d00 100644
--- a/nixos/desktop/configuration.nix
+++ b/nixos/desktop/configuration.nix
@@ -9,7 +9,11 @@
   ...
 }: {
   imports = [
+    # Import locale settings
     ../shared/locale/configuration.nix
+
+    # Import shared packages
+    ../../shared/packages/configuration.nix
   ];
   nixpkgs = {
     # You can add overlays here
@@ -59,23 +63,12 @@
   };
 
   environment.systemPackages = with pkgs; [
-    # Custom tools
-    dvd
-    dvt
-
     # System tools
-    age
-    alejandra
     direnv
     docker
     docker-compose
     git-filter-repo
-    home-manager
-    htop
-    oh-my-zsh
     pciutils
-    rsync
-    wget
     waydroid
     xwaylandvideobridge
     zsh
@@ -92,11 +85,6 @@
     libsForQt5.packagekit-qt
     libportal-qt5
 
-    # System libraries
-    noto-fonts
-    noto-fonts-emoji-blob-bin
-    noto-fonts-emoji
-
     # User tools
     noisetorch
   ];
diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix
index c328563..bdd26b5 100644
--- a/nixos/hosts/queen/configuration.nix
+++ b/nixos/hosts/queen/configuration.nix
@@ -21,6 +21,9 @@
     # Import locale settings
     ../../shared/locale/configuration.nix
 
+    # Import shared packages
+    ../../shared/packages/configuration.nix
+
     #../../server/package-configs/akkoma/configuration.nix
     ../../server/package-configs/forgejo/configuration.nix
     ../../server/package-configs/gotosocial/configuration.nix
@@ -88,12 +91,10 @@
 
   environment.systemPackages = with pkgs; [
     akkoma
-    age
     fzf
     matrix-conduit
     docker
     docker-compose
-    git
     gitea
     gotosocial
     alejandra
@@ -101,22 +102,14 @@
     imagemagick
     ffmpeg
     aria2
-    git-filter-repo
-    home-manager
-    htop
     jellyfin
     jellyfin-web
     jellyfin-ffmpeg
     nextcloud28
     nginx
-    noto-fonts
-    noto-fonts-emoji-blob-bin
-    noto-fonts-emoji
-    oh-my-zsh
     onlyoffice-documentserver
     postgresql_16
     python3
-    rsync
     rabbitmq-server
     roundcube
     roundcubePlugins.contextmenu
@@ -125,8 +118,6 @@
     roundcubePlugins.persistent_login
     roundcubePlugins.thunderbird_labels
     youtube-dl
-    wget
-    zsh
   ];
 
   # Enable networking
diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix
index 047f261..5d26cea 100644
--- a/nixos/hosts/wheatley/configuration.nix
+++ b/nixos/hosts/wheatley/configuration.nix
@@ -14,7 +14,12 @@
 
     ./armv7l.nix
     ./hardware-configuration.nix
+
+    # Import locale settings
     ../../shared/locale/configuration.nix
+
+    # Import shared packages
+    ../../shared/packages/configuration.nix
   ];
 
   boot.loader.generic-extlinux-compatible.enable = true;
diff --git a/nixos/shared/packages/configuration.nix b/nixos/shared/packages/configuration.nix
new file mode 100644
index 0000000..376e607
--- /dev/null
+++ b/nixos/shared/packages/configuration.nix
@@ -0,0 +1,31 @@
+{
+  inputs,
+  outputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    # Custom tools
+    dvd
+    dvt
+
+    # System tools
+    age
+    git
+    git-filter-repo
+    home-manager
+    htop
+    neofetch
+    oh-my-zsh
+    rsync
+    wget
+    zsh
+
+    # System libraries
+    noto-fonts
+    noto-fonts-emoji-blob-bin
+    noto-fonts-emoji
+  ];
+}