From a30b61fb45cf5dfb4f4da1bbbb9564fb32f9493a Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sat, 19 Nov 2022 00:41:59 +0000 Subject: Add changes to doom emacs and zsh --- X/.xinitrc | 9 +++++++++ doom/abbrev-defs | 2 -- doom/config.org | 25 +++++++++++++++++++++++-- doom/init.el | 12 ++++++------ git/.gitconfig | 5 +++++ zsh/.zsh/export.zsh | 2 +- zsh/.zsh/function.zsh | 1 + zsh/.zshrc | 3 ++- 8 files changed, 47 insertions(+), 12 deletions(-) diff --git a/X/.xinitrc b/X/.xinitrc index 909ad9a..5f6dc64 100644 --- a/X/.xinitrc +++ b/X/.xinitrc @@ -46,5 +46,14 @@ xrandr --output DP-1 --rotate normal --auto --output DVI-1-0 --rotate right --ri feh --bg-center /home/ymherklotz/images/wp1.jpg /home/ymherklotz/images/wp3.jpg /home/ymherklotz/images/wp2.jpg xsetroot -cursor_name left_ptr +tmux new-session -d -n main -s vericert -c /home/ymherklotz/projects/vericert +tmux new-window -d -n test + +tmux new-session -d -n main -s gsa -c /home/ymherklotz/projects/compcertgsa +tmux new-window -d -n test + +tmux new-session -d -n main -s server -c /home/ymherklotz +tmux new-window -d -n test + #exec i3 exec bspwm diff --git a/doom/abbrev-defs b/doom/abbrev-defs index 2f5eafe..b9b6d7e 100644 --- a/doom/abbrev-defs +++ b/doom/abbrev-defs @@ -1,10 +1,8 @@ ;;-*-coding: utf-8;-*- (define-abbrev-table 'global-abbrev-table '( - ("T" "The" nil :count 4) ("alth" "although" nil :count 1) ("bc" "because" nil :count 0) - ("t" "the" nil :count 1) ("th" "though" nil :count 0) ("vc" "Vericert" nil :count 0) )) diff --git a/doom/config.org b/doom/config.org index c58d898..6b9534b 100644 --- a/doom/config.org +++ b/doom/config.org @@ -747,7 +747,8 @@ This function uses the date command line tool to do it." "context --purgeall %s" TeX-run-command nil t :help "Run ConTeXt")) TeX-command-list)) (map! :map ConTeXt-mode-map - "C-c ]" #'ebib-insert-citation)) + "C-c ]" #'ebib-insert-citation) + (add-hook 'ConTeXt-mode-hook #'reftex-mode)) (use-package! ox-gfm :after ox) (use-package! ox-hugo :after ox) @@ -1000,6 +1001,20 @@ This function uses the date command line tool to do it." ;; Set up dictionaries (setq ispell-dictionary "british") +(use-package! spell-fu + :config + (add-hook 'spell-fu-mode-hook + (lambda () + (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "en_GB")) + (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "de_DE")) + (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "fr_FR")) + (spell-fu-dictionary-add + (spell-fu-get-personal-dictionary "fr-personal" "~/.aspell.en_GB.pws")) + (spell-fu-dictionary-add + (spell-fu-get-personal-dictionary "de-personal" "~/.aspell.de_DE.pws")) + (spell-fu-dictionary-add + (spell-fu-get-personal-dictionary "fr-personal" "~/.aspell.fr_FR.pws"))))) + (after! flyspell (define-key flyspell-mode-map (kbd "C-.") nil) (define-key flyspell-mode-map (kbd "C-,") nil) @@ -1094,7 +1109,8 @@ https://yannherklotz.com") (setq +notmuch-home-function (lambda () (notmuch-search "tag:inbox")))) -(after! shr (setq shr-use-fonts nil)) +(after! shr (setq shr-use-fonts nil + shr-max-image-proportion 0.5)) #+end_src ** Smartparens @@ -1382,6 +1398,11 @@ https://yannherklotz.com") (setq cdlatex-command-alist nil) (setq cdlatex-math-modify-alist nil)) +(use-package! boogie-friends + :config + (setq flycheck-dafny-executable (executable-find "dafny")) + (setq dafny-verification-backend 'cli)) + ;;(add-to-list 'load-path "/usr/local/Cellar/agda/2.6.2.2/cabal/store/ghc-8.10.7/Agd-2.6.2.2-3bca6588/share/emacs-mode") ;; ;;(use-package! agda2-mode) diff --git a/doom/init.el b/doom/init.el index 0e27669..e6e4aef 100644 --- a/doom/init.el +++ b/doom/init.el @@ -74,7 +74,7 @@ vc ; version-control and Emacs, sitting in a tree :term - eshell ; a consistent, cross-platform shell (WIP) + ;;eshell ; a consistent, cross-platform shell (WIP) ;;shell ; a terminal REPL for Emacs ;;term ; terminals in Emacs ;;vterm ; another terminals in Emacs @@ -89,14 +89,14 @@ ;;debugger ; FIXME stepping through code, to help you add bugs direnv ;;docker - editorconfig ; let someone else argue about tabs vs spaces + ;;editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs - (eval +overlay) ; run code, run (also, repls) + eval ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation (lsp +eglot) magit ; a git porcelain for Emacs - make ; run make tasks from Emacs + ;;make ; run make tasks from Emacs (pass +auth) ; password manager for nerds pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders @@ -129,7 +129,7 @@ ;;idris ; ;;(java +meghanada) ; the poster child for carpal tunnel syndrome ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) - julia ; a better, faster MATLAB + ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) latex ; writing papers in Emacs has never been so fun ;;lean @@ -145,7 +145,7 @@ ;;+dragndrop ; drag & drop files/images into org buffers +hugo ; use Emacs for hugo blogging ;;+jupyter ; ipython/jupyter support for babel - ;;+pandoc ; export-with-pandoc support + +pandoc ; export-with-pandoc support ;;+pomodoro ; be fruitful with the tomato technique +present ; using org-mode for presentations ) diff --git a/git/.gitconfig b/git/.gitconfig index 52597c9..661e297 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -25,3 +25,8 @@ [init] defaultBranch = main +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh index 1cc8bef..f7f6d9f 100644 --- a/zsh/.zsh/export.zsh +++ b/zsh/.zsh/export.zsh @@ -49,7 +49,7 @@ append_path "/opt/Xilinx/Vivado/2019.1/bin" append_path "/opt/intelFPGA_lite/18.1/quartus/bin" append_path "$HOME/projects/vericert/bin" append_path "/opt/bin" -append_path "$HOME/go/bin" +oappend_path "$HOME/go/bin" export PATH diff --git a/zsh/.zsh/function.zsh b/zsh/.zsh/function.zsh index 6fa8bd0..9c24c05 100644 --- a/zsh/.zsh/function.zsh +++ b/zsh/.zsh/function.zsh @@ -3,6 +3,7 @@ alias em='emacsclient -nw -a ""' alias ls='exa' alias ff='firefox' alias vim=nvim +alias open=xdg-open # alias lspasscp='lpass show -c --password $(lpass ls | fzf | awk '{print $(NF)}' | sed 's/\\]//g')' # fixing pdflatex diff --git a/zsh/.zshrc b/zsh/.zshrc index 017f031..26cc845 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -28,7 +28,8 @@ setopt HIST_FIND_NO_DUPS #if [ -d ~/.cache/wal ]; then (cat ~/.cache/wal/sequences &) fi #export MINIMAL_MAGIC_ENTER=no -PS1="%n@%m %1~ %# " +autoload -U colors && colors +PS1="%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[cyan]%}%m %{$fg[green]%}%1~%{$reset_color%} %# " # Sourcing everything #if [ -e /usr/share/fzf/key-bindings.zsh ]; then source /usr/share/fzf/key-bindings.zsh; fi -- cgit