Merge branch 'uni'

12 files changed, 154 insertions, 59 deletions

diff --git a/X/.xinitrc b/X/.xinitrc
index 630a1c0..4cbbf6e 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -33,14 +33,15 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 # Startup programs
+eval $(ssh-agent)
 dropbox &
-sxhkd -m 1 &
+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
 feh --bg-fill "$(< "${HOME}/.cache/wal/wal")"
-xinput set-prop 'DLL075B:01 06CB:76AF Touchpad' 'libinput Natural Scrolling Enabled' 1
 xsetroot -cursor_name left_ptr
 
 #exec i3
diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index bf0d897..b6a2ca7 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-bspc monitor eDP-1 -d term web code music 5 6
-bspc monitor DP-1  -d 7 8 9 0
+bspc monitor DP-1 -d term web code music
+bspc monitor DP-2 -d 5 6 7 8
+bspc monitor DVI-1-0 -d 9 0
 
 bspc config border_width 0
 bspc config window_gap   5
diff --git a/emacs/loader.org b/emacs/loader.org
index bd14c7e..5d300ee 100644
--- a/emacs/loader.org
+++ b/emacs/loader.org
@@ -132,12 +132,16 @@ buffer instead.
   (fset 'yes-or-no-p 'y-or-n-p)
   (global-hl-line-mode 1)
   (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
+  (add-to-list 'load-path "~/.emacs.d/modes/")
+  (setq ring-bell-function 'ignore)
 #+END_SRC
 
 #+RESULTS:
 : t
 
 #+BEGIN_SRC emacs-lisp
+  (global-unset-key (kbd "C-z"))
+
   (global-set-key (kbd "M-u")   #'upcase-dwim)
   (global-set-key (kbd "M-l")   #'downcase-dwim)
   (global-set-key (kbd "M-c")   #'capitalize-dwim)
@@ -155,8 +159,9 @@ buffer instead.
   (global-set-key (kbd "C-c c") #'org-capture)
 #+END_SRC
 
-#+RESULTS:
-: org-capture
+#+begin_src emacs-lisp
+  (global-visual-line-mode t)
+#+end_src
 
 #+begin_src emacs-lisp
   (global-visual-line-mode t)
@@ -355,8 +360,8 @@ programming and looking at source code.
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
-  (set-default-font "Iosevka Medium-14")
-  (setq default-frame-alist '((font . "Iosevka Medium-14")))
+  (set-default-font "Iosevka Medium-12")
+  (setq default-frame-alist '((font . "Iosevka Medium-12")))
 #+END_SRC
 
 #+RESULTS:
@@ -499,6 +504,15 @@ Define utility functions to make the reader work.
 : y/elfeed-save-db-and-bury
 
 * Utility
+** Zettelkasten
+
+#+begin_src emacs-lisp
+  (when (file-directory-p "~/projects/emacs-zettelkasten")
+    (add-to-list 'load-path "~/projects/emacs-zettelkasten")
+    (require 'zettelkasten)
+    (zettelkasten-mode t))
+#+end_src
+
 ** Navigation
 
 Set navigation commands in all the buffers
@@ -676,16 +690,11 @@ incrementally selecting more and more of the text.
     :config
     (yas-global-mode))
 #+END_SRC
+** Tramp
 
-** Nix
-
-#+BEGIN_SRC emacs-lisp
-  (use-package direnv
-    :config
-    (direnv-mode))
-#+END_SRC
-
-#+RESULTS:
+#+begin_src emacs-lisp
+  (setq tramp-default-method "ssh")
+#+end_src
 
 * Writing
 
@@ -722,7 +731,7 @@ incrementally selecting more and more of the text.
     (setq TeX-engine 'xetex)
     (setq TeX-auto-save t)
     (setq TeX-parse-self t)
-    (setq TeX-command-extra-options "-shell-escape")
+    (setq-default TeX-command-extra-options "-shell-escape")
     (setq TeX-save-query nil)
     (setq-default TeX-master nil)
     (setq TeX-PDF-mode t)
@@ -837,7 +846,7 @@ Add org noter
   (use-package org-noter
       :after org
       :config (setq org-noter-default-notes-file-names '("notes.org")
-                    org-noter-notes-search-path '("~/org/research")
+                    org-noter-notes-search-path '("~/org/bibliography")
                     org-noter-separate-notes-from-heading t))
 
   (use-package org-ref
@@ -849,19 +858,27 @@ Add org noter
     :config
     (setq org-ref-bibliography-notes "~/Dropbox/bibliography/notes.org"
           org-ref-default-bibliography '("~/Dropbox/bibliography/references.bib")
-          org-ref-pdf-directory "~/Dropbox/bibliography/bibtex-pdfs/")
-    (setq org-latex-pdf-process (list "latexmk -shell-escape -bibtex -f -pdf %f"))
+          org-ref-pdf-directory "~/Dropbox/bibliography/papers/")
     (setq org-ref-completion-library 'org-ref-ivy-cite))
 #+END_SRC
 
 #+RESULTS:
 : org-ref-bibtex-hydra/body
 
+*** Org ID
+
+#+begin_src emacs-lisp
+  (use-package org-id
+    :ensure nil
+    :after org)
+#+end_src
+
 *** Templates
 #+BEGIN_SRC emacs-lisp
   (setq org-capture-templates
         '(("t" "todo" entry (file+headline "~/Dropbox/org/inbox.org" "Tasks")
-           "* TODO %?\n\n%i\n%a\n\n")))
+           "* TODO %?\n\n%i\n%a\n\n")
+           ()))
 #+END_SRC
 
 *** Agenda
@@ -916,14 +933,12 @@ Add org noter
   (set-register ?c (cons 'file (format-time-string "~/Dropbox/org/journals/%Y-%m.org")))
 #+END_SRC
 
-#+RESULTS:
-: (file . ~/Dropbox/org/journals/2019-09.org)
-
 *** Exporting
 
 #+BEGIN_SRC emacs-lisp
   (use-package ox-twbs)
-  #+EN
+#+END_SRC
+
 ** PDF Tools
 
 #+BEGIN_SRC emacs-lisp
@@ -1097,7 +1112,8 @@ Adding hook to clojure mode to enable strict parentheses mode.
 #+begin_src emacs-lisp
   (use-package proof-general
     :config
-    (setq coq-compile-before-require t))
+    (setq coq-compile-before-require t)
+    (setq proof-splash-enable nil))
 #+end_src
 
 #+RESULTS:
@@ -1160,7 +1176,6 @@ Haskell mode with company mode completion.
                                     (set (make-local-variable 'projectile-tags-command)
                                           "hasktags -Re -f \"%s\" %s \"%s\"")))
     (setq ;;haskell-mode-stylish-haskell-path "brittany"
-     haskell-stylish-on-save t
      flycheck-ghc-language-extensions '("OverloadedStrings"))
 
     (setq haskell-indentation-layout-offset 4
@@ -1181,11 +1196,17 @@ Haskell mode with company mode completion.
 *** LLVM IR
 
 #+begin_src emacs-lisp
-  (require 'llvm-mode)
+  (when (file-exists-p "~/.emacs.d/modes/llvm-mode.el")
+      (require 'llvm-mode))
 #+end_src
 
-#+RESULTS:
-: llvm-mode
+*** HOL
+
+#+begin_src emacs-lisp
+  (when (file-exists-p "/opt/hol/tools/hol-mode.el")
+    (setq hol-executable "/opt/hol/bin/hol")
+    (load "/opt/hol/tools/hol-mode.el"))
+#+end_src
 
 *** Python
 Elpy package for python, which provides an IDE type environment for python.
@@ -1243,6 +1264,13 @@ JSON files should be opened in js-mode.
   (setq sh-indentation 2)
 #+END_SRC
 
+*** SMTLIBv2
+
+#+begin_src emacs-lisp
+  (require 'smtlib-mode)
+  (add-to-list 'auto-mode-alist '("\\.smt\\'" . smtlib-mode))
+#+end_src
+
 *** Verilog
 
 #+begin_src emacs-lisp
diff --git a/polybar/config b/polybar/config
index fbf09e0..c0913bd 100644
--- a/polybar/config
+++ b/polybar/config
@@ -17,7 +17,7 @@ secondary = ${xrdb:color5:#e60053}
 alert = ${xrdb:color1:#bd2c40}
 
 [bar/main]
-monitor = ${env:MONITOR:eDP-1}
+monitor = DP-1
 width = 100%
 height = 27
 ;offset-x = 1%
@@ -40,10 +40,11 @@ padding-right = 1
 module-margin-left = 1
 module-margin-right = 2
 
-font-0 = scientifica:style=Regular:pixelsize=12
-font-1 = Unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = FontAwesome:style=Regular
-font-4 = Wuncon Siji:style=Regular:pixelsize=10;1
+font-0 = Iosevka:style=Regular:pixelsize=10
+font-1 = Font Awesome 5 Free:style=Solid:pixelsize=9
+font-2 = Font Awesome 5 Brands:style=Regular
+font-3 = Siji:style=Regular:pixelsize=10
+font-4 = Unifont:fontformat=truetype:size=8:antialias=false
 
 modules-left = bspwm
 modules-center = date
@@ -68,8 +69,60 @@ scroll-down = bspwm-deskprev
 cursor-click = pointer
 cursor-scroll = ns-resize
 
+[bar/third]
+monitor = DVI-1-0
+width = 100%
+height = 27
+;offset-x = 1%
+;offset-y = 1%
+radius = 0
+fixed-center = true
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+line-size = 3
+line-color = ${colors.primary}
+
+border-size = 0
+border-color = #00000000
+
+padding-left = 1
+padding-right = 1
+
+module-margin-left = 1
+module-margin-right = 2
+
+font-0 = Iosevka:style=Regular:pixelsize=10
+font-1 = Font Awesome 5 Free:style=Solid:pixelsize=9
+font-2 = Font Awesome 5 Brands:style=Regular
+font-3 = Siji:style=Regular:pixelsize=10
+font-4 = Unifont:fontformat=truetype:size=8:antialias=false
+
+modules-left = bspwm
+modules-center = date
+
+tray-position = right
+tray-padding = 2
+;tray-transparent = true
+;tray-background = #0063ff
+
+wm-restack = bspwm
+;wm-restack = i3
+
+;override-redirect = true
+
+scroll-up = bspwm-desknext
+scroll-down = bspwm-deskprev
+
+;scroll-up = i3wm-wsnext
+;scroll-down = i3wm-wsprev
+
+cursor-click = pointer
+cursor-scroll = ns-resize
+
 [bar/second]
-monitor = DP-1
+monitor = DP-2
 width = 100%
 height = 27
 ;offset-x = 1%
@@ -92,12 +145,14 @@ padding-right = 1
 module-margin-left = 1
 module-margin-right = 2
 
-font-0 = scientifica:style=Regular:pixelsize=12
-font-1 = Unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = FontAwesome:style=Regular
-font-4 = Wuncon Siji:style=Regular:pixelsize=10;1
+font-0 = Iosevka:style=Regular:pixelsize=10
+font-1 = Font Awesome 5 Free:style=Solid:pixelsize=9
+font-2 = Font Awesome 5 Brands:style=Regular
+font-3 = Siji:style=Regular:pixelsize=10
+font-4 = Unifont:fontformat=truetype:size=8:antialias=false
 
 modules-left = bspwm
+modules-center = date
 
 tray-position = right
 tray-padding = 2
@@ -288,7 +343,7 @@ ramp-signal-foreground = ${colors.foreground}
 
 [module/eth]
 type = internal/network
-interface = net0
+interface = eno1
 interval = 3.0
 
 format-connected-underline = ${colors.primary}
@@ -319,7 +374,7 @@ format-underline = ${colors.primary}
 label = %date% %time%
 
 [module/volume]
-type = internal/volume
+type = internal/alsa
 
 format-volume = <label-volume> <bar-volume>
 label-volume = VOL
diff --git a/polybar/launch.sh b/polybar/launch.sh
index ad30310..1ab828a 100755
--- a/polybar/launch.sh
+++ b/polybar/launch.sh
@@ -8,5 +8,6 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
 polybar main &
 polybar second &
+polybar third &
 
 echo "Bars launched..."
diff --git a/rofi/config b/rofi/config
index f69402f..59512f6 100644
--- a/rofi/config
+++ b/rofi/config
@@ -1,4 +1,5 @@
 rofi.combi-modi: window,drun
 rofi.font: hack 10
 rofi.modi: combi
-rofi.theme: .cache/wal/colors-rofi-dark.rasi
+rofi.theme: sidebar
+rofi.monitor: -4
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 3e162bc..11e6853 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -92,7 +92,7 @@ super + alt + {_,shift + }{1-9,0}
 #
 
 # preselect the direction
-super + ctrl + {h,j,k,l}
+super + ctrl + {n,e,u,i}
     bspc node -p {west,south,north,east}
 
 # preselect the ratio
@@ -127,17 +127,17 @@ super + {Left,Down,Up,Right}
 # Media
 #
 
-XF86Audio{Play,Stop,Next,Prev}
-    playerctl {play-pause,stop,next,previous}
+super + alt + shift + ctrl + {a,r,s,t}
+    playerctl {play-pause,stop,previous,next}
 
-XF86MonBrightness{Up,Down}
+super + alt + shift + ctrl + {w,q}
     light -{A,U} 5
 
-XF86Audio{Raise,Lower}Volume
-    amixer set Master 5%{+,-}
+super + alt + shift + ctrl + {p,f,g}
+    amixer set Master {5%+,5%-,toggle-mute}
 
-XF86AudioMute
-    amixer set Master toggle-mute
+super + alt + shift + ctrl + z
+    emacsclient -c -a emacs
 
 #
 # Power
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index b2f198b..4205194 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -41,4 +41,4 @@ set -g visual-silence off
 set -g word-separators " -_@"
 set -g mouse on
 set -g set-clipboard external
-bind -T root MouseUp2Pane paste
\ No newline at end of file
+bind -T root MouseUp2Pane paste
diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index a395d92..78cff50 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -13,9 +13,12 @@ export PATH="${PATH}:/opt/intelFPGA_lite/18.1/quartus/bin"
 export PATH="${HOME}/.local/bin:${PATH}"
 export PATH="${HOME}/.cargo/bin:${PATH}"
 export PATH="${HOME}/.cabal/bin:${PATH}"
+if [[ -d "${HOME}/.gem/ruby/2.7.0/bin" ]]; then export PATH="${HOME}/.gem/ruby/2.7.0/bin:${PATH}"; fi
 
 # Stop dotnet telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
 # Fix java windows for tiling window managers
 export _JAVA_AWT_WM_NONREPARENTING=1
+
+eval "$(direnv hook zsh)"
diff --git a/zsh/.zsh/function.zsh b/zsh/.zsh/function.zsh
index fdd6980..b4cc40a 100644
--- a/zsh/.zsh/function.zsh
+++ b/zsh/.zsh/function.zsh
@@ -24,11 +24,11 @@ fdd() {
 wal-tile() {
     wal -n -i "$@"
     feh --bg-fill "$(< "${HOME}/.cache/wal/wal")"
-    /home/yannherklotz/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
+    $HOME/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
 }
 
 wal-tile-l() {
     wal -l -n -i "$@"
     feh --bg-fill "$(< "${HOME}/.cache/wal/wal")"
-    /home/yannherklotz/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
+    $HOME/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
 }
diff --git a/zsh/.zsh/startup.zsh b/zsh/.zsh/startup.zsh
index e8caf69..2002337 100644
--- a/zsh/.zsh/startup.zsh
+++ b/zsh/.zsh/startup.zsh
@@ -5,6 +5,6 @@ fi
 
 # direnv
 
-eval "$(direnv hook zsh)"
-
 # End Nix
+
+eval $(opam env)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9c02e6a..f89ad19 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,3 +1,5 @@
+[[ $TERM == "dumb" ]] && unsetopt zle && PS1=$  && return
+
 # Lines configured by zsh-newuser-install
 HISTFILE=~/.histfile
 HISTSIZE=100000
@@ -23,7 +25,7 @@ setopt HIST_IGNORE_DUPS
 setopt HIST_IGNORE_SPACE
 setopt HIST_FIND_NO_DUPS
 
-(cat ~/.cache/wal/sequences &)
+(cat ~/.cache/wal/sequences &) >/dev/null 2>&1
 
 # Sourcing everything
 source /usr/share/fzf/key-bindings.zsh
@@ -37,7 +39,10 @@ source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 bindkey -M emacs '^P' history-substring-search-up
-bindkey -M emacs '^N' history-substring-search-down
+bindkey -M emacs ^N history-substring-search-down
 
 # opam configuration
 test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
+
+# added by travis gem
+[ -f /home/ymherklotz/.travis/travis.sh ] && source /home/ymherklotz/.travis/travis.sh