add s-N to switch workspace, add rofi-switch-window

1 files changed, 16 insertions, 7 deletions

diff --git a/.emacs.d/lisp/init-exwm.el b/.emacs.d/lisp/init-exwm.el
index 1d81297..c5884cc 100644
--- a/.emacs.d/lisp/init-exwm.el
+++ b/.emacs.d/lisp/init-exwm.el
@@ -7,11 +7,11 @@
 ;;   :bind
 ;;   ("s-d" . dmenu))
 
-(defun apollo/run_rofi ()
+(defun apollo/rofi-switch-window ()
   "Launch rofi.  Cant get it to work with exwm as of now tho."
   (interactive)
   (start-process-shell-command
-   "rofi" nil "rofi -show run"))
+   "rofi" nil "rofi -show window"))
 ;; (global-set-key (kbd "s-<tab>") 'apollo/run_rofi)
 
 (defun apollo/run-in-background (command)
@@ -112,10 +112,10 @@
           ([?\s-r] . exwm-reset)
 
           ;; Move between windows
-          ([s-left] . windmove-left)
+          ([C-w C-p] . windmove-left)
           ([C-w C-n] . windmove-right)
-          ([s-up] . windmove-up)
-          ([s-down] . windmove-down)
+;          ([s-up] . windmove-up)
+;          ([s-down] . windmove-down)
 	  ([C-w C-v] . split-window-right)
 
           ;; Launch applications via shell command
@@ -126,6 +126,10 @@
           ;; Switch workspace
           ([?\s-e] . exwm-workspace-switch)
           ([?\s-`] . (lambda () (interactive) (exwm-workspace-switch-create 0)))
+          ([?\s-1] . (lambda () (interactive) (exwm-workspace-switch-create 1)))
+          ([?\s-2] . (lambda () (interactive) (exwm-workspace-switch-create 2)))
+          ([?\s-3] . (lambda () (interactive) (exwm-workspace-switch-create 3)))
+          ([?\s-4] . (lambda () (interactive) (exwm-workspace-switch-create 4)))
 
           ;; 's-N': Switch to certain workspace with Super (Win) plus a number key (0 - 9)
           ,@(mapcar (lambda (i)
@@ -135,8 +139,8 @@
                           (exwm-workspace-switch-create ,i))))
                     (number-sequence 0 9))))
   
-  (exwm-input-set-key (kbd "s-d") 'counsel-linux-app)
-  (exwm-input-set-key (kbd "s-<tab>") 'apollo/run_rofi)
+  (exwm-input-set-key (kbd "s-d") 'dmenu)
+  (exwm-input-set-key (kbd "s-<tab>") 'apollo/rofi-switch-window)
   (exwm-input-set-key (kbd "s-q") 'kill-emacs)
   (exwm-input-set-key (kbd "<XF86AudioRaiseVolume>") 'apollo/volume-increase)
   (exwm-input-set-key (kbd "<XF86AudioLowerVolume>") 'apollo/volume-decrease)
@@ -146,4 +150,9 @@
 (set-frame-parameter (selected-frame) 'alpha '(90 90))
 (add-to-list 'default-frame-alist '(alpha 90 90))
 
+;;Follow focus using exwm-mff
+(use-package exwm-mff
+  :init
+  (exwm-mff-mode))
+
 ;;; init-exwm.el ends here