Switch to Materia theme for better GTK & Qt consistency
Set Plasma accent colour in config, using base16 defined accent colour.
This commit is contained in:
parent
21f27fdc88
commit
44ee0f1e5b
|
@ -8,7 +8,10 @@
|
|||
./desktop/plasma/default.nix
|
||||
];
|
||||
programs.plasma = lib.mkIf config.programs.plasma.enable {
|
||||
configFile.kcminputrc."Libinput/1160/4132/DELL0A21:00 0488:1024 Touchpad".NaturalScroll = true;
|
||||
configFile = {
|
||||
kcminputrc."Libinput/1160/4132/DELL0A21:00 0488:1024 Touchpad".NaturalScroll = true;
|
||||
kwinrc."Tiling/8c3e40a5-6d02-561d-be90-abdf39b7afe6"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}";
|
||||
};
|
||||
};
|
||||
wayland.windowManager.sway = lib.mkIf config.wayland.windowManager.sway.enable {
|
||||
config = {
|
||||
|
|
|
@ -51,26 +51,17 @@
|
|||
enable = true;
|
||||
gtk3 = {inherit extraCss;};
|
||||
gtk4 = {inherit extraCss;};
|
||||
theme = let
|
||||
color = "purple";
|
||||
in {
|
||||
package = pkgs.colloid-gtk-theme.override {
|
||||
themeVariants = [color];
|
||||
colorVariants = [config.scheme.variant];
|
||||
};
|
||||
name = "Colloid-${toCapital color}-${toCapital config.scheme.variant}";
|
||||
theme = {
|
||||
package = pkgs.materia-theme;
|
||||
name = "Materia-${config.scheme.variant}";
|
||||
};
|
||||
iconTheme = let
|
||||
color = "breeze";
|
||||
color = "violet";
|
||||
in {
|
||||
package = pkgs.papirus-icon-theme.override {inherit color;};
|
||||
name = "Papirus-${toCapital config.scheme.variant}";
|
||||
};
|
||||
};
|
||||
# qt = {
|
||||
# enable = true;
|
||||
# style.name = "breeze";
|
||||
# };
|
||||
xdg = {
|
||||
mime.enable = true;
|
||||
mimeApps = let
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
pkgs,
|
||||
fonts,
|
||||
rc2nix,
|
||||
accentColourName,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
@ -13,6 +14,7 @@
|
|||
rc2nix
|
||||
wl-clipboard
|
||||
colloid-kde
|
||||
materia-kde-theme
|
||||
];
|
||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
programs.plasma = {
|
||||
|
@ -22,7 +24,7 @@
|
|||
workspace = {
|
||||
clickItemTo = "open";
|
||||
lookAndFeel = "org.kde.breeze.desktop";
|
||||
theme = "breeze-light";
|
||||
theme = "default";
|
||||
colorScheme = "BreezeLight";
|
||||
cursor = {
|
||||
inherit (config.home.pointerCursor) size;
|
||||
|
@ -184,22 +186,38 @@
|
|||
};
|
||||
};
|
||||
kdeglobals = {
|
||||
General = {
|
||||
General = let
|
||||
AccentColor = let
|
||||
r = config.scheme."${accentColourName}-rgb-r";
|
||||
g = config.scheme."${accentColourName}-rgb-g";
|
||||
b = config.scheme."${accentColourName}-rgb-b";
|
||||
in "${r}, ${g}, ${b}";
|
||||
in {
|
||||
inherit AccentColor;
|
||||
LastUsedCustomAccentColor = AccentColor;
|
||||
TerminalApplication = "konsole";
|
||||
TerminalService = "org.kde.konsole.desktop";
|
||||
};
|
||||
WM = {
|
||||
# TODO convert to base16 colours at some point
|
||||
activeBackground = "227,229,231";
|
||||
activeBlend = "227,229,231";
|
||||
activeForeground = "35,38,41";
|
||||
inactiveBackground = "239,240,241";
|
||||
inactiveBlend = "239,240,241";
|
||||
inactiveForeground = "112,125,138";
|
||||
};
|
||||
};
|
||||
kwinrc = {
|
||||
Plugins = {
|
||||
frozenappEnabled = false;
|
||||
mouseclickEnabled = true;
|
||||
shakecursorEnabled = true;
|
||||
shakecursorEnabled = false;
|
||||
};
|
||||
Windows = {
|
||||
FocusPolicy = "FocusFollowsMouse";
|
||||
RollOverDesktops = true;
|
||||
};
|
||||
Tiling.padding = 10;
|
||||
NightColor = {
|
||||
Active = true;
|
||||
Mode = "Location";
|
||||
|
@ -207,11 +225,17 @@
|
|||
LongitudeFixed = "-1.2";
|
||||
};
|
||||
"Effect-translucency" = {
|
||||
# Re-enable translucency when I can work out how to apply
|
||||
# blur to all windows
|
||||
Inactive = 100;
|
||||
MoveResize = 80;
|
||||
Dialogs = 80;
|
||||
ComboboxPopups = 80;
|
||||
Menus = 80;
|
||||
MoveResize = 100;
|
||||
Dialogs = 100;
|
||||
ComboboxPopups = 100;
|
||||
Menus = 100;
|
||||
};
|
||||
"org.kde.kdecoration2" = {
|
||||
BorderSize = "None";
|
||||
BorderSizeAuto = "false";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
fonts,
|
||||
...
|
||||
}: {
|
||||
home.packages = [pkgs.kdePackages.yakuake];
|
||||
programs.konsole = {
|
||||
enable = true;
|
||||
defaultProfile = "One-Light";
|
||||
|
|
|
@ -94,7 +94,7 @@ Blur=true
|
|||
ColorRandomization=false
|
||||
Description=One Light
|
||||
FillStyle=Tile
|
||||
Opacity=0.9
|
||||
Opacity=1.0
|
||||
Wallpaper=
|
||||
WallpaperFlipType=NoFlip
|
||||
WallpaperOpacity=1
|
||||
|
|
Loading…
Reference in a new issue