remove zeroad package unless enabled and nvtop is only enabled if nvi…

…dia is used
ding-f · Mar 11, 2024 · 81fd6c2 · 81fd6c2
1 parent 05e7697
commit 81fd6c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/config/home/packages.nix b/config/home/packages.nix
@@ -8,8 +8,8 @@ in {
   home.packages = with pkgs; [
     pkgs."${browser}" discord libvirt swww grim slurp gnome.file-roller
     swaynotificationcenter rofi-wayland imv transmission-gtk mpv
-    gimp obs-studio rustup audacity pavucontrol tree zeroad protonup-qt
-    font-awesome spotify swayidle neovide element-desktop swaylock
+    gimp obs-studio rustup audacity pavucontrol tree protonup-qt
+    font-awesome spotify swayidle neovide swaylock
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
     # Import Scripts
     (import ./../scripts/emopicker9000.nix { inherit pkgs; })

diff --git a/config/system/intel-nvidia.nix b/config/system/intel-nvidia.nix
@@ -8,6 +8,9 @@ lib.mkIf ("${gpuType}" == "intel-nvidia") {
       enableHybridCodec = true;
     };
   };
+  environment.systemPackages = with pkgs; [
+    nvtop
+  ];
   # OpenGL
   hardware.opengl = {
     extraPackages = with pkgs; [

diff --git a/config/system/nvidia.nix b/config/system/nvidia.nix
@@ -2,6 +2,9 @@
 
 let inherit (import ../../options.nix) gpuType; in
 lib.mkIf ("${gpuType}" == "nvidia") { 
+  environment.systemPackages = with pkgs; [
+    nvtop
+  ];
   services.xserver.videoDrivers = ["nvidia"];
   hardware.nvidia = {
     # Modesetting is required.

diff --git a/config/system/packages.nix b/config/system/packages.nix
@@ -12,7 +12,7 @@
     pkg-config meson hugo gnumake ninja go nodejs symbola
     noto-fonts-color-emoji material-icons brightnessctl
     toybox virt-viewer swappy ripgrep appimage-run 
-    networkmanagerapplet yad playerctl nh nvtop
+    networkmanagerapplet yad playerctl nh
   ];
 
   programs = {