flake.nix

@@ -53,10 +53,10 @@
       accentColourName = "base0E";
       fonts = with iosevkaCustom; rec {
         sizes = {
-          applications = 12;
-          desktop = 10;
-          popups = 14;
-          terminal = 12;
+          applications = 14;
+          desktop = 12;
+          popups = 16;
+          terminal = 14;
         };
         serif = sansSerif;
         sansSerif = {

home/Tone.nix

@@ -8,10 +8,7 @@
     ./desktop/plasma/default.nix
   ];
   programs.plasma = lib.mkIf config.programs.plasma.enable {
-    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}]}";
-    };
+    configFile.kcminputrc."Libinput/1160/4132/DELL0A21:00 0488:1024 Touchpad".NaturalScroll = true;
   };
   wayland.windowManager.sway = lib.mkIf config.wayland.windowManager.sway.enable {
     config = {

home/desktop/base16/gtk.nix

@@ -4,7 +4,7 @@
 }:
 with scheme.withHashtag; ''
   // Remove rounded corners
-  window.background { border-radius: 0; }
+  window.background { border-radius: 5; }
   @define-color accent_color ${scheme.withHashtag."${accentColourName}-hex"};
   @define-color accent_bg_color ${scheme.withHashtag."${accentColourName}-hex"};
   @define-color accent_fg_color ${base00-hex};

home/desktop/default.nix

@@ -51,17 +51,26 @@
     enable = true;
     gtk3 = {inherit extraCss;};
     gtk4 = {inherit extraCss;};
-    theme = {
-      package = pkgs.materia-theme;
-      name = "Materia-${config.scheme.variant}";
+    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}";
     };
     iconTheme = let
-      color = "violet";
+      color = "breeze";
     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

home/desktop/plasma/default.nix

@@ -3,7 +3,6 @@
   pkgs,
   fonts,
   rc2nix,
-  accentColourName,
   ...
 }: {
   imports = [
@@ -14,7 +13,6 @@
     rc2nix
     wl-clipboard
     colloid-kde
-    materia-kde-theme
   ];
   services.gpg-agent.pinentryPackage = pkgs.pinentry-qt;
   programs.plasma = {
@@ -24,13 +22,13 @@
     workspace = {
       clickItemTo = "open";
       lookAndFeel = "org.kde.breeze.desktop";
-      theme = "default";
+      theme = "breeze-light";
       colorScheme = "BreezeLight";
       cursor = {
         inherit (config.home.pointerCursor) size;
         theme = config.home.pointerCursor.name;
       };
-      iconTheme = config.gtk.iconTheme.name;
+      iconTheme = "Papirus";
       wallpaper = "${../wallpapers/landscapes/tropic_island_day.jpg}";
     };
 
@@ -186,38 +184,22 @@
         };
       };
       kdeglobals = {
-        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;
+        General = {
           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 = false;
+          shakecursorEnabled = true;
         };
         Windows = {
           FocusPolicy = "FocusFollowsMouse";
           RollOverDesktops = true;
         };
+        Tiling.padding = 10;
         NightColor = {
           Active = true;
           Mode = "Location";
@@ -225,17 +207,11 @@
           LongitudeFixed = "-1.2";
         };
         "Effect-translucency" = {
-          # Re-enable translucency when I can work out how to apply
-          # blur to all windows
           Inactive = 100;
-          MoveResize = 100;
-          Dialogs = 100;
-          ComboboxPopups = 100;
-          Menus = 100;
-        };
-        "org.kde.kdecoration2" = {
-          BorderSize = "None";
-          BorderSizeAuto = "false";
+          MoveResize = 80;
+          Dialogs = 80;
+          ComboboxPopups = 80;
+          Menus = 80;
         };
       };
     };

home/desktop/plasma/konsole.nix

@@ -3,6 +3,7 @@
   fonts,
   ...
 }: {
+  home.packages = [pkgs.kdePackages.yakuake];
   programs.konsole = {
     enable = true;
     defaultProfile = "One-Light";

home/desktop/plasma/onelight.colorscheme

@@ -94,7 +94,7 @@ Blur=true
 ColorRandomization=false
 Description=One Light
 FillStyle=Tile
-Opacity=1.0
+Opacity=0.9
 Wallpaper=
 WallpaperFlipType=NoFlip
 WallpaperOpacity=1

home/work.nix

@@ -8,7 +8,10 @@
     twinkle
     (import ./scripts/ukaea-vpn.nix pkgs)
   ];
-  programs.git.userEmail = config.accounts.email.accounts.outlook.address;
+  programs = {
+    git.userEmail = config.accounts.email.accounts.outlook.address;
+    firefox.policies.Homepage.URL = "https://nucleus.ukaea.uk";
+  };
   accounts.email.accounts = {
     proton.primary = lib.mkForce false;
     outlook.primary = lib.mkForce true;