From dd678ff7a105bb5215433c727588e3f3ee360aa6 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Wed, 4 Mar 2026 19:51:13 +0100
Subject: [PATCH] fix the theming for stylix, do konsole instead of foot again
 because it handles fonts better and has all the copy functions now

---
 .../desktop/package-configs/konsole/konsolerc |  4 ++
 .../plasma-desktop/default.nix                | 18 ++++-----
 nixos/shared/default.nix                      | 40 ++++++++++---------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/home-manager/desktop/package-configs/konsole/konsolerc b/home-manager/desktop/package-configs/konsole/konsolerc
index 15754ac..36091f3 100644
--- a/home-manager/desktop/package-configs/konsole/konsolerc
+++ b/home-manager/desktop/package-configs/konsole/konsolerc
@@ -15,3 +15,7 @@ ToolBarsMovable=Disabled
 
 [UiSettings]
 ColorScheme=
+
+[Notification Messages]
+CloseAllEmptyTabs=true
+CloseAllTabs=true
diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix
index 939229d..cf7da00 100644
--- a/home-manager/desktop/package-configs/plasma-desktop/default.nix
+++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix
@@ -85,14 +85,18 @@
       target = ".config/autostart/signal.desktop";
       source = "${pkgs.signal-desktop}/share/applications/signal.desktop";
     };
-    "foot.desktop" = {
-      target = ".config/autostart/foot.desktop";
-      source = "${pkgs.foot}/share/applications/foot.desktop";
+    "org.kde.konsole.desktop" = {
+      target = ".config/autostart/org.kde.konsole.desktop";
+      source = "${pkgs.kdePackages.konsole}/share/applications/org.kde.konsole.desktop";
     };
     "vesktop.desktop" = {
       target = ".config/autostart/vesktop.desktop";
       source = "${pkgs.vesktop}/share/applications/vesktop.desktop";
     };
+    "thunderbird.desktop" = {
+      target = ".config/autostart/thunderbird.desktop";
+      source = "${pkgs.thunderbird}/share/applications/thunderbird.desktop";
+    };
     "com.nextcloud.desktopclient.nextcloud.desktop" = {
       target = ".config/autostart/com.nextcloud.desktopclient.nextcloud.desktop";
       source = "${pkgs.nextcloud-client}/share/applications/com.nextcloud.desktopclient.nextcloud.desktop";
@@ -107,7 +111,7 @@
     enable = true;
     desktop.mouseActions.verticalScroll = "switchVirtualDesktop";
     kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
-    input.keyboard.options = ["compose:caps_toggle"];
+    input.keyboard.options = ["caps:none,compose:caps"];
     kwin = {
       nightLight = {
         enable = true;
@@ -245,7 +249,7 @@
                   "applications:steam.desktop"
                   "applications:noisetorch.desktop"
                   "applications:org.kde.plasma-systemmonitor.desktop"
-                  "applications:foot.desktop"
+                  "applications:org.kde.konsole.desktop"
                   "applications:freetube.desktop"
                 ];
               };
@@ -305,10 +309,6 @@
       "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print";
     };
     configFile = {
-      kwinrc."Tiling/8bc14a22-208f-4499-aeff-ba85e134c9ef/571267c2-b87a-46ea-9173-b5cacff0ebb0".padding = 0;
-      kwinrc."Tiling/8bc14a22-208f-4499-aeff-ba85e134c9ef/571267c2-b87a-46ea-9173-b5cacff0ebb0".tiles = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}";
-      kwinrc."Tiling/8bc14a22-208f-4499-aeff-ba85e134c9ef/88c5aae3-1a0f-4571-a7f3-5ae5c74a2282".padding = 0;
-      kwinrc."Tiling/8bc14a22-208f-4499-aeff-ba85e134c9ef/88c5aae3-1a0f-4571-a7f3-5ae5c74a2282".tiles = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}";
       kwinrc.Plugins.rememberwindowpositionsEnabled = true;
     };
   };
diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix
index 0a7b659..e0f4565 100644
--- a/nixos/shared/default.nix
+++ b/nixos/shared/default.nix
@@ -131,8 +131,8 @@
       base0A = "eed49f";
       base0B = "a6da95";
       base0C = "8bd5ca";
-      base0D = "8aadf4";
-      base0E = "c6a0f6";
+      base0D = "c6a0f6";
+      base0E = "8aadf4";
       base0F = "f0c6c6";
     };
     image = ./background.jpg;
@@ -143,17 +143,17 @@
     fonts = {
       serif = {
         package = pkgs.atkinson-hyperlegible;
-        name = "Atkinson Hyperlegible";
+        name = "Atkinson Hyperlegible Next";
       };
 
       monospace = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans Mono";
+        package = pkgs.atkinson-hyperlegible-mono;
+        name = "Atkinson Hyperlegbile Mono";
       };
 
       sansSerif = {
         package = pkgs.atkinson-hyperlegible;
-        name = "Atkinson Hyperlegible";
+        name = "Atkinson Hyperlegible Next";
       };
 
       emoji = {
@@ -168,23 +168,25 @@
     then false
     else true;
 
-  fonts.packages = [
-    pkgs.atkinson-hyperlegible
-    pkgs.atkinson-monolegible
-    pkgs.noto-fonts-emoji-blob-bin
-    pkgs.noto-fonts
-    pkgs.nerd-fonts.fira-mono
-    pkgs.font-awesome
-    pkgs.liberation_ttf
+  fonts.packages = with pkgs; [
+    atkinson-hyperlegible-next
+    atkinson-hyperlegible-mono
+    dejavu_fonts
+    noto-fonts-emoji-blob-bin
+    noto-fonts
+    nerd-fonts.fira-mono
+    font-awesome
+    liberation_ttf
   ];
 
   fonts.fontconfig = {
     useEmbeddedBitmaps = true;
-    # defaultFonts = {
-    #   emoji = ["Blobmoji"];
-    #   monospace = ["Atkinson Monolegible"];
-    #   sansSerif = ["Atkinson Hyperlegible"];
-    # };
+    defaultFonts = {
+      emoji = ["Blobmoji"];
+      monospace = ["Atkinson Hyperlegible Mono" "dejaVu Sans Mono"];
+      sansSerif = ["Atkinson Hyperlegible Next"];
+      serif = ["Atkinson Hyperlegible Next"];
+    };
   };
   systemd = {
     services."shutdown-zellij-zsh" = {