✨ make use of systemPackage

modules/profiles/desktop.nix

@@ -85,7 +85,6 @@ with lib; {
       thunar.enable = true;
       zathura.enable = true;
     };
-
     services = {
       dunst.enable = true;
       kdeconnect.enable = true;

modules/programs/bspwm/default.nix

@@ -80,8 +80,8 @@ in
           WantedBy = [ "graphical-session.target" ];
         };
       };
-
+    };
-      home.packages = with pkgs; [
+    environment.systemPackages = with pkgs; [
       bc # HACK to get bsp-layout to work
       brightnessctl
       bsp-layout
@@ -91,5 +91,4 @@ in
       synology-drive-client
     ];
   };
-  };
 }

modules/programs/emacs.nix

@@ -24,15 +24,7 @@ in
       emacs = "emacsclient -t -a 'emacs -t'";
     };
     fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
-
+    environment.systemPackages = with pkgs; [
-    home-manager.users.moritz = {
-      home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
-      services.emacs = {
-        enable = true;
-        package = myEmacs;
-      };
-
-      home.packages = with pkgs; [
       ### Emacs itself
       binutils # native-comp needs 'as', provided by this
       myEmacs
@@ -96,6 +88,12 @@ in
       xclip
       xorg.xprop
     ];
+    home-manager.users.moritz = {
+      home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
+      services.emacs = {
+        enable = true;
+        package = myEmacs;
+      };
     };
   };
 }

modules/programs/fish.nix

@@ -25,6 +25,7 @@ in
   config = lib.mkIf cfg.enable {
     # set as default shell
     users.users.moritz.shell = pkgs.fish;
+    environment.systemPackages = with pkgs.fishPlugins; [ fzf-fish pisces ];
     # needed for nix completions
     programs.fish.enable = true;
 
@@ -88,7 +89,6 @@ in
         fzf.enableFishIntegration = true;
         starship.enableFishIntegration = true;
       };
-      home.packages = with pkgs.fishPlugins; [ fzf-fish pisces ];
     };
   };
 }

modules/programs/ledger/default.nix

@@ -35,8 +35,7 @@ in
           reg = "ledger reg -R -V --tail 15";
         };
     };
-    home-manager.users.moritz = {
+    environment.systemPackages = with pkgs; let
-      home.packages = with pkgs; let
       reg-copy = writeShellApplication {
         name = "reg-copy";
 
@@ -58,5 +57,4 @@ in
       };
     };
   };
-  };
 }

modules/programs/rofi/default.nix

@@ -52,6 +52,11 @@ in
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      (lib.mkIf config.networking.networkmanager.enable networkmanager_dmenu)
+      (lib.mkIf config.hardware.bluetooth.enable rofi-bluetooth)
+      rofi-power-menu
+    ];
     home-manager.users.moritz = {
       programs.rofi = {
         enable = true;
@@ -59,11 +64,6 @@ in
           pkgs.rofi.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; };
         extraConfig = { combi-modi = "drun,window,emoji"; };
       };
-      home.packages = with pkgs; [
-        (lib.mkIf config.networking.networkmanager.enable networkmanager_dmenu)
-        (lib.mkIf config.hardware.bluetooth.enable rofi-bluetooth)
-        rofi-power-menu
-      ];
       xdg = {
         enable = true;
         configFile."networkmanager-dmenu/config.ini".text = ''

modules/programs/spotify.nix

@@ -22,8 +22,8 @@ in
       file = ../../secrets/spotifyd.age;
       owner = "1000";
     };
+    environment.systemPackages = with pkgs; [ spotify-tui sptlrx ];
     home-manager.users.moritz = {
-      home.packages = with pkgs; [ spotify-tui sptlrx ];
       services.spotifyd = {
         enable = true;
         package = pkgs.spotifyd.override { withMpris = true; };

modules/virtualisation/virtualisation.nix

@@ -22,7 +22,7 @@ in
       enable = true;
       package = pkgs.libvirt;
     };
-    home-manager.users.moritz.home.packages = with pkgs; [ virt-manager ];
+    environment.systemPackages = with pkgs; [ virt-manager ];
     users.users.moritz.extraGroups = [ "libvirtd" ];
   };
 }