From 109ae12bcc08634e995585c56e0595704d8cbd01 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Mon, 4 Aug 2025 14:02:37 -0500
Subject: [PATCH] fixes to greetd and switching back to fish

---
 home/home.nix       | 19 ++++++++++++++++++-
 modules/desktop.nix | 10 +++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 4f41f58..577b2e9 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -1249,6 +1249,23 @@ in {
       starship init fish | source
     '';
 
+    shellAliases = {
+      ls = "eza -l";
+      la = "eza -la";
+      mpf = "mpv --profile=fast";
+      mps = "mpv --profile=slow";
+      ec = "emacsclient -t";
+      ecc = "emacsclient -c";
+      # mkdir = "mkdir -p";
+      nupd = "update-nix";
+      nupg = "upgrade-nix";
+      suspend = "systemctl suspend";
+      sysuse = "systemctl --user";
+      myip = "curl icanhazip.com";
+      nixs = "nix search nixpkgs";
+      # ytd = "yt-dlp -o '~/Videos/%(title)s.%(ext)s'";
+    };
+
   };
 
   programs.nushell = {
@@ -1463,7 +1480,7 @@ in {
         padding.y = 10;
         dynamic_padding = true;
       };
-      terminal.shell.program = "nu";
+      terminal.shell.program = "fish";
       font = {
         normal = {
           family = "VictorMono Nerd Font";
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 72d9a73..7049614 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -82,16 +82,12 @@ in
     enable = true;
     settings = rec {
       initial_session = {
-        command = "if uwsm check may-start; then
-    exec uwsm start hyprland-uwsm.desktop
-fi";
+        command = "uwsm start hyprland-uwsm.desktop";
         # command = "dbus-run-session startplasma-wayland";
         user = "chris";
       };
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'if uwsm check may-start; then
-	exec uwsm start hyprland-uwsm.desktop
-fi' -s /etc/greetd/environments";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'uwsm start hyprland-uwsm.desktop' -s /etc/greetd/environments";
         user = "greeter";
       };
       plasma_session = {
@@ -99,7 +95,7 @@ fi' -s /etc/greetd/environments";
         user = "chris";
       };
       hyprland_session = {
-        command = "Hyprland";
+        command = "uwsm start hyprland-uwsm.desktop";
         user = "chris";
       };
     };