From 301587a5881c19eff035fdf173ebccf9838ca80f Mon Sep 17 00:00:00 2001 From: GeorgeSG Date: Fri, 5 Jul 2024 12:26:30 +0300 Subject: [PATCH] Rearrange files in .config folder, update makefile --- .gitignore | 4 +- .vim/undodir/.gitkeep | 0 Makefile | 61 ++++++++----------- home/.bashrc | 3 + {shell => home/.config}/.aliases | 6 +- {shell => home/.config/bash}/.bash_profile | 20 +++--- home/.config/bash/.bash_profile.local | 1 + .../.config/bash/git-completion.bash | 0 .../.config/bash/git-prompt-colors.sh | 0 {git => home/.config/git}/.gitconfig | 2 +- home/.config/tmux/themes/themes | 1 + .../.config/tmux}/themes/tomorrow-night.tmux | 0 {shell => home/.config/zsh}/.zprompt | 0 {shell => home/.config/zsh}/.zshrc | 40 +++++++----- {tmux => home}/.tmux.conf | 8 ++- {.vim => home/.vim}/README | 0 .../.vim}/colors/Monokai-Refined.vim | 0 {.vim => home/.vim}/colors/Monokai.vim | 0 .../Mustang_Vim_Colorscheme_by_hcalves.vim | 0 .../.vim}/colors/Tomorrow-Night-Blue.vim | 0 .../.vim}/colors/Tomorrow-Night-Bright.vim | 0 .../.vim}/colors/Tomorrow-Night-Eighties.vim | 0 {.vim => home/.vim}/colors/Tomorrow-Night.vim | 0 {.vim => home/.vim}/colors/Tomorrow.vim | 0 {.vim => home/.vim}/colors/blackboard.vim | 0 {.vim => home/.vim}/colors/calmar256-dark.vim | 0 {.vim => home/.vim}/colors/distinguished.vim | 0 {.vim => home/.vim}/colors/espresso-soda.vim | 0 {.vim => home/.vim}/colors/freya.vim | 0 {.vim => home/.vim}/colors/github.vim | 0 {.vim => home/.vim}/colors/grb256.vim | 0 {.vim => home/.vim}/colors/guardian.vim | 0 {.vim => home/.vim}/colors/hemisu.vim | 0 {.vim => home/.vim}/colors/holokai.vim | 0 {.vim => home/.vim}/colors/jellybeans.vim | 0 {.vim => home/.vim}/colors/kolor.vim | 0 {.vim => home/.vim}/colors/molokai.vim | 0 {.vim => home/.vim}/colors/railscasts.vim | 0 {.vim => home/.vim}/colors/solarized.vim | 0 {.vim => home/.vim}/colors/twilight.vim | 0 {.vim => home/.vim}/colors/vibrantink.vim | 0 {.vim => home/.vim}/colors/zenburn.vim | 0 {.vim => home/.vim}/colors/zmrok.vim | 0 {.vim => home/.vim}/ftdetect/javascript.vim | 0 {.vim => home/.vim}/ftplugin/ruby.vim | 0 {.vim => home/.vim}/swapdir/.gitkeep | 0 {.vim => home/.vim}/syntax/javascript.vim | 0 {.vim => home/.vim}/syntax/ruby.vim | 0 .vimrc => home/.vimrc | 0 home/.zshenv | 1 + shell/.bashrc | 3 - shell/.zshenv | 1 - 52 files changed, 79 insertions(+), 72 deletions(-) delete mode 100644 .vim/undodir/.gitkeep create mode 100644 home/.bashrc rename {shell => home/.config}/.aliases (95%) rename {shell => home/.config/bash}/.bash_profile (82%) create mode 100644 home/.config/bash/.bash_profile.local rename git/.git-completion.bash => home/.config/bash/git-completion.bash (100%) rename git/.git-prompt-colors.sh => home/.config/bash/git-prompt-colors.sh (100%) rename {git => home/.config/git}/.gitconfig (98%) create mode 120000 home/.config/tmux/themes/themes rename {tmux => home/.config/tmux}/themes/tomorrow-night.tmux (100%) rename {shell => home/.config/zsh}/.zprompt (100%) rename {shell => home/.config/zsh}/.zshrc (74%) rename {tmux => home}/.tmux.conf (95%) rename {.vim => home/.vim}/README (100%) rename {.vim => home/.vim}/colors/Monokai-Refined.vim (100%) rename {.vim => home/.vim}/colors/Monokai.vim (100%) rename {.vim => home/.vim}/colors/Mustang_Vim_Colorscheme_by_hcalves.vim (100%) rename {.vim => home/.vim}/colors/Tomorrow-Night-Blue.vim (100%) rename {.vim => home/.vim}/colors/Tomorrow-Night-Bright.vim (100%) rename {.vim => home/.vim}/colors/Tomorrow-Night-Eighties.vim (100%) rename {.vim => home/.vim}/colors/Tomorrow-Night.vim (100%) rename {.vim => home/.vim}/colors/Tomorrow.vim (100%) rename {.vim => home/.vim}/colors/blackboard.vim (100%) rename {.vim => home/.vim}/colors/calmar256-dark.vim (100%) rename {.vim => home/.vim}/colors/distinguished.vim (100%) rename {.vim => home/.vim}/colors/espresso-soda.vim (100%) rename {.vim => home/.vim}/colors/freya.vim (100%) rename {.vim => home/.vim}/colors/github.vim (100%) rename {.vim => home/.vim}/colors/grb256.vim (100%) rename {.vim => home/.vim}/colors/guardian.vim (100%) rename {.vim => home/.vim}/colors/hemisu.vim (100%) rename {.vim => home/.vim}/colors/holokai.vim (100%) rename {.vim => home/.vim}/colors/jellybeans.vim (100%) rename {.vim => home/.vim}/colors/kolor.vim (100%) rename {.vim => home/.vim}/colors/molokai.vim (100%) rename {.vim => home/.vim}/colors/railscasts.vim (100%) rename {.vim => home/.vim}/colors/solarized.vim (100%) rename {.vim => home/.vim}/colors/twilight.vim (100%) rename {.vim => home/.vim}/colors/vibrantink.vim (100%) rename {.vim => home/.vim}/colors/zenburn.vim (100%) rename {.vim => home/.vim}/colors/zmrok.vim (100%) rename {.vim => home/.vim}/ftdetect/javascript.vim (100%) rename {.vim => home/.vim}/ftplugin/ruby.vim (100%) rename {.vim => home/.vim}/swapdir/.gitkeep (100%) rename {.vim => home/.vim}/syntax/javascript.vim (100%) rename {.vim => home/.vim}/syntax/ruby.vim (100%) rename .vimrc => home/.vimrc (100%) create mode 100644 home/.zshenv delete mode 100644 shell/.bashrc delete mode 100644 shell/.zshenv diff --git a/.gitignore b/.gitignore index e84c594..e3f9dad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .DS_Store -.vim/bundle -.vim/undodir +home/.vim/bundle +home/.vim/undodir Brewfile.lock.json Caskfile.lock.json diff --git a/.vim/undodir/.gitkeep b/.vim/undodir/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile index 214bfe6..f4e0b17 100644 --- a/Makefile +++ b/Makefile @@ -2,25 +2,12 @@ linux: link bash_git_prompt tmux vim zsh macos: link link_mac mac_setup bash_git_prompt tmux vim zsh brew link: - -rm ~/.aliases - -rm ~/.bash_profile - -rm ~/.bashrc - -rm ~/.git-completion.bash - -rm ~/.gitconfig - -rm ~/.tmux.conf - -rm ~/.zsh/.zprompt - -rm ~/.zsh/.zshrc - -rm ~/.zshenv - mkdir -p ~/.zsh - ln -s ~/Git/dotfiles/git/.git-completion.bash ~ - ln -s ~/Git/dotfiles/git/.gitconfig ~ - ln -s ~/Git/dotfiles/shell/.aliases ~ - ln -s ~/Git/dotfiles/shell/.bashrc ~ - ln -s ~/Git/dotfiles/shell/.bash_profile ~ - ln -s ~/Git/dotfiles/shell/.zprompt ~/.zsh/ - ln -s ~/Git/dotfiles/shell/.zshrc ~/.zsh/ - ln -s ~/Git/dotfiles/shell/.zshenv ~ - ln -s ~/Git/dotfiles/tmux/.tmux.conf ~ + ln -fs ~/Git/dotfiles/home/.config/bash ~/.config/ + mkdir -p ~/.config/git + ln -fs ~/Git/dotfiles/home/.config/git/.gitconfig ~/.config/git/.gitconfig + ln -fs ~/Git/dotfiles/home/.config/.aliases ~/.config/ + ln -fs ~/Git/dotfiles/home/.bashrc ~/ + link_mac: -rm ~/.hushlogin @@ -41,28 +28,32 @@ cask_personal: brew bundle --file ./macos/Caskfile.personal tmux: - git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm - -rm ~/.tmux/themes - ln -s ~/Git/dotfiles/tmux/themes ~/.tmux/themes + ln -fs ~/Git/dotfiles/home/.tmux.conf ~/ + mkdir -p ~/.config/tmux + ln -fs ~/Git/dotfiles/home/.config/tmux/themes ~/.config/tmux/themes + -git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm bash_git_prompt: - -git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt --depth=1 - -rm ~/.git-prompt-colors - -ln -s ~/Git/dotfiles/git/.git-prompt-colors.sh ~ + -git clone https://github.com/magicmonty/bash-git-prompt.git ~/.config/bash/bash-git-prompt --depth=1 vim: -rm ~/.vim -rm ~/.vimrc - ln -s ~/Git/dotfiles/.vim ~ - ln -s ~/Git/dotfiles/.vimrc ~ + ln -fs ~/Git/dotfiles/home/.vim ~ + ln -fs ~/Git/dotfiles/home/.vimrc ~ -git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim zsh: - mkdir -p ~/.zsh/plugins - -git clone git@github.com:zsh-git-prompt/zsh-git-prompt.git ~/.zsh/plugins/zsh-git-prompt - -git clone git@github.com:arzzen/calc.plugin.zsh.git ~/.zsh/plugins/calc.plugin.zsh - -git clone git@github.com:softmoth/zsh-vim-mode.git ~/.zsh/plugins/zsh-vim-mode - -git clone https://github.com/lukechilds/zsh-better-npm-completion.git ~/.zsh/plugins/.zsh-better-npm-completion - -git clone https://github.com/sunlei/zsh-ssh ~/.zsh/plugins/zsh-ssh - mkdir -p ~/.zsh/plugins/bd - curl https://raw.githubusercontent.com/Tarrasch/zsh-bd/master/bd.zsh > ~/.zsh/plugins/bd/bd.zsh + ln -fs ~/Git/dotfiles/home/.zshenv ~/ + mkdir -p ~/.config/zsh + ln -fs ~/Git/dotfiles/home/.config/zsh/.zprompt ~/.config/zsh/.zprompt + ln -fs ~/Git/dotfiles/home/.config/zsh/.zshrc ~/.config/zsh/.zshrc + + mkdir -p ~/.config/zsh/plugins + -git clone git@github.com:zsh-git-prompt/zsh-git-prompt.git ~/.config/zsh/plugins/zsh-git-prompt + -git clone git@github.com:arzzen/calc.plugin.zsh.git ~/.config/zsh/plugins/calc.plugin.zsh + -git clone git@github.com:softmoth/zsh-vim-mode.git ~/.config/zsh/plugins/zsh-vim-mode + -git clone https://github.com/lukechilds/zsh-better-npm-completion.git ~/.config/zsh/plugins/.zsh-better-npm-completion + -git clone https://github.com/sunlei/zsh-ssh ~/.config/zsh/plugins/zsh-ssh + mkdir -p ~/.config/zsh/plugins/bd + curl https://raw.githubusercontent.com/Tarrasch/zsh-bd/master/bd.zsh > ~/.config/zsh/plugins/bd/bd.zsh diff --git a/home/.bashrc b/home/.bashrc new file mode 100644 index 0000000..ec19082 --- /dev/null +++ b/home/.bashrc @@ -0,0 +1,3 @@ +[ -n "$PS1" ] && source ~/.config/bash/.bash_profile; + +[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/shell/.aliases b/home/.config/.aliases similarity index 95% rename from shell/.aliases rename to home/.config/.aliases index 193e17f..ccee0c7 100644 --- a/shell/.aliases +++ b/home/.config/.aliases @@ -16,7 +16,7 @@ alias l='ls -CFG' # fi; # eza aliases, if available -if test $(which eza); then +if type ls >/dev/null 2>&1; then eza_params=( '--git' '--icons' '--group' '--group-directories-first' '--time-style=relative' @@ -84,8 +84,8 @@ alias dps="docker ps" alias dl="docker logs" # Editing files -alias aliases="code ~/.aliases" -alias laliases="code ~/.aliases.local" +alias aliases="code ~/.config/aliases" +alias laliases="code ~/.config/aliases.local" alias zshrc="code $ZDOTDIR/.zshrc" alias lzshrc="code $ZDOTDIR/.zshrc.local" alias vimrc="vim ~/.vimrc" diff --git a/shell/.bash_profile b/home/.config/bash/.bash_profile similarity index 82% rename from shell/.bash_profile rename to home/.config/bash/.bash_profile index e90ad34..9574fc1 100644 --- a/shell/.bash_profile +++ b/home/.config/bash/.bash_profile @@ -65,22 +65,22 @@ export BASH_SILENCE_DEPRECATION_WARNING=1 # Sources & exports # ###################### -if [ -f ~/.aliases ]; then - source ~/.aliases +if [ -f ~/.config/.aliases ]; then + source ~/.config/.aliases fi -if [ -f ~/.aliases.local ]; then - . ~/.aliases.local +if [ -f ~/.config/.aliases.local ]; then + . ~/.config/.aliases.local fi -if [ -f ~/.bash_profile.local ]; then - source ~/.bash_profile.local +if [ -f ~/.config/bash/.bash_profile.local ]; then + source ~/.config/bash/.bash_profile.local fi # bash-git prompt -if [ -f ~/.bash-git-prompt/gitprompt.sh ]; then - source ~/.bash-git-prompt/gitprompt.sh +if [ -f ~/.config/bash/bash-git-prompt/gitprompt.sh ]; then + source ~/.config/bash/bash-git-prompt/gitprompt.sh fi # enable programmable completion features (you don't need to enable @@ -91,6 +91,6 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then fi # Git completion -if [ -f ~/.git-completion.bash ]; then - source ~/.git-completion.bash +if [ -f ~/.config/bash/git-completion.bash ]; then + source ~/.config/bash/git-completion.bash fi diff --git a/home/.config/bash/.bash_profile.local b/home/.config/bash/.bash_profile.local new file mode 100644 index 0000000..9751022 --- /dev/null +++ b/home/.config/bash/.bash_profile.local @@ -0,0 +1 @@ +export PATH="$HOME/Scripts:$PATH" diff --git a/git/.git-completion.bash b/home/.config/bash/git-completion.bash similarity index 100% rename from git/.git-completion.bash rename to home/.config/bash/git-completion.bash diff --git a/git/.git-prompt-colors.sh b/home/.config/bash/git-prompt-colors.sh similarity index 100% rename from git/.git-prompt-colors.sh rename to home/.config/bash/git-prompt-colors.sh diff --git a/git/.gitconfig b/home/.config/git/.gitconfig similarity index 98% rename from git/.gitconfig rename to home/.config/git/.gitconfig index 7d31548..d602f70 100644 --- a/git/.gitconfig +++ b/home/.config/git/.gitconfig @@ -1,6 +1,6 @@ # local user config, usernames, etc [include] - path=~/.gitconfig.local + path=~/.config/git/.gitconfig.local [color] diff = auto status = auto diff --git a/home/.config/tmux/themes/themes b/home/.config/tmux/themes/themes new file mode 120000 index 0000000..caec773 --- /dev/null +++ b/home/.config/tmux/themes/themes @@ -0,0 +1 @@ +/home/georgi/Git/dotfiles/home/.config/tmux/themes \ No newline at end of file diff --git a/tmux/themes/tomorrow-night.tmux b/home/.config/tmux/themes/tomorrow-night.tmux similarity index 100% rename from tmux/themes/tomorrow-night.tmux rename to home/.config/tmux/themes/tomorrow-night.tmux diff --git a/shell/.zprompt b/home/.config/zsh/.zprompt similarity index 100% rename from shell/.zprompt rename to home/.config/zsh/.zprompt diff --git a/shell/.zshrc b/home/.config/zsh/.zshrc similarity index 74% rename from shell/.zshrc rename to home/.config/zsh/.zshrc index 6cd3cfc..09afb37 100644 --- a/shell/.zshrc +++ b/home/.config/zsh/.zshrc @@ -1,14 +1,31 @@ -ZDOTDIR=~/.zsh + +ZDOTDIR=~/.config/zsh setopt auto_cd setopt no_case_glob setopt glob_complete -setopt correct -setopt correct_all +# setopt correct +# setopt correct_all setopt completeinword # not just at the end +# -------- +# Comp init +# -------- + +# The following lines were added by compinstall + +zstyle ':completion:*' completer _complete _ignored _correct _approximate +zstyle :compinstall filename '/home/georgi/.config/zsh/.zshrc' + +autoload -Uz compinit +compinit +# End of lines added by compinstall + +# Load bashcompinit for some old bash completions +autoload bashcompinit && bashcompinit + # -------- # History @@ -39,15 +56,18 @@ fpath+=~/Git/dotfiles/functions autoload extract +echo "ATTEMPTING TO LOAD" [ -f $ZDOTDIR/.zshrc.local ] && source $ZDOTDIR/.zshrc.local -[ -f ~/.aliases ] && source ~/.aliases -[ -f ~/.aliases.local ] && source ~/.aliases.local +[ -f ~/.config/.aliases ] && source ~/.config/.aliases +[ -f ~/.config/.aliases.local ] && source ~/.config/.aliases.local # -------- # Plugins # -------- -source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +if type brew >/dev/null 2>&1; then + source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +fi source "$ZDOTDIR/plugins/zsh-vim-mode/zsh-vim-mode.plugin.zsh" @@ -64,14 +84,6 @@ source "$ZDOTDIR/plugins/zsh-ssh/zsh-ssh.zsh" source "$ZDOTDIR/plugins/bd/bd.zsh" -# -------- -# Comp init -# -------- - -autoload -Uz compinit && compinit -i - -# Load bashcompinit for some old bash completions -autoload bashcompinit && bashcompinit # Prompt diff --git a/tmux/.tmux.conf b/home/.tmux.conf similarity index 95% rename from tmux/.tmux.conf rename to home/.tmux.conf index 913bbbf..3ed1f68 100755 --- a/tmux/.tmux.conf +++ b/home/.tmux.conf @@ -2,6 +2,8 @@ # General Settings # ------------------ +set-option -g default-shell "/bin/zsh" + # See: https://github.com/gpakosz/.tmux/blob/master/.tmux.conf # Set Custom Prefix @@ -31,7 +33,7 @@ setw -g aggressive-resize on # ------------------- set -g default-terminal "screen-256color" -source-file ~/.tmux/themes/tomorrow-night.tmux +source-file ~/.config/tmux/themes/tomorrow-night.tmux # Theme Variables @@ -109,7 +111,7 @@ unbind C-Left unbind C-Right # Source this file -bind r source-file ~/.tmux.conf \; display "Config file reloaded!" +bind r source-file $HOME/.tmux.conf \; display "Config file reloaded!" # split current window horizontally bind v split-window -h @@ -160,4 +162,4 @@ set -g @plugin 'tmux-plugins/tmux-cpu' set -g @plugin 'tmux-plugins/tmux-prefix-highlight' set -g @plugin 'sainnhe/tmux-fzf' -run -b '~/.tmux/plugins/tpm/tpm' +run -b '~/.config/tmux/plugins/tpm/tpm' diff --git a/.vim/README b/home/.vim/README similarity index 100% rename from .vim/README rename to home/.vim/README diff --git a/.vim/colors/Monokai-Refined.vim b/home/.vim/colors/Monokai-Refined.vim similarity index 100% rename from .vim/colors/Monokai-Refined.vim rename to home/.vim/colors/Monokai-Refined.vim diff --git a/.vim/colors/Monokai.vim b/home/.vim/colors/Monokai.vim similarity index 100% rename from .vim/colors/Monokai.vim rename to home/.vim/colors/Monokai.vim diff --git a/.vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim b/home/.vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim similarity index 100% rename from .vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim rename to home/.vim/colors/Mustang_Vim_Colorscheme_by_hcalves.vim diff --git a/.vim/colors/Tomorrow-Night-Blue.vim b/home/.vim/colors/Tomorrow-Night-Blue.vim similarity index 100% rename from .vim/colors/Tomorrow-Night-Blue.vim rename to home/.vim/colors/Tomorrow-Night-Blue.vim diff --git a/.vim/colors/Tomorrow-Night-Bright.vim b/home/.vim/colors/Tomorrow-Night-Bright.vim similarity index 100% rename from .vim/colors/Tomorrow-Night-Bright.vim rename to home/.vim/colors/Tomorrow-Night-Bright.vim diff --git a/.vim/colors/Tomorrow-Night-Eighties.vim b/home/.vim/colors/Tomorrow-Night-Eighties.vim similarity index 100% rename from .vim/colors/Tomorrow-Night-Eighties.vim rename to home/.vim/colors/Tomorrow-Night-Eighties.vim diff --git a/.vim/colors/Tomorrow-Night.vim b/home/.vim/colors/Tomorrow-Night.vim similarity index 100% rename from .vim/colors/Tomorrow-Night.vim rename to home/.vim/colors/Tomorrow-Night.vim diff --git a/.vim/colors/Tomorrow.vim b/home/.vim/colors/Tomorrow.vim similarity index 100% rename from .vim/colors/Tomorrow.vim rename to home/.vim/colors/Tomorrow.vim diff --git a/.vim/colors/blackboard.vim b/home/.vim/colors/blackboard.vim similarity index 100% rename from .vim/colors/blackboard.vim rename to home/.vim/colors/blackboard.vim diff --git a/.vim/colors/calmar256-dark.vim b/home/.vim/colors/calmar256-dark.vim similarity index 100% rename from .vim/colors/calmar256-dark.vim rename to home/.vim/colors/calmar256-dark.vim diff --git a/.vim/colors/distinguished.vim b/home/.vim/colors/distinguished.vim similarity index 100% rename from .vim/colors/distinguished.vim rename to home/.vim/colors/distinguished.vim diff --git a/.vim/colors/espresso-soda.vim b/home/.vim/colors/espresso-soda.vim similarity index 100% rename from .vim/colors/espresso-soda.vim rename to home/.vim/colors/espresso-soda.vim diff --git a/.vim/colors/freya.vim b/home/.vim/colors/freya.vim similarity index 100% rename from .vim/colors/freya.vim rename to home/.vim/colors/freya.vim diff --git a/.vim/colors/github.vim b/home/.vim/colors/github.vim similarity index 100% rename from .vim/colors/github.vim rename to home/.vim/colors/github.vim diff --git a/.vim/colors/grb256.vim b/home/.vim/colors/grb256.vim similarity index 100% rename from .vim/colors/grb256.vim rename to home/.vim/colors/grb256.vim diff --git a/.vim/colors/guardian.vim b/home/.vim/colors/guardian.vim similarity index 100% rename from .vim/colors/guardian.vim rename to home/.vim/colors/guardian.vim diff --git a/.vim/colors/hemisu.vim b/home/.vim/colors/hemisu.vim similarity index 100% rename from .vim/colors/hemisu.vim rename to home/.vim/colors/hemisu.vim diff --git a/.vim/colors/holokai.vim b/home/.vim/colors/holokai.vim similarity index 100% rename from .vim/colors/holokai.vim rename to home/.vim/colors/holokai.vim diff --git a/.vim/colors/jellybeans.vim b/home/.vim/colors/jellybeans.vim similarity index 100% rename from .vim/colors/jellybeans.vim rename to home/.vim/colors/jellybeans.vim diff --git a/.vim/colors/kolor.vim b/home/.vim/colors/kolor.vim similarity index 100% rename from .vim/colors/kolor.vim rename to home/.vim/colors/kolor.vim diff --git a/.vim/colors/molokai.vim b/home/.vim/colors/molokai.vim similarity index 100% rename from .vim/colors/molokai.vim rename to home/.vim/colors/molokai.vim diff --git a/.vim/colors/railscasts.vim b/home/.vim/colors/railscasts.vim similarity index 100% rename from .vim/colors/railscasts.vim rename to home/.vim/colors/railscasts.vim diff --git a/.vim/colors/solarized.vim b/home/.vim/colors/solarized.vim similarity index 100% rename from .vim/colors/solarized.vim rename to home/.vim/colors/solarized.vim diff --git a/.vim/colors/twilight.vim b/home/.vim/colors/twilight.vim similarity index 100% rename from .vim/colors/twilight.vim rename to home/.vim/colors/twilight.vim diff --git a/.vim/colors/vibrantink.vim b/home/.vim/colors/vibrantink.vim similarity index 100% rename from .vim/colors/vibrantink.vim rename to home/.vim/colors/vibrantink.vim diff --git a/.vim/colors/zenburn.vim b/home/.vim/colors/zenburn.vim similarity index 100% rename from .vim/colors/zenburn.vim rename to home/.vim/colors/zenburn.vim diff --git a/.vim/colors/zmrok.vim b/home/.vim/colors/zmrok.vim similarity index 100% rename from .vim/colors/zmrok.vim rename to home/.vim/colors/zmrok.vim diff --git a/.vim/ftdetect/javascript.vim b/home/.vim/ftdetect/javascript.vim similarity index 100% rename from .vim/ftdetect/javascript.vim rename to home/.vim/ftdetect/javascript.vim diff --git a/.vim/ftplugin/ruby.vim b/home/.vim/ftplugin/ruby.vim similarity index 100% rename from .vim/ftplugin/ruby.vim rename to home/.vim/ftplugin/ruby.vim diff --git a/.vim/swapdir/.gitkeep b/home/.vim/swapdir/.gitkeep similarity index 100% rename from .vim/swapdir/.gitkeep rename to home/.vim/swapdir/.gitkeep diff --git a/.vim/syntax/javascript.vim b/home/.vim/syntax/javascript.vim similarity index 100% rename from .vim/syntax/javascript.vim rename to home/.vim/syntax/javascript.vim diff --git a/.vim/syntax/ruby.vim b/home/.vim/syntax/ruby.vim similarity index 100% rename from .vim/syntax/ruby.vim rename to home/.vim/syntax/ruby.vim diff --git a/.vimrc b/home/.vimrc similarity index 100% rename from .vimrc rename to home/.vimrc diff --git a/home/.zshenv b/home/.zshenv new file mode 100644 index 0000000..558223f --- /dev/null +++ b/home/.zshenv @@ -0,0 +1 @@ +ZDOTDIR=$HOME/.config/zsh diff --git a/shell/.bashrc b/shell/.bashrc deleted file mode 100644 index 4399a01..0000000 --- a/shell/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -[ -n "$PS1" ] && source ~/.bash_profile; - -[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/shell/.zshenv b/shell/.zshenv deleted file mode 100644 index 33f7836..0000000 --- a/shell/.zshenv +++ /dev/null @@ -1 +0,0 @@ -ZDOTDIR=$HOME/.zsh