瀏覽代碼

Like a month worth of laptop changes lol

Josh Bicking 6 年之前
父節點
當前提交
a59f66da67

+ 5 - 3
emacs/.emacs.d/init.el

@@ -5,6 +5,8 @@
 
 (setq gc-cons-threshold (* 500 100000))
 
+(setq suggest-key-bindings nil)
+
 (setq inhibit-splash-screen t
       inhibit-startup-echo-area-message t
       initial-scratch-message ""
@@ -160,9 +162,9 @@
 (set-face-attribute 'default nil :height 120 :family "Ubuntu Mono")
 (set-face-attribute 'evil-goggles-delete-face nil :inherit 'diff-removed)
 (set-face-attribute 'evil-goggles-paste-face nil :inherit 'diff-added)
-(set-face-attribute 'evil-goggles-undo-redo-add-face nil :inherit 'diff-added)
-(set-face-attribute 'evil-goggles-undo-redo-change-face nil :inherit 'diff-changed)
-(set-face-attribute 'evil-goggles-undo-redo-remove-face nil :inherit 'diff-removed)
+;(set-face-attribute 'evil-goggles-undo-redo-add-face nil :inherit 'diff-added)
+;(set-face-attribute 'evil-goggles-undo-redo-change-face nil :inherit 'diff-changed)
+;(set-face-attribute 'evil-goggles-undo-redo-remove-face nil :inherit 'diff-removed)
 (set-face-attribute 'evil-goggles-yank-face nil :inherit 'diff-changed)
 (set-face-attribute 'linum-relative-current-face nil :inherit 'linum :background "dim gray" :foreground "white" :underline nil)
 (set-face-attribute 'mode-line-buffer-id-inactive nil :inherit 'mode-line-inactive)

+ 17 - 0
emacs/.emacs.d/packages/packages.el

@@ -415,6 +415,7 @@
 
 (use-package treemacs-evil
   :after treemacs
+  :commands treemacs-toggle
   :ensure t)
 
 (use-package editorconfig
@@ -777,6 +778,12 @@
   :ensure t
   )
 
+(use-package helpful
+  :ensure t
+  :bind (("C-h f" . helpful-callable)
+	 ("C-h v" . helpful-variable)
+         ("C-h k" . helpful-key)))
+
 ;;;; Optional packages
 
 (use-package flymd
@@ -904,6 +911,16 @@
   :config
   (add-hook 'elpy-mode-hook 'py-autopep8-enable-on-save))
 
+(use-package rust-mode
+  :defer t)
+
+(use-package flycheck-rust
+  :defer t
+  :after rust-mode
+  :init
+  (with-eval-after-load 'rust-mode
+  (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)))
+
 ;; List of optional packages
 (defvar optional-packages
       '(

+ 0 - 155
emacs/.emacs.d/packages/prettify-custom-symbols.el

@@ -10,159 +10,4 @@
                      (">=" . ?≥)
                      ("!=" . ?≠)) prettify-symbols-alist))))
 
