From f84ad70c113275c8e96132c7115a63860c5867df Mon Sep 17 00:00:00 2001
From: JaeYoo-Im <cpu3792@gmail.com>
Date: Sat, 2 Apr 2022 16:10:16 +0900
Subject: [PATCH] EXWM : updates for rational emacs

---
 .emacs.rational.d/config.el         |  2 +-
 .emacs.rational.d/desktop.el        | 17 ++++++++---------
 .emacs.rational.d/exwm/EXWM.desktop |  2 +-
 .xmonad/scripts/autostart.sh        |  2 +-
 .xmonad/xmonad.hs                   |  4 +++-
 .xmonad/xmonad.org                  |  4 +++-
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.emacs.rational.d/config.el b/.emacs.rational.d/config.el
index dc9a250..195850c 100644
--- a/.emacs.rational.d/config.el
+++ b/.emacs.rational.d/config.el
@@ -40,6 +40,7 @@
 (setenv "LC_ALL" "en_US.UTF-8")
 
 ;; Set further font and theme customizations
+(set-frame-parameter (selected-frame) 'alpha '(80 . 80))
 (custom-set-variables
    '(rational-ui-default-font
      '(:font "Fira Code Retina" :weight light :height 110)))
@@ -155,7 +156,6 @@
               100)
          '(80 . 80) '(100 . 100)))))
 (global-set-key (kbd "C-c t") 'toggle-transparency)
-(set-frame-parameter (selected-frame) 'alpha '(80 . 80))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; EMOJIFY ♌ 
diff --git a/.emacs.rational.d/desktop.el b/.emacs.rational.d/desktop.el
index 2926103..510538c 100644
--- a/.emacs.rational.d/desktop.el
+++ b/.emacs.rational.d/desktop.el
@@ -13,18 +13,17 @@
   ;; Make workspace 1 be the one where we land at startup
   (exwm-workspace-switch-create 1)
   (efs/start-panel)
-  (set-frame-parameter (selected-frame) 'alpha '(75 . 75))
   ;; if not wsl
-  ;;(efs/run-in-background "xsetroot -cursor_name left_ptr")
-  ;;(efs/run-in-background "nm-applet")
-  ;;(efs/run-in-background "pamac-tray")
-  ;;(efs/run-in-background "volumeicon")
-  ;;(efs/run-in-background "numlockx on")
-  ;;(efs/run-in-background "blueberry-tray")
-  ;;(efs/run-in-background "enpass -minimize")
+  (efs/run-in-background "xsetroot -cursor_name left_ptr")
+  (efs/run-in-background "nm-applet")
+  (efs/run-in-background "pamac-tray")
+  (efs/run-in-background "volumeicon")
+  (efs/run-in-background "numlockx on")
+  (efs/run-in-background "blueberry-tray")
+  (efs/run-in-background "bitwarden-desktop")
 
   ;; Launch apps that will run in the background
-  ;;(efs/run-in-background "fcitx"))
+  (efs/run-in-background "fcitx")
 )
 
 (defun efs/exwm-update-class ()
diff --git a/.emacs.rational.d/exwm/EXWM.desktop b/.emacs.rational.d/exwm/EXWM.desktop
index 7a5d2c2..7de02bf 100644
--- a/.emacs.rational.d/exwm/EXWM.desktop
+++ b/.emacs.rational.d/exwm/EXWM.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=EXWM
 Comment=Emacs Window Manager
-Exec=sh /home/jaeus/.emacs.d/exwm/start-exwm.sh
+Exec=sh /home/jaeus/.emacs.rational.d/exwm/start-exwm.sh
 TryExec=sh
 Type=Application
 X-LightDM-DesktopName=exwm
diff --git a/.xmonad/scripts/autostart.sh b/.xmonad/scripts/autostart.sh
index d78d605..e359f6c 100755
--- a/.xmonad/scripts/autostart.sh
+++ b/.xmonad/scripts/autostart.sh
@@ -22,7 +22,7 @@ run nm-applet &
 run pamac-tray &
 run xfce4-power-manager &
 run volumeicon &
-run bitwarden &
+run bitwarden-desktop &
 numlockx on &
 blueberry-tray &
 
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 3c4a3f9..7adfc8e 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -165,6 +165,7 @@ myAppGrid = [ --("Audacity", "audacity")
                  ("Vivaldi", "vivaldi-stable")
                  , ("Emacs", "emacsclient -c -a emacs")
                  , ("Firefox", "firefox")
+                 , ("Vivaldi", "vivaldi-stable")
                  --, ("Geany", "geany")
                  --, ("Geary", "geary")
                  , ("Gimp", "gimp")
@@ -362,8 +363,9 @@ myKeys =
 
     -- Launch Apps
         , ("M-f", spawn "firefox")
+        , ("M-v", spawn "vivaldi-stable")
         , ("M-t", spawn "thunar")
-        , ("M-p", spawn "enpass")
+        , ("M-p", spawn "bitwarden-desktop")
         --, ("M-e", spawn "emacs")
         , ("M-e", spawn myEmacs)
         , ("M-l", spawn "arcolinux-logout")
diff --git a/.xmonad/xmonad.org b/.xmonad/xmonad.org
index b252968..a131505 100644
--- a/.xmonad/xmonad.org
+++ b/.xmonad/xmonad.org
@@ -178,6 +178,7 @@
                    ("Vivaldi", "vivaldi-stable")
                    , ("Emacs", "emacsclient -c -a emacs")
                    , ("Firefox", "firefox")
+                   , ("Vivaldi", "vivaldi-stable")
                    --, ("Geany", "geany")
                    --, ("Geary", "geary")
                    , ("Gimp", "gimp")
@@ -382,8 +383,9 @@
 
       -- Launch Apps
           , ("M-f", spawn "firefox")
+          , ("M-v", spawn "vivaldi-stable")
           , ("M-t", spawn "thunar")
-          , ("M-p", spawn "enpass")
+          , ("M-p", spawn "bitwarden-desktop")
           --, ("M-e", spawn "emacs")
           , ("M-e", spawn myEmacs)
           , ("M-l", spawn "arcolinux-logout")