From 009174919698505e35100f621b9015f779de5e96 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sun, 8 Mar 2020 18:29:16 +0000 Subject: Add emacs support for mac --- emacs/loader.org | 89 +++++++++++++++++++------------------------------------- zsh/.zshrc | 20 +++++++------ 2 files changed, 41 insertions(+), 68 deletions(-) diff --git a/emacs/loader.org b/emacs/loader.org index bd14c7e..e879d2f 100644 --- a/emacs/loader.org +++ b/emacs/loader.org @@ -40,12 +40,10 @@ be manually set inside emacs. "/home/ymherklotz/.local/bin" ":" "/home/ymherklotz/.yarn/bin" ":" "/usr/bin/vendor_perl" ":" - "/home/ymherklotz/.opam/ocaml-base-compiler.4.09.0/bin" ":" "/home/ymherklotz/.nix-profile/bin" ":" (getenv "PATH"))) (setq exec-path (append - '("/home/ymherklotz/.opam/ocaml-base-compiler.4.09.0/bin" - "/home/ymherklotz/.local/bin" + '("/home/ymherklotz/.local/bin" "/home/ymherklotz/.yarn/bin" "/home/ymherklotz/.nix-profile/bin") exec-path)) @@ -107,7 +105,7 @@ threshold at which it will start cleaning, so that it is not triggered during startup. #+BEGIN_SRC emacs-lisp - (setq gc-cons-threshold 500000000) + (setq gc-cons-threshold (* 1024 1024 1024)) #+END_SRC #+RESULTS: @@ -123,15 +121,20 @@ yes or no. Also stop the start up message from popping up and enter the scratch buffer instead. #+BEGIN_SRC emacs-lisp + ;;(setq warning-minimum-level :emergency) (setq inhibit-startup-message t - confirm-nonexistent-file-or-buffer nil) + confirm-nonexistent-file-or-buffer nil + default-directory "~/") (setq-default fill-column 80) (setq-default truncate-lines t) (tool-bar-mode 0) - (menu-bar-mode 0) + (unless (string= system-type "darwin") + (menu-bar-mode 0)) (fset 'yes-or-no-p 'y-or-n-p) (global-hl-line-mode 1) (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/") + (when (string= system-type "darwin") + (setq dired-use-ls-dired nil)) #+END_SRC #+RESULTS: @@ -355,8 +358,12 @@ 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"))) + (if (string= system-type "darwin") + (set-face-attribute 'default nil + :family "Iosevka" :height 145 :weight 'normal) + (progn + (set-default-font "Iosevka Medium-16") + (setq default-frame-alist '((font . "Iosevka Medium-16"))))) #+END_SRC #+RESULTS: @@ -433,7 +440,7 @@ the ~-a~ flag. Finally, remove buffers when an email has been sent. -#+BEGIN_SRC emacs-lisp +#+BEGIN_SRC text (load-user-file "personal.el") #+END_SRC @@ -708,10 +715,10 @@ incrementally selecting more and more of the text. ** Latex #+BEGIN_SRC emacs-lisp - (use-package latex + (use-package tex-site :ensure auctex + :mode (".tex'" . latex-mode) :config - (require 'tex-site) ;; to use pdfview with auctex (setq TeX-view-program-selection '((output-pdf "PDF Tools")) TeX-view-program-list '(("PDF Tools" TeX-pdf-tools-sync-view)) @@ -719,10 +726,10 @@ incrementally selecting more and more of the text. ;; to have the buffer refresh after compilation (add-hook 'TeX-after-compilation-finished-functions #'TeX-revert-document-buffer) - (setq TeX-engine 'xetex) + (setq TeX-engine 'luatex) (setq TeX-auto-save t) (setq TeX-parse-self t) - (setq TeX-command-extra-options "-shell-escape") + ; (setq TeX-command-extra-options "-shell-escape") (setq TeX-save-query nil) (setq-default TeX-master nil) (setq TeX-PDF-mode t) @@ -739,12 +746,13 @@ incrementally selecting more and more of the text. (add-hook 'LaTeX-mode-hook 'turn-on-reftex) (setq reftex-bibliography-commands '("bibliography" "nobibliography" "addbibresource")) (setq org-latex-listings 'minted) - (require 'ox-latex) - (add-to-list 'org-latex-packages-alist '("" "minted"))) ; with Emacs latex mode + (add-to-list 'org-latex-packages-alist '("" "minted")) ; with Emacs latex mode + + (require 'ox-latex)) #+END_SRC #+RESULTS: -: t +: ((\.json\' . js-mode) (\.flex\' . c-mode) (\.h\' . c++-mode) (\.odc\' . archive-mode) (\.odf\' . archive-mode) (\.odi\' . archive-mode) (\.otp\' . archive-mode) (\.odp\' . archive-mode) (\.otg\' . archive-mode) (\.odg\' . archive-mode) (\.ots\' . archive-mode) (\.ods\' . archive-mode) (\.odm\' . archive-mode) (\.ott\' . archive-mode) (\.odt\' . archive-mode) (README\.md\' . gfm-mode) (.tex' . latex-mode) (\.gpg\(~\|\.~[0-9]+~\)?\' nil epa-file) (\.hva\' . latex-mode) (\.drv\' . latex-mode) (\(?:build\|profile\)\.boot\' . clojure-mode) (\.cljs\' . clojurescript-mode) (\.cljc\' . clojurec-mode) (\.\(clj\|dtm\|edn\)\' . clojure-mode) (\.cmake\' . cmake-mode) (CMakeLists\.txt\' . cmake-mode) (\.envrc\' . direnv-envrc-mode) (\.elm\' . elm-mode) (\.fs[iylx]?\' . fsharp-mode) (\.hsc\' . haskell-mode) (\.l[gh]s\' . literate-haskell-mode) (\.hsig\' . haskell-mode) (\.[gh]s\' . haskell-mode) (\.cabal\'\|/cabal\.project\|/\.cabal/config\' . haskell-cabal-mode) (\.chs\' . haskell-c2hs-mode) (\.ghci\' . ghci-script-mode) (\.dump-simpl\' . ghc-core-mode) (\.hcr\' . ghc-core-mode) (/git-rebase-todo\' . git-rebase-mode) (\.md\' . markdown-mode) (\.markdown\' . markdown-mode) (\.nix\' . nix-mode) (\.pghci\' . pghaskell-mode) (\.pgml\' . pgocaml-mode) (\.pgsh\' . pgshell-mode) (\.phx\' . phox-mode) (\.eca?\' . easycrypt-mode) (\.v\' . coq-mode) (\.\(scala\|sbt\)\' . scala-mode) (\.elc\' . elisp-byte-code-mode) (\.zst\' nil jka-compr) (\.dz\' nil jka-compr) (\.xz\' nil jka-compr) (\.lzma\' nil jka-compr) (\.lz\' nil jka-compr) (\.g?z\' nil jka-compr) (\.bz2\' nil jka-compr) (\.Z\' nil jka-compr) (\.vr[hi]?\' . vera-mode) (\(?:\.\(?:rbw?\|ru\|rake\|thor\|jbuilder\|rabl\|gemspec\|podspec\)\|/\(?:Gem\|Rake\|Cap\|Thor\|Puppet\|Berks\|Vagrant\|Guard\|Pod\)file\)\' . ruby-mode) (\.re?st\' . rst-mode) (\.py[iw]?\' . python-mode) (\.m\' . octave-maybe-mode) (\.less\' . less-css-mode) (\.scss\' . scss-mode) (\.awk\' . awk-mode) (\.\(u?lpc\|pike\|pmod\(\.in\)?\)\' . pike-mode) (\.idl\' . idl-mode) (\.java\' . java-mode) (\.m\' . objc-mode) (\.ii\' . c++-mode) (\.i\' . c-mode) (\.lex\' . c-mode) (\.y\(acc\)?\' . c-mode) (\.h\' . c-or-c++-mode) (\.c\' . c-mode) (\.\(CC?\|HH?\)\' . c++-mode) (\.[ch]\(pp\|xx\|\+\+\)\' . c++-mode) (\.\(cc\|hh\)\' . c++-mode) (\.\(bat\|cmd\)\' . bat-mode) (\.[sx]?html?\(\.[a-zA-Z_]+\)?\' . mhtml-mode) (\.svgz?\' . image-mode) (\.svgz?\' . xml-mode) (\.x[bp]m\' . image-mode) (\.x[bp]m\' . c-mode) (\.p[bpgn]m\' . image-mode) (\.tiff?\' . image-mode) (\.gif\' . image-mode) (\.png\' . image-mode) (\.jpe?g\' . image-mode) (\.te?xt\' . text-mode) (\.[tT]e[xX]\' . tex-mode) (\.ins\' . tex-mode) (\.ltx\' . latex-mode) (\.dtx\' . doctex-mode) (\.org\' . org-mode) (\.el\' . emacs-lisp-mode) (Project\.ede\' . emacs-lisp-mode) (\.\(scm\|stk\|ss\|sch\)\' . scheme-mode) (\.l\' . lisp-mode) (\.li?sp\' . lisp-mode) (\.[fF]\' . fortran-mode) (\.for\' . fortran-mode) (\.p\' . pascal-mode) (\.pas\' . pascal-mode) (\.\(dpr\|DPR\)\' . delphi-mode) (\.ad[abs]\' . ada-mode) (\.ad[bs].dg\' . ada-mode) (\.\([pP]\([Llm]\|erl\|od\)\|al\)\' . perl-mode) (Imakefile\' . makefile-imake-mode) (Makeppfile\(?:\.mk\)?\' . makefile-makepp-mode) (\.makepp\' . makefile-makepp-mode) (\.mk\' . makefile-bsdmake-mode) (\.make\' . makefile-bsdmake-mode) (GNUmakefile\' . makefile-gmake-mode) ([Mm]akefile\' . makefile-bsdmake-mode) (\.am\' . makefile-automake-mode) (\.texinfo\' . texinfo-mode) (\.te?xi\' . texinfo-mode) (\.[sS]\' . asm-mode) (\.asm\' . asm-mode) (\.css\' . css-mode) (\.mixal\' . mixal-mode) (\.gcov\' . compilation-mode) (/\.[a-z0-9-]*gdbinit . gdb-script-mode) (-gdb\.gdb . gdb-script-mode) ([cC]hange\.?[lL]og?\' . change-log-mode) ([cC]hange[lL]og[-.][0-9]+\' . change-log-mode) (\$CHANGE_LOG\$\.TXT . change-log-mode) (\.scm\.[0-9]*\' . scheme-mode) (\.[ckz]?sh\'\|\.shar\'\|/\.z?profile\' . sh-mode) (\.bash\' . sh-mode) (\(/\|\`\)\.\(bash_\(profile\|history\|log\(in\|out\)\)\|z?log\(in\|out\)\)\' . sh-mode) (\(/\|\`\)\.\(shrc\|zshrc\|m?kshrc\|bashrc\|t?cshrc\|esrc\)\' . sh-mode) (\(/\|\`\)\.\([kz]shenv\|xinitrc\|startxrc\|xsession\)\' . sh-mode) (\.m?spec\' . sh-mode) (\.m[mes]\' . nroff-mode) (\.man\' . nroff-mode) (\.sty\' . latex-mode) (\.cl[so]\' . latex-mode) (\.bbl\' . latex-mode) (\.bib\' . bibtex-mode) (\.bst\' . bibtex-style-mode) (\.sql\' . sql-mode) (\(acinclude\|aclocal\|acsite\)\.m4\' . autoconf-mode) (\.m[4c]\' . m4-mode) (\.mf\' . metafont-mode) (\.mp\' . metapost-mode) (\.vhdl?\' . vhdl-mode) (\.article\' . text-mode) (\.letter\' . text-mode) (\.i?tcl\' . tcl-mode) (\.exp\' . tcl-mode) (\.itk\' . tcl-mode) (\.icn\' . icon-mode) (\.sim\' . simula-mode) (\.mss\' . scribe-mode) (\.f9[05]\' . f90-mode) (\.f0[38]\' . f90-mode) (\.indent\.pro\' . fundamental-mode) (\.\(pro\|PRO\)\' . idlwave-mode) (\.srt\' . srecode-template-mode) (\.prolog\' . prolog-mode) (\.tar\' . tar-mode) (\.\(arc\|zip\|lzh\|lha\|zoo\|[jew]ar\|xpi\|rar\|cbr\|7z\|ARC\|ZIP\|LZH\|LHA\|ZOO\|[JEW]AR\|XPI\|RAR\|CBR\|7Z\)\' . archive-mode) (\.oxt\' . archive-mode) (\.\(deb\|[oi]pk\)\' . archive-mode) (\`/tmp/Re . text-mode) (/Message[0-9]*\' . text-mode) (\`/tmp/fol/ . text-mode) (\.oak\' . scheme-mode) (\.sgml?\' . sgml-mode) (\.x[ms]l\' . xml-mode) (\.dbk\' . xml-mode) (\.dtd\' . sgml-mode) (\.ds\(ss\)?l\' . dsssl-mode) (\.js[mx]?\' . javascript-mode) (\.har\' . javascript-mode) (\.json\' . javascript-mode) (\.[ds]?va?h?\' . verilog-mode) (\.by\' . bovine-grammar-mode) (\.wy\' . wisent-grammar-mode) ([:/\]\..*\(emacs\|gnus\|viper\)\' . emacs-lisp-mode) (\`\..*emacs\' . emacs-lisp-mode) ([:/]_emacs\' . emacs-lisp-mode) (/crontab\.X*[0-9]+\' . shell-script-mode) (\.ml\' . lisp-mode) (\.ld[si]?\' . ld-script-mode) (ld\.?script\' . ld-script-mode) (\.xs\' . c-mode) (\.x[abdsru]?[cnw]?\' . ld-script-mode) (\.zone\' . dns-mode) (\.soa\' . dns-mode) (\.asd\' . lisp-mode) (\.\(asn\|mib\|smi\)\' . snmp-mode) (\.\(as\|mi\|sm\)2\' . snmpv2-mode) (\.\(diffs?\|patch\|rej\)\' . diff-mode) (\.\(dif\|pat\)\' . diff-mode) (\.[eE]?[pP][sS]\' . ps-mode) (\.\(?:PDF\|DVI\|OD[FGPST]\|DOCX\|XLSX?\|PPTX?\|pdf\|djvu\|dvi\|od[fgpst]\|docx\|xlsx?\|pptx?\)\' . doc-view-mode-maybe) (configure\.\(ac\|in\)\' . autoconf-mode) (\.s\(v\|iv\|ieve\)\' . sieve-mode) (BROWSE\' . ebrowse-tree-mode) (\.ebrowse\' . ebrowse-tree-mode) (#\*mail\* . mail-mode) (\.g\' . antlr-mode) (\.mod\' . m2-mode) (\.ses\' . ses-mode) (\.docbook\' . sgml-mode) (\.com\' . dcl-mode) (/config\.\(?:bat\|log\)\' . fundamental-mode) (/\.\(authinfo\|netrc\)\' . authinfo-mode) (\.\(?:[iI][nN][iI]\|[lL][sS][tT]\|[rR][eE][gG]\|[sS][yY][sS]\)\' . conf-mode) (\.la\' . conf-unix-mode) (\.ppd\' . conf-ppd-mode) (java.+\.conf\' . conf-javaprop-mode) (\.properties\(?:\.[a-zA-Z0-9._-]+\)?\' . conf-javaprop-mode) (\.toml\' . conf-toml-mode) (\.desktop\' . conf-desktop-mode) (/\.redshift.conf\' . conf-windows-mode) (\`/etc/\(?:DIR_COLORS\|ethers\|.?fstab\|.*hosts\|lesskey\|login\.?de\(?:fs\|vperm\)\|magic\|mtab\|pam\.d/.*\|permissions\(?:\.d/.+\)?\|protocols\|rpc\|services\)\' . conf-space-mode) (\`/etc/\(?:acpid?/.+\|aliases\(?:\.d/.+\)?\|default/.+\|group-?\|hosts\..+\|inittab\|ksysguarddrc\|opera6rc\|passwd-?\|shadow-?\|sysconfig/.+\)\' . conf-mode) ([cC]hange[lL]og[-.][-0-9a-z]+\' . change-log-mode) (/\.?\(?:gitconfig\|gnokiirc\|hgrc\|kde.*rc\|mime\.types\|wgetrc\)\' . conf-mode) (/\.\(?:asound\|enigma\|fetchmail\|gltron\|gtk\|hxplayer\|mairix\|mbsync\|msmtp\|net\|neverball\|nvidia-settings-\|offlineimap\|qt/.+\|realplayer\|reportbug\|rtorrent\.\|screen\|scummvm\|sversion\|sylpheed/.+\|xmp\)rc\' . conf-mode) (/\.\(?:gdbtkinit\|grip\|mpdconf\|notmuch-config\|orbital/.+txt\|rhosts\|tuxracer/options\)\' . conf-mode) (/\.?X\(?:default\|resource\|re\)s\> . conf-xdefaults-mode) (/X11.+app-defaults/\|\.ad\' . conf-xdefaults-mode) (/X11.+locale/.+/Compose\' . conf-colon-mode) (/X11.+locale/compose\.dir\' . conf-javaprop-mode) (\.~?[0-9]+\.[0-9][-.0-9]*~?\' nil t) (\.\(?:orig\|in\|[bB][aA][kK]\)\' nil t) ([/.]c\(?:on\)?f\(?:i?g\)?\(?:\.[a-zA-Z0-9._-]+\)?\' . conf-mode-maybe) (\.[1-9]\' . nroff-mode) (\.art\' . image-mode) (\.avs\' . image-mode) (\.bmp\' . image-mode) (\.cmyk\' . image-mode) (\.cmyka\' . image-mode) (\.crw\' . image-mode) (\.dcr\' . image-mode) (\.dcx\' . image-mode) (\.dng\' . image-mode) (\.dpx\' . image-mode) (\.fax\' . image-mode) (\.hrz\' . image-mode) (\.icb\' . image-mode) (\.icc\' . image-mode) (\.icm\' . image-mode) (\.ico\' . image-mode) (\.icon\' . image-mode) (\.jbg\' . image-mode) (\.jbig\' . image-mode) (\.jng\' . image-mode) (\.jnx\' . image-mode) (\.miff\' . image-mode) (\.mng\' . image-mode) (\.mvg\' . image-mode) (\.otb\' . image-mode) (\.p7\' . image-mode) (\.pcx\' . image-mode) (\.pdb\' . image-mode) (\.pfa\' . image-mode) (\.pfb\' . image-mode) (\.picon\' . image-mode) (\.pict\' . image-mode) (\.rgb\' . image-mode) (\.rgba\' . image-mode) (\.tga\' . image-mode) (\.wbmp\' . image-mode) (\.webp\' . image-mode) (\.wmf\' . image-mode) (\.wpg\' . image-mode) (\.xcf\' . image-mode) (\.xmp\' . image-mode) (\.xwd\' . image-mode) (\.yuv\' . image-mode) (\.tgz\' . tar-mode) (\.tbz2?\' . tar-mode) (\.txz\' . tar-mode) (\.tzst\' . tar-mode)) ** Markdown Markdown is the standard for writing documentation. This snippet loads GFM @@ -878,7 +886,7 @@ Add org noter (,(format-time-string "~/Dropbox/org/journals/%Y-%m.org") :maxlevel . 2)) org-todo-keywords '((sequence "TODO(t)" "WAITING(w)" "|" "DONE(d)" "CANCELLED(c)"))) - (setq org-agenda-custom-commands + (setq org-agenda-custom-commands '(("w" "At work" tags-todo "@work" ((org-agenda-overriding-header "Work"))) ("h" "At home" tags-todo "@home" @@ -1180,7 +1188,7 @@ Haskell mode with company mode completion. *** LLVM IR -#+begin_src emacs-lisp +#+begin_src text (require 'llvm-mode) #+end_src @@ -1329,43 +1337,6 @@ Shamelessly taken from https://github.com/alphapapa/unpackaged.el#hydra. * Look and Feel -Keybindings - -#+BEGIN_SRC emacs-lisp - (defun y/set-theme (theme) - (load-theme theme t) - (toggle-scroll-bar -1)) - - (defun y/sanityinc-tomorrow-bright () - (interactive) - (y/set-theme 'sanityinc-tomorrow-bright)) - - (defun y/inkpot () - (interactive) - (y/set-theme 'inkpot)) - - (defun y/zenburn () - (interactive) - (y/set-theme 'zenburn)) - - (defun y/solarized-light () - (interactive) - (y/set-theme 'solarized-light)) - - (defun y/gruvbox () - (interactive) - (y/set-theme 'gruvbox)) - - (define-key y-map (kbd "1") 'y/sanityinc-tomorrow-bright) - (define-key y-map (kbd "2") 'y/zenburn) - (define-key y-map (kbd "3") 'y/solarized-light) - (define-key y-map (kbd "4") 'y/gruvbox) - (define-key y-map (kbd "5") 'y/inkpot) -#+END_SRC - -#+RESULTS: -: y/inkpot - #+BEGIN_SRC emacs-lisp (defadvice load-theme (before theme-dont-propagate activate) @@ -1376,9 +1347,9 @@ Keybindings (select-frame frame) (toggle-scroll-bar -1))) - (unless (boundp 'server-process) - (progn (load-theme 'sanityinc-tomorrow-night t) - (toggle-scroll-bar -1))) + ;(unless (boundp 'server-process) + ; (progn (load-theme 'sanityinc-solarized-light t) + ; (toggle-scroll-bar -1))) #+END_SRC #+RESULTS: @@ -1389,5 +1360,5 @@ Setting the gc-cons threshold back to what it was at the beginning. #+BEGIN_SRC emacs-lisp (server-start) - (setq gc-cons-threshold 10000000) + (setq gc-cons-threshold (* 1024 1024 10)) #+END_SRC diff --git a/zsh/.zshrc b/zsh/.zshrc index 9c02e6a..b854793 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -23,17 +23,19 @@ setopt HIST_IGNORE_DUPS setopt HIST_IGNORE_SPACE setopt HIST_FIND_NO_DUPS -(cat ~/.cache/wal/sequences &) +if [ -d ~/.cache/wal ]; then + (cat ~/.cache/wal/sequences &) +fi # Sourcing everything -source /usr/share/fzf/key-bindings.zsh -source /usr/share/fzf/completion.zsh -source $HOME/.zsh/export.zsh -source $HOME/.zsh/minimal.zsh -source $HOME/.zsh/function.zsh -source $HOME/.zsh/startup.zsh -source $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh -source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh +if [ -e /usr/share/fzf/key-bindings.zsh ]; then source /usr/share/fzf/key-bindings.zsh; fi +if [ -e /usr/share/fzf/completion.zsh ]; then source /usr/share/fzf/completion.zsh; fi +if [ -e $HOME/.zsh/export.zsh ]; then source $HOME/.zsh/export.zsh; fi +if [ -e $HOME/.zsh/minimal.zsh ]; then source $HOME/.zsh/minimal.zsh; fi +if [ -e $HOME/.zsh/function.zsh ]; then source $HOME/.zsh/function.zsh; fi +if [ -e $HOME/.zsh/startup.zsh ]; then source $HOME/.zsh/startup.zsh; fi +if [ -e $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh ]; then source $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh; fi +if [ -e $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh; fi bindkey '^[[A' history-substring-search-up bindkey '^[[B' history-substring-search-down bindkey -M emacs '^P' history-substring-search-up -- cgit From f763fb20585973b1c7cd5691607fdfd984ce27f9 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sun, 8 Mar 2020 18:54:18 +0000 Subject: Remove all results --- emacs/loader.org | 145 ++----------------------------------------------------- 1 file changed, 3 insertions(+), 142 deletions(-) diff --git a/emacs/loader.org b/emacs/loader.org index e879d2f..1183215 100644 --- a/emacs/loader.org +++ b/emacs/loader.org @@ -25,9 +25,6 @@ for that can be found in the [[#Writing][Writing]] section. (setq user-mail-address "yann@yannherklotz.com") #+END_SRC -#+RESULTS: -: yann@yannherklotz.com - * Setup Set path so that it picks up some executables that I use. This is done because @@ -49,9 +46,6 @@ be manually set inside emacs. exec-path)) #+END_SRC -#+RESULTS: -| /home/ymherklotz/.opam/ocaml-base-compiler.4.09.0/bin | /home/ymherklotz/.local/bin | /home/ymherklotz/.yarn/bin | /home/ymherklotz/.nix-profile/bin | /home/ymherklotz/.opam/ocaml-base-compiler.4.09.0/bin | /home/ymherklotz/.local/bin | /home/ymherklotz/.yarn/bin | /home/ymherklotz/.nix-profile/bin | /home/yannherklotz/.opam/4.09.0/bin | /home/yannherklotz/.local/bin | /home/yannherklotz/.yarn/bin | /home/ymherklotz/.cargo/bin | /home/ymherklotz/.local/bin | /home/ymherklotz/.yarn/bin | /usr/bin | /home/ymherklotz/.gem/ruby/2.6.0/bin | /usr/local/bin | /usr/local/sbin | /usr/local/bin | /usr/bin | /usr/bin/site_perl | /usr/bin/vendor_perl | /usr/bin/core_perl | /opt/Xilinx/Vivado/2019.1/bin | /opt/intelFPGA_lite/18.1/quartus/bin | /usr/lib/emacs/26.3/x86_64-pc-linux-gnu | - Define a function to load a user file whenever I want to add configurations that are not pushed as part of this configuration file. This includes a private file containing email configurations for [[https://www.emacswiki.org/emacs/mu4e][mu4e]]. In this case, ~user-init-dir~ is used @@ -95,9 +89,6 @@ Use ~use-package~ to manage other packages, and improve load times. (setq use-package-always-ensure t) #+END_SRC -#+RESULTS: -: t - ** GC Threshold Threshold for faster startup. This should increase the garbage collector's @@ -108,9 +99,6 @@ startup. (setq gc-cons-threshold (* 1024 1024 1024)) #+END_SRC -#+RESULTS: -: 500000000 - ** General Configuration *** Editor settings @@ -137,9 +125,6 @@ buffer instead. (setq dired-use-ls-dired nil)) #+END_SRC -#+RESULTS: -: t - #+BEGIN_SRC emacs-lisp (global-set-key (kbd "M-u") #'upcase-dwim) (global-set-key (kbd "M-l") #'downcase-dwim) @@ -158,9 +143,6 @@ 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 @@ -230,9 +212,6 @@ if that is ever a problem. (quote (" " mode-line-misc-info)))))) #+END_SRC -#+RESULTS: -| :eval | (simple-mode-line-render (quote ( mode-line-modified mode-line-buffer-identification %l:%c mode-line-modes )) (quote ((:propertize (:eval (when vc-mode (cond ((string-match Git[:-] vc-mode) (-custom-modeline-github-vc)) ((string-match SVN- vc-mode) (-custom-modeline-svn-vc)) (t (format %s vc-mode))))) face mode-line-vc))) (quote ( mode-line-misc-info))) | - Move the backup files into the temporaty directory so that they are out of the way. @@ -243,9 +222,6 @@ way. `((".*" ,temporary-file-directory t))) #+END_SRC -#+RESULTS: -| .* | /tmp/ | t | - Make emacs follow symlinks every time, this means that it will open the actual file and go to where the file is actually stored instead of editing it through the symlink. This enables the use of git and other version control when editing @@ -254,17 +230,11 @@ the file. (setq vc-follow-symlinks t) #+END_SRC -#+RESULTS: -: t - This stops paren mode with interfering with the modeline. #+BEGIN_SRC emacs-lisp (show-paren-mode 'expression) #+END_SRC -#+RESULTS: -: t - Revert the buffer automatically when a file changes on disc. This is useful when monitoring a file such as a log file. It will also do this silently. #+BEGIN_SRC emacs-lisp @@ -272,8 +242,6 @@ monitoring a file such as a log file. It will also do this silently. (setq auto-revert-verbose nil) #+END_SRC -#+RESULTS: - Disable tabs, I want to move towards only using spaces everywhere as that is my preferred style. This is just personal preference though. #+BEGIN_SRC emacs-lisp @@ -285,25 +253,16 @@ preferred style. This is just personal preference though. (setq-default python-indent 4) #+END_SRC -#+RESULTS: -: 4 - Set the line number display very high so that it is always shown in the modeline. #+BEGIN_SRC emacs-lisp (setq line-number-display-limit 2000000) #+END_SRC -#+RESULTS: -: 2000000 - Set the undo correctly #+BEGIN_SRC emacs-lisp (define-key global-map (kbd "C-\\") 'undo-only) #+END_SRC -#+RESULTS: -: undo-only - Setting up my keybindings #+BEGIN_SRC emacs-lisp @@ -346,9 +305,6 @@ Setting up my keybindings (define-key y-map (kbd "r") 'toggle-rot13-mode) #+END_SRC -#+RESULTS: -: password-store-generate - Set the font to Hack, which is an opensource monospace font designed for programming and looking at source code. @@ -366,9 +322,6 @@ programming and looking at source code. (setq default-frame-alist '((font . "Iosevka Medium-16"))))) #+END_SRC -#+RESULTS: -: ((font . Iosevka Medium-14)) - #+BEGIN_SRC emacs-lisp (use-package eshell :ensure nil @@ -404,9 +357,6 @@ programming and looking at source code. (eshell-send-input)))) #+END_SRC -#+RESULTS: -: eshell - *** Reload #+BEGIN_SRC emacs-lisp @@ -444,9 +394,6 @@ Finally, remove buffers when an email has been sent. (load-user-file "personal.el") #+END_SRC -#+RESULTS: -: t - ** Elfeed #+BEGIN_SRC emacs-lisp @@ -464,9 +411,6 @@ Finally, remove buffers when an email has been sent. ("q" . y/elfeed-save-db-and-bury))) #+END_SRC -#+RESULTS: -: y/elfeed-save-db-and-bury - Define utility functions to make the reader work. #+BEGIN_SRC emacs-lisp @@ -502,9 +446,6 @@ Define utility functions to make the reader work. (quit-window)) #+END_SRC -#+RESULTS: -: y/elfeed-save-db-and-bury - * Utility ** Navigation @@ -528,9 +469,6 @@ Set navigation commands in all the buffers (set-mark-command 1)) #+END_SRC -#+RESULTS: -: jump-to-mark - Enable winner mode to save window state. #+BEGIN_SRC emacs-lisp (winner-mode 1) @@ -559,9 +497,6 @@ Enable winner mode to save window state. '((t . ivy--regex-fuzzy)))) #+END_SRC -#+RESULTS: -: counsel-unicode-char - #+begin_src emacs-lisp (use-package avy :bind @@ -570,17 +505,12 @@ Enable winner mode to save window state. (setq avy-keys '(?a ?r ?s ?t ?d ?h ?n ?e ?i ?o))) #+end_src -#+RESULTS: -: avy-goto-char-2 - ** Visual *** All the icons #+BEGIN_SRC emacs-lisp (use-package all-the-icons) #+END_SRC -#+RESULTS: - ** Editing *** Hungry Delete #+BEGIN_SRC emacs-lisp @@ -589,9 +519,6 @@ Enable winner mode to save window state. (global-hungry-delete-mode)) #+END_SRC -#+RESULTS: -: t - *** SmartParens #+BEGIN_SRC emacs-lisp (use-package smartparens @@ -653,9 +580,6 @@ incrementally selecting more and more of the text. :bind ("M-o" . er/expand-region)) #+END_SRC -#+RESULTS: -: er/expand-region - *** Dired #+BEGIN_SRC emacs-lisp @@ -673,9 +597,6 @@ incrementally selecting more and more of the text. :bind (("C-c d" . deadgrep))) #+END_SRC -#+RESULTS: -: deadgrep - ** Yasnippets #+BEGIN_SRC emacs-lisp @@ -692,8 +613,6 @@ incrementally selecting more and more of the text. (direnv-mode)) #+END_SRC -#+RESULTS: - * Writing ** Spellcheck in emacs @@ -751,9 +670,6 @@ incrementally selecting more and more of the text. (require 'ox-latex)) #+END_SRC -#+RESULTS: -: ((\.json\' . js-mode) (\.flex\' . c-mode) (\.h\' . c++-mode) (\.odc\' . archive-mode) (\.odf\' . archive-mode) (\.odi\' . archive-mode) (\.otp\' . archive-mode) (\.odp\' . archive-mode) (\.otg\' . archive-mode) (\.odg\' . archive-mode) (\.ots\' . archive-mode) (\.ods\' . archive-mode) (\.odm\' . archive-mode) (\.ott\' . archive-mode) (\.odt\' . archive-mode) (README\.md\' . gfm-mode) (.tex' . latex-mode) (\.gpg\(~\|\.~[0-9]+~\)?\' nil epa-file) (\.hva\' . latex-mode) (\.drv\' . latex-mode) (\(?:build\|profile\)\.boot\' . clojure-mode) (\.cljs\' . clojurescript-mode) (\.cljc\' . clojurec-mode) (\.\(clj\|dtm\|edn\)\' . clojure-mode) (\.cmake\' . cmake-mode) (CMakeLists\.txt\' . cmake-mode) (\.envrc\' . direnv-envrc-mode) (\.elm\' . elm-mode) (\.fs[iylx]?\' . fsharp-mode) (\.hsc\' . haskell-mode) (\.l[gh]s\' . literate-haskell-mode) (\.hsig\' . haskell-mode) (\.[gh]s\' . haskell-mode) (\.cabal\'\|/cabal\.project\|/\.cabal/config\' . haskell-cabal-mode) (\.chs\' . haskell-c2hs-mode) (\.ghci\' . ghci-script-mode) (\.dump-simpl\' . ghc-core-mode) (\.hcr\' . ghc-core-mode) (/git-rebase-todo\' . git-rebase-mode) (\.md\' . markdown-mode) (\.markdown\' . markdown-mode) (\.nix\' . nix-mode) (\.pghci\' . pghaskell-mode) (\.pgml\' . pgocaml-mode) (\.pgsh\' . pgshell-mode) (\.phx\' . phox-mode) (\.eca?\' . easycrypt-mode) (\.v\' . coq-mode) (\.\(scala\|sbt\)\' . scala-mode) (\.elc\' . elisp-byte-code-mode) (\.zst\' nil jka-compr) (\.dz\' nil jka-compr) (\.xz\' nil jka-compr) (\.lzma\' nil jka-compr) (\.lz\' nil jka-compr) (\.g?z\' nil jka-compr) (\.bz2\' nil jka-compr) (\.Z\' nil jka-compr) (\.vr[hi]?\' . vera-mode) (\(?:\.\(?:rbw?\|ru\|rake\|thor\|jbuilder\|rabl\|gemspec\|podspec\)\|/\(?:Gem\|Rake\|Cap\|Thor\|Puppet\|Berks\|Vagrant\|Guard\|Pod\)file\)\' . ruby-mode) (\.re?st\' . rst-mode) (\.py[iw]?\' . python-mode) (\.m\' . octave-maybe-mode) (\.less\' . less-css-mode) (\.scss\' . scss-mode) (\.awk\' . awk-mode) (\.\(u?lpc\|pike\|pmod\(\.in\)?\)\' . pike-mode) (\.idl\' . idl-mode) (\.java\' . java-mode) (\.m\' . objc-mode) (\.ii\' . c++-mode) (\.i\' . c-mode) (\.lex\' . c-mode) (\.y\(acc\)?\' . c-mode) (\.h\' . c-or-c++-mode) (\.c\' . c-mode) (\.\(CC?\|HH?\)\' . c++-mode) (\.[ch]\(pp\|xx\|\+\+\)\' . c++-mode) (\.\(cc\|hh\)\' . c++-mode) (\.\(bat\|cmd\)\' . bat-mode) (\.[sx]?html?\(\.[a-zA-Z_]+\)?\' . mhtml-mode) (\.svgz?\' . image-mode) (\.svgz?\' . xml-mode) (\.x[bp]m\' . image-mode) (\.x[bp]m\' . c-mode) (\.p[bpgn]m\' . image-mode) (\.tiff?\' . image-mode) (\.gif\' . image-mode) (\.png\' . image-mode) (\.jpe?g\' . image-mode) (\.te?xt\' . text-mode) (\.[tT]e[xX]\' . tex-mode) (\.ins\' . tex-mode) (\.ltx\' . latex-mode) (\.dtx\' . doctex-mode) (\.org\' . org-mode) (\.el\' . emacs-lisp-mode) (Project\.ede\' . emacs-lisp-mode) (\.\(scm\|stk\|ss\|sch\)\' . scheme-mode) (\.l\' . lisp-mode) (\.li?sp\' . lisp-mode) (\.[fF]\' . fortran-mode) (\.for\' . fortran-mode) (\.p\' . pascal-mode) (\.pas\' . pascal-mode) (\.\(dpr\|DPR\)\' . delphi-mode) (\.ad[abs]\' . ada-mode) (\.ad[bs].dg\' . ada-mode) (\.\([pP]\([Llm]\|erl\|od\)\|al\)\' . perl-mode) (Imakefile\' . makefile-imake-mode) (Makeppfile\(?:\.mk\)?\' . makefile-makepp-mode) (\.makepp\' . makefile-makepp-mode) (\.mk\' . makefile-bsdmake-mode) (\.make\' . makefile-bsdmake-mode) (GNUmakefile\' . makefile-gmake-mode) ([Mm]akefile\' . makefile-bsdmake-mode) (\.am\' . makefile-automake-mode) (\.texinfo\' . texinfo-mode) (\.te?xi\' . texinfo-mode) (\.[sS]\' . asm-mode) (\.asm\' . asm-mode) (\.css\' . css-mode) (\.mixal\' . mixal-mode) (\.gcov\' . compilation-mode) (/\.[a-z0-9-]*gdbinit . gdb-script-mode) (-gdb\.gdb . gdb-script-mode) ([cC]hange\.?[lL]og?\' . change-log-mode) ([cC]hange[lL]og[-.][0-9]+\' . change-log-mode) (\$CHANGE_LOG\$\.TXT . change-log-mode) (\.scm\.[0-9]*\' . scheme-mode) (\.[ckz]?sh\'\|\.shar\'\|/\.z?profile\' . sh-mode) (\.bash\' . sh-mode) (\(/\|\`\)\.\(bash_\(profile\|history\|log\(in\|out\)\)\|z?log\(in\|out\)\)\' . sh-mode) (\(/\|\`\)\.\(shrc\|zshrc\|m?kshrc\|bashrc\|t?cshrc\|esrc\)\' . sh-mode) (\(/\|\`\)\.\([kz]shenv\|xinitrc\|startxrc\|xsession\)\' . sh-mode) (\.m?spec\' . sh-mode) (\.m[mes]\' . nroff-mode) (\.man\' . nroff-mode) (\.sty\' . latex-mode) (\.cl[so]\' . latex-mode) (\.bbl\' . latex-mode) (\.bib\' . bibtex-mode) (\.bst\' . bibtex-style-mode) (\.sql\' . sql-mode) (\(acinclude\|aclocal\|acsite\)\.m4\' . autoconf-mode) (\.m[4c]\' . m4-mode) (\.mf\' . metafont-mode) (\.mp\' . metapost-mode) (\.vhdl?\' . vhdl-mode) (\.article\' . text-mode) (\.letter\' . text-mode) (\.i?tcl\' . tcl-mode) (\.exp\' . tcl-mode) (\.itk\' . tcl-mode) (\.icn\' . icon-mode) (\.sim\' . simula-mode) (\.mss\' . scribe-mode) (\.f9[05]\' . f90-mode) (\.f0[38]\' . f90-mode) (\.indent\.pro\' . fundamental-mode) (\.\(pro\|PRO\)\' . idlwave-mode) (\.srt\' . srecode-template-mode) (\.prolog\' . prolog-mode) (\.tar\' . tar-mode) (\.\(arc\|zip\|lzh\|lha\|zoo\|[jew]ar\|xpi\|rar\|cbr\|7z\|ARC\|ZIP\|LZH\|LHA\|ZOO\|[JEW]AR\|XPI\|RAR\|CBR\|7Z\)\' . archive-mode) (\.oxt\' . archive-mode) (\.\(deb\|[oi]pk\)\' . archive-mode) (\`/tmp/Re . text-mode) (/Message[0-9]*\' . text-mode) (\`/tmp/fol/ . text-mode) (\.oak\' . scheme-mode) (\.sgml?\' . sgml-mode) (\.x[ms]l\' . xml-mode) (\.dbk\' . xml-mode) (\.dtd\' . sgml-mode) (\.ds\(ss\)?l\' . dsssl-mode) (\.js[mx]?\' . javascript-mode) (\.har\' . javascript-mode) (\.json\' . javascript-mode) (\.[ds]?va?h?\' . verilog-mode) (\.by\' . bovine-grammar-mode) (\.wy\' . wisent-grammar-mode) ([:/\]\..*\(emacs\|gnus\|viper\)\' . emacs-lisp-mode) (\`\..*emacs\' . emacs-lisp-mode) ([:/]_emacs\' . emacs-lisp-mode) (/crontab\.X*[0-9]+\' . shell-script-mode) (\.ml\' . lisp-mode) (\.ld[si]?\' . ld-script-mode) (ld\.?script\' . ld-script-mode) (\.xs\' . c-mode) (\.x[abdsru]?[cnw]?\' . ld-script-mode) (\.zone\' . dns-mode) (\.soa\' . dns-mode) (\.asd\' . lisp-mode) (\.\(asn\|mib\|smi\)\' . snmp-mode) (\.\(as\|mi\|sm\)2\' . snmpv2-mode) (\.\(diffs?\|patch\|rej\)\' . diff-mode) (\.\(dif\|pat\)\' . diff-mode) (\.[eE]?[pP][sS]\' . ps-mode) (\.\(?:PDF\|DVI\|OD[FGPST]\|DOCX\|XLSX?\|PPTX?\|pdf\|djvu\|dvi\|od[fgpst]\|docx\|xlsx?\|pptx?\)\' . doc-view-mode-maybe) (configure\.\(ac\|in\)\' . autoconf-mode) (\.s\(v\|iv\|ieve\)\' . sieve-mode) (BROWSE\' . ebrowse-tree-mode) (\.ebrowse\' . ebrowse-tree-mode) (#\*mail\* . mail-mode) (\.g\' . antlr-mode) (\.mod\' . m2-mode) (\.ses\' . ses-mode) (\.docbook\' . sgml-mode) (\.com\' . dcl-mode) (/config\.\(?:bat\|log\)\' . fundamental-mode) (/\.\(authinfo\|netrc\)\' . authinfo-mode) (\.\(?:[iI][nN][iI]\|[lL][sS][tT]\|[rR][eE][gG]\|[sS][yY][sS]\)\' . conf-mode) (\.la\' . conf-unix-mode) (\.ppd\' . conf-ppd-mode) (java.+\.conf\' . conf-javaprop-mode) (\.properties\(?:\.[a-zA-Z0-9._-]+\)?\' . conf-javaprop-mode) (\.toml\' . conf-toml-mode) (\.desktop\' . conf-desktop-mode) (/\.redshift.conf\' . conf-windows-mode) (\`/etc/\(?:DIR_COLORS\|ethers\|.?fstab\|.*hosts\|lesskey\|login\.?de\(?:fs\|vperm\)\|magic\|mtab\|pam\.d/.*\|permissions\(?:\.d/.+\)?\|protocols\|rpc\|services\)\' . conf-space-mode) (\`/etc/\(?:acpid?/.+\|aliases\(?:\.d/.+\)?\|default/.+\|group-?\|hosts\..+\|inittab\|ksysguarddrc\|opera6rc\|passwd-?\|shadow-?\|sysconfig/.+\)\' . conf-mode) ([cC]hange[lL]og[-.][-0-9a-z]+\' . change-log-mode) (/\.?\(?:gitconfig\|gnokiirc\|hgrc\|kde.*rc\|mime\.types\|wgetrc\)\' . conf-mode) (/\.\(?:asound\|enigma\|fetchmail\|gltron\|gtk\|hxplayer\|mairix\|mbsync\|msmtp\|net\|neverball\|nvidia-settings-\|offlineimap\|qt/.+\|realplayer\|reportbug\|rtorrent\.\|screen\|scummvm\|sversion\|sylpheed/.+\|xmp\)rc\' . conf-mode) (/\.\(?:gdbtkinit\|grip\|mpdconf\|notmuch-config\|orbital/.+txt\|rhosts\|tuxracer/options\)\' . conf-mode) (/\.?X\(?:default\|resource\|re\)s\> . conf-xdefaults-mode) (/X11.+app-defaults/\|\.ad\' . conf-xdefaults-mode) (/X11.+locale/.+/Compose\' . conf-colon-mode) (/X11.+locale/compose\.dir\' . conf-javaprop-mode) (\.~?[0-9]+\.[0-9][-.0-9]*~?\' nil t) (\.\(?:orig\|in\|[bB][aA][kK]\)\' nil t) ([/.]c\(?:on\)?f\(?:i?g\)?\(?:\.[a-zA-Z0-9._-]+\)?\' . conf-mode-maybe) (\.[1-9]\' . nroff-mode) (\.art\' . image-mode) (\.avs\' . image-mode) (\.bmp\' . image-mode) (\.cmyk\' . image-mode) (\.cmyka\' . image-mode) (\.crw\' . image-mode) (\.dcr\' . image-mode) (\.dcx\' . image-mode) (\.dng\' . image-mode) (\.dpx\' . image-mode) (\.fax\' . image-mode) (\.hrz\' . image-mode) (\.icb\' . image-mode) (\.icc\' . image-mode) (\.icm\' . image-mode) (\.ico\' . image-mode) (\.icon\' . image-mode) (\.jbg\' . image-mode) (\.jbig\' . image-mode) (\.jng\' . image-mode) (\.jnx\' . image-mode) (\.miff\' . image-mode) (\.mng\' . image-mode) (\.mvg\' . image-mode) (\.otb\' . image-mode) (\.p7\' . image-mode) (\.pcx\' . image-mode) (\.pdb\' . image-mode) (\.pfa\' . image-mode) (\.pfb\' . image-mode) (\.picon\' . image-mode) (\.pict\' . image-mode) (\.rgb\' . image-mode) (\.rgba\' . image-mode) (\.tga\' . image-mode) (\.wbmp\' . image-mode) (\.webp\' . image-mode) (\.wmf\' . image-mode) (\.wpg\' . image-mode) (\.xcf\' . image-mode) (\.xmp\' . image-mode) (\.xwd\' . image-mode) (\.yuv\' . image-mode) (\.tgz\' . tar-mode) (\.tbz2?\' . tar-mode) (\.txz\' . tar-mode) (\.tzst\' . tar-mode)) - ** Markdown Markdown is the standard for writing documentation. This snippet loads GFM (Github Flavoured Markdown) style. @@ -793,9 +709,6 @@ Markdown is the standard for writing documentation. This snippet loads GFM (add-hook 'org-trigger-hook 'save-buffer)) #+END_SRC -#+RESULTS: -: t - Set up ob for executing code blocks #+BEGIN_SRC emacs-lisp @@ -818,9 +731,6 @@ Set up ob for executing code blocks (shell . t)))) #+END_SRC -#+RESULTS: -: t - Exporting to html needs htmlize. #+BEGIN_SRC emacs-lisp @@ -862,9 +772,6 @@ Add org noter (setq org-ref-completion-library 'org-ref-ivy-cite)) #+END_SRC -#+RESULTS: -: org-ref-bibtex-hydra/body - *** Templates #+BEGIN_SRC emacs-lisp (setq org-capture-templates @@ -895,11 +802,6 @@ Add org noter ((org-agenda-overriding-header "University"))))) #+END_SRC -#+RESULTS: -| w | At work | tags-todo | @work | ((org-agenda-overriding-header Work)) | -| h | At home | tags-todo | @home | ((org-agenda-overriding-header Home)) | -| u | At uni | tags-todo | @uni | ((org-agenda-overriding-header University)) | - *** Contacts #+BEGIN_SRC emacs-lisp @@ -907,9 +809,6 @@ Add org noter '("~/Dropbox/org/contacts.org"))) #+END_SRC -#+RESULTS: -| /home/yannherklotz/Dropbox/org/contacts.org | - *** Remove Binding #+BEGIN_SRC emacs-lisp (define-key org-mode-map (kbd "C-,") nil) @@ -924,9 +823,6 @@ 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 @@ -947,9 +843,6 @@ Add org noter (define-key pdf-view-mode-map (kbd "C-s") 'isearch-forward)) #+END_SRC -#+RESULTS: -| pdf-view-mode | - ** Writeroom #+begin_src emacs-lisp @@ -971,9 +864,6 @@ lot of different language support. (setq server-switch-hook nil)) #+END_SRC -#+RESULTS: -: magit-status - *** Projectile #+BEGIN_SRC emacs-lisp (use-package projectile @@ -1001,9 +891,6 @@ lot of different language support. (setq-default ediff-forward-word-function 'forward-char) #+END_SRC -#+RESULTS: -: forward-char - ** Language Support *** C++ @@ -1068,9 +955,6 @@ to install clang format script). ("C-c u" . 'clang-format-buffer))) #+END_SRC -#+RESULTS: -: clang-format-buffer - *** Clojure Using Cider for clojure environment. @@ -1108,9 +992,6 @@ Adding hook to clojure mode to enable strict parentheses mode. (setq coq-compile-before-require t)) #+end_src -#+RESULTS: -: t - *** Elm #+BEGIN_SRC emacs-lisp @@ -1183,18 +1064,12 @@ Haskell mode with company mode completion. :hook haskell-mode) #+END_SRC -#+RESULTS: -| (lambda nil (set (make-local-variable (quote projectile-tags-command)) hasktags -Re -f "%s" %s "%s")) | (lambda nil (local-set-key (kbd C-c v) (quote haskell-add-import))) | (lambda nil (local-set-key (kbd C-c y a) (quote y/haskell-align-comment))) | haskell-decl-scan-mode | interactive-haskell-mode | - *** LLVM IR #+begin_src text (require 'llvm-mode) #+end_src -#+RESULTS: -: llvm-mode - *** Python Elpy package for python, which provides an IDE type environment for python. @@ -1218,9 +1093,6 @@ Elpy package for python, which provides an IDE type environment for python. nil "_")))) #+END_SRC -#+RESULTS: -: python-shell-completion-native-try - *** JSON JSON files should be opened in js-mode. #+BEGIN_SRC emacs-lisp @@ -1243,8 +1115,6 @@ JSON files should be opened in js-mode. (use-package scala-mode) #+end_src -#+RESULTS: - *** Shell #+BEGIN_SRC emacs-lisp (setq sh-basic-offset 2) @@ -1257,9 +1127,6 @@ JSON files should be opened in js-mode. (setq flycheck-verilog-verilator-executable "verilator_bin") #+end_src -#+RESULTS: -: verilator_bin - ** Completion Support *** Company #+BEGIN_SRC emacs-lisp @@ -1332,9 +1199,6 @@ Shamelessly taken from https://github.com/alphapapa/unpackaged.el#hydra. (unpackaged/smerge-hydra/body))))) #+END_SRC -#+RESULTS: -| lambda | nil | (when smerge-mode (unpackaged/smerge-hydra/body)) | - * Look and Feel #+BEGIN_SRC emacs-lisp @@ -1347,14 +1211,11 @@ Shamelessly taken from https://github.com/alphapapa/unpackaged.el#hydra. (select-frame frame) (toggle-scroll-bar -1))) - ;(unless (boundp 'server-process) - ; (progn (load-theme 'sanityinc-solarized-light t) - ; (toggle-scroll-bar -1))) + (unless (boundp 'server-process) + (progn (load-theme 'sanityinc-tomorrow-night t) + (toggle-scroll-bar -1))) #+END_SRC -#+RESULTS: -| (lambda (frame) (select-frame frame) (load-theme (quote sanityinc-tomorrow-night) t) (toggle-scroll-bar -1)) | (lambda (frame) (select-frame frame) (load-theme (quote gruvbox-light-soft) t) (toggle-scroll-bar -1)) | x-dnd-init-frame | - * Conclusion Setting the gc-cons threshold back to what it was at the beginning. -- cgit From a9bb367d8117fb92d966eca6d5aefe1c70036a4b Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Mon, 16 Mar 2020 20:51:06 +0000 Subject: Add temp files, need to work on integrating --- emacs/loader.org | 20 ++++++++++++++++++-- install.sh | 2 +- zsh/.zsh/export.zsh | 12 ++++++++---- zsh/.zsh/function.zsh | 6 ------ zsh/.zsh/startup.zsh | 10 ---------- zsh/.zshrc | 3 +++ 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/emacs/loader.org b/emacs/loader.org index 1183215..b66488b 100644 --- a/emacs/loader.org +++ b/emacs/loader.org @@ -109,7 +109,7 @@ yes or no. Also stop the start up message from popping up and enter the scratch buffer instead. #+BEGIN_SRC emacs-lisp - ;;(setq warning-minimum-level :emergency) + (setq warning-minimum-level :emergency) (setq inhibit-startup-message t confirm-nonexistent-file-or-buffer nil default-directory "~/") @@ -121,11 +121,18 @@ 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/") - (when (string= system-type "darwin") + (when (eq system-type 'darwin) (setq dired-use-ls-dired nil)) #+END_SRC #+BEGIN_SRC emacs-lisp + (when (eq system-type 'darwin) + (setq mac-right-option-modifier 'none + mac-option-key-is-meta nil + mac-command-key-is-meta t + mac-command-modifier 'meta + mac-option-modifier nil)) + (global-set-key (kbd "M-u") #'upcase-dwim) (global-set-key (kbd "M-l") #'downcase-dwim) (global-set-key (kbd "M-c") #'capitalize-dwim) @@ -447,6 +454,15 @@ Define utility functions to make the reader work. #+END_SRC * 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 diff --git a/install.sh b/install.sh index f7c0022..2bd7b26 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_DIR=$(dirname "$(readlink -f "$0")") +SCRIPT_DIR=$(pwd) function print_help { echo "Install configuration options to the correct paths." diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh index a395d92..c488153 100644 --- a/zsh/.zsh/export.zsh +++ b/zsh/.zsh/export.zsh @@ -1,21 +1,25 @@ -export GITHUB_HOME=$HOME/Github +. $HOME/.nix-profile/etc/profile.d/nix.sh + +export GITHUB_HOME=$HOME/Projects export FZF_DEFAULT_COMMAND='fd --type file --hidden --no-ignore' export ALTERNATE_EDITOR="emacs -nw -Q" export EDITOR='emacsclient -nw' export VISUAL='emacsclient -c' export TERM='xterm-256color' +export CLICOLOR=1 export PATH="${HOME}/.gem/ruby/2.6.0/bin:/usr/local/bin:${PATH}" -export PATH="/usr/bin:${PATH}" export PATH="${HOME}/.yarn/bin:${PATH}" export PATH="${PATH}:/opt/Xilinx/Vivado/2019.1/bin" 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}" +export PATH="/usr/local/bin:${PATH}" +export PATH="/Library/TeX/texbin:${PATH}" +export PATH="${PATH}:/Users/yannherklotz/Library/Python/3.7/bin" # 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..06a8e43 100644 --- a/zsh/.zsh/function.zsh +++ b/zsh/.zsh/function.zsh @@ -1,9 +1,3 @@ -alias fdisk='fdisk --color=always' -alias grep='grep --color=always' -alias ls='ls --color=always' -alias l='ls -la --color=always' -alias vi='nvim' -alias vim='nvim' alias emc='emacsclient -c -a ""' alias em='emacsclient -nw -a ""' alias ff='firefox' diff --git a/zsh/.zsh/startup.zsh b/zsh/.zsh/startup.zsh index e8caf69..e69de29 100644 --- a/zsh/.zsh/startup.zsh +++ b/zsh/.zsh/startup.zsh @@ -1,10 +0,0 @@ -# Nix -if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then - . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' -fi - -# direnv - -eval "$(direnv hook zsh)" - -# End Nix diff --git a/zsh/.zshrc b/zsh/.zshrc index b854793..ae0ee35 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -43,3 +43,6 @@ 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 /Users/yannherklotz/.travis/travis.sh ] && source /Users/yannherklotz/.travis/travis.sh -- cgit