From 4bfcb5dacd384507162e3b100a56f49688f93d11 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:59:30 +0100
Subject: [PATCH] move packages to own module

---
 modules/graphical/basics.nix         | 35 ++++++++++++++++++++++++++++
 modules/graphical/default.nix        |  1 +
 modules/graphical/games.nix          |  4 ++--
 modules/graphical/shared.nix         | 22 -----------------
 systems/amd-server/configuration.nix |  2 ++
 systems/pc/configuration.nix         |  1 +
 6 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 modules/graphical/basics.nix

diff --git a/modules/graphical/basics.nix b/modules/graphical/basics.nix
new file mode 100644
index 0000000..40c5523
--- /dev/null
+++ b/modules/graphical/basics.nix
@@ -0,0 +1,35 @@
+{ config, pkgs, inputs, lib, ... }:
+with lib;
+let cfg = config.custom.graphical.basics;
+in {
+  options.custom.graphical.basics = {
+    enable = mkEnableOption "Enables basics";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      keepassxc
+      discord
+      gvfs
+      remmina
+      thunderbird
+      localsend
+      #element-desktop
+      krita
+      libreoffice
+      #anki TODO broken because pyqt6 build fails
+      p7zip
+      qbittorrent
+      brightnessctl
+      #wacomtablet
+      pinta # paint
+      #qalculate-qt # calculator TODO build broken
+      #libsForQt5.kcalc
+        #syncthingtray #doesnt work with socket yet
+      v4l-utils
+      logseq # notes
+      ani-cli
+      mangal
+    ];
+  };
+}
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index c6bf4a2..506363d 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -26,5 +26,6 @@
     ./shared.nix
     ./nightlight.nix
     ./xfce.nix
+    ./basics.nix
   ];
 }
diff --git a/modules/graphical/games.nix b/modules/graphical/games.nix
index d626618..56d68cd 100644
--- a/modules/graphical/games.nix
+++ b/modules/graphical/games.nix
@@ -19,8 +19,8 @@ in {
     };
     environment.systemPackages = [ pkgs.mangohud ]
       ++ optionals cfg.enablePreinstalled (with pkgs; [
-        taisei
-        osu-lazer-bin
+        #taisei
+        #osu-lazer-bin
         wineWowPackages.unstableFull
         winetricks
         lutris
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index 7fdf689..7123d6b 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -64,31 +64,9 @@ in {
     # $ nix search wget
     environment.systemPackages = with pkgs; [
       keepassxc
-      discord
-        #vesktop
-      gvfs
-      remmina
-      thunderbird
-      localsend
-      #element-desktop
-      krita
-      libreoffice
       screenshot
-      #anki TODO broken because pyqt6 build fails
-      p7zip
-      qbittorrent
-      brightnessctl
-      #wacomtablet
       wl-clipboard
-      pinta # paint
-      #qalculate-qt # calculator TODO build broken
-      #libsForQt5.kcalc
-        #syncthingtray #doesnt work with socket yet
-      v4l-utils
-      logseq # notes
       xarchiver # archive tool
-      ani-cli
-      mangal
       adwaita-icon-theme
     ];
   };
diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix
index 098d240..ff6f66e 100644
--- a/systems/amd-server/configuration.nix
+++ b/systems/amd-server/configuration.nix
@@ -34,6 +34,8 @@
       i3.enable = true;
       xfce.enable = true;
       shared.enable = true;
+      games.enable = true;
+      basics.enable = true;
     };
   };
   mainUser.layout = "de";
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index b87a13d..7f6c02e 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -74,6 +74,7 @@
       #gnome.enable = true;
       #cosmic.enable = true;
       shared.enable = true;
+      basics.enable = true;
       stylix.enable = true;
     };
   };