diff options
| -rw-r--r-- | X/.xinitrc | 7 | ||||
| -rwxr-xr-x | bspwm/bspwmrc | 3 | ||||
| -rw-r--r-- | doom/config.el | 15 | ||||
| -rw-r--r-- | doom/packages.el | 9 | ||||
| -rw-r--r-- | sxhkd/sxhkdrc | 7 | ||||
| -rw-r--r-- | zsh/.zsh/export.zsh | 12 |
6 files changed, 30 insertions, 23 deletions
@@ -33,6 +33,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi xset r rate 200 30 +setxkbmap us -variant colemak -option altwin:swap_alt_win # Startup programs eval $(ssh-agent) @@ -40,10 +41,8 @@ sxhkd & compton & redshift & dunst & -wal -R -# xrandr --output DP-1 --auto --output DP-2 --left-of DP-1 --auto --output DVI-1-0 --rotate left --right-of DP-1 --auto -xrandr --output DP-1 --rotate normal --auto --output DVI-1-0 --rotate left --right-of DP-1 --auto -feh --bg-fill "$(< "${HOME}/.cache/wal/wal")" +xrandr --output DP-1 --rotate normal --auto --output DVI-1-0 --rotate right --right-of DP-1 --auto --output DP-2 --left-of DP-1 --auto +feh --bg-center /home/ymherklotz/images/wp1.jpg /home/ymherklotz/images/wp3.jpg /home/ymherklotz/images/wp2.jpg xsetroot -cursor_name left_ptr #exec i3 diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc index 090494a..d27a070 100755 --- a/bspwm/bspwmrc +++ b/bspwm/bspwmrc @@ -1,7 +1,8 @@ #!/bin/sh bspc monitor DP-1 -d term web code music -bspc monitor DVI-1-0 -d 5 6 7 8 +bspc monitor DP-2 -d 5 6 7 +bspc monitor DVI-1-0 -d 8 9 bspc config border_width 0 bspc config window_gap 5 diff --git a/doom/config.el b/doom/config.el index ec5b1be..805a820 100644 --- a/doom/config.el +++ b/doom/config.el @@ -42,6 +42,7 @@ (global-set-key (kbd "C-c a") #'org-agenda) (global-set-key (kbd "C-c /") #'avy-goto-word-1) (global-set-key (kbd "M-=") #'count-words) +(global-set-key (kbd "C-x m") #'+notmuch/compose) ;; Set undo-only correctly (global-set-key (kbd "C-\\") 'undo-only) @@ -163,8 +164,8 @@ ;; Set sensitive data mode (setq auto-mode-alist (append - (list '("\\.\\(vcf\\|gpg\\)\\'" . sensitive-minor-mode) - '("\\.sv\\'" . verilog-mode)) + (list ;;'("\\.\\(vcf\\|gpg\\)\\'" . sensitive-minor-mode) + '("\\.sv\\'" . verilog-mode)) auto-mode-alist)) (after! verilog-mode @@ -351,6 +352,8 @@ (setq org-export-with-broken-links t) (require 'org-habit) + (require 'ox-extra) + (ox-extras-activate '(ignore-headlines)) (require 'calendar) (setq calendar-mark-diary-entries-flag t) @@ -442,13 +445,7 @@ ("\\paragraph{%s}" . "\\paragraph*{%s}"))) (add-to-list 'org-latex-packages-alist '("" "minted")) (setq org-latex-listings 'minted) - - (setq org-latex-pdf-process - '("%latex -shell-escape -interaction nonstopmode -output-directory %o %f" - "%latex -shell-escape -interaction nonstopmode -output-directory %o %f" - "%latex -shell-escape -interaction nonstopmode -output-directory %o %f")) - (setq-default TeX-command-extra-options "-shell-escape" - TeX-engine 'xetex) + (setq org-latex-pdf-process '("latexmk -f -pdf -%latex -shell-escape -interaction=nonstopmode -output-directory=%o %f")) (setq org-beamer-environments-extra '(("onlyenv" "o" "\\begin{onlyenv}%a{%h}" "\\end{onlyenv}") ("onlyenvNH" "o" "\\begin{onlyenv}%a" "\\end{onlyenv}") ("blockNH" "o" "\\begin{block}%a{}" "\\end{block}") diff --git a/doom/packages.el b/doom/packages.el index 043f41e..8a3016f 100644 --- a/doom/packages.el +++ b/doom/packages.el @@ -39,7 +39,14 @@ ;; Misc dependencies (package! hungry-delete) (package! vagrant-tramp) -(package! org-zettelkasten) + +(package! plz + :recipe (:host github :repo "alphapapa/plz.el")) +(package! ement + :recipe (:host github :repo "alphapapa/ement.el")) +(package! org-zettelkasten + :recipe (:host github :repo "ymherklotz/emacs-zettelkasten")) + (package! pinentry) (package! package-lint) diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 11e6853..78e64e9 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -59,8 +59,8 @@ super + {_,shift + }{n,e,u,i} bspc node -{f,s} {west,south,north,east} # focus the node for the given path jump -super + {p,b,comma,period} - bspc node -f @{parent,brother,first,second} +super + {p,b} + bspc node -f @{parent,brother} # focus the next/previous node in the current desktop super + {_,shift + }c @@ -87,6 +87,9 @@ super + {_,shift + }{1-9,0} super + alt + {_,shift + }{1-9,0} bspc {desktop -f,node -d} '{11,12,13,14,15,16,17,18,19,20}' +super + {comma,period} + bspc monitor --focus {prev,next} + # # preselect # diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh index 3a277c1..46b6118 100644 --- a/zsh/.zsh/export.zsh +++ b/zsh/.zsh/export.zsh @@ -13,7 +13,7 @@ export VISUAL='emacsclient -c' export TERM='xterm-256color' export CLICOLOR=1 -export LFSCSIGS="$HOME/.opam/default/.opam-switch/sources/coq-smtcoq.dev+8.13/src/lfsc/tests/signatures" +#export LFSCSIGS="$HOME/.opam/default/.opam-switch/sources/coq-smtcoq.dev+8.13/src/lfsc/tests/signatures" prepend_path() { [ -d "$1" ] && PATH="$1:$PATH" @@ -64,11 +64,11 @@ command -v direnv >/dev/null 2>&1 [ "$?" -eq 0 ] && eval "$(direnv hook zsh)" # Opam hook setup and initialising it -command -v opam >/dev/null 2>&1 -if [ "$?" -eq 0 ]; then - test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true - eval "$(opam env)"; -fi +# command -v opam >/dev/null 2>&1 +# if [ "$?" -eq 0 ]; then +# test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true +# eval "$(opam env)"; +# fi # Load rust environment [ -r "$HOME/.cargo/env" ] && source $HOME/.cargo/env |