From 02528907eba0686ef49689e3d2cd14e194d9e030 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 13 Jul 2021 10:47:09 -0600
Subject: [PATCH] [NixOS] Fix rofi-systemd term

---
 dotfiles/xprofile      | 11 -----------
 dotfiles/xsession      |  1 -
 nixos/home-manager.nix | 10 ++++++----
 3 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 dotfiles/xprofile
 delete mode 100644 dotfiles/xsession

diff --git a/dotfiles/xprofile b/dotfiles/xprofile
deleted file mode 100644
index 82bcdf19..00000000
--- a/dotfiles/xprofile
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: sh; -*-
-
-# If there are issues with path, check /etc/profile for hard overrides of PATH.
-. "$HOME/.lib/login.sh"
-# XXX: prevents https://github.com/xmonad/xmonad/issues/86 from affecting startup
-rm -f ~/.xmonad
-
-load_xkb_map.sh
-
-run_if_exists systemctl --user import-environment XDG_DATA_DIRS
-run_if_exists systemctl --user start wm.target
diff --git a/dotfiles/xsession b/dotfiles/xsession
deleted file mode 100644
index 5b690c17..00000000
--- a/dotfiles/xsession
+++ /dev/null
@@ -1 +0,0 @@
-ROFI_SYSTEMD_TERM=alacritty
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index 8dc3a1be..457b34e9 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -1,11 +1,13 @@
 { pkgs, ... }: {
-  home.sessionVariablesExtra = ''
-    ROFI_SYSTEMD_TERM="alacritty"
-  '';
-
   xsession = {
+    enable = true;
     preferStatusNotifierItems = true;
+    windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad";
+    profileExtra = ''
+      export ROFI_SYSTEMD_TERM="alacritty -e"
+    '';
   };
+
   home.emptyActivationPath = false;
   programs.home-manager.enable = true;