diff --git a/hosts/tuxcomp/kanshi.nix b/hosts/tuxcomp/kanshi.nix
index 1c21226..1e28e20 100644
--- a/hosts/tuxcomp/kanshi.nix
+++ b/hosts/tuxcomp/kanshi.nix
@@ -5,6 +5,10 @@
     enable = true;
     settings = [
       { profile.name = "default";
+        profile.exec = [
+          /home/djai/.config/hypr/scripts/waybar.sh
+          /home/djai/.config/hypr/scripts/bg.sh
+        ];
         profile.outputs = [
           {
             criteria = "eDP-2";
@@ -14,6 +18,10 @@
         ];
       }
       { profile.name = "grun";
+        profile.exec = [
+          /home/djai/.config/hypr/scripts/waybar.sh
+          /home/djai/.config/hypr/scripts/bg.sh
+        ];
         profile.outputs = [
           {
             criteria = "eDP-2";
@@ -28,6 +36,10 @@
         ];
       }
       { profile.name = "illo";
+        profile.exec = [
+          /home/djai/.config/hypr/scripts/waybar.sh
+          /home/djai/.config/hypr/scripts/bg.sh
+        ];
         profile.outputs = [
           {
             criteria = "eDP-2";
@@ -42,6 +54,10 @@
         ];
       }
       { profile.name = "remi";
+        profile.exec = [
+          /home/djai/.config/hypr/scripts/waybar.sh
+          /home/djai/.config/hypr/scripts/bg.sh
+        ];
         profile.outputs = [
           {
             criteria = "eDP-2";
diff --git a/modules/base.nix b/modules/base.nix
index f7b533a..39ff30c 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -3,7 +3,7 @@
   pkgs,
   inputs,
   ...
-}:
+}@osConfig:
 
 {
   nix.settings.experimental-features = [
@@ -59,11 +59,13 @@
     extraSpecialArgs = { inherit inputs; };
     backupFileExtension = "bck";
 
-    users."djai" = {
+    users."djai" = { config, ... }: {
       programs.home-manager.enable = true;
 
+      xdg.configFile."uwsm/env".source = "${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh";
+
       home.file.".ssh/config".text = ''
-        Include ${config.sops.secrets."ssh-config".path}
+        Include ${osConfig.config.sops.secrets."ssh-config".path}
       '';
 
       home = {
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index e06d256..0de75b1 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -7,15 +7,18 @@
 
   services.greetd = {
     enable = true;
+    useTextGreeter = true;
     settings = rec {
       initial_session = {
         command="${pkgs.uwsm}/bin/uwsm start hyprland.desktop";
         user = "djai";
       };
-      default_session = initial_session;
+      default_session = {
+        command = "${pkgs.tuigreet}/bin/tuigreet";
+        user = "greeter";
+      };
     };
   };
-  programs.regreet.enable = true;
 
   # note that we set the videodrivers on a per-host basis, so not here.
   services.xserver = {
@@ -51,13 +54,13 @@
   users.users.djai.packages = with pkgs; [
     hyprpicker
     hyprprop
-    hyprlandPlugins.hypr-darkwindow
+    waybar
+    tuigreet
     wf-recorder
     grimblast
     wmctrl
     kanshi
     rofi
-    waybar
     wl-clipboard
     wl-clipboard-x11
     swaybg
diff --git a/modules/desktop/hypr.nix b/modules/desktop/hypr.nix
index 01f3bec..30bf791 100644
--- a/modules/desktop/hypr.nix
+++ b/modules/desktop/hypr.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 
 let
@@ -40,6 +40,7 @@ in
   home-manager.users."djai".home.file.".config/hypr/scripts".source = ./scripts;
   home-manager.users."djai".home.file.".config/hypr/shaders".source = ./shaders;
 
+
   home-manager.users."djai".wayland.windowManager.hyprland = {
     enable = true;
     configType = "lua";
@@ -48,6 +49,7 @@ in
       hyprlandPlugins.hypr-darkwindow
     ];
     portalPackage = null;
+    systemd.enable = false;
 
     settings = {
       on = [ #TODO: set up exec oncess