Compare commits

...

16 Commits

  1. 1
      .vim/startup/vundle_vimrc
  2. 8
      .zprofile
  3. 1
      .zshrc
  4. 11
      Brewfile-essentials
  5. 5
      README.md
  6. 17
      config/bootstrap.conf.yml
  7. 12
      config/hammerspoon.conf.yml
  8. 36
      config/macos.conf.yml
  9. 4
      git/work.gitconfig
  10. 3
      karabiner/karabiner.edn
  11. 4
      kitty/kitty.conf
  12. 4
      tmux/.tmux.conf
  13. 4
      zsh/env.zsh
  14. 3
      zsh/github-copilot-cli.zsh
  15. 2
      zsh/osx.zsh

1
.vim/startup/vundle_vimrc

@ -75,6 +75,7 @@ Plug 'nathangrigg/vim-beancount'
Plug 'hashivim/vim-terraform' Plug 'hashivim/vim-terraform'
Plug 'wakatime/vim-wakatime' Plug 'wakatime/vim-wakatime'
Plug 'editorconfig/editorconfig-vim' Plug 'editorconfig/editorconfig-vim'
Plug 'chrisbra/csv.vim'
" Git plugin not hosted on GitHub " Git plugin not hosted on GitHub
Plug 'git://git.wincent.com/command-t.git' Plug 'git://git.wincent.com/command-t.git'

8
.zprofile

@ -2,3 +2,11 @@ export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH" export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init --path)" eval "$(pyenv init --path)"
if [[ $(uname -m) == 'arm64' ]]; then
# Set PATH, MANPATH, etc., for Homebrew.
eval "$(/opt/homebrew/bin/brew shellenv)"
fi
# Added by OrbStack: command-line tools and integration
source ~/.orbstack/shell/init.zsh 2>/dev/null || :

1
.zshrc

@ -196,6 +196,7 @@ source $HOME/dotfiles/zsh/keybindings.zsh
source $HOME/dotfiles/zsh/alias.zsh source $HOME/dotfiles/zsh/alias.zsh
source $HOME/dotfiles/zsh/env.zsh source $HOME/dotfiles/zsh/env.zsh
source $HOME/dotfiles/zsh/fzf.zsh source $HOME/dotfiles/zsh/fzf.zsh
source $HOME/dotfiles/zsh/github-copilot-cli.zsh
case `uname` in case `uname` in
Darwin) Darwin)

11
Brewfile-essentials

@ -35,15 +35,18 @@ brew "koekeishiya/formulae/skhd"
brew "koekeishiya/formulae/yabai" brew "koekeishiya/formulae/yabai"
brew "yqrashawn/goku/goku" brew "yqrashawn/goku/goku"
cask "1password" cask "syncthing"
cask "alfred" cask "bitwarden"
cask "raycast"
cask "smartgit"
cask "wechat"
cask "obsidian"
# cask "arq" # Wait for v5 compatability # cask "arq" # Wait for v5 compatability
cask "beardedspice" cask "beardedspice"
cask "bitbar" cask "bitbar"
cask "dash" cask "dash"
cask "docker" cask "docker"
cask "dropbox" cask "dropbox"
cask "firefox"
cask "flux" cask "flux"
cask "font-firacode-nerd-font" cask "font-firacode-nerd-font"
cask "font-fantasque-sans-mono-nerd-font" cask "font-fantasque-sans-mono-nerd-font"
@ -59,11 +62,9 @@ cask "omnifocus"
cask "postgres" cask "postgres"
cask "postman" cask "postman"
cask "rescuetime" cask "rescuetime"
cask "setapp"
cask "slack" cask "slack"
cask "spotify" cask "spotify"
cask "startupizer" cask "startupizer"
cask "syncthing"
cask "telegram" cask "telegram"
cask "the-unarchiver" cask "the-unarchiver"
cask "visual-studio-code" cask "visual-studio-code"

5
README.md

