Compare commits

..

No commits in common. "c9e0ee6c3f80c1b72102dee9039a49700172383a" and "4c14a4131cde29de56e697f9fc142428e98a63f8" have entirely different histories.

View file

@ -50,37 +50,39 @@
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(Buffer-menu-name-width 30) '(Buffer-menu-name-width 30)
'(agda2-program-args nil) '(agda2-program-args nil)
'(auth-sources '("~/.authinfo.gpg" "~/.authinfo" "~/.netrc")) '(auth-sources (quote ("~/.authinfo.gpg" "~/.authinfo" "~/.netrc")))
'(blink-cursor-mode nil) '(blink-cursor-mode nil)
'(column-number-mode t) '(column-number-mode t)
'(company-tooltip-minimum-width 35) '(company-tooltip-minimum-width 35)
'(compilation-disable-input t) '(compilation-disable-input t)
'(confirm-kill-emacs 'yes-or-no-p) '(confirm-kill-emacs (quote yes-or-no-p))
'(css-indent-offset 2) '(css-indent-offset 2)
'(custom-safe-themes '(custom-safe-themes
'("224f84d5013ad0b98a43c54683302309a7cba53c0e37480a65284fd365774400" "d59e18ab7969fd68103ab0fe07e03c1830fd77c21c12a3fb4fe970931ddaf68d" "670df6cad1a732850a5d90ce2b0326969bd7596881dc1fed6b35091520a3da97" "aa81baddda211ffab84a5dc68750ac519d4841be63907a6b5de0cd72e631b172" "c91a5bf65b3f79ab28ab350b1d16c24d8b8bc1201e9c6c2106a60f98bceae754" default)) (quote
("224f84d5013ad0b98a43c54683302309a7cba53c0e37480a65284fd365774400" "d59e18ab7969fd68103ab0fe07e03c1830fd77c21c12a3fb4fe970931ddaf68d" "670df6cad1a732850a5d90ce2b0326969bd7596881dc1fed6b35091520a3da97" "aa81baddda211ffab84a5dc68750ac519d4841be63907a6b5de0cd72e631b172" "c91a5bf65b3f79ab28ab350b1d16c24d8b8bc1201e9c6c2106a60f98bceae754" default)))
'(dashboard-set-footer nil) '(dashboard-set-footer nil)
'(delete-selection-mode t) '(delete-selection-mode t)
'(dhall-repl-executable "dhall-repl") '(dhall-repl-executable "dhall-repl")
'(dhall-use-header-line nil) '(dhall-use-header-line nil)
'(dired-isearch-filenames t) '(dired-isearch-filenames t)
'(dired-use-ls-dired nil)
'(display-buffer-alist '(display-buffer-alist
'(("*Man*" display-buffer-same-window) (quote
("*Buffer List*" display-buffer-same-window))) (("*Man*" display-buffer-same-window)
("*Buffer List*" display-buffer-same-window))))
'(echo-keystrokes 1e-10) '(echo-keystrokes 1e-10)
'(erc-autojoin-channels-alist '(("irc.freenode.net" "#haskell" "#data.coop"))) '(erc-autojoin-channels-alist (quote (("irc.freenode.net" "#haskell" "#data.coop"))))
'(erc-autojoin-mode t) '(erc-autojoin-mode t)
'(erc-nick "fredefox") '(erc-nick "fredefox")
'(erc-port 6667) '(erc-port 6667)
'(erc-prompt-for-password nil) '(erc-prompt-for-password nil)
'(erc-server "irc.freenode.net") '(erc-server "irc.freenode.net")
'(exec-path-from-shell-check-startup-files nil) '(exec-path-from-shell-check-startup-files nil)
'(flycheck-emacs-lisp-load-path 'inherit) '(flycheck-emacs-lisp-load-path (quote inherit))
'(flycheck-ghc-language-extensions (symbol-value 'haskell-language-extensions)) '(flycheck-ghc-language-extensions (symbol-value (quote haskell-language-extensions)))
'(flycheck-hlint-language-extensions (symbol-value 'haskell-language-extensions)) '(flycheck-hlint-language-extensions (symbol-value (quote haskell-language-extensions)))
'(forge-alist '(forge-alist
'(("github.com" "api.github.com" "github.com" forge-github-repository) (quote
(("github.com" "api.github.com" "github.com" forge-github-repository)
("gitlab.com" "gitlab.com/api/v4" "gitlab.com" forge-gitlab-repository) ("gitlab.com" "gitlab.com/api/v4" "gitlab.com" forge-gitlab-repository)
("salsa.debian.org" "salsa.debian.org/api/v4" "salsa.debian.org" forge-gitlab-repository) ("salsa.debian.org" "salsa.debian.org/api/v4" "salsa.debian.org" forge-gitlab-repository)
("framagit.org" "framagit.org/api/v4" "framagit.org" forge-gitlab-repository) ("framagit.org" "framagit.org/api/v4" "framagit.org" forge-gitlab-repository)
@ -92,63 +94,76 @@
("repo.or.cz" nil "repo.or.cz" forge-repoorcz-repository) ("repo.or.cz" nil "repo.or.cz" forge-repoorcz-repository)
("git.suckless.org" nil "git.suckless.org" forge-stagit-repository) ("git.suckless.org" nil "git.suckless.org" forge-stagit-repository)
("git.sr.ht" nil "git.sr.ht" forge-srht-repository) ("git.sr.ht" nil "git.sr.ht" forge-srht-repository)
("git.data.coop" "git.data.coop/api/v1" "git.data.coop" forge-gitea-repository))) ("git.data.coop" "git.data.coop/api/v1" "git.data.coop" forge-gitea-repository))))
'(global-company-mode t) '(global-company-mode t)
'(graphviz-dot-indent-width 2)
'(haskell-indentation-where-post-offset 0) '(haskell-indentation-where-post-offset 0)
'(haskell-indentation-where-pre-offset 0) '(haskell-indentation-where-pre-offset 0)
'(haskell-language-extensions (symbol-value 'haskell-language-extensions)) '(haskell-language-extensions (symbol-value (quote haskell-language-extensions)))
'(haskell-tags-on-save t) '(haskell-tags-on-save t)
'(indent-tabs-mode nil) '(indent-tabs-mode nil)
'(initial-scratch-message nil) '(initial-scratch-message nil)
'(js-indent-level 2) '(js-indent-level 2)
'(js2-basic-offset 2) '(js2-basic-offset 2)
'(js2-global-externs (list 'this)) '(js2-global-externs (list (quote this)))
'(kill-whole-line t) '(kill-whole-line t)
'(line-move-visual nil) '(line-move-visual nil)
'(lsp-auto-guess-root t) '(lsp-auto-guess-root t)
'(magit-display-buffer-function 'magit-display-buffer-same-window-except-diff-v1) '(magit-display-buffer-function (quote magit-display-buffer-same-window-except-diff-v1))
'(magit-popup-display-buffer-action nil) '(magit-popup-display-buffer-action nil)
'(markdown-command "pandoc -t html") '(markdown-command "pandoc -t html")
'(menu-bar-mode nil) '(menu-bar-mode nil)
'(message-send-mail-function 'smtpmail-send-it) '(message-send-mail-function (quote smtpmail-send-it))
'(mode-line-percent-position '(6 "%q"))
'(org-agenda-files "~/.config/orgmode/agenda_files") '(org-agenda-files "~/.config/orgmode/agenda_files")
'(org-hide-leading-stars t)
'(package-selected-packages '(package-selected-packages
'(graphviz-dot-mode rust-mode lsp forge tide origami dhall-mode docker-tramp graphql-mode enh-ruby-mode scala-mode string-inflection prettier-js quelpa typescript-mode visual-fill-column ag ripgrep fill-column-indicator rjsx-mode image+ company org-jira which-key flycheck es-mode lsp-haskell projectile exec-path-from-shell lsp-ui lsp-mode editorconfig purescript-mode markdown-mode+ ssh-agency dash yaml-mode restart-emacs markdown-mode magit helm haskell-mode haml-mode form-feed dashboard)) (quote
(origami dhall-mode docker-tramp graphql-mode enh-ruby-mode scala-mode string-inflection prettier-js quelpa typescript-mode visual-fill-column ag ripgrep fill-column-indicator rjsx-mode image+ company org-jira which-key flycheck es-mode lsp-haskell forge projectile exec-path-from-shell lsp-ui lsp-mode editorconfig purescript-mode markdown-mode+ ssh-agency dash yaml-mode restart-emacs markdown-mode magit helm haskell-mode haml-mode form-feed dashboard)))
'(prettier-js-command "prettier-1.18.2") '(prettier-js-command "prettier-1.18.2")
'(projectile-globally-ignored-directories '(projectile-globally-ignored-directories
'(".idea" ".ensime_cache" ".eunit" ".git" ".hg" ".fslckout" "_FOSSIL_" ".bzr" "_darcs" ".tox" ".svn" ".stack-work" "node_modules" "vendor")) (quote
'(projectile-globally-ignored-files '("/TAGS" "/vendor" "/.bundle" "/node_modules")) (".idea" ".ensime_cache" ".eunit" ".git" ".hg" ".fslckout" "_FOSSIL_" ".bzr" "_darcs" ".tox" ".svn" ".stack-work" "node_modules" "vendor")))
'(projectile-globally-ignored-files (quote ("/TAGS" "/vendor" "/.bundle" "/node_modules")))
'(projectile-mode t nil (projectile)) '(projectile-mode t nil (projectile))
'(projectile-project-search-path '(projectile-project-search-path
(seq-filter 'file-directory-p (seq-filter
(seq-drop (quote file-directory-p)
(directory-files "~/git" t) (seq-drop
2))) (directory-files "~/git" t)
'(purescript-mode-hook '(turn-on-purescript-indentation)) 2)))
'(purescript-mode-hook (quote (turn-on-purescript-indentation)))
'(recentf-max-menu-items 255) '(recentf-max-menu-items 255)
'(recentf-mode t) '(recentf-mode t)
'(ruby-align-chained-calls t) '(ruby-align-chained-calls t)
'(ruby-align-to-stmt-keywords t) '(ruby-align-to-stmt-keywords t)
'(ruby-chained-calls t) '(ruby-chained-calls t)
'(ruby-insert-encoding-magic-comment nil) '(ruby-insert-encoding-magic-comment nil)
'(rust-indent-offset 2)
'(safe-local-eval-forms '(safe-local-eval-forms
'((add-hook 'write-file-hooks 'time-stamp) (quote
(add-hook 'write-file-functions 'time-stamp) ((add-hook
(add-hook 'before-save-hook 'time-stamp nil t) (quote write-file-hooks)
(add-hook 'before-save-hook 'delete-trailing-whitespace nil t) (quote time-stamp))
(add-hook
(quote write-file-functions)
(quote time-stamp))
(add-hook
(quote before-save-hook)
(quote time-stamp)
nil t)
(add-hook
(quote before-save-hook)
(quote delete-trailing-whitespace)
nil t)
(format "cd ~/git/zendesk/guide-acceptance-tests && rspec --no-color '%s'" (format "cd ~/git/zendesk/guide-acceptance-tests && rspec --no-color '%s'"
(projectile-get-relative-path-buffer)))) (projectile-get-relative-path-buffer)))))
'(safe-local-variable-values '(safe-local-variable-values
'((compilation-disable-input . t) (quote
((compilation-disable-input . t)
(sgml-basic-offset . 2) (sgml-basic-offset . 2)
(electric-indent-mode) (electric-indent-mode)
(eval add-hook 'js2-mode-hook (eval add-hook
(quote js2-mode-hook)
(prettier-js-mode 0)) (prettier-js-mode 0))
(eval add-hook 'js-mode-hook (eval add-hook
(quote js-mode-hook)
(prettier-js-mode 0)) (prettier-js-mode 0))
(js-mode (js-mode
((prettier-js-mode . 0))) ((prettier-js-mode . 0)))
@ -157,17 +172,20 @@
(magit-git-debug . 1) (magit-git-debug . 1)
(magit-refresh-verbose . 1) (magit-refresh-verbose . 1)
(setq magit-refresh-verbose 1) (setq magit-refresh-verbose 1)
(eval remove-hook 'magit-refs-sections-hook 'magit-insert-tags) (eval remove-hook
(quote magit-refs-sections-hook)
(quote magit-insert-tags))
(eval (eval
(remove-hook 'magit-refs-sections-hook 'magit-insert-tags)) (remove-hook
(quote magit-refs-sections-hook)
(quote magit-insert-tags)))
(magit-refresh-buffers) (magit-refresh-buffers)
(git-commit-major-mode . git-commit-elisp-text-mode) (git-commit-major-mode . git-commit-elisp-text-mode))))
(magit-status-headers-hook)))
'(scroll-bar-mode nil) '(scroll-bar-mode nil)
'(scroll-conservatively 101) '(scroll-conservatively 101)
'(scroll-margin 0) '(scroll-margin 0)
'(select-enable-clipboard t) '(select-enable-clipboard t)
'(send-mail-function 'smtpmail-send-it) '(send-mail-function (quote smtpmail-send-it))
'(set-mark-command-repeat-pop t) '(set-mark-command-repeat-pop t)
'(sgml-basic-offset 1) '(sgml-basic-offset 1)
'(show-paren-mode t) '(show-paren-mode t)
@ -178,7 +196,6 @@
'(tool-bar-mode nil) '(tool-bar-mode nil)
'(typescript-indent-level 2) '(typescript-indent-level 2)
'(vc-follow-symlinks nil) '(vc-follow-symlinks nil)
'(which-key-idle-delay 1e-05)
'(window-combination-resize t) '(window-combination-resize t)
'(window-resize-pixelwise t)) '(window-resize-pixelwise t))
@ -224,7 +241,6 @@
(ruby-trace-mode . "ruby-trace-mode/") (ruby-trace-mode . "ruby-trace-mode/")
(js2-globals . "js2-globals/") (js2-globals . "js2-globals/")
(datadog . "datadog/") (datadog . "datadog/")
(solargraph . "solargraph/")
(zdi . "zdi/"))) (zdi . "zdi/")))
(defun load-additional-packages () (defun load-additional-packages ()
@ -245,8 +261,6 @@
(load-additional-themes) (load-additional-themes)
;; (quelpa '(lsp :url "git@github.com:emacs-lsp/lsp-mode.git" :fetcher git :commit "026ad0edf93e1a9e1d7927635a2bb431874541c5"))
;; (require 'lsp) ;; (require 'lsp)
;; Shame! `lsp-ui` is emitting: ;; Shame! `lsp-ui` is emitting:
;; Eager macro-expansion failure: (wrong-type-argument listp kind) ;; Eager macro-expansion failure: (wrong-type-argument listp kind)
@ -403,15 +417,6 @@
;; (add-to-list 'semantic-symref-filepattern-alist '(enh-ruby-mode "*.r[bu]" "*.rake" "*.gemspec" "*.erb" "*.haml" "Rakefile" "Thorfile" "Capfile" "Guardfile" "Vagrantfile")) ;; (add-to-list 'semantic-symref-filepattern-alist '(enh-ruby-mode "*.r[bu]" "*.rake" "*.gemspec" "*.erb" "*.haml" "Rakefile" "Thorfile" "Capfile" "Guardfile" "Vagrantfile"))
(add-to-list 'auto-mode-alist '("\\.rb\\'" . enh-ruby-mode)) (add-to-list 'auto-mode-alist '("\\.rb\\'" . enh-ruby-mode))
(add-to-list 'auto-mode-alist '("\\.hbs\\'" . html-mode)) (add-to-list 'auto-mode-alist '("\\.hbs\\'" . html-mode))
(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode))
(add-hook 'typescript-mode-hook
(lambda ()
(lsp)
(subword-mode t)))
(add-hook 'graphql-mode-hook
(lambda ()
(subword-mode t)))
;; I'm confused about the less worse option here. I think the best ;; I'm confused about the less worse option here. I think the best
;; option is to use smie (the default). ;; option is to use smie (the default).
@ -473,7 +478,6 @@ npm i -g sql-formatter-cli"
(put 'upcase-region 'disabled nil) (put 'upcase-region 'disabled nil)
(put 'downcase-region 'disabled nil) (put 'downcase-region 'disabled nil)
(put 'set-goal-column 'disabled nil) (put 'set-goal-column 'disabled nil)
(put 'scroll-left 'disabled nil)
(when (memq window-system '(mac ns)) (when (memq window-system '(mac ns))
(exec-path-from-shell-initialize)) (exec-path-from-shell-initialize))