From 83c3783e39459eb34f94432ded0a3ca217e177e9 Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 11 Mar 2020 20:33:24 -0700 Subject: [PATCH 1/4] Added usrlocalbin --- zsh/env.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/env.zsh b/zsh/env.zsh index c971d4f..9b38b57 100644 --- a/zsh/env.zsh +++ b/zsh/env.zsh @@ -1,5 +1,6 @@ export GOPATH=$HOME/go export PATH=$PATH:$HOME/.gem/ruby/2.6.0 +export PATH=$PATH:/usr/local/bin export PATH=$PATH:$HOME/go/bin export PATH=$PATH:/home/linuxbrew/.linuxbrew/bin export PATH=$PATH:$HOME/.local/bin From 4fae48da3fba4d1e74f045913f3ce2c38b53515e Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 11 Mar 2020 21:28:50 -0700 Subject: [PATCH 2/4] added mac dirs --- ranger/rc.conf | 4 ++-- zsh/_env.zsh | 1 + zsh/env.zsh | 2 +- zsh/zshrc | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 zsh/_env.zsh diff --git a/ranger/rc.conf b/ranger/rc.conf index 00d23c1..cc9ac01 100644 --- a/ranger/rc.conf +++ b/ranger/rc.conf @@ -16,7 +16,7 @@ set confirm_on_delete multiple # Use non-default path for file preview script? # ranger ships with scope.sh, a script that calls external programs (see # README.md for dependencies) to preview images, archives, etc. -set preview_script /home/david/.config/ranger/scope.sh +set preview_script ~/.config/ranger/scope.sh # Use the external preview script or display simple plain text or image previews? set use_preview_script true @@ -382,7 +382,7 @@ map gM cd /mnt map gG cd ~/go/src map gp cd ~/prog map gw cd ~/Pictures/wallpapers -source /home/david/.sconfig/ranger/rc.conf +source ~/.sconfig/ranger/rc.conf # In case you work on a keyboard with dvorak layout diff --git a/zsh/_env.zsh b/zsh/_env.zsh new file mode 100644 index 0000000..70cf7e8 --- /dev/null +++ b/zsh/_env.zsh @@ -0,0 +1 @@ +export XDG_CONFIG_HOME=$HOME/.config diff --git a/zsh/env.zsh b/zsh/env.zsh index 9b38b57..3b9f20e 100644 --- a/zsh/env.zsh +++ b/zsh/env.zsh @@ -8,12 +8,12 @@ export PATH=$PATH:$HOME/.config/bin export PATH=$PATH:/snap/bin #export TERM=xterm-256color export PATH=$PATH:/home/david/prog/flutter/bin +export PATH=$PATH:/Users/david/prog/flutter/bin export TERM=xterm-256color export TERM_ITALICS=true export RANGER_LOAD_DEFAULT_RC="false" #export TERM=screen-256color export EDITOR=nvim -export XDG_CONFIG_HOME=/home/david/.config export ZSH_AUTOSUGGEST_USE_ASYNC=1 export ZSH_AUTOSUGGEST_MANUAL_REBIND=1 diff --git a/zsh/zshrc b/zsh/zshrc index 0a9631c..186cd2e 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,4 +1,5 @@ source ~/.config/zsh/env.zsh +source ~/.config/zsh/_env.zsh source ~/.config/zsh/aliases.zsh source ~/.config/zsh/plugins.zsh source ~/.config/zsh/vi.zsh From d95a8ae01a973ba303252db7bcb6697107389d71 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 12 Mar 2020 05:28:13 +0000 Subject: [PATCH 3/4] update config --- .gitignore | 1 + bin/update_config.sh | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100755 bin/update_config.sh diff --git a/.gitignore b/.gitignore index 8c87464..4c8b934 100755 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ ranger/plugins/devicons_linemode.pyo !/pudb/ /pudb/* !/pudb/pudb.cfg +!/bin diff --git a/bin/update_config.sh b/bin/update_config.sh new file mode 100755 index 0000000..bf6d515 --- /dev/null +++ b/bin/update_config.sh @@ -0,0 +1,10 @@ +#/usr/bin/env bash + +cd ~/.config +git pull +cd ~/.sconfig +git pull +cd ~/scripts +git pull +cd ~/.config/nvim +git pull From d2d925658d689eaf07b25ccdebd205121994c169 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 12 Mar 2020 05:33:26 +0000 Subject: [PATCH 4/4] update config script --- bin/{update_config.sh => update_config} | 0 zsh/_env.zsh | 1 - zsh/env.zsh | 1 + zsh/zshrc | 3 --- 4 files changed, 1 insertion(+), 4 deletions(-) rename bin/{update_config.sh => update_config} (100%) delete mode 100644 zsh/_env.zsh diff --git a/bin/update_config.sh b/bin/update_config similarity index 100% rename from bin/update_config.sh rename to bin/update_config diff --git a/zsh/_env.zsh b/zsh/_env.zsh deleted file mode 100644 index 70cf7e8..0000000 --- a/zsh/_env.zsh +++ /dev/null @@ -1 +0,0 @@ -export XDG_CONFIG_HOME=$HOME/.config diff --git a/zsh/env.zsh b/zsh/env.zsh index 3b9f20e..04554b9 100644 --- a/zsh/env.zsh +++ b/zsh/env.zsh @@ -16,6 +16,7 @@ export RANGER_LOAD_DEFAULT_RC="false" export EDITOR=nvim export ZSH_AUTOSUGGEST_USE_ASYNC=1 export ZSH_AUTOSUGGEST_MANUAL_REBIND=1 +export XDG_CONFIG_HOME=$HOME/.config # fzf export FZF_DEFAULT_OPTS='--bind ctrl-e:down,ctrl-u:up --preview "[[ $(file --mime {}) =~ binary ]] && echo {} is a binary file || (ccat --color=always {} || highlight -O ansi -l {} || cat {}) 2> /dev/null | head -500"' diff --git a/zsh/zshrc b/zsh/zshrc index 186cd2e..6aaa902 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,12 +1,9 @@ source ~/.config/zsh/env.zsh -source ~/.config/zsh/_env.zsh source ~/.config/zsh/aliases.zsh source ~/.config/zsh/plugins.zsh source ~/.config/zsh/vi.zsh source ~/.config/zsh/fzf.zsh - - if [ -f ~/.sconfig/zsh/zshrc ]; then source ~/.sconfig/zsh/zshrc fi