✨ make use of systemPackage

2022-10-06 20:32:21 +02:00 · 2022-10-06 20:32:21 +02:00 · 85de3b3ac6
parent aa42f6678e
commit 85de3b3ac6
8 changed files with 97 additions and 103 deletions
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@ -85,7 +85,6 @@ with lib; {
      thunar.enable = true;
      zathura.enable = true;
    };
-
    services = {
      dunst.enable = true;
      kdeconnect.enable = true;
--- a/modules/programs/bspwm/default.nix
+++ b/modules/programs/bspwm/default.nix
@ -80,16 +80,15 @@ in
          WantedBy = [ "graphical-session.target" ];
        };
      };
-
-      home.packages = with pkgs; [
-        bc # HACK to get bsp-layout to work
-        brightnessctl
-        bsp-layout
-        feh
-        pamixer
-        playerctl
-        synology-drive-client
-      ];
    };
+    environment.systemPackages = with pkgs; [
+      bc # HACK to get bsp-layout to work
+      brightnessctl
+      bsp-layout
+      feh
+      pamixer
+      playerctl
+      synology-drive-client
+    ];
  };
 }
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@ -24,78 +24,76 @@ in
      emacs = "emacsclient -t -a 'emacs -t'";
    };
    fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
+    environment.systemPackages = with pkgs; [
+      ### Emacs itself
+      binutils # native-comp needs 'as', provided by this
+      myEmacs

+      ### Doom dependencies
+      git
+      (ripgrep.override { withPCRE2 = true; })
+      gnutls # for TLS connectivity
+
+      ### Optional dependencies
+      fd # faster projectile indexing
+      imagemagick # for image-dired
+      zstd # for undo-fu-session/undo-tree compression
+
+      ### Module dependencies
+      ## :checkers
+      # spell
+      (hunspellWithDicts [
+        hunspellDicts.en_GB-ize
+        hunspellDicts.en_US
+        hunspellDicts.de_DE
+      ])
+
+      # grammar
+      languagetool
+
+      ## : tools
+      # lookup & org +roam
+      sqlite
+      gcc # HACK to get emacsqlite binary
+      wordnet
+      graphviz
+
+      ## :lang
+      # latex & org (latex previews)
+      stable.texlive.combined.scheme-full # HACK to fix broken perl package
+      texlab
+
+      # nix
+      nixfmt # for formating nix
+      rnix-lsp
+
+      # markdown & org +pandoc
+      pandoc
+
+      # python
+      nodePackages.pyright
+
+      # sh
+      nodePackages.bash-language-server
+
+      ## :email
+      # mu4e
+      mu
+      isync
+
+      ## :app
+      # everywhere
+      xdotool
+      xorg.xwininfo
+      xclip
+      xorg.xprop
+    ];
    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
-
-        ### Doom dependencies
-        git
-        (ripgrep.override { withPCRE2 = true; })
-        gnutls # for TLS connectivity
-
-        ### Optional dependencies
-        fd # faster projectile indexing
-        imagemagick # for image-dired
-        zstd # for undo-fu-session/undo-tree compression
-
-        ### Module dependencies
-        ## :checkers
-        # spell
-        (hunspellWithDicts [
-          hunspellDicts.en_GB-ize
-          hunspellDicts.en_US
-          hunspellDicts.de_DE
-        ])
-
-        # grammar
-        languagetool
-
-        ## : tools
-        # lookup & org +roam
-        sqlite
-        gcc # HACK to get emacsqlite binary
-        wordnet
-        graphviz
-
-        ## :lang
-        # latex & org (latex previews)
-        stable.texlive.combined.scheme-full # HACK to fix broken perl package
-        texlab
-
-        # nix
-        nixfmt # for formating nix
-        rnix-lsp
-
-        # markdown & org +pandoc
-        pandoc
-
-        # python
-        nodePackages.pyright
-
-        # sh
-        nodePackages.bash-language-server
-
-        ## :email
-        # mu4e
-        mu
-        isync
-
-        ## :app
-        # everywhere
-        xdotool
-        xorg.xwininfo
-        xclip
-        xorg.xprop
-      ];
    };
  };
 }
--- a/modules/programs/fish.nix
+++ b/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 ];
    };
  };
 }
--- a/modules/programs/ledger/default.nix
+++ b/modules/programs/ledger/default.nix
@ -35,26 +35,24 @@ in
          reg = "ledger reg -R -V --tail 15";
        };
    };
+    environment.systemPackages = with pkgs; let
+      reg-copy = writeShellApplication {
+        name = "reg-copy";
+
+        runtimeInputs = [ ledger xclip ];
+
+        text = ''
+          table="$(printf '%-10s %-30s %8s %8s\n' Datum Beschreibung Einzeln Gesamt && ledger reg -V --format '%10D %.30P %8t %8T\n' "$@")"
+          echo "$table"
+          echo "$table" | xclip -selection clipboard
+        '';
+      };
+    in
+    [ ledger reg-copy hledger hledger-ui hledger-web ];
    home-manager.users.moritz = {
-      home.packages = with pkgs; let
-        reg-copy = writeShellApplication {
-          name = "reg-copy";
-
-          runtimeInputs = [ ledger xclip ];
-
-          text = ''
-            table="$(printf '%-10s %-30s %8s %8s\n' Datum Beschreibung Einzeln Gesamt && ledger reg -V --format '%10D %.30P %8t %8T\n' "$@")"
-            echo "$table"
-            echo "$table" | xclip -selection clipboard
-          '';
-        };
-      in
-      [ ledger reg-copy hledger hledger-ui hledger-web ];
-      home-manager.users.moritz = {
-        xdg.configFile = {
-          "fish/completions/ledger.fish" = {
-            text = builtins.readFile ./ledger.fish;
-          };
+      xdg.configFile = {
+        "fish/completions/ledger.fish" = {
+          text = builtins.readFile ./ledger.fish;
        };
      };
    };
--- a/modules/programs/rofi/default.nix
+++ b/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 = ''
--- a/modules/programs/spotify.nix
+++ b/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; };
--- a/modules/virtualisation/virtualisation.nix
+++ b/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" ];
  };
 }