diff options
| -rw-r--r-- | aliases.sh | 7 | ||||
| -rw-r--r-- | configs/shared/.emacs | 66 |
2 files changed, 44 insertions, 29 deletions
diff --git a/aliases.sh b/aliases.sh index 0b3ca310ab4f..096c144c542c 100644 --- a/aliases.sh +++ b/aliases.sh @@ -4,11 +4,12 @@ alias dir='find . -maxdepth 1 -type d -regex "\.\/[^.].+"' # aliases with dependencies -command -v nvim && alias vim="nvim" || echo "Missing dependency (nvim). Failed to alias vim -> nvim" -command -v 'find -E' && alias find="find -E" || echo "Missing dependency (find -E). Failed to alias find -> find -E" -command -v egrep && alias grep="egrep" || echo "Missing dependency (egrep). Failed to alias grep -> egrep" +command -v nvim && alias vim=nvim || echo "Missing dependency (nvim). Failed to alias vim -> nvim" +command -v 'find -E' && alias find='find -E' || echo "Missing dependency (find -E). Failed to alias find -> find -E" +command -v egrep && alias grep=egrep || echo "Missing dependency (egrep). Failed to alias grep -> egrep" command -v 'pygmentize -g' && alias ccat='pygmentize -g' || echo "Missing dependency (pygmentize -g). Failed to alias ccat -> pygmentize -g" command -v hub && alias git=hub || echo "Missing dependency (hub). Failed to alias git -> hub" +command -v tmux && alias tls='tmux list-sessions' || echo "Missing dependency (tmux). Failed to alias tls -> tmux list-sessions" # git-specific aliases diff --git a/configs/shared/.emacs b/configs/shared/.emacs index 1a09f2b91623..9b89d68af4c2 100644 --- a/configs/shared/.emacs +++ b/configs/shared/.emacs @@ -19,20 +19,28 @@ '(ansi-color-faces-vector [default bold shadow italic underline bold bold-italic bold]) '(ansi-color-names-vector - (vector "#eaeaea" "#d54e53" "#b9ca4a" "#e7c547" "#7aa6da" "#c397d8" "#70c0b1" "#424242")) + (vector "#cccccc" "#f2777a" "#99cc99" "#ffcc66" "#6699cc" "#cc99cc" "#66cccc" "#515151")) '(column-number-mode t) '(custom-enabled-themes (quote (sanityinc-tomorrow-eighties))) '(custom-safe-themes (quote - ("5c9bd73de767fa0d0ea71ee2f3ca6fe77261d931c3d4f7cca0734e2a3282f439" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "398e6465d45d5af4cbf94f8ebfb24deb71249f28cdfb4b0fa7197354ee0c9802" "db34c17b9a7810856352a341e15d701696fb4710fe7e0dab57b8268515c2b082" "ee93cac221c92b580bde1326209e1a327287cd49931ba319a9af7a7af201967c" "68f66d916f4e90f11f2dc815e9580c1aaf9e9c75eeee3fbd8b663d706e121a1a" "c158c2a9f1c5fcf27598d313eec9f9dceadf131ccd10abc6448004b14984767c" "cc0dbb53a10215b696d391a90de635ba1699072745bf653b53774706999208e3" "3e335d794ed3030fefd0dbd7ff2d3555e29481fe4bbb0106ea11c660d6001767" "d677ef584c6dfc0697901a44b885cc18e206f05114c8a3b7fde674fce6180879" "8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" "20e23cba00cf376ea6f20049022241c02a315547fc86df007544852c94ab44cb" "60d4556ebff0dc94849f177b85dcb6956fe9bd394c18a37e339c0fcd7c83e4a9" "707227acad0cf8d4db55dcf1e574b3644b68eab8aca4a8ce6635c8830bc72144" "1c656eb3f6ae6c84ced46282cb4ed697bffe2f6c764bb5a737ed7ca6d068f798" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" "c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "9f3181dc1fabe5d58bbbda8c48ef7ece59b01bed606cfb868dd147e8b36af97c" "ad1c2abad40e11d22156fe3987fd9b74b9e1c822264a07dacb24e0b3133aaed1" "945fe66fbc30a7cbe0ed3e970195a7ee79ee34f49a86bc96d02662ab449b8134" "0f0db69b7a75a7466ef2c093e127a3fe3213ce79b87c95d39ed1eccd6fe69f74" "08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "9d91458c4ad7c74cf946bd97ad085c0f6a40c370ac0a1cbeb2e3879f15b40553" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "8ec2e01474ad56ee33bc0534bdbe7842eea74dccfb576e09f99ef89a705f5501" "5b24babd20e58465e070a8d7850ec573fe30aca66c8383a62a5e7a3588db830b" "eb0a314ac9f75a2bf6ed53563b5d28b563eeba938f8433f6d1db781a47da1366" "3d47d88c86c30150c9a993cc14c808c769dad2d4e9d0388a24fee1fbf61f0971" default))) + ("f67652440b66223b66a4d3e9c0ddeddbf4a6560182fa38693bdc4d940ce43a2e" "0f0022c8091326c9894b707df2ae58dd51527b0cf7abcb0a310fb1e7bda78cd2" "8d737627879eff1bbc7e3ef1e9adc657207d9bf74f9abb6e0e53a6541c5f2e88" "5c9bd73de767fa0d0ea71ee2f3ca6fe77261d931c3d4f7cca0734e2a3282f439" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "398e6465d45d5af4cbf94f8ebfb24deb71249f28cdfb4b0fa7197354ee0c9802" "db34c17b9a7810856352a341e15d701696fb4710fe7e0dab57b8268515c2b082" "ee93cac221c92b580bde1326209e1a327287cd49931ba319a9af7a7af201967c" "68f66d916f4e90f11f2dc815e9580c1aaf9e9c75eeee3fbd8b663d706e121a1a" "c158c2a9f1c5fcf27598d313eec9f9dceadf131ccd10abc6448004b14984767c" "cc0dbb53a10215b696d391a90de635ba1699072745bf653b53774706999208e3" "3e335d794ed3030fefd0dbd7ff2d3555e29481fe4bbb0106ea11c660d6001767" "d677ef584c6dfc0697901a44b885cc18e206f05114c8a3b7fde674fce6180879" "8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" "20e23cba00cf376ea6f20049022241c02a315547fc86df007544852c94ab44cb" "60d4556ebff0dc94849f177b85dcb6956fe9bd394c18a37e339c0fcd7c83e4a9" "707227acad0cf8d4db55dcf1e574b3644b68eab8aca4a8ce6635c8830bc72144" "1c656eb3f6ae6c84ced46282cb4ed697bffe2f6c764bb5a737ed7ca6d068f798" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" "c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "9f3181dc1fabe5d58bbbda8c48ef7ece59b01bed606cfb868dd147e8b36af97c" "ad1c2abad40e11d22156fe3987fd9b74b9e1c822264a07dacb24e0b3133aaed1" "945fe66fbc30a7cbe0ed3e970195a7ee79ee34f49a86bc96d02662ab449b8134" "0f0db69b7a75a7466ef2c093e127a3fe3213ce79b87c95d39ed1eccd6fe69f74" "08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "9d91458c4ad7c74cf946bd97ad085c0f6a40c370ac0a1cbeb2e3879f15b40553" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "8ec2e01474ad56ee33bc0534bdbe7842eea74dccfb576e09f99ef89a705f5501" "5b24babd20e58465e070a8d7850ec573fe30aca66c8383a62a5e7a3588db830b" "eb0a314ac9f75a2bf6ed53563b5d28b563eeba938f8433f6d1db781a47da1366" "3d47d88c86c30150c9a993cc14c808c769dad2d4e9d0388a24fee1fbf61f0971" default))) '(evil-shift-width 2) - '(fci-rule-color "#424242") + '(fci-rule-color "#515151") + '(flycheck-color-mode-line-face-to-color (quote mode-line-buffer-id)) + '(jdee-db-active-breakpoint-face-colors (cons "#0d0d0d" "#41728e")) + '(jdee-db-requested-breakpoint-face-colors (cons "#0d0d0d" "#b5bd68")) + '(jdee-db-spec-breakpoint-face-colors (cons "#0d0d0d" "#5a5b5a")) '(mouse-wheel-mode nil) '(neo-window-fixed-size nil) '(neo-window-width 35) + '(org-ellipsis " ") + '(org-fontify-done-headline t) + '(org-fontify-quote-and-verse-blocks t) + '(org-fontify-whole-heading-line t) '(package-selected-packages (quote - (dired+ linum-off git markdown-mode yaml-mode haskell-mode color-theme-sanityinc-tomorrow graphql-mode flycheck-elm popup-kill-ring green-phosphor-theme green-screen-theme minimal-theme creamsody-theme autothemer solarized-theme avk-emacs-themes github-theme all-the-icons-dired ace-window yasnippet chess synonyms powerline doom-neotree doom-themes persp-mode use-package helm-projectile persp-projectile perspective projectile with-editor helm-core company helm-ag evil-leader flycheck-mix flycheck-elixir evil-matchit typescript-mode evil-surround erlang elixir-mode golden-ratio flycheck-credo flycheck command-log-mode atom-one-dark-theme exec-path-from-shell clues-theme gotham-theme dracula-theme zenburn-theme fill-column-indicator neotree evil iedit vimrc-mode helm-ispell transpose-frame helm-ack nyan-mode alchemist helm dockerfile-mode elm-mode ack))) + (s font-lock+ f diminish dash avy all-the-icons dired+ linum-off git markdown-mode yaml-mode haskell-mode color-theme-sanityinc-tomorrow graphql-mode flycheck-elm popup-kill-ring green-phosphor-theme green-screen-theme minimal-theme creamsody-theme autothemer solarized-theme avk-emacs-themes github-theme all-the-icons-dired ace-window yasnippet chess synonyms powerline doom-neotree doom-themes persp-mode use-package helm-projectile persp-projectile perspective projectile with-editor helm-core company helm-ag evil-leader flycheck-mix flycheck-elixir evil-matchit typescript-mode evil-surround erlang elixir-mode golden-ratio flycheck-credo flycheck command-log-mode atom-one-dark-theme exec-path-from-shell clues-theme gotham-theme dracula-theme zenburn-theme fill-column-indicator neotree evil iedit vimrc-mode helm-ispell transpose-frame helm-ack nyan-mode alchemist helm dockerfile-mode elm-mode ack))) '(popwin-mode t) '(popwin:popup-window-height 25) '(popwin:special-display-config @@ -61,24 +69,24 @@ '(vc-annotate-background nil) '(vc-annotate-color-map (quote - ((20 . "#d54e53") - (40 . "#e78c45") - (60 . "#e7c547") - (80 . "#b9ca4a") - (100 . "#70c0b1") - (120 . "#7aa6da") - (140 . "#c397d8") - (160 . "#d54e53") - (180 . "#e78c45") - (200 . "#e7c547") - (220 . "#b9ca4a") - (240 . "#70c0b1") - (260 . "#7aa6da") - (280 . "#c397d8") - (300 . "#d54e53") - (320 . "#e78c45") - (340 . "#e7c547") - (360 . "#b9ca4a")))) + ((20 . "#f2777a") + (40 . "#f99157") + (60 . "#ffcc66") + (80 . "#99cc99") + (100 . "#66cccc") + (120 . "#6699cc") + (140 . "#cc99cc") + (160 . "#f2777a") + (180 . "#f99157") + (200 . "#ffcc66") + (220 . "#99cc99") + (240 . "#66cccc") + (260 . "#6699cc") + (280 . "#cc99cc") + (300 . "#f2777a") + (320 . "#f99157") + (340 . "#ffcc66") + (360 . "#99cc99")))) '(vc-annotate-very-old-color nil)) (custom-set-faces ;; custom-set-faces was added by Custom. @@ -131,6 +139,16 @@ (smart-mode-line-enable)) +;; Colorscheme +(use-package doom-themes + :ensure t + :config + (setq doom-themes-enable-bold nil + doom-themes-enable-italic nil) + (load-theme 'doom-molokai) + (doom-themes-neotree-config)) + + ;; Nyan cat (use-package nyan-mode :ensure t) @@ -600,10 +618,6 @@ (add-to-list 'default-frame-alist '(font . "Menlo 12")))) -;; Colorscheme -(load-theme 'atom-one-dark t) - - ;; Line Height (setq-default line-spacing 4) |