From b5dab67f08d0c2afbbd38a0170cf2fb0cdfaca6f Mon Sep 17 00:00:00 2001
From: Emile Clark-Boman <eclarkboman@gmail.com>
Date: Fri, 1 Aug 2025 13:35:24 +1000
Subject: [PATCH] auto stash before checking out "forge/main"

---
 hosts/hyrule/default.nix     |  2 ++
 hosts/hyrule/mailserver.nix  | 14 ++++++--------
 hosts/lolcathost/default.nix | 10 +++++++++-
 hosts/sddm-theme-corners.nix |  6 +++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix
index a21a5ac..e68d0d3 100755
--- a/hosts/hyrule/default.nix
+++ b/hosts/hyrule/default.nix
@@ -12,6 +12,8 @@ in {
   imports = [
     ./hardware-configuration.nix
     (import "${home-manager}/nixos")
+
+    ./mailserver.nix # TEMP: location
     #../modules/server/nginx.nix
     #../modules/server/ssh.nix
     #../modules/server/fail2ban.nix
diff --git a/hosts/hyrule/mailserver.nix b/hosts/hyrule/mailserver.nix
index c5556f2..49274f2 100644
--- a/hosts/hyrule/mailserver.nix
+++ b/hosts/hyrule/mailserver.nix
@@ -6,8 +6,7 @@
   imports = [
     (builtins.fetchTarball {
       url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.05/nixos-mailserver-nixos-25.05.tar.gz";
-      # release="nixos-25.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      sha256 = "0jpp086m839dz6xh6kw5r8iq0cm4nd691zixzy6z11c4z2vf8v85";
     })
   ];
 
@@ -15,7 +14,7 @@
   # DOCS: https://nixos-mailserver.readthedocs.io/en/latest
   mailserver = {
     enable = true;
-    stateVersion = 3;
+    # stateVersion = 3;
     # Manually open the firewall instead
     openFirewall = false;
     virusScanning = false; # expensive memory usage
@@ -23,17 +22,16 @@
     fqdn = "mail.imbored.dev";
     domains = ["imbored.dev"];
 
-    # A list of all login accounts. To create the password hashes, use
-    # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
+    # NOTE: generate hashes with `mkpasswd -sm bcrypt`
     loginAccounts = {
       "me@imbored.dev" = {
-        hashedPasswordFile = "/a/file/containing/a/hashed/password";
         aliases = ["emile@imbored.dev"];
+        hashedPasswordFile = let
+          CWD = builtins.getEnv "PWD";
+        in "${CWD}/secrets/passwd/me";
       };
     };
 
-    # Use Let's Encrypt certificates. Note that this needs to set up a stripped
-    # down nginx and opens port 80.
     certificateScheme = "acme-nginx";
   };
 }
diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix
index 39e448e..2317275 100755
--- a/hosts/lolcathost/default.nix
+++ b/hosts/lolcathost/default.nix
@@ -107,7 +107,13 @@ in {
         wayland.enable = true; # experimental
         theme = "corners";
       };
-      defaultSession = "hyprland";
+      defaultSession =
+        "hyprland"
+        + (
+          if config.programs.hyprland.withUWSM == true
+          then "-uwsm"
+          else null
+        );
     };
 
     # Multimedia Framework
@@ -233,6 +239,8 @@ in {
     # Sage
     sageWithDoc # SageMath + HTML Documentation
 
+    qemu # Fellice Bellard's Quick Emulator
+
     openvpn
     inetutils
 
diff --git a/hosts/sddm-theme-corners.nix b/hosts/sddm-theme-corners.nix
index ccc93f0..e9a755f 100755
--- a/hosts/sddm-theme-corners.nix
+++ b/hosts/sddm-theme-corners.nix
@@ -1,8 +1,8 @@
 {pkgs}: {
-  sddm-theme-corners = pkgs.stdenv.mkDerivation rec {
+  sddm-theme-corners = pkgs.stdenv.mkDerivation {
     name = "sddm-theme-corners";
-    #version = "1.0";
-    #dontBuild = true;
+    version = "1.0.0";
+
     installPhase = ''
       mkdir -p $out/share/sddm/themes
       cp -ar $src/corners $out/share/sddm/themes/