Changed Emacs to daemon mode, setting editors accordingly

6 files changed, 21 insertions, 20 deletions

diff --git a/.config/bspwm/README.org b/.config/bspwm/README.org
index b22d2d8..86cd706 100644
--- a/.config/bspwm/README.org
+++ b/.config/bspwm/README.org
@@ -21,7 +21,6 @@
 
   You can get ~bspwm~ here: [[https://github.com/baskerville/bspwm][bspwm]].
 
-
 * Restart safety
 ** No-rerun function
    The following function helps me not restart a specific program in case it is already running,
@@ -77,15 +76,15 @@ bspc config single_monocle			true
 * Applications workspaces assignations
   #+BEGIN_SRC shell
 if [ $screens -eq 3 ]; then
-	bspc rule -a Emacs desktop=01 follow=true
+	bspc rule -a Emacs state=tiled
 	bspc rule -a Firefox desktop=08 follow=true
 	bspc rule -a Wine desktop=07 state=floating
 elif [ $screens -eq 2 ]; then
-	bspc rule -a Emacs desktop=01 follow=true
+	bspc rule -a Emacs state=tiled
 	bspc rule -a Firefox desktop=08 follow=true
 	bspc rule -a Wine desktop=07 state=floating
 elif [ $screens -eq 1 ]; then
-	bspc rule -a Emacs desktop=01 follow=true
+	bspc rule -a Emacs state=tiled
 	bspc rule -a Firefox desktop=08 follow=true
 	bspc rule -a Wine desktop=04 state=floating
 fi
@@ -115,6 +114,7 @@ sleep 2
 
 ** Foreground applications
    #+BEGIN_SRC shell
+bspc desktop -f 01
 run emacs &
 sleep 12
 if [ $screens -eq 3 ]; then
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 7875a96..4e38a84 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -33,15 +33,15 @@ bspc config gapless_monocle			true
 bspc config single_monocle			true
 
 if [ $screens -eq 3 ]; then
-	bspc rule -a Emacs desktop=01 follow=true
+	bspc rule -a Emacs state=tiled
 	bspc rule -a Firefox desktop=08 follow=true
 	bspc rule -a Wine desktop=07 state=floating
 elif [ $screens -eq 2 ]; then
-	bspc rule -a Emacs desktop=01 follow=true
+	bspc rule -a Emacs state=tiled
 	bspc rule -a Firefox desktop=08 follow=true
 	bspc rule -a Wine desktop=07 state=floating
 elif [ $screens -eq 1 ]; then
-	bspc rule -a Emacs desktop=01 follow=true
+	bspc rule -a Emacs state=tiled
 	bspc rule -a Firefox desktop=08 follow=true
 	bspc rule -a Wine desktop=04 state=floating
 fi
@@ -64,6 +64,7 @@ run dunst > /dev/null 2>&1 &
 run lowbat --say "You're low, partner" >/dev/null 2>&1 &
 sleep 2
 
+bspc desktop -f 01
 run emacs &
 sleep 12
 if [ $screens -eq 3 ]; then
diff --git a/.config/sxhkd/README.org b/.config/sxhkd/README.org
index e4345c7..17f5edf 100644
--- a/.config/sxhkd/README.org
+++ b/.config/sxhkd/README.org
@@ -32,7 +32,7 @@
   - [[#expand-a-window-by-moving-one-of-its-side-outward][Expand a window by moving one of its side outward]]
   - [[#contract-a-window-by-moving-one-of-its-side-inward][Contract a window by moving one of its side inward]]
   - [[#move-a-floating-window][Move a floating window]]
-- [[#some-quick-launch-apps][Some quick launch apps]]
+- [[#some-custom-quick-launch-apps][Some custom quick launch apps]]
 - [[#xf86-keys][XF86 keys]]
 
 * About
@@ -211,12 +211,12 @@ super + {Left,Down,Up,Right}
 	/usr/local/bin/bspc node -v {-20 0,0 20,0 -20,20 0}
    #+END_SRC
 
-* Some quick launch apps
+* Some custom quick launch apps
   #+BEGIN_SRC text
 super + 1
 	/usr/local/bin/alacritty -e vifm
 super + 2
-	/usr/local/bin/alacritty
+	/usr/local/bin/emacsclient -c
 super + 3
 	/usr/local/bin/firefox --kiosk https://start.duckduckgo.com/
 super + 4
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index eeb5e9d..8925c5d 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -97,7 +97,7 @@ super + {Left,Down,Up,Right}
 super + 1
 	/usr/local/bin/alacritty -e vifm
 super + 2
-	/usr/local/bin/alacritty
+	/usr/local/bin/emacsclient -c
 super + 3
 	/usr/local/bin/firefox --kiosk https://start.duckduckgo.com/
 super + 4
diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc
index 175401e..428943c 100644
--- a/.config/vifm/vifmrc
+++ b/.config/vifm/vifmrc
@@ -1,7 +1,7 @@
 " vim: filetype=vifm
 source ~/.config/vifm/vifmshortcuts
 
-set vicmd=nvim
+set vicmd="emacsclient -c"
 set syscalls
 set nofollowlinks
 set sortnumbers
diff --git a/.config/zsh/README.org b/.config/zsh/README.org
index 1d385f7..fc4b3a6 100644
--- a/.config/zsh/README.org
+++ b/.config/zsh/README.org
@@ -18,13 +18,13 @@
 This is my ~.zshrc~ org file. Pretty straight forward.
 
 * Colors for the prompt
-  #+BEGIN_SRC zsh
+  #+BEGIN_SRC shell
 autoload -U colors && colors
   #+END_SRC
 
 * History
 ** Basic
-   #+BEGIN_SRC zsh
+   #+BEGIN_SRC shell
 HISTSIZE=5000
 SAVEHIST=5000
 HISTFILE=$XDG_CONFIG_HOME/zsh/history
@@ -34,13 +34,13 @@ zle -N history-beginning-search-forward-end history-search-end
    #+END_SRC
  
 ** Share history between multiple zsh instances
-   #+BEGIN_SRC zsh
+   #+BEGIN_SRC shell
 setopt inc_append_history
 setopt share_history
    #+END_SRC
 
 * Stuff for completions
-#+BEGIN_SRC zsh
+#+BEGIN_SRC shell
 autoload -U compinit
 zstyle ':completion:*' menu select
 zstyle ':completion:*' list-colors 'di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
@@ -52,7 +52,7 @@ _comp_options+=(globdots)
 * Key bindings
 ** Basic keybindings
   These are my ~zsh~ key bindings, enabling vi mode as well
-   #+BEGIN_SRC zsh
+   #+BEGIN_SRC shell
 bindkey -v
 export KEYTIMEOUT=1
 bindkey -M menuselect 'h' vi-backward-char
@@ -70,19 +70,19 @@ bindkey -M vicmd "j" history-beginning-search-forward
 
 ** Command line edit
    This allows me to edit the current line with ~C-e~
-   #+BEGIN_SRC zsh
+   #+BEGIN_SRC shell
 autoload edit-command-line && zle -N edit-command-line
 bindkey "^e" edit-command-line
    #+END_SRC
 
 * Sourcing alias and plugins files
-  #+BEGIN_SRC zsh
+  #+BEGIN_SRC shell
 [ -f "$XDG_CONFIG_HOME/zsh/alias.zsh" ]		&& source $ZDOTDIR/alias.zsh
 [ -f "$XDG_CONFIG_HOME/zsh/plugins.zsh" ]	&& source $ZDOTDIR/plugins.zsh
   #+END_SRC
 
 * Prompt variables
-  #+BEGIN_SRC zsh
+  #+BEGIN_SRC shell
 PROMPT="%B%{$fg[red]%}%M %{$fg[blue]%}%c%{$fg[red]%}%%%{$reset_color%} "
 RPROMPT="${RPROMPT}"'%{$fg_bold[red]%}%(?..%?)%{$reset_color%} $(gitprompt)'
   #+END_SRC