From 12e31b005a761d508d35e0722a0629fd1d448a2a Mon Sep 17 00:00:00 2001
From: "Mohamed C." <mohamed@chrayed.de>
Date: Sat, 3 Aug 2024 13:43:50 +0200
Subject: [PATCH] modular packages

---
 configuration.nix                             |  9 ++++++
 flake.lock                                    |  6 ++--
 packages/customizationpkgs.nix                | 15 ++++++++++
 packages/devpkgs.nix                          | 14 ++++++++++
 packages/firefoxpkgs.nix                      |  7 +++++
 packages/gamingpkgs.nix                       | 16 +++++++++++
 packages/hardwarepkgs.nix                     | 14 ++++++++++
 packages/miscpkgs.nix                         |  0
 .../systempkgs.nix => packages/plasmapkgs.nix | 28 ++++---------------
 system/gaming.nix => packages/steampkgs.nix   |  0
 10 files changed, 84 insertions(+), 25 deletions(-)
 create mode 100644 packages/customizationpkgs.nix
 create mode 100644 packages/devpkgs.nix
 create mode 100644 packages/firefoxpkgs.nix
 create mode 100644 packages/gamingpkgs.nix
 create mode 100644 packages/hardwarepkgs.nix
 create mode 100644 packages/miscpkgs.nix
 rename system/systempkgs.nix => packages/plasmapkgs.nix (66%)
 rename system/gaming.nix => packages/steampkgs.nix (100%)

diff --git a/configuration.nix b/configuration.nix
index 548256d..dd3029c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,6 +2,15 @@
 {
   imports =
     [ 
+      # Packages
+      ./packages/customizationpkgs.nix
+      ./packages/devpkgs.nix
+      ./packages/firefoxpkgs.nix
+      ./packages/gamingpkgs.nix
+      ./packages/hardwarepkgs.nix
+      ./packages/plasmapkgs.nix
+      ./packages/steampkgs.nix
+      # Settings
       ./system/boot.nix
       ./system/controller.nix
       ./system/desktop.nix
diff --git a/flake.lock b/flake.lock
index f6dc806..5b6137a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -145,11 +145,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1722678071,
-        "narHash": "sha256-jfbdSg4YgdkBCfMfUZCbepB8EoBFfvpLnKJgDoL0EqI=",
+        "lastModified": 1722684766,
+        "narHash": "sha256-SJjvsTdCqAb3WJG7ZTKKQNoZyfISkRz/OQO7qFBi3k8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "704b2f6673ab7e8b4bfa001b665b69cbb26dc9f0",
+        "rev": "afad34c2df3e9ca7695745de1cd6dc5a6193daff",
         "type": "github"
       },
       "original": {
diff --git a/packages/customizationpkgs.nix b/packages/customizationpkgs.nix
new file mode 100644
index 0000000..b7b2aa5
--- /dev/null
+++ b/packages/customizationpkgs.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, pkgs-stable, ... }:
+{
+  environment.systemPackages =
+   (with pkgs; [
+    kde-rounded-corners
+    neofetch
+    ibm-plex
+    ])
+
+    ++
+
+   (with pkgs-stable; [
+
+    ]);
+}
diff --git a/packages/devpkgs.nix b/packages/devpkgs.nix
new file mode 100644
index 0000000..eca6466
--- /dev/null
+++ b/packages/devpkgs.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, pkgs-stable, ... }:
+{
+  environment.systemPackages =
+   (with pkgs; [
+    git
+    nixd
+    ])
+
+    ++
+
+   (with pkgs-stable; [
+
+    ]);
+}
diff --git a/packages/firefoxpkgs.nix b/packages/firefoxpkgs.nix
new file mode 100644
index 0000000..f149722
--- /dev/null
+++ b/packages/firefoxpkgs.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, pkgs-stable, ... }:
+{
+  programs.firefox = {
+    enable = true;
+    languagePacks = ["de"];
+  };
+}
diff --git a/packages/gamingpkgs.nix b/packages/gamingpkgs.nix
new file mode 100644
index 0000000..e637cca
--- /dev/null
+++ b/packages/gamingpkgs.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, pkgs-stable, ... }:
+{
+  environment.systemPackages =
+   (with pkgs; [
+    mangohud
+    unigine-valley
+    unigine-heaven
+    unigine-tropics
+    ])
+
+    ++
+
+   (with pkgs-stable; [
+
+    ]);
+}
diff --git a/packages/hardwarepkgs.nix b/packages/hardwarepkgs.nix
new file mode 100644
index 0000000..a14d183
--- /dev/null
+++ b/packages/hardwarepkgs.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, pkgs-stable, ... }:
+{
+  environment.systemPackages =
+   (with pkgs; [
+    pciutils
+    aha
+    ])
+
+    ++
+
+   (with pkgs-stable; [
+
+    ]);
+}
diff --git a/packages/miscpkgs.nix b/packages/miscpkgs.nix
new file mode 100644
index 0000000..e69de29
diff --git a/system/systempkgs.nix b/packages/plasmapkgs.nix
similarity index 66%
rename from system/systempkgs.nix
rename to packages/plasmapkgs.nix
index f698be4..f74808a 100644
--- a/system/systempkgs.nix
+++ b/packages/plasmapkgs.nix
@@ -1,21 +1,7 @@
 { config, pkgs, pkgs-stable, ... }:
 {
-  programs.firefox = {
-    enable = true;
-    languagePacks = ["de"];
-  };
   environment.systemPackages =
    (with pkgs; [
-    mangohud
-    unigine-valley
-    unigine-heaven
-    unigine-tropics
-
-    ])
-
-    ++
-
-   (with pkgs-stable; [
     kdePackages.kate
     kdePackages.gwenview
     kdePackages.okular
@@ -31,13 +17,11 @@
     xwaylandvideobridge
     krita
     haruna
-    vesktop
-    bitwarden-desktop
-    git
-    pciutils
-    aha
-    neofetch
-    ibm-plex
-    nixd
+    ])
+
+    ++
+
+   (with pkgs-stable; [
+
     ]);
 }
diff --git a/system/gaming.nix b/packages/steampkgs.nix
similarity index 100%
rename from system/gaming.nix
rename to packages/steampkgs.nix