From fe3c2d1438804d7ff69167dd0e29d5dd26ecdbb8 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Mon, 31 Jul 2017 17:23:54 +0200 Subject: [PATCH] streamlined some more stuff, removed fzf for system installed version --- .gitignore | 1 + .gitmodules | 3 -- README.md | 1 + config/dir/{dircolors => config} | 0 config/dotbot/config | 6 ++++ config/dotbot/dotbot.yaml | 7 ---- config/git/{gitconfig => config} | 0 config/ssh/{sshconfig => config} | 0 config/zsh/config | 20 +++++++++++ config/zsh/config.d/00-ohmy.zsh | 3 ++ config/zsh/config.d/01-aliases.zsh | 7 ++++ config/zsh/config.d/02-functions.zsh | 1 + .../{zshrc.d => config.d}/03-highlighting.zsh | 2 +- .../{zshrc.d => config.d}/04-autosuggest.zsh | 6 ++-- .../aliases/dcompose.zsh | 0 config/zsh/config.d/aliases/os.zsh | 3 ++ .../aliases/os/archlinux.zsh | 3 -- .../aliases/os/debian.zsh | 0 .../{zshrc.d => config.d}/aliases/systemd.zsh | 0 .../exports/dotfiles.zsh | 0 .../{zshrc.d => config.d}/exports/other.zsh | 0 config/zsh/config.d/functions/cnf.zsh | 2 ++ config/zsh/config.d/functions/dircolors.zsh | 1 + .../functions/extract.zsh | 0 .../functions/fixatwork.zsh | 0 config/zsh/config.d/functions/fzf.zsh | 2 ++ .../{zshrc.d => config.d}/functions/git.zsh | 0 .../functions/gitignore.zsh | 2 +- .../{zshrc.d => config.d}/functions/tmux.zsh | 2 +- .../functions/transfer.zsh | 0 .../functions/zshmarks.zsh | 2 +- config/zsh/zshrc | 20 ----------- config/zsh/zshrc.d/00-ohmy.zsh | 7 ---- config/zsh/zshrc.d/01-aliases.zsh | 9 ----- config/zsh/zshrc.d/02-functions.zsh | 1 - config/zsh/zshrc.d/aliases/os.zsh | 3 -- config/zsh/zshrc.d/functions/cnf.zsh | 33 ------------------- config/zsh/zshrc.d/functions/dircolors.zsh | 1 - config/zsh/zshrc.d/functions/fzf.zsh | 2 -- install | 2 +- lib/fzf | 1 - 41 files changed, 55 insertions(+), 98 deletions(-) rename config/dir/{dircolors => config} (100%) create mode 100644 config/dotbot/config delete mode 100644 config/dotbot/dotbot.yaml rename config/git/{gitconfig => config} (100%) rename config/ssh/{sshconfig => config} (100%) create mode 100644 config/zsh/config create mode 100644 config/zsh/config.d/00-ohmy.zsh create mode 100644 config/zsh/config.d/01-aliases.zsh create mode 100644 config/zsh/config.d/02-functions.zsh rename config/zsh/{zshrc.d => config.d}/03-highlighting.zsh (99%) rename config/zsh/{zshrc.d => config.d}/04-autosuggest.zsh (99%) rename config/zsh/{zshrc.d => config.d}/aliases/dcompose.zsh (100%) create mode 100644 config/zsh/config.d/aliases/os.zsh rename config/zsh/{zshrc.d => config.d}/aliases/os/archlinux.zsh (99%) rename config/zsh/{zshrc.d => config.d}/aliases/os/debian.zsh (100%) rename config/zsh/{zshrc.d => config.d}/aliases/systemd.zsh (100%) rename config/zsh/{zshrc.d => config.d}/exports/dotfiles.zsh (100%) rename config/zsh/{zshrc.d => config.d}/exports/other.zsh (100%) create mode 100644 config/zsh/config.d/functions/cnf.zsh create mode 100644 config/zsh/config.d/functions/dircolors.zsh rename config/zsh/{zshrc.d => config.d}/functions/extract.zsh (100%) rename config/zsh/{zshrc.d => config.d}/functions/fixatwork.zsh (100%) create mode 100644 config/zsh/config.d/functions/fzf.zsh rename config/zsh/{zshrc.d => config.d}/functions/git.zsh (100%) rename config/zsh/{zshrc.d => config.d}/functions/gitignore.zsh (94%) rename config/zsh/{zshrc.d => config.d}/functions/tmux.zsh (98%) rename config/zsh/{zshrc.d => config.d}/functions/transfer.zsh (100%) rename config/zsh/{zshrc.d => config.d}/functions/zshmarks.zsh (98%) delete mode 100644 config/zsh/zshrc delete mode 100644 config/zsh/zshrc.d/00-ohmy.zsh delete mode 100644 config/zsh/zshrc.d/01-aliases.zsh delete mode 100644 config/zsh/zshrc.d/02-functions.zsh delete mode 100644 config/zsh/zshrc.d/aliases/os.zsh delete mode 100644 config/zsh/zshrc.d/functions/cnf.zsh delete mode 100644 config/zsh/zshrc.d/functions/dircolors.zsh delete mode 100644 config/zsh/zshrc.d/functions/fzf.zsh delete mode 160000 lib/fzf diff --git a/.gitignore b/.gitignore index eb81c56..3a464ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bin/zunit lib/local/_zunit +lib/bookmarks diff --git a/.gitmodules b/.gitmodules index 4e55a5b..bb1066b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "lib/ohmyzsh"] path = lib/ohmyzsh url = https://github.com/robbyrussell/oh-my-zsh -[submodule "lib/fzf"] - path = lib/fzf - url = https://github.com/junegunn/fzf.git [submodule "lib/gitignore"] path = lib/gitignore url = https://github.com/github/gitignore diff --git a/README.md b/README.md index ed72b14..4c5c3f3 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,6 @@ This Repo contains my dotfiles Prerequisites: - xmlstarlet: ```yaourt -S xmlstarlet``` - nano-syntax-highlighting ```yaourt -S nano-syntax-highleighting``` and then ```echo "include /usr/share/nano-syntax-highlighting/*.nanorc" >> /etc/nanorc``` as root +- fzf nano-syntax-highlighting ```yaourt -S fzf``` Install with the ```./install``` script. diff --git a/config/dir/dircolors b/config/dir/config similarity index 100% rename from config/dir/dircolors rename to config/dir/config diff --git a/config/dotbot/config b/config/dotbot/config new file mode 100644 index 0000000..68832f6 --- /dev/null +++ b/config/dotbot/config @@ -0,0 +1,6 @@ +- clean: ['~'] + +- link: + ~/.gitconfig: config/git/config + ~/.zshrc: config/zsh/config + ~/.ssh/config: config/ssh/config diff --git a/config/dotbot/dotbot.yaml b/config/dotbot/dotbot.yaml deleted file mode 100644 index b1c3f43..0000000 --- a/config/dotbot/dotbot.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- clean: ['~'] - -- link: - ~/.fzf: lib/fzf - ~/.gitconfig: config/git/gitconfig - ~/.zshrc: config/zsh/zshrc - ~/.ssh/config: config/ssh/sshconfig diff --git a/config/git/gitconfig b/config/git/config similarity index 100% rename from config/git/gitconfig rename to config/git/config diff --git a/config/ssh/sshconfig b/config/ssh/config similarity index 100% rename from config/ssh/sshconfig rename to config/ssh/config diff --git a/config/zsh/config b/config/zsh/config new file mode 100644 index 0000000..b82faa1 --- /dev/null +++ b/config/zsh/config @@ -0,0 +1,20 @@ +export DOTFILES="${HOME}/dotfiles" +export DOTLIB="${DOTFILES}/lib" +export DOTBIN="${DOTFILES}/bin" +export DOTCONF="${DOTFILES}/config" +export DOTCONFD="${DOTCONF}/zsh/config.d" + +# Export Path +export PATH="${DOTBIN}:/opt/android-sdk/build-tools/26.0.0:${PATH}" + +# Export Editor +export EDITOR='nano' + +# Completions Paths +fpath+=(${DOTLIB}/completions/src ${DOTLIB}/local) + +for file in ${DOTCONFD}/*.zsh; do source $file; done + +# Prompt +autoload -U promptinit && promptinit +prompt filthy diff --git a/config/zsh/config.d/00-ohmy.zsh b/config/zsh/config.d/00-ohmy.zsh new file mode 100644 index 0000000..784620a --- /dev/null +++ b/config/zsh/config.d/00-ohmy.zsh @@ -0,0 +1,3 @@ +export ZSH="${DOTLIB}/ohmyzsh" +DISABLE_AUTO_UPDATE="true" +source ${ZSH}/oh-my-zsh.sh diff --git a/config/zsh/config.d/01-aliases.zsh b/config/zsh/config.d/01-aliases.zsh new file mode 100644 index 0000000..35ed02c --- /dev/null +++ b/config/zsh/config.d/01-aliases.zsh @@ -0,0 +1,7 @@ +alias rm='rm -i' +alias cp='cp -i' +alias mv='mv -i' +alias la='ls -lAh' +clearall () { clear; printf '\033[3J' } + +for file in ${DOTCONFD}/aliases/*.zsh; do source $file; done diff --git a/config/zsh/config.d/02-functions.zsh b/config/zsh/config.d/02-functions.zsh new file mode 100644 index 0000000..7aa652d --- /dev/null +++ b/config/zsh/config.d/02-functions.zsh @@ -0,0 +1 @@ +for file in ${DOTCONFD}/functions/*.zsh; do source $file; done diff --git a/config/zsh/zshrc.d/03-highlighting.zsh b/config/zsh/config.d/03-highlighting.zsh similarity index 99% rename from config/zsh/zshrc.d/03-highlighting.zsh rename to config/zsh/config.d/03-highlighting.zsh index 2617e16..4faa24a 100644 --- a/config/zsh/zshrc.d/03-highlighting.zsh +++ b/config/zsh/config.d/03-highlighting.zsh @@ -268,7 +268,7 @@ ZSH_HIGHLIGHT_MAXLENGTH=10000 zmodload zsh/parameter 2>/dev/null autoload -U is-at-least -source "${DOTF_LIB}/highlight" +source "${DOTLIB}/highlight" [[ "${+termcap[Co]}" = 1 && "${termcap[Co]}" = "256" ]] && FAST_HIGHLIGHT_STYLES[variable]="fg=112" diff --git a/config/zsh/zshrc.d/04-autosuggest.zsh b/config/zsh/config.d/04-autosuggest.zsh similarity index 99% rename from config/zsh/zshrc.d/04-autosuggest.zsh rename to config/zsh/config.d/04-autosuggest.zsh index e82b8de..0bd96a3 100644 --- a/config/zsh/zshrc.d/04-autosuggest.zsh +++ b/config/zsh/config.d/04-autosuggest.zsh @@ -3,7 +3,7 @@ # v0.4.0 # Copyright (c) 2013 Thiago de Arruda # Copyright (c) 2016-2017 Eric Freese -# +# # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation # files (the "Software"), to deal in the Software without @@ -12,10 +12,10 @@ # copies of the Software, and to permit persons to whom the # Software is furnished to do so, subject to the following # conditions: -# +# # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES # OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff --git a/config/zsh/zshrc.d/aliases/dcompose.zsh b/config/zsh/config.d/aliases/dcompose.zsh similarity index 100% rename from config/zsh/zshrc.d/aliases/dcompose.zsh rename to config/zsh/config.d/aliases/dcompose.zsh diff --git a/config/zsh/config.d/aliases/os.zsh b/config/zsh/config.d/aliases/os.zsh new file mode 100644 index 0000000..b61d60e --- /dev/null +++ b/config/zsh/config.d/aliases/os.zsh @@ -0,0 +1,3 @@ +# Aliases for OS +if type pacman &>/dev/null; then source ${DOTCONFD}/aliases/os/archlinux.zsh; fi +if type apt-get &>/dev/null; then source ${DOTCONFD}/aliases/os/debian.zsh; fi diff --git a/config/zsh/zshrc.d/aliases/os/archlinux.zsh b/config/zsh/config.d/aliases/os/archlinux.zsh similarity index 99% rename from config/zsh/zshrc.d/aliases/os/archlinux.zsh rename to config/zsh/config.d/aliases/os/archlinux.zsh index 69b75f9..5ee9b9a 100644 --- a/config/zsh/zshrc.d/aliases/os/archlinux.zsh +++ b/config/zsh/config.d/aliases/os/archlinux.zsh @@ -15,7 +15,6 @@ if (( $+commands[yaourt] )); then alias yainsd='yaourt -S --asdeps' alias yamir='yaourt -Syy' - if (( $+commands[abs] && $+commands[aur] )); then alias yaupd='yaourt -Sy && sudo abs && sudo aur' elif (( $+commands[abs] )); then @@ -85,7 +84,6 @@ alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)' alias pacfileupg='sudo pacman -Fy' alias pacfiles='pacman tFs' - if (( $+commands[abs] && $+commands[aur] )); then alias pacupd='sudo pacman -Sy && sudo abs && sudo aur' elif (( $+commands[abs] )); then @@ -136,4 +134,3 @@ pacmansignkeys() { --no-permission-warning --command-fd 0 --edit-key $key done } - diff --git a/config/zsh/zshrc.d/aliases/os/debian.zsh b/config/zsh/config.d/aliases/os/debian.zsh similarity index 100% rename from config/zsh/zshrc.d/aliases/os/debian.zsh rename to config/zsh/config.d/aliases/os/debian.zsh diff --git a/config/zsh/zshrc.d/aliases/systemd.zsh b/config/zsh/config.d/aliases/systemd.zsh similarity index 100% rename from config/zsh/zshrc.d/aliases/systemd.zsh rename to config/zsh/config.d/aliases/systemd.zsh diff --git a/config/zsh/zshrc.d/exports/dotfiles.zsh b/config/zsh/config.d/exports/dotfiles.zsh similarity index 100% rename from config/zsh/zshrc.d/exports/dotfiles.zsh rename to config/zsh/config.d/exports/dotfiles.zsh diff --git a/config/zsh/zshrc.d/exports/other.zsh b/config/zsh/config.d/exports/other.zsh similarity index 100% rename from config/zsh/zshrc.d/exports/other.zsh rename to config/zsh/config.d/exports/other.zsh diff --git a/config/zsh/config.d/functions/cnf.zsh b/config/zsh/config.d/functions/cnf.zsh new file mode 100644 index 0000000..2a1d84d --- /dev/null +++ b/config/zsh/config.d/functions/cnf.zsh @@ -0,0 +1,2 @@ +[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found +[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh diff --git a/config/zsh/config.d/functions/dircolors.zsh b/config/zsh/config.d/functions/dircolors.zsh new file mode 100644 index 0000000..908b692 --- /dev/null +++ b/config/zsh/config.d/functions/dircolors.zsh @@ -0,0 +1 @@ +eval `dircolors ${DOTCONF}/dir/config` diff --git a/config/zsh/zshrc.d/functions/extract.zsh b/config/zsh/config.d/functions/extract.zsh similarity index 100% rename from config/zsh/zshrc.d/functions/extract.zsh rename to config/zsh/config.d/functions/extract.zsh diff --git a/config/zsh/zshrc.d/functions/fixatwork.zsh b/config/zsh/config.d/functions/fixatwork.zsh similarity index 100% rename from config/zsh/zshrc.d/functions/fixatwork.zsh rename to config/zsh/config.d/functions/fixatwork.zsh diff --git a/config/zsh/config.d/functions/fzf.zsh b/config/zsh/config.d/functions/fzf.zsh new file mode 100644 index 0000000..693fbae --- /dev/null +++ b/config/zsh/config.d/functions/fzf.zsh @@ -0,0 +1,2 @@ +[[ $- == *i* ]] && source "/usr/share/fzf/completion.zsh" 2> /dev/null +source "/usr/share/fzf/key-bindings.zsh" diff --git a/config/zsh/zshrc.d/functions/git.zsh b/config/zsh/config.d/functions/git.zsh similarity index 100% rename from config/zsh/zshrc.d/functions/git.zsh rename to config/zsh/config.d/functions/git.zsh diff --git a/config/zsh/zshrc.d/functions/gitignore.zsh b/config/zsh/config.d/functions/gitignore.zsh similarity index 94% rename from config/zsh/zshrc.d/functions/gitignore.zsh rename to config/zsh/config.d/functions/gitignore.zsh index 05bf312..2d2dfa6 100644 --- a/config/zsh/zshrc.d/functions/gitignore.zsh +++ b/config/zsh/config.d/functions/gitignore.zsh @@ -1,5 +1,5 @@ export ZSH_PLUGIN_GITIGNORE_PATH=$(dirname $0) -export ZSH_PLUGIN_GITIGNORE_TEMPLATE_PATHS=${DOTF_LIB}/gitignore +export ZSH_PLUGIN_GITIGNORE_TEMPLATE_PATHS=${DOTLIB}/gitignore function gie () { ${EDITOR} .gitignore diff --git a/config/zsh/zshrc.d/functions/tmux.zsh b/config/zsh/config.d/functions/tmux.zsh similarity index 98% rename from config/zsh/zshrc.d/functions/tmux.zsh rename to config/zsh/config.d/functions/tmux.zsh index 82b89e3..a3dac50 100644 --- a/config/zsh/zshrc.d/functions/tmux.zsh +++ b/config/zsh/config.d/functions/tmux.zsh @@ -38,7 +38,7 @@ if which tmux &> /dev/null # Get the absolute path to the current directory - local zsh_tmux_plugin_path="/home/eeleater/dotfiles/config/tmux" + local zsh_tmux_plugin_path=${DOTCONF}/tmux # Determine if the terminal supports 256 colors if [[ `tput colors` == "256" ]] diff --git a/config/zsh/zshrc.d/functions/transfer.zsh b/config/zsh/config.d/functions/transfer.zsh similarity index 100% rename from config/zsh/zshrc.d/functions/transfer.zsh rename to config/zsh/config.d/functions/transfer.zsh diff --git a/config/zsh/zshrc.d/functions/zshmarks.zsh b/config/zsh/config.d/functions/zshmarks.zsh similarity index 98% rename from config/zsh/zshrc.d/functions/zshmarks.zsh rename to config/zsh/config.d/functions/zshmarks.zsh index fc6526f..4c0e7cb 100644 --- a/config/zsh/zshrc.d/functions/zshmarks.zsh +++ b/config/zsh/config.d/functions/zshmarks.zsh @@ -8,7 +8,7 @@ # Set BOOKMARKS_FILE if it doesn't exist to the default. # Allows for a user-configured BOOKMARKS_FILE. if [[ -z $BOOKMARKS_FILE ]] ; then - export BOOKMARKS_FILE="$HOME/.bookmarks" + export BOOKMARKS_FILE=${DOTLIB}/bookmarks fi # Check if $BOOKMARKS_FILE is a symlink. diff --git a/config/zsh/zshrc b/config/zsh/zshrc deleted file mode 100644 index ace2bc5..0000000 --- a/config/zsh/zshrc +++ /dev/null @@ -1,20 +0,0 @@ -export DOTFILES="${HOME}/dotfiles" # Main Dotfile Folder -export DOTF_LIB="${DOTFILES}/lib" # Libraries Folder -export DOTF_BIN="${DOTFILES}/bin" # Binaries Folder -export DOTF_CONF="${DOTFILES}/config" # Config Folder -export ZSHRCD="${DOTF_CONF}/zsh/zshrc.d" # ZSHRC.D Folder - -# Export Path -export PATH="${DOTF_BIN}:${DOTF_LIB}/welder/bin:/opt/android-sdk/build-tools/26.0.0:${HOME}/.fzf/bin:${PATH}" - -# Export Editor -export EDITOR='nano' - -# Completions Paths -fpath+=(${DOTF_LIB}/completions/src ${DOTF_LIB}/local) - -for file in ${ZSHRCD}/*.zsh; do source $file; done - -# Prompt -autoload -U promptinit && promptinit -prompt filthy diff --git a/config/zsh/zshrc.d/00-ohmy.zsh b/config/zsh/zshrc.d/00-ohmy.zsh deleted file mode 100644 index 6e24d3a..0000000 --- a/config/zsh/zshrc.d/00-ohmy.zsh +++ /dev/null @@ -1,7 +0,0 @@ -export ZSH="${DOTF_LIB}/ohmyzsh" - -# Settings -#ZSH_THEME="mortalscumbag" -DISABLE_AUTO_UPDATE="true" - -source ${ZSH}/oh-my-zsh.sh diff --git a/config/zsh/zshrc.d/01-aliases.zsh b/config/zsh/zshrc.d/01-aliases.zsh deleted file mode 100644 index b2817b6..0000000 --- a/config/zsh/zshrc.d/01-aliases.zsh +++ /dev/null @@ -1,9 +0,0 @@ -alias rm='rm -i' -alias cp='cp -i' -alias mv='mv -i' -alias la='ls -lAh' - -clearall () { clear; printf '\033[3J' } -mkcd() { mkdir $1 &>/dev/null; [ -e $1 ] && cd $1 } - -for file in ${ZSHRCD}/aliases/*.zsh; do source $file; done diff --git a/config/zsh/zshrc.d/02-functions.zsh b/config/zsh/zshrc.d/02-functions.zsh deleted file mode 100644 index 351d44b..0000000 --- a/config/zsh/zshrc.d/02-functions.zsh +++ /dev/null @@ -1 +0,0 @@ -for file in ${ZSHRCD}/functions/*.zsh; do source $file; done diff --git a/config/zsh/zshrc.d/aliases/os.zsh b/config/zsh/zshrc.d/aliases/os.zsh deleted file mode 100644 index 61f7bc0..0000000 --- a/config/zsh/zshrc.d/aliases/os.zsh +++ /dev/null @@ -1,3 +0,0 @@ -# Aliases for OS -if type pacman &>/dev/null; then source ${ZSHRCD}/aliases/os/archlinux.zsh; fi -if type apt-get &>/dev/null; then source ${ZSHRCD}/aliases/os/debian.zsh; fi diff --git a/config/zsh/zshrc.d/functions/cnf.zsh b/config/zsh/zshrc.d/functions/cnf.zsh deleted file mode 100644 index 0e2f213..0000000 --- a/config/zsh/zshrc.d/functions/cnf.zsh +++ /dev/null @@ -1,33 +0,0 @@ -# Uses the command-not-found package zsh support -# as seen in http://www.porcheron.info/command-not-found-for-zsh/ -# this is installed in Ubuntu - -[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found - -# Arch Linux command-not-found support, you must have package pkgfile installed -# https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook -[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh - -# Fedora command-not-found support -if [ -f /usr/libexec/pk-command-not-found ]; then - command_not_found_handler () { - runcnf=1 - retval=127 - [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0 - [ ! -x /usr/libexec/packagekitd ] && runcnf=0 - if [ $runcnf -eq 1 ] - then - /usr/libexec/pk-command-not-found $@ - retval=$? - fi - return $retval - } -fi - -# OSX command-not-found support -# https://github.com/Homebrew/homebrew-command-not-found -if type brew &> /dev/null; then - if brew command command-not-found-init > /dev/null 2>&1; then - eval "$(brew command-not-found-init)"; - fi -fi diff --git a/config/zsh/zshrc.d/functions/dircolors.zsh b/config/zsh/zshrc.d/functions/dircolors.zsh deleted file mode 100644 index 36c4092..0000000 --- a/config/zsh/zshrc.d/functions/dircolors.zsh +++ /dev/null @@ -1 +0,0 @@ -eval `dircolors ${DOTF_CONF}/dir/dircolors` diff --git a/config/zsh/zshrc.d/functions/fzf.zsh b/config/zsh/zshrc.d/functions/fzf.zsh deleted file mode 100644 index 1da22f1..0000000 --- a/config/zsh/zshrc.d/functions/fzf.zsh +++ /dev/null @@ -1,2 +0,0 @@ -[[ $- == *i* ]] && source "/home/eeleater/.fzf/shell/completion.zsh" 2> /dev/null -source "/home/eeleater/.fzf/shell/key-bindings.zsh" diff --git a/install b/install index 84a8f05..ae08344 100755 --- a/install +++ b/install @@ -7,7 +7,7 @@ git submodule update --init --recursive echo "Installing Dotbot and Linking Files" -${BASEDIR}/lib/dotbot/bin/dotbot -d ${BASEDIR} -c config/dotbot/dotbot.yaml ${@} +${BASEDIR}/lib/dotbot/bin/dotbot -d ${BASEDIR} -c config/dotbot/config ${@} echo "Installing ZUnit" cd ${BASEDIR}/lib/zunit diff --git a/lib/fzf b/lib/fzf deleted file mode 160000 index bc39831..0000000 --- a/lib/fzf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bc3983181d992c564e069791b5c6549bde9bfeb3