From 64ed7976ce7ae211feee686ce3d3746aceb7d477 Mon Sep 17 00:00:00 2001
From: Joinemm <joonas@rautiola.co>
Date: Thu, 7 Mar 2024 16:38:42 +0200
Subject: [PATCH] Move most packages to user-level

---
 home-modules/common.nix      | 28 +++++++++++++++-
 hosts/x1/configuration.nix   | 62 ------------------------------------
 hosts/zeus/configuration.nix | 40 +----------------------
 modules/common.nix           |  2 ++
 modules/default.nix          |  1 +
 modules/transmission.nix     |  9 ++++++
 6 files changed, 40 insertions(+), 102 deletions(-)
 create mode 100644 modules/transmission.nix

diff --git a/home-modules/common.nix b/home-modules/common.nix
index 5fff170..f02fe9e 100644
--- a/home-modules/common.nix
+++ b/home-modules/common.nix
@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   home.stateVersion = "23.11";
   programs.home-manager.enable = true;
   dconf.enable = true;
@@ -9,4 +9,30 @@
     easyeffects.enable = true;
     udiskie.enable = true;
   };
+
+  home.packages = with pkgs; [
+    # development
+    python3
+    rustup
+    lua
+    nodejs
+    actionlint
+    gitmoji-cli
+    pre-commit
+
+    # gui apps
+    spotify
+    darktable
+    slack
+    pavucontrol
+    pcmanfm
+    obsidian
+    gimp
+    chromium
+    prusa-slicer
+
+    # cli apps
+    ffmpeg-full
+    glow # render markdown on the cli
+  ];
 }
diff --git a/hosts/x1/configuration.nix b/hosts/x1/configuration.nix
index eb6fd70..ae608fe 100644
--- a/hosts/x1/configuration.nix
+++ b/hosts/x1/configuration.nix
@@ -43,66 +43,4 @@
 
     tailscale.enable = true;
   };
-
-  environment.systemPackages = lib.flatten [
-    (
-      with pkgs; [
-        # languages and dev tools
-        (python3.withPackages (ps:
-          with ps; [
-            requests
-          ]))
-        pipenv
-        rustup
-        lua
-        nodejs
-        statix
-        (haskellPackages.ghcWithPackages (hpkgs:
-          with hpkgs; [
-            xmobar
-            xmonad
-            xmonad-contrib
-          ]))
-
-        # apps
-        spotify
-        darktable
-        slack
-        pavucontrol
-        pcmanfm
-        obsidian
-        dwmblocks
-        gimp
-        firefox
-        chromium
-        keyd
-
-        # cli tools
-        ffmpeg-full
-        acpi
-        fastfetch
-        wget
-        mons
-        file
-        bottom
-        xdotool
-        playerctl
-        pulseaudio
-        alsa-utils
-        pre-commit
-        wirelesstools
-        jq # json parser
-        fd # faster find
-        dig
-        rsync
-        glow # render markdown on the cli
-        xclip
-        pciutils
-        usbutils
-
-        # libs
-        libnotify
-      ]
-    )
-  ];
 }
diff --git a/hosts/zeus/configuration.nix b/hosts/zeus/configuration.nix
index 532cdb2..caa3a42 100644
--- a/hosts/zeus/configuration.nix
+++ b/hosts/zeus/configuration.nix
@@ -46,15 +46,7 @@
         "work".enable = true;
       };
     };
-  };
-
-  services.transmission = {
-    enable = true;
-    settings = {
-      ratio-limit = 0;
-      ratio-limit-enabled = true;
-    };
-  };
+  }; 
 
   services.xserver = {
     videoDrivers = ["amdgpu"];
@@ -69,34 +61,4 @@
       }
     ];
   };
-
-  environment.systemPackages = lib.flatten [
-    (
-      with pkgs; [
-        # development
-        python3
-        rustup
-        lua
-        nodejs
-        statix
-        actionlint
-        gitmoji-cli
-
-        # gui apps
-        spotify
-        darktable
-        slack
-        pavucontrol
-        pcmanfm
-        obsidian
-        gimp
-        chromium
-        prusa-slicer
-
-        # cli apps
-        ffmpeg-full
-        glow # render markdown on the cli
-      ]
-    )
-  ];
 }
diff --git a/modules/common.nix b/modules/common.nix
index c33e9c9..7f53920 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -100,5 +100,7 @@
     xclip
     pciutils
     usbutils
+    wirelesstools
+    acpi
   ];
 }
diff --git a/modules/default.nix b/modules/default.nix
index cf41b75..2c01ed9 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -14,5 +14,6 @@
   ssh-access = import ./ssh-access.nix;
   syncthing = import ./syncthing.nix;
   trackpoint = import ./trackpoint.nix;
+  transmission = import ./transmission.nix;
   work-vpn = import ./work-vpn.nix;
 }
diff --git a/modules/transmission.nix b/modules/transmission.nix
new file mode 100644
index 0000000..595c782
--- /dev/null
+++ b/modules/transmission.nix
@@ -0,0 +1,9 @@
+{
+  services.transmission = {
+    enable = true;
+    settings = {
+      ratio-limit = 0;
+      ratio-limit-enabled = true;
+    };
+  };
+}