remove zeroad package unless enabled and nvtop is only enabled if nvidia is used

This commit is contained in:
Tyler Kelley 2024-03-11 15:38:07 -05:00
parent 05e7697227
commit 81fd6c231e
4 changed files with 9 additions and 3 deletions

View File

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

View File

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

View File

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

View File

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