refactor build

This commit is contained in:
MichaelFisher1997 2025-05-10 16:56:54 +01:00
parent 7a79886dc6
commit 1914559b88
4 changed files with 26 additions and 29 deletions

View File

@ -61,7 +61,9 @@
services = { services = {
# Enable X11 and configure Wayland support # Enable X11 and configure Wayland support
desktopManager.plasma6 = true; desktopManager = {
plasma6.enable = true;
};
xserver = { xserver = {
enable = true; enable = true;
xkb.layout = "gb"; xkb.layout = "gb";
@ -74,7 +76,6 @@
# Desktop Managers Configuration # Desktop Managers Configuration
desktopManager = { desktopManager = {
gnome.enable = true; # GNOME gnome.enable = true; # GNOME
#plasma6.enable = true; # Use plasma5 for KDE6 as well
}; };
# Window Managers Configuration # Window Managers Configuration
@ -108,7 +109,7 @@
services.printing.enable = true; services.printing.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
hardware.pulseaudio.enable = false; services.pulseaudio.enable = false;
#sound.enable = true; #sound.enable = true;
services.flatpak.enable = true; services.flatpak.enable = true;
@ -171,22 +172,6 @@
#services.desktopManager.cosmic.enable = true; #services.desktopManager.cosmic.enable = true;
#services.displayManager.cosmic-greeter.enable = true; #services.displayManager.cosmic-greeter.enable = true;
hardware.opengl = {
enable = true;
#driSupport = true;
#driSupport32Bit = true;
extraPackages = with pkgs; [
vulkan-loader
vulkan-validation-layers
vulkan-extension-layer
intel-media-driver # LIBVA_DRIVER_NAME=iHD
intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
libvdpau-va-gl
vaapiVdpau
mesa
];
};
programs.steam.enable = true; programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true; programs.steam.gamescopeSession.enable = true;

View File

@ -1,10 +1,22 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
hardware.opengl.extraPackages = with pkgs; [
rocmPackages.clr.icd
];
environment.systemPackages = [ environment.systemPackages = [
pkgs.rocmPackages.rpp pkgs.rocmPackages.rpp
]; ];
hardware.graphics = {
enable = true;
#driSupport = true;
#driSupport32Bit = true;
extraPackages = with pkgs; [
rocmPackages.clr.icd
vulkan-loader
vulkan-validation-layers
vulkan-extension-layer
intel-media-driver # LIBVA_DRIVER_NAME=iHD
intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
libvdpau-va-gl
vaapiVdpau
mesa
];
};
} }

View File

@ -35,7 +35,6 @@
discocss discocss
themechanger themechanger
catppuccin-kvantum catppuccin-kvantum
dolphin
nwg-drawer nwg-drawer
hyprpaper hyprpaper
]; ];

View File

@ -8,7 +8,6 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Text Editors # Text Editors
vim vim
libsForQt5.kate
sublime sublime
lunarvim lunarvim
vscode vscode
@ -34,7 +33,6 @@ in
python3 python3
php php
php83Packages.composer php83Packages.composer
libsForQt5.kdenlive
exercism exercism
betterdiscord-installer betterdiscord-installer
unstable.go unstable.go
@ -112,7 +110,6 @@ in
eww eww
vesktop vesktop
unstable.hyprsunset unstable.hyprsunset
unstable.hyprshot
# Web Browsers # Web Browsers
brave brave
@ -180,7 +177,7 @@ in
spice-vdagent spice-vdagent
# Themes and Customization # Themes and Customization
kdePackages.qt6ct #kdePackages.qt6ct
catppuccin-kvantum catppuccin-kvantum
# Multimedia Tools # Multimedia Tools
@ -195,7 +192,6 @@ in
unstable.ghostty unstable.ghostty
guacamole-client guacamole-client
rpi-imager rpi-imager
kdePackages.filelight
light light
#games #games
@ -214,6 +210,11 @@ in
modrinth-app modrinth-app
minecraft minecraft
nsnake nsnake
#kdePackages
kdePackages.dolphin
kdePackages.filelight
kdePackages.kate
]; ];
} }