Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
  • Loading branch information
xueruini committed Mar 8, 2021
1 parent fd3e57d commit f2e8b79
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 47 deletions.
42 changes: 23 additions & 19 deletions emacs/.spacemacs
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,34 @@ values."
auto-completion
better-defaults
emacs-lisp
nginx
;; nginx
syntax-checking
version-control
javascript
git
org
markdown
(c-c++ :variables c-c++-enable-clang-support t)
(markdown :variables markdown-live-preview-engine 'vmd)
c-c++ ;; :variables
;; ;;c-c++-enable-clang-support t)
python
docker
;; themes-megapack
;; docker
;; ;; themes-megapack
sql
lua
colors
yaml
(latex :variables latex-build-command "LatexMk")
(latex :variables
latex-build-command "LatexMk")
bibtex
html
graphviz
;; plantuml
(go :variables
go-use-gometalinter t
go-tab-width 4
gofmt-command "goimports")
;; graphql
;; clojure
;; graphviz
;; ;; plantuml
;; (go :variables
;; go-use-gometalinter t
;; go-tab-width 4
;; gofmt-command "goimports")
;; ;; graphql
;; ;; clojure
shell-scripts
)
;; List of additional packages that will be installed without being
Expand Down Expand Up @@ -150,15 +152,16 @@ values."
;; List of themes, the first of the list is loaded when spacemacs starts.
;; Press <SPC> T n to cycle to the next theme in the list (works great
;; with 2 themes variants, one dark and one light)
dotspacemacs-themes '(spacemacs-dark
dotspacemacs-themes '(
spacemacs-dark
tsdh-light
afternoon
adwaita
spacemacs-light)
;; If non nil the cursor color matches the state color in GUI Emacs.
dotspacemacs-colorize-cursor-according-to-state t
;; Default font, or prioritized list of fonts. `powerline-scale' allows to
;; quickly tweak the mode-line size to make separators look not too crappy.
dotspacemacs-default-font '("Input Mono Narrow" ;; FuraCode Nerd Font
dotspacemacs-default-font '("NanumGothicCoding" ;; "FuraCode Nerd Font" "Input Mono Narrow"
:size 15
:weight normal
:width normal
Expand Down Expand Up @@ -335,7 +338,7 @@ layers configuration.
This is the place where most of your configurations should be done. Unless it is
explicitly specified that a variable should be set before a package is loaded,
you should place your code here."
(setq-default line-spacing 3)
(setq-default line-spacing 5)
(setq python-shell-completion-native-enable nil)

;; skips 'vendor' directories and sets GO15VENDOREXPERIMENT=1
Expand Down Expand Up @@ -367,9 +370,10 @@ you should place your code here."
(quote
("4aee8551b53a43a883cb0b7f3255d6859d766b6c5e14bcb01bed572fcbef4328" default)))
'(evil-want-Y-yank-to-eol nil)
'(org-agenda-files (quote ("~/Dropbox/ToDo/todo.org")))
'(package-selected-packages
(quote
(transient lv insert-shebang fish-mode company-shell cider-hydra clojure-snippets clj-refactor inflections edn paredit peg cider-eval-sexp-fu cider sesman queue clojure-mode white-sand-theme rebecca-theme exotica-theme treepy graphql disaster company-c-headers cmake-mode clang-format vagrant-tramp vagrant plantuml-mode org-mime ghub let-alist org-category-capture rainbow-mode rainbow-identifiers color-identifiers-mode flycheck-gometalinter pdf-tools auctex-latexmk web-mode tagedit slim-mode scss-mode sass-mode pug-mode org-ref key-chord ivy lua-mode less-css-mode helm-css-scss helm-bibtex parsebib haml-mode emmet-mode company-web web-completion-data biblio biblio-core company-auctex auctex web-beautify sql-indent livid-mode skewer-mode simple-httpd js2-refactor multiple-cursors js2-mode js-doc company-tern dash-functional tern coffee-mode yaml-mode flyspell-correct-helm flyspell-correct auto-dictionary zonokai-theme zenburn-theme zen-and-art-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tronesque-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme pastels-on-dark-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme nginx-mode naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme firebelly-theme farmhouse-theme espresso-theme dracula-theme django-theme darktooth-theme autothemer darkokai-theme darkmine-theme darkburn-theme dakrone-theme cyberpunk-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes afternoon-theme graphviz-dot-mode dockerfile-mode docker json-mode tablist docker-tramp json-snatcher json-reformat go-guru go-eldoc company-go go-mode unfill mwim helm-company helm-c-yasnippet git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter fuzzy flycheck-pos-tip pos-tip flycheck diff-hl company-statistics company-anaconda company auto-yasnippet yasnippet ac-ispell auto-complete smeargle orgit org-projectile org-present org-pomodoro alert log4e gntp org-download magit-gitflow htmlize helm-gitignore gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit magit-popup git-commit with-editor mmm-mode markdown-toc markdown-mode gh-md yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode helm-pydoc cython-mode anaconda-mode pythonic ws-butler winum which-key volatile-highlights uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
(posframe vmd-mode edit-indirect ox-reveal transient lv insert-shebang fish-mode company-shell cider-hydra clojure-snippets clj-refactor inflections edn paredit peg cider-eval-sexp-fu cider sesman queue clojure-mode white-sand-theme rebecca-theme exotica-theme treepy graphql disaster company-c-headers cmake-mode clang-format vagrant-tramp vagrant plantuml-mode org-mime ghub let-alist org-category-capture rainbow-mode rainbow-identifiers color-identifiers-mode flycheck-gometalinter pdf-tools auctex-latexmk web-mode tagedit slim-mode scss-mode sass-mode pug-mode org-ref key-chord ivy lua-mode less-css-mode helm-css-scss helm-bibtex parsebib haml-mode emmet-mode company-web web-completion-data biblio biblio-core company-auctex auctex web-beautify sql-indent livid-mode skewer-mode simple-httpd js2-refactor multiple-cursors js2-mode js-doc company-tern dash-functional tern coffee-mode yaml-mode flyspell-correct-helm flyspell-correct auto-dictionary zonokai-theme zenburn-theme zen-and-art-theme underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tronesque-theme toxi-theme tao-theme tangotango-theme tango-plus-theme tango-2-theme sunny-day-theme sublime-themes subatomic256-theme subatomic-theme spacegray-theme soothe-theme solarized-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme seti-theme reverse-theme railscasts-theme purple-haze-theme professional-theme planet-theme phoenix-dark-pink-theme phoenix-dark-mono-theme pastels-on-dark-theme organic-green-theme omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme nginx-mode naquadah-theme mustang-theme monokai-theme monochrome-theme molokai-theme moe-theme minimal-theme material-theme majapahit-theme madhat2r-theme lush-theme light-soap-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme heroku-theme hemisu-theme hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme gandalf-theme flatui-theme flatland-theme firebelly-theme farmhouse-theme espresso-theme dracula-theme django-theme darktooth-theme autothemer darkokai-theme darkmine-theme darkburn-theme dakrone-theme cyberpunk-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme cherry-blossom-theme busybee-theme bubbleberry-theme birds-of-paradise-plus-theme badwolf-theme apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes afternoon-theme graphviz-dot-mode dockerfile-mode docker json-mode tablist docker-tramp json-snatcher json-reformat go-guru go-eldoc company-go go-mode unfill mwim helm-company helm-c-yasnippet git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter fuzzy flycheck-pos-tip pos-tip flycheck diff-hl company-statistics company-anaconda company auto-yasnippet yasnippet ac-ispell auto-complete smeargle orgit org-projectile org-present org-pomodoro alert log4e gntp org-download magit-gitflow htmlize helm-gitignore gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit magit-popup git-commit with-editor mmm-mode markdown-toc markdown-mode gh-md yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode helm-pydoc cython-mode anaconda-mode pythonic ws-butler winum which-key volatile-highlights uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed dash aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
Expand Down
36 changes: 20 additions & 16 deletions shell/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,16 @@ export CLICOLOR=1
export PS1='\[\033[34m\]\u\[\033[33m@\[\033[36m\]\h:\[\033[35m\]\w\[\033[32m\]$(__git_ps1 " (%s)")\[\033[31m\]\n\$\[\033[m\] '

alias rm="rm -i"
alias ta="tig --all"

# brew
eval "$(/opt/homebrew/bin/brew shellenv)"
export HOMEBREW_NO_ANALYTICS=1

# nvm
export NVM_DIR=$HOME/.nvm
source $(brew --prefix nvm)/nvm.sh

# bash-completion@2 for bash 4.1+
export BASH_COMPLETION_COMPAT_DIR="/usr/local/etc/bash_completion.d"
[[ -r "/usr/local/etc/profile.d/bash_completion.sh" ]] && . "/usr/local/etc/profile.d/bash_completion.sh"

# fasd
fasd_cache="$HOME/.fasd-init-bash"
if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then
fasd --init posix-alias bash-hook bash-ccomp bash-ccomp-install >| "$fasd_cache"
fi
source "$fasd_cache"
unset fasd_cache

man() {
env \
LESS_TERMCAP_mb=$(printf "\e[1;31m") \
Expand All @@ -38,19 +28,33 @@ man() {
# pip should only run if there is a virtualenv currently activated
# export PIP_REQUIRE_VIRTUALENV=true

# fasd
eval "$(fasd --init auto)"

# fzf
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
bind -x '"\C-x\C-t": fzf-file-widget'
bind '"\C-t": transpose-chars'

# pyenv
eval "$(pyenv init -)"
if which pyenv-virtualenv-init > /dev/null; then
eval "$(pyenv virtualenv-init -)"
fi

# fzf
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
# nvm
export NVM_DIR=$HOME/.nvm
source $(brew --prefix nvm)/nvm.sh

## rbenv
#eval "$(rbenv init -)"

# # GOPATH
# export GOPATH=$HOME/Documents/go
# export GOROOT=$(go env GOROOT)
# export PATH=$GOPATH/bin:$PATH
# gvm
[[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
gvm use go1.12.4
#[[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
#gvm use go1.13.5

export PATH="$HOME/.cargo/bin:$PATH"
10 changes: 5 additions & 5 deletions shell/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ limit coredumpsize 0
eval "$(/opt/homebrew/bin/brew shellenv)"
export HOMEBREW_NO_ANALYTICS=1

# nvm
export NVM_DIR=$HOME/.nvm
source $(brew --prefix nvm)/nvm.sh

# antigen via brew
source $(brew --prefix)/share/antigen/antigen.zsh

Expand Down Expand Up @@ -112,7 +108,7 @@ antigen bundle pyenv
# antigen bundle lein
# antigen bundle golang
antigen bundle sudo
antigen bundle nvm
# antigen bundle nvm
antigen bundle npm
antigen bundle node
antigen bundle httpie
Expand Down Expand Up @@ -160,5 +156,9 @@ bindkey '^T' transpose-chars
# [[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
# gvm use go1.13.5

# nvm
export NVM_DIR=$HOME/.nvm
source $(brew --prefix nvm)/nvm.sh

# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
14 changes: 7 additions & 7 deletions tmux/.tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ set -g display-time 3000
set -g status-interval 5
set -g status-fg white
set -g status-bg colour234
set -g window-status-activity-attr bold
set -g pane-border-fg colour245
set -g pane-active-border-fg colour39
set -g message-fg colour16
set -g message-bg colour221
set -g message-attr bold
#set -g window-status-activity-attr bold
#set -g pane-border-fg colour245
#set -g pane-active-border-fg colour39
#set -g message-fg colour16
#set -g message-bg colour221
#set -g message-attr bold
set -g window-status-separator ""
set -g status-left "#[fg=colour234,bg=colour106]❐ [S#S:W#I:P#P]"
set -g window-status-format "#[fg=colour245,bg=colour234] #I:#W#F "
set -g window-status-current-format "#[fg=white,bg=red,bold] #I:#W#F "
set -g window-status-last-style "reverse"
set -g status-right "#[fg=blue]#(whoami)#[fg=colour97]@#H"
setw -g window-status-bell-fg red
#setw -g window-status-bell-fg red

0 comments on commit f2e8b79

Please sign in to comment.