From f3d5ff594a56384be3a15bc6abf7d0cbeec244f1 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Wed, 4 Dec 2024 00:46:02 -0500
Subject: [PATCH] Add tuigreet in place of direct login to sway, fix startup
 issue with mpd calling nfs mount before existing network

---
 hosts/tower/filesystems/default.nix             | 2 +-
 modules/home/programs/gui/mangohud/default.nix  | 2 --
 modules/system/programs/greetd/default.nix      | 2 +-
 modules/system/services/general/mpd/default.nix | 1 +
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix
index 26bb7fa..9a6a7a0 100644
--- a/hosts/tower/filesystems/default.nix
+++ b/hosts/tower/filesystems/default.nix
@@ -37,7 +37,7 @@
     "/home/jimbo/JimboNFS" = {
       device = "${config.ips.server}:/export/JimboNFS";
       fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
+      options = [ "x-systemd.automount" "noauto" ];
     };
   };
 }
diff --git a/modules/home/programs/gui/mangohud/default.nix b/modules/home/programs/gui/mangohud/default.nix
index 7687704..647ae17 100644
--- a/modules/home/programs/gui/mangohud/default.nix
+++ b/modules/home/programs/gui/mangohud/default.nix
@@ -4,7 +4,6 @@
     packages = with pkgs; [ mangohud ];
     file = {
       # These options exist in Nixlang, but the order is not respected.
-      # As of 24.11, exec is no longer respected either. No clue why.
       ".config/MangoHud/MangoHud.conf".text = ''
         table_columns=2
         frametime=0
@@ -12,7 +11,6 @@
         font_scale=0.80
         background_alpha=0.25
         
-        exec=echo $(echo $XDG_CURRENT_DESKTOP | sed 's/./\U&/') on $(cat /etc/os-release | grep PRETTY_NAME | cut -d '"' -f 2)
         fps
         fps_color_change
         ram
diff --git a/modules/system/programs/greetd/default.nix b/modules/system/programs/greetd/default.nix
index 9732cd4..7327775 100644
--- a/modules/system/programs/greetd/default.nix
+++ b/modules/system/programs/greetd/default.nix
@@ -8,7 +8,7 @@
         vt = 2;
         switch = true;
       };
-      default_session.command = "${pkgs.cage}/bin/cage -d -m last ${pkgs.greetd.gtkgreet}/bin/gtkgreet";
+      default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet";
     };
   };
 
diff --git a/modules/system/services/general/mpd/default.nix b/modules/system/services/general/mpd/default.nix
index 5ce31d8..f86b87f 100644
--- a/modules/system/services/general/mpd/default.nix
+++ b/modules/system/services/general/mpd/default.nix
@@ -3,6 +3,7 @@
   config = lib.mkIf config.system.desktop.enable {
     services.mpd = {
       enable = true;
+      startWhenNeeded = true;
       user = "jimbo";
       group = "users";
       musicDirectory = "/home/jimbo/JimboNFS/Music/JimBops";