From dfa623f370490f12a2263ffb686e7f0e0742f8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Sat, 19 Oct 2024 14:52:29 +0200
Subject: [PATCH] refactor sys-modules

---
 hosts/comfy-station/configuration.nix | 30 ++++-----------------------
 modules/chat/default.nix              | 10 ---------
 modules/desktop/fonts/default.nix     |  1 -
 modules/home/zsh/default.nix          |  1 +
 modules/home/zsh/tools.nix            | 28 +++++++++++++++++++++++++
 modules/multimedia/default.nix        | 11 ----------
 modules/programs.nix                  | 29 ++++++++++++++++++++++++++
 modules/services/docker.nix           |  3 ---
 modules/services/openhantek.nix       | 10 ---------
 9 files changed, 62 insertions(+), 61 deletions(-)
 delete mode 100644 modules/chat/default.nix
 create mode 100644 modules/home/zsh/tools.nix
 delete mode 100644 modules/multimedia/default.nix
 create mode 100644 modules/programs.nix
 delete mode 100644 modules/services/docker.nix
 delete mode 100644 modules/services/openhantek.nix

diff --git a/hosts/comfy-station/configuration.nix b/hosts/comfy-station/configuration.nix
index d3cdcd8..cd4622b 100644
--- a/hosts/comfy-station/configuration.nix
+++ b/hosts/comfy-station/configuration.nix
@@ -12,17 +12,14 @@
     ./hardware-configuration.nix
     inputs.home-manager.nixosModules.home-manager
     ../../modules/bin/nix-scripts.nix
+    ../../modules/desktop/de
+    ../../modules/desktop/dm
+    ../../modules/desktop/fonts
     ../../modules/hardware/bluetooth.nix
     ../../modules/hardware/printing.nix
     ../../modules/hardware/sound.nix
     ../../modules/hardware/yubikey.nix
-    ../../modules/services/docker.nix
-    ../../modules/services/openhantek.nix
-    ../../modules/desktop/dm
-    ../../modules/desktop/de
-    ../../modules/desktop/fonts
-    ../../modules/chat
-    ../../modules/multimedia
+    ../../modules/programs.nix
   ];
   desktop.dm.name = "sddm";
   desktop.de.plasma.enable = true;
@@ -46,25 +43,6 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    age
-    alejandra
-    borgbackup
-    borgmatic
-    docker
-    docker-compose
-    git
-    nix-index
-    nix-output-monitor
-    ranger
-    sops
-    unstable.nh
-    vim
-    wget
-  ];
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/modules/chat/default.nix b/modules/chat/default.nix
deleted file mode 100644
index 8505d2b..0000000
--- a/modules/chat/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  users.users."jonas".packages = with pkgs; [
-    discord
-    zoom
-  ];
-}
diff --git a/modules/desktop/fonts/default.nix b/modules/desktop/fonts/default.nix
index 66a3fd3..ed70f66 100644
--- a/modules/desktop/fonts/default.nix
+++ b/modules/desktop/fonts/default.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }: {
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index 4ca7d3e..cf6d4b8 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -2,6 +2,7 @@
   ...
 }: {
   imports = [
+    ./tools.nix
     ./zsh.nix
   ];
 }
diff --git a/modules/home/zsh/tools.nix b/modules/home/zsh/tools.nix
new file mode 100644
index 0000000..bed253a
--- /dev/null
+++ b/modules/home/zsh/tools.nix
@@ -0,0 +1,28 @@
+{
+  pkgs
+}: {
+  home.packages = with pkgs; [
+    bat
+    firefox
+    fzf
+    git
+    htop
+    killall
+    neofetch
+    nil
+    nix-search-cli
+    nixpkgs-fmt
+    pass
+    poetry
+    python311Packages.radian
+    ranger
+    thefuck
+    vim
+    w3m
+    wget
+    youtube-dl
+  ];
+  nixpkgs.config.permittedInsecurePackages = [
+    "python3.11-youtube-dl-2021.12.17"
+  ];
+}
diff --git a/modules/multimedia/default.nix b/modules/multimedia/default.nix
deleted file mode 100644
index 72d70b3..0000000
--- a/modules/multimedia/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  programs.steam.enable = true;
-  users.users."jonas".packages = with pkgs; [
-    lutris
-    spotify
-  ];
-}
diff --git a/modules/programs.nix b/modules/programs.nix
new file mode 100644
index 0000000..070629b
--- /dev/null
+++ b/modules/programs.nix
@@ -0,0 +1,29 @@
+{
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    age
+    alejandra
+    borgbackup
+    borgmatic
+    discord
+    docker
+    docker-compose
+    git
+    lutris
+    nix-index
+    nix-output-monitor
+    openhantek6022
+    ranger
+    sops
+    spotify
+    unstable.nh
+    vim
+    wget
+    zoom
+  ];
+  programs.steam.enable = true;
+  services.udev.packages = [pkgs.openhantek6022];
+  virtualisation.docker.enable = true;
+}
diff --git a/modules/services/docker.nix b/modules/services/docker.nix
deleted file mode 100644
index 7fe2103..0000000
--- a/modules/services/docker.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{config, ...}: {
-  virtualisation.docker.enable = true;
-}
diff --git a/modules/services/openhantek.nix b/modules/services/openhantek.nix
deleted file mode 100644
index c6d1b0e..0000000
--- a/modules/services/openhantek.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  environment.systemPackages = [
-    pkgs.openhantek6022
-  ];
-  services.udev.packages = [pkgs.openhantek6022];
-}