update doom.d

5 files changed, 108 insertions, 21 deletions

diff --git a/.doom.d/config.el b/.doom.d/config.el
index 3ea0925..ac7a4c9 100644
--- a/.doom.d/config.el
+++ b/.doom.d/config.el
@@ -19,12 +19,14 @@
 ;;
 ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
 ;; font string. You generally only need these two:
+;;(setq doom-font (font-spec ("DejaVu Saans Mono") :size 16))
 (setq doom-font (font-spec :family "monospace" :size 16))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-one)
+;;(setq doom-theme 'doom-one)
+(setq doom-theme 'doom-gruvbox)
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
@@ -34,6 +36,25 @@
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers-type `relative)
 
+(require 'shell-pop)
+(require 'zone)
+(zone-when-idle 120)
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(shell-pop-shell-type (quote ("ansi-term" "*ansi-term*" (lambda nil (ansi-term shell-pop-term-shell)))))
+ '(shell-pop-term-shell "/bin/zsh")
+ '(shell-pop-universal-key "<f5>")
+ '(shell-pop-window-size 30)
+ '(shell-pop-full-span t)
+ '(shell-pop-window-position "bottom")
+ '(shell-pop-autocd-to-working-dir t)
+ '(shell-pop-restore-window-configuration t)
+ '(shell-pop-cleanup-buffer-at-process-exit t))
+
+;;(setq fancy-splash-image "~/Images/wallpapers/night.png")
 
 ;; Here are some additional functions/macros that could help you configure Doom:
 ;;
diff --git a/.doom.d/custom.el b/.doom.d/custom.el
new file mode 100644
index 0000000..40f294b
--- /dev/null
+++ b/.doom.d/custom.el
@@ -0,0 +1,12 @@
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(package-selected-packages (quote (shell-pop org-superstar))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
diff --git a/.doom.d/init.el b/.doom.d/init.el
index 2da2e55..00b3158 100644
--- a/.doom.d/init.el
+++ b/.doom.d/init.el
@@ -35,7 +35,7 @@
        ;;indent-guides     ; highlighted indent columns
        modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
-       neotree           ; a project drawer, like NERDTree for vim
+       ;;neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
        ;;pretty-code       ; ligatures or substitute text with pretty symbols
@@ -76,7 +76,7 @@
        ;;vterm             ; the best terminal emulation in Emacs
 
        :checkers
-       ;;syntax              ; tasing you for every semicolon you forget
+       syntax              ; tasing you for every semicolon you forget
        ;;spell             ; tasing you for misspelling mispelling
        ;;grammar           ; tasing grammar mistake every you make
 
@@ -140,7 +140,7 @@
        ;;ocaml             ; an objective camel
        org               ; organize your plain life in plain text
        ;;perl              ; write code no one else can comprehend
-       ;;php               ; perl's insecure younger brother
+       php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
        ;;python            ; beautiful is better than ugly
@@ -150,7 +150,7 @@
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
        rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-       ;;scala             ; java, but good
+       scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
        ;;sml
diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 7c68fc1..a59a36f 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -2,27 +2,31 @@
 
 sxhkd &
 
-bspc monitor HDMI-0  -d I II III IV V VI VII VIII
+bspc monitor HDMI-0  -d EMACS JEUX MAIL CFG
+bspc monitor DVI-D-0  -d WEB MUS TOR CHAT
 bspc config border_width         2
 bspc config window_gap          16
 
-bspc config top_padding          20
+bspc config top_padding          27
 bspc config split_ratio          0.50
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
-bspc config active_border_color \#6600cc
-bspc config normal_border_color \#3333aa
+bspc config active_border_color \#0066ff
+bspc config normal_border_color \#3366ff
 
 xset r rate 200 100
 bspc rule -a Emacs state=tiled
 bspc rule -a Zathura state=tiled
-bspc rule -a Firefox desktop='^1'
-bspc rule -a Emacs desktop='^2'
-bspc rule -a Clementine desktop='^3'
-bspc rule -a Steam desktop='^4'
-bspc rule -a Lutris desktop='^5'
+bspc rule -a Clementine desktop='^2'
+bspc rule -a signal desktop='^4'
+bspc rule -a discord desktop='^4'
+bspc rule -a Emacs desktop='^5'
+bspc rule -a Lutris desktop='^7'
+bspc rule -a thunderbird desktop='^7'
+bspc rule -a Steam desktop='^6'
 
-feh --bg-fill ~/Images/wallpapers/night.png
+feh --bg-fill ~/Images/wallpapers/minimmountains.jpg
 bash ~/.config/polybar/launch.sh
+bash ~/.screenlayout/one.sh
 compton &
 ~/.config/bspwm/bspswallow &
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 5e85317..372506a 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -6,13 +6,40 @@
 super + Return
 	st
 
-# program launcher
-super + @space
-	rofi -show run
+super + n
+	st -e ranger
+
+super + p
+	thunderbird
+
+super + r
+	emacs
 
+super + a
+	clementine
 
 super + shift + Return
 	firefox
+
+super + F1
+	setxkbmap us
+
+super + F2
+	setxkbmap fr
+
+# program launcher
+super + d
+	rofi -show run \
+	-lines 15 -width 30 \
+	-padding 30 -columns 1 \
+	-font "NotoSans Nerd Font 14" \
+	-scroll-method 1 \
+	-color-window "#1d2021, #b16286, #ebdbb2" \
+	-color-normal "#1d2021, #ebdbb2, #1d2021, #b16286, #1d2021, 0" \
+	-color-active "#1d2021, #ebdbb2, #1d2021, #b16286, #1d2021, 0" \
+	-color-urgent "#1d2021, #ebdbb2, #1d2021, #b16286, #1d2021, 0" \
+	-monitor primary -threads 4
+
 # make sxhkd reload its configuration files:
 super + Escape
 	pkill -USR1 -x sxhkd
@@ -37,10 +64,19 @@ super + m
 super + y
 	bspc node newest.marked.local -n newest.!automatic.local
 
-# swap the current node and the biggest node
-super + g
-	bspc node -s biggest
+## swap the current node and the biggest node
+#super + g
+#	bspc node -s biggest
 
+
+super + v
+	bsp-layout set tall
+
+super + c
+	bsp-layout set wide
+
+super + g
+	bsp-layout set tiled
 #
 # state/flags
 #
@@ -87,6 +123,20 @@ super + {o,i}
 super + {_,shift + }{1-9,0}
 	bspc {desktop -f,node -d} '^{1-9,10}'
 
+XF86Tools
+	bspc desktop -f ^1
+
+XF86Launch5
+	bspc desktop -f ^5
+
+XF86Launch6
+	bspc desktop -f ^2
+
+XF86Launch7
+	bspc desktop -f ^6
+
+XF86Launch8
+	bspc desktop -f ^4
 #
 # preselect
 #