2 files changed, 18 insertions, 82 deletions

diff --git a/home.nix b/home.nix
index 401ee8b..476b563 100644
--- a/home.nix
+++ b/home.nix
@@ -309,55 +309,8 @@ in
   programs = {
     home-manager.enable = true;
 
-    aerc.enable = true;
-
     emacs.enable = true;
 
-    foot = {
-      enable = true;
-
-      settings = {
-        main = {
-          # makes it easier when ssh'ing
-          term = "xterm-256color";
-
-          font = "monospace:size=14";
-          dpi-aware = "yes";
-
-          pad = "10x10";
-        };
-
-        colors =
-          let
-            rmhash = s: builtins.substring 1 (-1) s;
-          in
-          {
-            alpha = 0.9;
-
-            background = rmhash colors.current.primary.background;
-            foreground = rmhash colors.current.primary.foreground;
-
-            regular0 = rmhash colors.current.normal.black;
-            regular1 = rmhash colors.current.normal.red;
-            regular2 = rmhash colors.current.normal.green;
-            regular3 = rmhash colors.current.normal.yellow;
-            regular4 = rmhash colors.current.normal.blue;
-            regular5 = rmhash colors.current.normal.magenta;
-            regular6 = rmhash colors.current.normal.cyan;
-            regular7 = rmhash colors.current.normal.white;
-
-            bright0 = rmhash colors.current.bright.black;
-            bright1 = rmhash colors.current.bright.red;
-            bright2 = rmhash colors.current.bright.green;
-            bright3 = rmhash colors.current.bright.yellow;
-            bright4 = rmhash colors.current.bright.blue;
-            bright5 = rmhash colors.current.bright.magenta;
-            bright6 = rmhash colors.current.bright.cyan;
-            bright7 = rmhash colors.current.bright.white;
-          };
-      };
-    };
-
     git = {
       enable = true;
       difftastic = {
@@ -558,32 +511,6 @@ in
       '';
     };
 
-    tmux = {
-      enable = true;
-
-      keyMode = "emacs";
-      mouse = false;
-      prefix = "C-s";
-      terminal = "screen-256color";
-
-      extraConfig = ''
-        # status bar
-        set-option -g status-style bg=terminal
-        set-option -g status-style fg=terminal
-
-        set-option -g window-status-format "#[bg=terminal fg=terminal noreverse]#{window_index}:#{window_name}"
-        set-option -g window-status-current-format "#[bg=black fg=terminal]#{window_index}:#{window_name}#{window_flags}"
-
-        set-option -g status-right "%R %b %d %Y"
-
-        # colorscheme stuff
-        set-option -sa terminal-features ',*:RGB'
-
-        # remove annoying escape delay
-        set-option -g escape-time 0
-      '';
-    };
-
     yt-dlp = {
       enable = true;
       settings = {
@@ -648,13 +575,9 @@ in
     poweralertd.enable = true;
 
     emacs = {
-      enable = false;
+      enable = true;
       client.enable = true;
       startWithUserSession = true;
-      extraOptions = [
-        "-f"
-        "exwm-wm-mode"
-      ];
     };
 
     redshift = {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index fb153e7..ca26902 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -113,14 +113,27 @@
       };
     };
 
-    # to get startx and use amdgpu driver
-    # WM in home-manager
-    xserver = {
+    displayManager = {
       enable = true;
+      ly.enable = true;
+    };
+
+    xserver = {
+      enable = false;
       autorun = false;
-      displayManager.startx.enable = true;
+      displayManager.setupCommands = ''
+        xinput set-prop "Logitech USB Receiver Mouse" "libinput Accel Profile Enabled" 0 1 0
+        xsetwacom set "Wacom One by Wacom S Pen stylus" MapToOutput 2304x1440+560+0
+
+        #xrandr --output HDMI-1 --mode 1920x1080 --left-of DP-1
+
+        xwallpaper --zoom ~/pics/wp/elite_milky_way_below2.png
+      '';
       modules = [ pkgs.xf86_input_wacom ];
       wacom.enable = true;
+
+      # config managed separately
+      windowManager.stumpwm.enable = true;
     };
   };