home/desktop/default.nix

@@ -7,7 +7,7 @@
 }: {
   imports = [
     ./sway/default.nix
-    ./alacritty/default.nix
+    ./foot/default.nix
     ./avizo/default.nix
     ./fuzzel/default.nix
     ./swaylock/default.nix
@@ -79,40 +79,31 @@
       inherit (config) scheme;
       inherit accentColourName;
     };
-    toCapital = string:
-      with lib; let
-        chars = let
-          lc = strings.splitString "" string;
-        in (lists.sublist 1 (lists.length lc - 2) lc);
-      in (
-        strings.concatStringsSep "" (
-          (lists.singleton (strings.toUpper (lists.elemAt chars 0)))
-          ++ (lists.sublist 1 (lists.length chars) chars)
-        )
-      );
   in {
     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.adw-gtk3;
+      name = "adw-gtk3";
     };
-    iconTheme = let
-      color = "violet";
-    in {
-      package = pkgs.papirus-icon-theme.override {inherit color;};
-      name = "Papirus-${toCapital config.scheme.variant}";
+    iconTheme = {
+      package = pkgs.papirus-icon-theme.override {color = "violet";};
+      name =
+        if config.scheme.variant == "light"
+        then "Papirus-Light"
+        else "Papirus-Dark";
     };
   };
   qt = {
     enable = true;
-    style.name = "gtk2";
+    style = {
+      package = pkgs.adwaita-qt;
+      name =
+        if config.scheme.variant == "light"
+        then "adwaita"
+        else "adwaita-dark";
+    };
   };
   xdg = {
     mime.enable = true;

home/desktop/fuzzel/default.nix

@@ -17,10 +17,10 @@
         fuzzy = true;
         filter-desktop = true;
         terminal = with config.programs; "${
-          if alacritty.enable
-          then alacritty.package
-          else pkgs.alacritty
-        }/bin/alacritty -e";
+          if foot.enable
+          then foot.package
+          else pkgs.foot
+        }/bin/foot -e";
         lines = 24;
         width = 80;
         tabs = 4;

home/desktop/rofi/default.nix

@@ -9,10 +9,10 @@
     enable = true;
     package = pkgs.rofi-wayland;
     terminal = with config.programs; "${
-      if alacritty.enable
-      then alacritty.package
-      else pkgs.alacritty
-    }/bin/alacritty";
+      if foot.enable
+      then foot.package
+      else pkgs.foot
+    }/bin/foot";
     font = fonts.monospace.name;
     location = "center";
     plugins = with pkgs; [rofi-emoji];

home/desktop/sway/default.nix

@@ -39,7 +39,7 @@ in {
         };
       };
       modifier = "Mod4";
-      terminal = "${config.programs.alacritty.package}/bin/alacritty";
+      terminal = "${config.programs.foot.package}/bin/foot";
       menu = "${config.programs.fuzzel.package}/bin/fuzzel";
       workspaceAutoBackAndForth = true;
       bars = [];

home/desktop/waybar/default.nix

@@ -63,7 +63,7 @@
         "max-length" = 50;
         "rewrite" = {
           "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
-          "(alacritty.*)" = "  $1";
+          "(foot.*)" = "  $1";
           "(.*) - mpv" = "󰦟  $1";
           "swayimg: (.*)" = "󰋩  $1";
           "(btm)" = "  Resource Usage [$1]";

system/desktop.nix

@@ -64,9 +64,7 @@
       package =
         pkgs.swayfx.overrideAttrs
         (old: {passthru.providedSessions = ["sway"];});
-      extraPackages = [];
       wrapperFeatures.gtk = true;
-      xwayland.enable = true;
     };
     gamescope = {
       enable = true;
@@ -77,8 +75,8 @@
   gtk.iconCache.enable = true;
   qt = {
     enable = true;
-    style = "gtk2";
-    platformTheme = "gtk2";
+    style = "adwaita";
+    platformTheme = "gnome";
   };
   services = {
     dbus.packages = with pkgs; [gcr];