Update dotfilesHEADmaster

2 files changed, 86 insertions, 68 deletions

diff --git a/init.el b/init.el
index b1c0d9e..c55c7c5 100644
--- a/init.el
+++ b/init.el
@@ -17,13 +17,7 @@
 (menu-bar-mode -1)
 (setq frame-title-format "%b - emacs")
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
-(set-frame-font (font-spec :family "Input" :size 10.5))
-(xterm-mouse-mode 1)
-
-(set-variable 'nord-comment-brightness 20)
-(load-theme 'doom-one t)
-(doom-themes-visual-bell-config)
-(doom-themes-org-config)
+;; (xterm-mouse-mode 1)
 
 (add-hook 'text-mode-hook
           (lambda ()
@@ -34,7 +28,6 @@
             (display-line-numbers-mode 1)
             ))
 
-
 (global-auto-revert-mode 1)
 
 ;; Some minor modes
@@ -45,10 +38,17 @@
 (global-set-key (kbd "C-x o") 'ace-window)
 
 ;; Powerline
-(require 'powerline)
-(powerline-center-evil-theme)
-;; Fix issue with alt-tab not resetting colors
-(remove-hook 'focus-out-hook 'powerline-unset-selected-window)
+;; (require 'powerline)
+;; (powerline-center-evil-theme)
+;; ;; Fix issue with alt-tab not resetting colors
+;; (remove-hook 'focus-out-hook 'powerline-unset-selected-window)
+
+(require 'doom-modeline)
+(doom-modeline-mode 1)
+(setq doom-modeline-buffer-encoding nil)
+(setq doom-modeline-buffer-state-icon t)
+(setq doom-modeline-minor-modes nil)
+(column-number-mode 1)
 
 ;; Indentation
 (setq-default indent-tabs-mode nil)
@@ -76,6 +76,12 @@
 
 (setq ivy-wrap 't)
 
+;; projectile
+(require 'projectile)
+(define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
+(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
+(projectile-mode +1)
+
 ;; electric-pair
 (electric-pair-mode 1)
 
@@ -116,11 +122,11 @@ This functions should be added to the hooks of major modes for programming."
 (advice-add 'evil-beginning-of-line :around (evil--check-visual-line-mode 'evil-beginning-of-visual-line))
 (advice-add 'evil-end-of-line :around (evil--check-visual-line-mode 'evil-end-of-visual-line))
 
-(require 'evil-little-word)
-(define-key evil-motion-state-map (kbd "w") 'evil-forward-little-word-begin)
-(define-key evil-motion-state-map (kbd "glw") 'evil-forward-word-begin)
-(define-key evil-motion-state-map (kbd "b") 'evil-backward-little-word-begin)
-(define-key evil-motion-state-map (kbd "glb") 'evil-backward-word-begin)
+;; (require 'evil-little-word)
+;; (define-key evil-motion-state-map (kbd "w") 'evil-forward-little-word-begin)
+;; (define-key evil-motion-state-map (kbd "glw") 'evil-forward-word-begin)
+;; (define-key evil-motion-state-map (kbd "b") 'evil-backward-little-word-begin)
+;; (define-key evil-motion-state-map (kbd "glb") 'evil-backward-word-begin)
 
 (defun comment-or-uncomment-region-or-line ()
     "Comments or uncomments the region or the current line if there's no active region."
@@ -164,10 +170,13 @@ This functions should be added to the hooks of major modes for programming."
 ;; company-mode
 (add-hook 'after-init-hook 'global-company-mode)
 
+;; clojure-mode
+(add-hook 'clojure-mode-hook '(lambda () (cider-mode 1)))
+
 ;; rust
-(add-hook 'rust-mode-hook 'cargo-minor-mode)
+;; (add-hook 'rust-mode-hook 'cargo-minor-mode)
 (add-hook 'rust-mode-hook '(lambda ()
-                             (racer-mode 1)
+                             ;; (racer-mode 1)
                              (eldoc-mode 1)))
 
 ;; javascript: js2
@@ -185,6 +194,11 @@ This functions should be added to the hooks of major modes for programming."
 (add-hook 'flycheck-mode-hook #'my/use-eslint-from-node-modules)
 
 (add-to-list 'auto-mode-alist `(,(rx ".js" string-end) . js2-mode))
+(add-to-list 'auto-mode-alist `(,(rx ".mjs" string-end) . js2-mode))
+
+;; web-mode
+
+(add-to-list 'auto-mode-alist `(,(rx ".svelte" string-end) . web-mode))
 
 ;; typescript: tide
 
@@ -195,43 +209,32 @@ This functions should be added to the hooks of major modes for programming."
             (setq flycheck-check-syntax-automatically '(save mode-enabled))
             (company-mode-on)))
 (add-to-list 'auto-mode-alist `(,(rx ".tsx" string-end) . web-mode))
+(add-to-list 'auto-mode-alist `(,(rx ".facade" string-end) . web-mode))
 
 ;; aligns annotation to the right hand side
 (setq company-tooltip-align-annotations t)
 
 ;; haskell-mode
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
 
 ;; latex-mode
-
-
 (add-hook 'LaTeX-mode-hook (lambda ()
                              (flyspell-mode 1)
                              (visual-line-mode 1)))
 
-;; go-mode
+;; C++/CXX/C
 
-(add-hook 'go-mode-hook
+(require 'google-c-style)
+(add-hook 'c++-mode-hook
           (lambda ()
-            (add-hook 'before-save-hook 'gofmt-before-save nil t)
-            (go-eldoc-setup)
-            (set (make-local-variable 'company-backends) '(company-go))
-            (company-mode)
-            ))
+            (google-set-c-style)))
 
-;; Ocaml/Merlin
+;; Markdown
 
-(let ((opam-share (ignore-errors (car (process-lines "opam" "config" "var"
-   "share")))))
-      (when (and opam-share (file-directory-p opam-share))
-       ;; Register Merlin
-       (add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
-       (autoload 'merlin-mode "merlin" nil t nil)
-       ;; Automatically start it in OCaml buffers
-       (add-hook 'tuareg-mode-hook 'merlin-mode t)
-       (add-hook 'caml-mode-hook 'merlin-mode t)
-       ;; Use opam switch to lookup ocamlmerlin binary
-       (setq merlin-command 'opam)))
+(add-hook 'markdown-mode-hook
+          (lambda ()
+            (visual-line-mode t)
+            (flyspell-mode t)
+            ))
 
 ;; org-mode
 
@@ -239,14 +242,13 @@ This functions should be added to the hooks of major modes for programming."
           (lambda ()
             (org-indent-mode t)
             (visual-line-mode t)
-            (adaptive-wrap-prefix-mode t)
+            ;; (adaptive-wrap-prefix-mode t)
             (flyspell-mode t)
             ))
 
 (org-babel-do-load-languages 'org-babel-load-languages '((latex . t)))
 
 (eval-after-load "ox-latex"
-
   ;; update the list of LaTeX classes and associated header (encoding, etc.)
   ;; and structure
   '(add-to-list 'org-latex-classes
@@ -261,6 +263,13 @@ This functions should be added to the hooks of major modes for programming."
 (setq org-latex-listings t)
 ;; (add-to-list 'org-latex-packages-alist '("" "listings"))
 
+;; pollen
+
+(add-hook 'pollen-mode-hook
+          (lambda ()
+            (flyspell-mode t)))
+(add-to-list 'auto-mode-alist `(,(rx ".pm" string-end) . pollen-mode))
+
 ;; adaptive-wrap when available
 
 (when (fboundp 'adaptive-wrap-prefix-mode)
@@ -269,77 +278,83 @@ This functions should be added to the hooks of major modes for programming."
     (adaptive-wrap-prefix-mode (if visual-line-mode 1 -1)))
   (add-hook 'visual-line-mode-hook 'my-activate-adaptive-wrap-prefix-mode))
 
+;; variable-pitch-mode
+;; (add-hook 'text-mode-hook
+;;           (lambda ()
+;;             (variable-pitch-mode 1)))
+
 (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.
- '(LaTeX-verbatim-environments (quote ("verbatim" "verbatim*" "lstlisting")))
+ '(LaTeX-verbatim-environments '("verbatim" "verbatim*" "lstlisting"))
  '(TeX-view-program-selection
-   (quote
-    (((output-dvi has-no-display-manager)
+   '(((output-dvi has-no-display-manager)
       "dvi2tty")
      ((output-dvi style-pstricks)
       "dvips and gv")
      (output-dvi "xdvi")
      (output-pdf "xdg-open")
-     (output-html "xdg-open"))))
+     (output-html "xdg-open")))
  '(company-racer-executable "~/.cargo/bin/racer")
  '(completion-ignored-extensions
-   (quote
-    (".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".svn/" ".hg/" ".git/" ".bzr/" "CVS/" "_darcs/" "_MTN/" ".fmt" ".tfm" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".dfsl" ".pfsl" ".d64fsl" ".p64fsl" ".lx64fsl" ".lx32fsl" ".dx64fsl" ".dx32fsl" ".fx64fsl" ".fx32fsl" ".sx64fsl" ".sx32fsl" ".wx64fsl" ".wx32fsl" ".fasl" ".ufsl" ".fsl" ".dxl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".log")))
+   '(".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".svn/" ".hg/" ".git/" ".bzr/" "CVS/" "_darcs/" "_MTN/" ".fmt" ".tfm" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".dfsl" ".pfsl" ".d64fsl" ".p64fsl" ".lx64fsl" ".lx32fsl" ".dx64fsl" ".dx32fsl" ".fx64fsl" ".fx32fsl" ".sx64fsl" ".sx32fsl" ".wx64fsl" ".wx32fsl" ".fasl" ".ufsl" ".fsl" ".dxl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".log"))
  '(custom-safe-themes
-   (quote
-    ("ce3e6c12b48979ce89754884d913c7ecc8a7956543d8b09ef13abfab6af9aa35" "fe666e5ac37c2dfcf80074e88b9252c71a22b6f5d2f566df9a7aa4f9bea55ef8" "9d9fda57c476672acd8c6efeb9dc801abea906634575ad2c7688d055878e69d6" "1c082c9b84449e54af757bcae23617d11f563fc9f33a832a8a2813c4d7dfb652" "8f83397e58db2a094d534aef83bbecbeefa1fb473141e7504609dc07580b66af" "7527f3308a83721f9b6d50a36698baaedc79ded9f6d5bd4e9a28a22ab13b3cb1" "4cbec5d41c8ca9742e7c31cc13d8d4d5a18bd3a0961c18eb56d69972bbcf3071" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "a2dd771a05705be2a6e6adb6ddbc7a27ebf49edab1dffdbefe243096becba7c9" "71ecffba18621354a1be303687f33b84788e13f40141580fa81e7840752d31bf" "561ba4316ba42fe75bc07a907647caa55fc883749ee4f8f280a29516525fc9e8" "a81bc918eceaee124247648fc9682caddd713897d7fd1398856a5b61a592cb62" default)))
+   '("37a4701758378c93159ad6c7aceb19fd6fb523e044efe47f2116bc7398ce20c9" "6096a2f93610f29bf0f6fe34307587edd21edec95073cbfcfb9d7a3b9206b399" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "ce3e6c12b48979ce89754884d913c7ecc8a7956543d8b09ef13abfab6af9aa35" "fe666e5ac37c2dfcf80074e88b9252c71a22b6f5d2f566df9a7aa4f9bea55ef8" "9d9fda57c476672acd8c6efeb9dc801abea906634575ad2c7688d055878e69d6" "1c082c9b84449e54af757bcae23617d11f563fc9f33a832a8a2813c4d7dfb652" "8f83397e58db2a094d534aef83bbecbeefa1fb473141e7504609dc07580b66af" "7527f3308a83721f9b6d50a36698baaedc79ded9f6d5bd4e9a28a22ab13b3cb1" "4cbec5d41c8ca9742e7c31cc13d8d4d5a18bd3a0961c18eb56d69972bbcf3071" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "a2dd771a05705be2a6e6adb6ddbc7a27ebf49edab1dffdbefe243096becba7c9" "71ecffba18621354a1be303687f33b84788e13f40141580fa81e7840752d31bf" "561ba4316ba42fe75bc07a907647caa55fc883749ee4f8f280a29516525fc9e8" "a81bc918eceaee124247648fc9682caddd713897d7fd1398856a5b61a592cb62" default))
  '(doc-view-continuous t)
+ '(flycheck-checkers
+   '(ada-gnat asciidoctor asciidoc c/c++-gcc c/c++-cppcheck cfengine chef-foodcritic coffee coffee-coffeelint coq css-csslint css-stylelint cwl d-dmd dockerfile-hadolint emacs-lisp emacs-lisp-checkdoc erlang-rebar3 erlang eruby-erubis fortran-gfortran go-gofmt go-golint go-vet go-build go-test go-errcheck go-unconvert go-megacheck groovy haml handlebars haskell-stack-ghc haskell-ghc haskell-hlint html-tidy javascript-eslint javascript-jshint javascript-standard json-jsonlint json-python-json jsonnet less less-stylelint llvm-llc lua-luacheck lua perl perl-perlcritic php php-phpmd php-phpcs processing proselint protobuf-protoc pug puppet-parser puppet-lint python-flake8 python-pylint python-pycompile r-lintr racket rpm-rpmlint markdown-markdownlint-cli markdown-mdl nix rst-sphinx rst ruby-rubocop ruby-reek ruby-rubylint ruby ruby-jruby rust-cargo rust rust-clippy scala scala-scalastyle scheme-chicken scss-lint scss-stylelint sass/scss-sass-lint sass scss sh-bash sh-posix-dash sh-posix-bash sh-zsh sh-shellcheck slim slim-lint sql-sqlint systemd-analyze tcl-nagelfar tex-chktex tex-lacheck texinfo typescript-tslint verilog-verilator vhdl-ghdl xml-xmlstarlet xml-xmllint yaml-jsyaml yaml-ruby))
  '(font-latex-fontify-sectioning 1.0)
  '(gofmt-command "goimports")
  '(hl-sexp-background-color "#1c1f26")
  '(ido-auto-merge-work-directories-length -1)
- '(jabber-account-list
-   (quote
-    (("david@genki.is"
-      (:password . "CWr2jexUWcvuzMyLLEhI")))))
+ '(jabber-account-list '(("david@genki.is" (:password . "CWr2jexUWcvuzMyLLEhI"))))
  '(js2-highlight-level 3)
  '(js2-mode-assume-strict t)
  '(org-agenda-files nil)
  '(org-html-container-element "section")
  '(org-html-divs
-   (quote
-    ((preamble "div" "preamble")
+   '((preamble "div" "preamble")
      (content "article" "content")
-     (postamble "footer" "postamble"))))
+     (postamble "footer" "postamble")))
  '(org-html-doctype "html5")
  '(org-html-html5-fancy t)
- '(org-html-htmlize-output-type (quote css))
- '(org-preview-latex-default-process (quote imagemagick))
+ '(org-html-htmlize-output-type 'css)
+ '(org-preview-latex-default-process 'imagemagick)
  '(org-startup-folded nil)
  '(package-selected-packages
-   (quote
-    (doom-themes poet-theme js2-refactor org-bullets rainbow-delimiters nord-theme ace-window counsel ivy moe-theme ag imenu-anywhere org-ref htmlize ox-reveal color-theme-sanityinc-tomorrow white-theme adaptive-wrap company-go go-eldoc go-guru go-mode lua-mode company-racer material-theme yaml-mode web-mode tuareg tide smex racket-mode racer powerline paredit multiple-cursors markdown-mode magit json-mode ido-vertical-mode haskell-mode goto-last-change glsl-mode flycheck-rust flycheck-elm fill-column-indicator expand-region evil-vimish-fold evil-surround evil-rsi evil-mc evil-escape elm-yasnippets elm-mode deferred cyberpunk-theme cargo auctex alchemist)))
+   '(protobuf-mode pollen-mode ripgrep doom-modeline prettier cider company cython-mode cmake-mode counsel-projectile projectile js2-mode leuven-theme rust-mode merlin merlin-eldoc eglot doom-themes poet-theme js2-refactor org-bullets rainbow-delimiters nord-theme ace-window counsel ivy moe-theme ag imenu-anywhere org-ref htmlize ox-reveal color-theme-sanityinc-tomorrow white-theme adaptive-wrap company-go go-eldoc go-guru go-mode lua-mode company-racer material-theme yaml-mode web-mode tuareg tide smex racket-mode racer powerline paredit multiple-cursors markdown-mode magit json-mode ido-vertical-mode haskell-mode goto-last-change glsl-mode flycheck-rust flycheck-elm fill-column-indicator expand-region evil-vimish-fold evil-surround evil-rsi evil-mc evil-escape elm-yasnippets elm-mode deferred cyberpunk-theme cargo auctex alchemist))
  '(racer-cmd "/home/lidavidm/.cargo/bin/racer")
+ '(rust-format-on-save t)
  '(safe-local-variable-values
-   (quote
-    ((coq-prog-args "-emacs" "-I" "./cpdtlib/")
+   '((js2-global-externs . import)
+     (js2-include-node-externs . t)
+     (js2-include-node-externs quote t)
+     (eval prettier-mode t)
+     (js2-basic-offset . 2)
+     (coq-prog-args "-emacs" "-I" "./cpdtlib/")
      (org-latex-pdf-process "latexmk -shell-escape -bibtex -pdf %f")
      (org-html-htmlize-output-type . "inline-css")
      (org-html-htmlize-output-type . "css")
      (org-html-metadata-timestamp-format . "%A, %B %d, %Y")
      (org-src-fontify-natively)
      (js2-basic-offset . 4)
-     (js2-basic-offset 4))))
+     (js2-basic-offset 4)))
  '(tide-tsserver-executable "node_modules/typescript/bin/tsserver")
  '(web-mode-script-padding 4)
  '(web-mode-style-padding 4))
 
-;; custom variables
-
 (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.
- '(font-latex-sectioning-5-face ((t (:foreground "deep sky blue" :slant italic :height 1.15 :family "Charis SIL")))))
+ '(default ((t (:height 105 :family "JetBrains Mono")))))
+
+
+(if (display-graphic-p)
+    (load-theme 'doom-flatwhite))
 
 (provide 'init)
 ;;; init.el ends here
diff --git a/tmux.conf b/tmux.conf
index d7e7ff0..efe81f3 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -42,4 +42,7 @@ bind -n C-right swap-window -t +1
 # Status bar
 # set -g status-right '#{prefix_highlight} | %a %Y-%m-%d %H:%M'
 
+# Use fish
+set -g default-shell /usr/bin/fish
+
 # TODO: put this in Git