diff --git a/home/Tone.nix b/home/Tone.nix index a99bce36..596611cb 100644 --- a/home/Tone.nix +++ b/home/Tone.nix @@ -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 = { diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 0731a067..fa334697 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -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 diff --git a/home/desktop/plasma/default.nix b/home/desktop/plasma/default.nix index aa42d12b..09bf4228 100644 --- a/home/desktop/plasma/default.nix +++ b/home/desktop/plasma/default.nix @@ -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"; }; }; }; diff --git a/home/desktop/plasma/konsole.nix b/home/desktop/plasma/konsole.nix index 22459e17..40c50182 100644 --- a/home/desktop/plasma/konsole.nix +++ b/home/desktop/plasma/konsole.nix @@ -3,7 +3,6 @@ fonts, ... }: { - home.packages = [pkgs.kdePackages.yakuake]; programs.konsole = { enable = true; defaultProfile = "One-Light"; diff --git a/home/desktop/plasma/onelight.colorscheme b/home/desktop/plasma/onelight.colorscheme index 60630cd7..75ac9f79 100644 --- a/home/desktop/plasma/onelight.colorscheme +++ b/home/desktop/plasma/onelight.colorscheme @@ -94,7 +94,7 @@ Blur=true ColorRandomization=false Description=One Light FillStyle=Tile -Opacity=0.9 +Opacity=1.0 Wallpaper= WallpaperFlipType=NoFlip WallpaperOpacity=1