Changes

emacs/init.el

@@ -58,7 +58,7 @@
  '(confirm-kill-emacs 'yes-or-no-p)
  '(css-indent-offset 2)
  '(custom-safe-themes
-   '("224f84d5013ad0b98a43c54683302309a7cba53c0e37480a65284fd365774400" "d59e18ab7969fd68103ab0fe07e03c1830fd77c21c12a3fb4fe970931ddaf68d" "670df6cad1a732850a5d90ce2b0326969bd7596881dc1fed6b35091520a3da97" "aa81baddda211ffab84a5dc68750ac519d4841be63907a6b5de0cd72e631b172" "c91a5bf65b3f79ab28ab350b1d16c24d8b8bc1201e9c6c2106a60f98bceae754" default))
+   '("670df6cad1a732850a5d90ce2b0326969bd7596881dc1fed6b35091520a3da97" "cfca08e1a703af85a52840c6839ec6ae6568fbdf2f4f6e344fb807345fca45b8" default))
  '(dashboard-set-footer nil)
  '(delete-selection-mode t)
  '(dhall-repl-executable "dhall-repl")
@@ -107,6 +107,7 @@
  '(kill-whole-line t)
  '(line-move-visual nil)
  '(lsp-auto-guess-root t)
+ '(magit-diff-refine-hunk "all")
  '(magit-display-buffer-function 'magit-display-buffer-same-window-except-diff-v1)
  '(magit-popup-display-buffer-action nil)
  '(markdown-command "pandoc -t html")
@@ -117,7 +118,7 @@
  '(org-hide-leading-stars t)
  '(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))
- '(prettier-js-command "prettier-1.18.2")
+ '(prettier-js-command "prettier")
  '(projectile-globally-ignored-directories
    '(".idea" ".ensime_cache" ".eunit" ".git" ".hg" ".fslckout" "_FOSSIL_" ".bzr" "_darcs" ".tox" ".svn" ".stack-work" "node_modules" "vendor"))
  '(projectile-globally-ignored-files '("/TAGS" "/vendor" "/.bundle" "/node_modules"))
@@ -127,6 +128,7 @@
                (seq-drop
                 (directory-files "~/git" t)
                 2)))
+ '(projectile-switch-project-action 'magit-status)
  '(purescript-mode-hook '(turn-on-purescript-indentation))
  '(recentf-max-menu-items 255)
  '(recentf-mode t)
@@ -170,12 +172,15 @@
  '(send-mail-function 'smtpmail-send-it)
  '(set-mark-command-repeat-pop t)
  '(sgml-basic-offset 1)
+ '(sh-basic-offset 2)
  '(show-paren-mode t)
  '(shr-width 80)
  '(split-window-keep-point nil)
  '(tags-add-tables t)
  '(temp-buffer-resize-mode nil)
  '(tool-bar-mode nil)
+ '(typescript--keywords
+   '("abstract" "any" "as" "async" "await" "boolean" "bigint" "break" "case" "catch" "class" "const" "constructor" "continue" "declare" "default" "delete" "do" "else" "enum" "export" "extends" "extern" "false" "finally" "for" "function" "from" "goto" "if" "implements" "import" "in" "instanceof" "interface" "keyof" "let" "module" "namespace" "never" "new" "null" "number" "object" "of" "private" "protected" "public" "readonly" "return" "static" "string" "super" "switch" "this" "throw" "true" "try" "type" "typeof" "unknown" "var" "void" "while"))
  '(typescript-indent-level 2)
  '(vc-follow-symlinks nil)
  '(which-key-idle-delay 1e-05)
@@ -290,6 +295,9 @@
 (global-set-key (kbd "C-x C-r") 'recentf-open-files)
 (global-unset-key (kbd "s-q"))
 (global-unset-key (kbd "C-x C-l")) ;; downcase-region
+(global-set-key (kbd "C-<left>") 'previous-buffer)
+(global-set-key (kbd "C-<right>") 'next-buffer)
+(global-set-key (kbd "C-c C-c") 'compile)
 
 (global-set-key (kbd "C-x r v") 'revert-buffer)
 
@@ -326,17 +334,21 @@
 
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 
+(require 'prettier-js)
+
 (add-hook
  'js-mode-hook
  (lambda ()
    (subword-mode t)
-   (prettier-js-mode 1)))
+   (prettier-js-mode 1)
+   (local-set-key (kbd "C-M-\\") 'prettier-js)))
 
 (add-hook
  'js2-mode-hook
  (lambda ()
    (local-set-key (kbd "C-c F n") 'js2-next-error)
    (local-set-key (kbd "C-c F l") 'js2-display-error-list)
+   (local-set-key (kbd "C-M-\\") 'prettier-js)
    (prettier-js-mode 1)))
 
 (require 'js2-globals)
@@ -407,7 +419,8 @@
 (add-hook 'typescript-mode-hook
           (lambda ()
             (lsp)
-            (subword-mode t)))
+            (subword-mode t)
+            (local-set-key (kbd "C-M-\\") 'prettier-js)))
 
 (add-hook 'graphql-mode-hook
           (lambda ()

emacs/lisp/inheritance-theme/inheritance-theme.el

@@ -50,7 +50,9 @@
  '(magit-branch-upstream ((t (:inherit magit-branch-remote :slant italic))))
  '(show-paren-match-expression ((t (:inherit lazy-highlight))))
  '(smerge-refined-added ((t (:inherit smerge-refined-change :background "#338033"))))
- '(smerge-refined-removed ((t (:inherit smerge-refined-change :background "#803333")))))
+ '(smerge-refined-removed ((t (:inherit smerge-refined-change :background "#803333"))))
+ '(typescript-primitive-face ((t (:inherit font-lock-type-face))))
+ '(typescript-this-face ((t (:inherit font-lock-constant-face)))))
 
 (provide-theme 'inheritance)
 ;;; inheritance-theme.el ends here

ghci

@@ -42,10 +42,8 @@
 
 -- Interface options
 :set -fdefer-type-errors
-:set -fno-show-valid-substitutions
+:set -fno-show-valid-hole-fits
-:set -fmax-valid-substitutions=0
--- :set -fprint-unicode-syntax
 :set -Wincomplete-patterns
 :set -Wcompat
 :set prompt "λ "
-:set prompt-cont "… "
+:set prompt-cont ""