-;; List from https://github.com/cpitclaudel/.emacs.d/blob/master/lisp/prettify-alists/haskell-prettify.el
-(add-hook 'haskell-mode-hook
-            (lambda ()
-              (setq prettify-symbols-alist
-		    (append
-		     '(;; Double-struck letters
-		       ("|A|" . ?𝔸)
-		       ("|B|" . ?𝔹)
-		       ("|C|" . ?ℂ)
-		       ("|D|" . ?𝔻)
-		       ("|E|" . ?𝔼)
-		       ("|F|" . ?𝔽)
-		       ("|G|" . ?𝔾)
-		       ("|H|" . ?ℍ)
-		       ("|I|" . ?𝕀)
-		       ("|J|" . ?𝕁)
-		       ("|K|" . ?𝕂)
-		       ("|L|" . ?𝕃)
-		       ("|M|" . ?𝕄)
-		       ("|N|" . ?ℕ)
-		       ("|O|" . ?𝕆)
-		       ("|P|" . ?ℙ)
-		       ("|Q|" . ?ℚ)
-		       ("|R|" . ?ℝ)
-		       ("|S|" . ?𝕊)
-		       ("|T|" . ?𝕋)
-		       ("|U|" . ?𝕌)
-		       ("|V|" . ?𝕍)
-		       ("|W|" . ?𝕎)
-		       ("|X|" . ?𝕏)
-		       ("|Y|" . ?𝕐)
-		       ("|Z|" . ?ℤ)
-		       ("|gamma|" . ?ℽ)
-		       ("|Gamma|" . ?ℾ)
-		       ("|pi|" . ?ℼ)
-		       ("|Pi|" . ?ℿ)
-
-		       ;; Types
-		       ("::" . ?∷)
-
-		       ;; Quantifiers
-		       ("forall" . ?∀)
-		       ("exists" . ?∃)
-
-		       ;; Arrows
-		       ("-->" . ?⟶)
-		       ("<-" . ?←)
-		       ("<--" . ?⟵)
-		       ("<->" . ?↔)
-		       ("<-->" . ?⟷)
-
-		       ("=>" . ?⇒)
-		       ("==>" . ?⟹)
-		       ("<==" . ?⟸)
-		       ("<=>" . ?⇔)
-		       ("<==>" . ?⟺)
-
-		       ("|->" . ?↦)
-		       ("|-->" . ?⟼)
-		       ("<-|" . ?↤)
-		       ("<--|" . ?⟻)
-
-		       ("|=>" . ?⤇)
-		       ("|==>" . ?⟾)
-		       ("<=|" . ?⤆)
-		       ("<==|" . ?⟽)
-
-		       ("~>" . ?⇝)
-		       ("<~" . ?⇜)
-
-		       (">->" . ?↣)
-		       ("<-<" . ?↢)
-		       ("->>" . ?↠)
-		       ("<<-" . ?↞)
-
-		       (">->>" . ?⤖)
-		       ("<<-<" . ?⬻)
-
-		       ("<|-" . ?⇽)
-		       ("-|>" . ?⇾)
-		       ("<|-|>" . ?⇿)
-
-		       ("<-/-" . ?↚)
-		       ("-/->" . ?↛)
-
-		       ("<-|-" . ?⇷)
-		       ("-|->" . ?⇸)
-		       ("<-|->" . ?⇹)
-
-		       ("<-||-" . ?⇺)
-		       ("-||->" . ?⇻)
-		       ("<-||->" . ?⇼)
-
-		       ("-o->" . ?⇴)
-		       ("<-o-" . ?⬰)
-
-		       ;; Boolean operators
-		       ("not" . ?¬)
-		       ("&&" . ?∧)
-		       ("||" . ?∨)
-
-		       ;; Relational operators
-		       ("==" . ?≡)
-		       ("/=" . ?≠)
-		       ("<=" . ?≤)
-		       (">=" . ?≥)
-		       ("/<" . ?≮)
-		       ("/>" . ?≯)
-
-		       ;; Containers / Collections
-		       ("++" . ?⧺)
-		       ("+++" . ?⧻)
-		       ("|||" . ?⫴)
-		       ("empty" . ?∅)
-		       ("elem" . ?∈)
-		       ("notElem" . ?∉)
-		       ("member" . ?∈)
-		       ("notMember" . ?∉)
-		       ("union" . ?∪)
-		       ("intersection" . ?∩)
-		       ("isSubsetOf" . ?⊆)
-                       ("isProperSubsetOf" . ?⊂)
-
-                       ;; Other
-                       ("<<" . ?≪)
-                       (">>" . ?≫)
-                       ("<<<" . ?⋘)
-                       (">>>" . ?⋙)
-                       ("<|" . ?⊲)
-                       ("|>" . ?⊳)
-                       ("><" . ?⋈)
-                       ("mempty" . ?∅)
-                       ("mappend" . ?⊕)
-                       ("<*>" . ?⊛)
-                       ("undefined" . ?⊥)
-                       (":=" . ?≔)
-                       ("=:" . ?≕)
-                       ("=def" . ?≝)
-                       ("=?" . ?≟)
-                       ("..." . ?…)) prettify-symbols-alist))))
-
-(setq python--prettify-symbols-alist
-   '(("def" .      #x2131)
-     ("not" .      #x2757)
-     ("return" .   #x27fc)
-     ("yield" .    #x27fb)
-     ("or" . ?∨)
-     ("and" . ?∧)
-     ("None" . ?⊥)
-     ("set()" . ?∅)
-     ("not in" . ?∉)
-     ("in" . ?∈)
-     ("is not" . ?≢)
-     ("is" . ?≡)))
-
 (provide 'prettify-custom-symbols)

+ 6 - 0
zsh-local-arch/.zshrc.local

@@ -38,3 +38,9 @@ export VISUAL="emacsclient -c -a emacs"         # $VISUAL opens in GUI with non-
 alias emacs='emacsclient -c'
 
 alias beep='paplay /usr/share/sounds/gnome/default/alerts/glass.ogg'
+
+# pyenv
+export PATH="/home/josh/.pyenv/bin:$PATH"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+

+ 1 - 1
zsh/.zshrc

@@ -25,7 +25,7 @@ then
     antigen bundle zsh-users/zsh-autosuggestions
 
     # Load the theme.
-    antigen theme lambda
+    antigen theme bureau
 
     # Tell antigen that you're done.
     antigen apply