@ -1,4 +1,4 @@
This is my personal dotfiles which contain config for vim, zsh, tmux, git, fzf, etc; This is my personal dotfiles which contain config for vim, zsh, tmux, git, fzf etc;
## macOS setup ## macOS setup
Set up by using [dotbot](https://blog.einverne.info/post/2020/08/use-dotbot-dotfiles-management.html): Set up by using [dotbot](https://blog.einverne.info/post/2020/08/use-dotbot-dotfiles-management.html):
@ -12,8 +12,9 @@ Set up by using [dotbot](https://blog.einverne.info/post/2020/08/use-dotbot-dotf
make linux make linux
# under macOS, install applications by brew # under macOS, install applications by brew
make mac make mac
./install -c config/macos.conf.yaml
Log out and log in again, zinit will install all plugins automatically. If you tried to edit file by vi, the vim-plug will install all plugins automatically. Log out and log in again, zinit will install all plugins automatically. If you use vi to edit file at first time, the vim-plug will install all vim plugins automatically.
## Termux setup ## Termux setup
Install dependency first: Install dependency first:

17
config/bootstrap.conf.yml

@ -1,4 +1,9 @@
# bootstrap linux, macos # bootstrap linux, macos
- defaults:
link:
relink: true
force: true
# Setup zinit # Setup zinit
- create: - create:
- ~/.zinit - ~/.zinit
@ -21,15 +26,6 @@
then git pull; then git pull;
else git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm; fi else git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm; fi
- shell:
- description: Install pyenv
quiet: true
command: |
if ! command -v pyenv &> /dev/null
then
curl https://pyenv.run | bash
fi
# Change default shell to zsh # Change default shell to zsh
- shell: - shell:
- description: Change default shell to zsh - description: Change default shell to zsh
@ -49,6 +45,9 @@
update_shell update_shell
- create:
- ~/.config/
- link: - link:
~/.config/espanso: ~/.config/espanso:
if: '[ `uname` = Linux ]' if: '[ `uname` = Linux ]'

12
config/hammerspoon.conf.yml

@ -0,0 +1,12 @@
- defaults:
link:
relink: true
force: true
- brew:
- hammerspoon
- link:
~/.hammerspoon:
if: '[ `uname` = Darwin ]'
path: hammerspoon

36
config/macos.conf.yml

@ -15,6 +15,9 @@
~/Library/Preferences/espanso: ~/Library/Preferences/espanso:
if: '[ `uname` = Darwin ]' if: '[ `uname` = Darwin ]'
path: espanso path: espanso
~/.config/karabiner.edn:
if: '[ `uname` = Darwin ]'
path: karabiner/karabiner.edn
~/.hammerspoon: ~/.hammerspoon:
if: '[ `uname` = Darwin ]' if: '[ `uname` = Darwin ]'
path: hammerspoon path: hammerspoon
@ -41,23 +44,42 @@
path: yabai/yabai_focus_display path: yabai/yabai_focus_display
- brew: - brew:
- assh
- git - git
- zsh - fd
- fzf
- htop
- tmux - tmux
- pyenv - pyenv
- assh - pyenv-virtualenv
- ripgrep - ripgrep
- ffmpeg - ffmpeg
- zsh
- yqrashawn/goku/goku
- tap: - tap:
- homebrew/cask-fonts - homebrew/cask-fonts
- cask: - cask:
- kitty - appcleaner
- iterm2 - contexts
- warp - bigwig-club/brew/upic
- syncthing - font-fira-code
- hammerspoon - hammerspoon
- iterm2
- jetbrains-toolbox
- karabiner-elements
- kitty
- keka
- mos
- maczip
- obsidian - obsidian
- bigwig-club/brew/upic - plexamp
- postman
- raycast
- syncthing
- tailscale
- telegram-desktop
- visual-studio-code - visual-studio-code
- warp
- zerotier-one

4
git/work.gitconfig

@ -1,3 +1,3 @@
[user] [user]
name = yourname name = Ein Verne
email = [email protected] email = [email protected]

3
karabiner/karabiner.edn

@ -46,11 +46,11 @@
} }
:applications {:chrome ["^com\\.google\\.Chrome$"] :applications {:chrome ["^com\\.google\\.Chrome$"]
:chrome-canary [ "^com\\.google\\.Chrome\\.canary$"] :chrome-canary [ "^com\\.google\\.Chrome\\.canary$"]
:raycast ["^com\\.raycast\\.macos$"]
:chromes ["^com\\.google\\.Chrome$" "^com\\.google\\.Chrome\\.canary$"] :chromes ["^com\\.google\\.Chrome$" "^com\\.google\\.Chrome\\.canary$"]
:ctrlnp ["^md\\.obsidian", :ctrlnp ["^md\\.obsidian",
"^com\\.jetbrains\\.intellij", "^com\\.jetbrains\\.intellij",
"com\\.jetbrains\\.pycharm", "com\\.jetbrains\\.pycharm",
"^com\\.electron\\.lark",
"^com\\.tencent\\.xinWeChat", "^com\\.tencent\\.xinWeChat",
"^com\\.google\\.Chrome"] "^com\\.google\\.Chrome"]
:finder ["^com\\.apple\\.finder$"] :finder ["^com\\.apple\\.finder$"]
@ -460,7 +460,6 @@
[:4 :!C4] [:4 :!C4]
[:b [:open "/Applications/Obsidian.app"]] [:b [:open "/Applications/Obsidian.app"]]
[:c [:open "/Applications/Google Chrome.app"]] [:c [:open "/Applications/Google Chrome.app"]]
[:e [:open "/Applications/Lark.app"]]
[:w [:open "/Applications/WeChat.app"]] [:w [:open "/Applications/WeChat.app"]]
[:g [:open "/Applications/GoldenDict.app"]] [:g [:open "/Applications/GoldenDict.app"]]
[:v [:open "/Applications/Visual Studio Code.app"]] [:v [:open "/Applications/Visual Studio Code.app"]]

4
kitty/kitty.conf

@ -36,7 +36,7 @@ font_features FiraCode-Retina +ss02 +ss03 +ss04 +ss05 +ss07 +zero
# foreground #c0b18b # foreground #c0b18b
# The background color # The background color
# background #262626 background #262626
# The foreground for selections # The foreground for selections
# selection_foreground #2f2f2f # selection_foreground #2f2f2f
@ -771,7 +771,7 @@ inactive_tab_background #999
#: The foreground and background colors #: The foreground and background colors
# background_opacity 1.0 background_opacity 0.9
#: The opacity of the background. A number between 0 and 1, where 1 is #: The opacity of the background. A number between 0 and 1, where 1 is
#: opaque and 0 is fully transparent. This will only work if #: opaque and 0 is fully transparent. This will only work if

4
tmux/.tmux.conf

@ -203,7 +203,8 @@ set-option -g status-left "\
set-option -g status-right "\ set-option -g status-right "\
#[fg=colour214, bg=colour237] \ #[fg=colour214, bg=colour237] \
#[fg=colour223, bg=colour237] #(~/dotfiles/tmux/scripts/uptime.sh) \ #[fg=colour223, bg=colour237]#{prefix_highlight} \
#[fg=colour223, bg=colour237] #(~/dotfiles/tmux/scripts/uptime.sh) \
#[fg=colour246, bg=colour237] %m/%d\ #[fg=colour246, bg=colour237] %m/%d\
#[fg=colour109] %H:%M \ #[fg=colour109] %H:%M \
#[fg=colour248, bg=colour239]" #[fg=colour248, bg=colour239]"
@ -244,6 +245,7 @@ set -g @plugin 'tmux-plugins/tmux-copycat'
set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'christoomey/vim-tmux-navigator'
set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'tmux-plugins/tmux-continuum'
set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
# Other examples: # Other examples:
# set -g @plugin 'github_username/plugin_name' # set -g @plugin 'github_username/plugin_name'

4
zsh/env.zsh

@ -179,6 +179,10 @@ if [[ -d $HOME/.asdf/installs/rust/1.51.0/bin ]]; then
export PATH="$PATH:$HOME/.asdf/installs/rust/1.51.0/bin" export PATH="$PATH:$HOME/.asdf/installs/rust/1.51.0/bin"
fi fi
if [[ -d $HOME/Library/Application\ Support/JetBrains/Toolbox/scripts ]]; then
export PATH=$PATH:$HOME/Library/Application\ Support/JetBrains/Toolbox/scripts/
fi
export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH" export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
if [[ -d $HOME/Sync/beancount ]]; then if [[ -d $HOME/Sync/beancount ]]; then

3
zsh/github-copilot-cli.zsh

@ -0,0 +1,3 @@
if command -v 1github-copilot-cli > /dev/null 2>&1; then
eval "$(github-copilot-cli alias -- "$0")"
fi

2
zsh/osx.zsh

@ -7,3 +7,5 @@ fi
if [[ -d "/usr/local/opt/gnu-getopt/bin" ]]; then if [[ -d "/usr/local/opt/gnu-getopt/bin" ]]; then
PATH="/usr/local/opt/gnu-getopt/bin:$PATH" PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
fi fi
[[ -s `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh
Loading…
Cancel
Save