From f222879f761454b00d29758eacca43e5998b8e87 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Mon, 28 Apr 2025 18:31:47 -0500
Subject: [PATCH] feat: fuck it just need a quick commit

---
 modules/home/default.nix                      |  4 +-
 .../home/gui/apps/tools/espanso/default.nix   | 48 ++++++++++++++-----
 .../home/gui/desktop/theming/gtk/default.nix  |  2 +-
 modules/nixos/default.nix                     |  4 +-
 systems/mars/config/networking.nix            |  2 +-
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/modules/home/default.nix b/modules/home/default.nix
index 4b20180..a0c64bb 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -59,9 +59,6 @@ in
             systemMonitor
             usbImager
             virtManager
-            hypr
-            wayland
-            theming
             polychromatic
             dolphin
             espanso
@@ -69,6 +66,7 @@ in
             jamesDsp
             zoom
             academic
+            theming
             ;
         };
       };
diff --git a/modules/home/gui/apps/tools/espanso/default.nix b/modules/home/gui/apps/tools/espanso/default.nix
index d977e37..a6c0d2c 100755
--- a/modules/home/gui/apps/tools/espanso/default.nix
+++ b/modules/home/gui/apps/tools/espanso/default.nix
@@ -1,17 +1,11 @@
 {
   pkgs,
-  flake,
-  osConfig,
   ...
 }:
-let
-  inherit (flake.config.machines.devices) mars;
-  hostname = osConfig.networking.hostName;
-in
 {
   services.espanso = {
     enable = true;
-    package = if hostname == mars.name then pkgs.espanso-wayland else pkgs.espanso;
+    package = pkgs.espanso;
     matches = {
       base = {
         matches = [
@@ -55,6 +49,18 @@ in
             trigger = ":em";
             replace = "—";
           }
+          {
+            trigger = ":glp";
+            replace = "GLP-1RA";
+          }
+          {
+            trigger = ":degree";
+            replace = "°";
+          }
+          {
+            trigger = ":ss1";
+            replace = "¹";
+          }
           {
             trigger = ":ss2";
             replace = "²";
@@ -64,12 +70,32 @@ in
             replace = "³";
           }
           {
-            trigger = ":glp";
-            replace = "GLP-1RA";
+            trigger = ":ss4";
+            replace = "⁴";
           }
           {
-            trigger = ":degree";
-            replace = "°";
+            trigger = ":ss5";
+            replace = "⁵";
+          }
+          {
+            trigger = ":ss6";
+            replace = "⁶";
+          }
+          {
+            trigger = ":ss7";
+            replace = "⁷";
+          }
+          {
+            trigger = ":ss8";
+            replace = "⁸";
+          }
+          {
+            trigger = ":ss9";
+            replace = "⁹";
+          }
+          {
+            trigger = ":ss0";
+            replace = "⁰";
           }
         ];
       };
diff --git a/modules/home/gui/desktop/theming/gtk/default.nix b/modules/home/gui/desktop/theming/gtk/default.nix
index 498427a..ab0ea7e 100755
--- a/modules/home/gui/desktop/theming/gtk/default.nix
+++ b/modules/home/gui/desktop/theming/gtk/default.nix
@@ -38,6 +38,6 @@ in
     x11.enable = true;
     name = "catppuccin-mocha-dark-cursors";
     package = pkgs.catppuccin-cursors.macchiatoDark;
-    size = cursor.size;
+    size = 12;
   };
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 2863b29..135a205 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -10,8 +10,8 @@ in
           mullvad
           syncthing
           ollama
-          hypr
-          wayland
+          plasma
+          sddm
           searx
           portals
           xserver
diff --git a/systems/mars/config/networking.nix b/systems/mars/config/networking.nix
index 1f1df8c..6bf640b 100755
--- a/systems/mars/config/networking.nix
+++ b/systems/mars/config/networking.nix
@@ -23,7 +23,7 @@ in
         3131 # Deskreen
         1234 # Elm-land server
         5037 # ADB Server
-        53440
+        39578
       ];
     };
   };