Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Merge pull request 'Switch to plasma 6' (#9) from plasma6 into main

Browse source 
Reviewed-on: http://git.everest.sable-pancake.ts.net/Toast/nix-stuff/pulls/9
This commit is contained in:
Toast 2024-04-29 20:02:43 +02:00
commit 3eee85a87d
3 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/gaming/programs/default.nix
View file

@ -8,6 +8,6 @@
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
heroic heroic
prismlauncher-qt5 prismlauncher
]; ];
} }

38
roles/kde/plasma.nix
View file

@ -19,21 +19,6 @@
}; };
}; };
# Make custom packages
breezeTint = pkgs.stdenv.mkDerivation {
name = "breeze-tint";
src = "${pkgs.breeze-qt5}";
patches = [./patches/BreezeTint.patch];
installPhase = ''
runHook preInstall
mkdir -p $out/share/color-schemes/
cp -r share/color-schemes/* $out/share/color-schemes/
runHook postInstall
'';
};
# /etc/xdg is not read by plasma, so to change the default settings you need to put them in a package # /etc/xdg is not read by plasma, so to change the default settings you need to put them in a package
plasmaDefaults = pkgs.stdenv.mkDerivation { plasmaDefaults = pkgs.stdenv.mkDerivation {
name = "toast-plasma-defaults"; name = "toast-plasma-defaults";
@ -49,21 +34,16 @@
''; '';
}; };
in { in {
services = { # Enable the Plasma 6 Desktop Environment
displayManager.defaultSession = "plasmawayland"; services.desktopManager.plasma6.enable = true;
xserver = {
# Enable the Plasma 5 Desktop Environment
desktopManager.plasma5.enable = true;
};
};
qt.enable = true; qt.enable = true;
# GTK apps need dconf to grab the correct theme on Wayland # GTK apps need dconf to grab the correct theme on Wayland
programs.dconf.enable = true; programs.dconf.enable = true;
# Install the patched Breeze color schemes as well as the plasma default configs # Install the plasma default configs
environment.systemPackages = [breezeTint plasmaDefaults]; environment.systemPackages = [plasmaDefaults];
# Plasma configs should be on all users # Plasma configs should be on all users
home-manager.sharedModules = [ home-manager.sharedModules = [
@ -82,15 +62,15 @@ in {
enable = true; enable = true;
# Most apps are dark, so a white cursor is easier to spot # Most apps are dark, so a white cursor is easier to spot
cursorTheme = { cursorTheme = {
package = pkgs.breeze-qt5; package = pkgs.kdePackages.breeze;
name = "Breeze_Snow"; name = "Breeze_Light";
}; };
iconTheme = { iconTheme = {
package = pkgs.breeze-icons; package = pkgs.kdePackages.breeze-icons;
name = "breeze-dark"; name = "breeze-dark";
}; };
theme = { theme = {
package = pkgs.breeze-gtk; package = pkgs.kdePackages.breeze-gtk;
name = "Breeze"; name = "Breeze";
}; };
# Gtk2 doesn't have a dark mode, so I just tell gtk 3 and 4 to use the dark variant # Gtk2 doesn't have a dark mode, so I just tell gtk 3 and 4 to use the dark variant
@ -110,7 +90,7 @@ in {
enable = true; enable = true;
workspace = { workspace = {
clickItemTo = "select"; clickItemTo = "select";
cursorTheme = "Breeze_Snow"; cursorTheme = "Breeze_Light";
iconTheme = "breeze-dark"; iconTheme = "breeze-dark";
lookAndFeel = "Catppuccin-Mocha-Mauve"; lookAndFeel = "Catppuccin-Mocha-Mauve";
theme = "default"; theme = "default";

6
roles/kde/sddm.nix
View file

@ -45,12 +45,12 @@ in {
# Enable SDDM. # Enable SDDM.
services.displayManager.sddm = { services.displayManager.sddm = {
enable = true; enable = true;
theme = "sugar-candy"; # theme = "sugar-candy";
settings = { settings = {
General = {Numlock = "off";}; General = {Numlock = "off";};
Theme = {CursorTheme = "Breeze_Snow";}; Theme = {CursorTheme = "Breeze_Snow";};
}; };
}; };
# Sugar candy doesn't seem to work on qt6 :(
environment.systemPackages = [sddm-sugar-candy customcfg]; # environment.systemPackages = [sddm-sugar-candy customcfg];
} }