From 832fa5ee30b6ebf5a9685de596c36e1c2211a2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Sun, 15 Oct 2017 20:50:00 +0200 Subject: [PATCH] Grouping stuff --- install.sh | 7 ++--- {NAS_mounts => network/NAS_mounts}/auto_nas | 0 .../NAS_mounts}/fix_mounts.sh | 0 .../org.autonomous.fixmounts.plist | 0 {NAS_mounts => network/NAS_mounts}/setup.sh | 10 ++++-- {git => network/git}/gitconfig | 0 {git => network/git}/gitignore_global | 0 {git => network/git}/setup.sh | 6 ++-- network/setup.sh | 16 ++++++++++ {ssh => network/ssh}/config | 0 {ssh => network/ssh}/setup.sh | 4 ++- system/setup.sh | 16 ++++++++++ homebrew/setup.sh => system/setup_homebrew.sh | 12 ++----- {fish => terminal/fish}/config.fish | 0 terminal/fish/fishd.10ddb19c5a35 | 31 +++++++++++++++++++ {fish => terminal/fish}/functions/bubu.fish | 0 .../fish}/functions/fish_greeting.fish | 0 .../fish}/functions/fish_prompt.fish | 0 .../fish}/functions/fish_right_prompt.fish | 0 .../functions/fish_user_key_bindings.fish | 0 {fish => terminal/fish}/functions/g.fish | 0 {fish => terminal/fish}/functions/greb.fish | 0 {fish => terminal/fish}/functions/man.fish | 0 {fish => terminal/fish}/functions/mcd.fish | 0 .../fish}/functions/try_subst.fish | 0 {fish => terminal/fish}/setup.sh | 8 +++-- terminal/{ => kitty}/kitty.conf | 0 terminal/kitty/setup.sh | 21 +++++++++++++ terminal/setup.sh | 15 +++------ wm/setup.sh | 11 +++++-- 30 files changed, 120 insertions(+), 37 deletions(-) rename {NAS_mounts => network/NAS_mounts}/auto_nas (100%) rename {NAS_mounts => network/NAS_mounts}/fix_mounts.sh (100%) rename {NAS_mounts => network/NAS_mounts}/org.autonomous.fixmounts.plist (100%) rename {NAS_mounts => network/NAS_mounts}/setup.sh (91%) rename {git => network/git}/gitconfig (100%) rename {git => network/git}/gitignore_global (100%) rename {git => network/git}/setup.sh (63%) create mode 100755 network/setup.sh rename {ssh => network/ssh}/config (100%) rename {ssh => network/ssh}/setup.sh (69%) create mode 100644 system/setup.sh rename homebrew/setup.sh => system/setup_homebrew.sh (62%) rename {fish => terminal/fish}/config.fish (100%) create mode 100644 terminal/fish/fishd.10ddb19c5a35 rename {fish => terminal/fish}/functions/bubu.fish (100%) rename {fish => terminal/fish}/functions/fish_greeting.fish (100%) rename {fish => terminal/fish}/functions/fish_prompt.fish (100%) rename {fish => terminal/fish}/functions/fish_right_prompt.fish (100%) rename {fish => terminal/fish}/functions/fish_user_key_bindings.fish (100%) rename {fish => terminal/fish}/functions/g.fish (100%) rename {fish => terminal/fish}/functions/greb.fish (100%) rename {fish => terminal/fish}/functions/man.fish (100%) rename {fish => terminal/fish}/functions/mcd.fish (100%) rename {fish => terminal/fish}/functions/try_subst.fish (100%) rename {fish => terminal/fish}/setup.sh (63%) rename terminal/{ => kitty}/kitty.conf (100%) create mode 100755 terminal/kitty/setup.sh diff --git a/install.sh b/install.sh index 0fc3b81..33d08fe 100755 --- a/install.sh +++ b/install.sh @@ -2,10 +2,7 @@ DOTFILES="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" -${DOTFILES}/homebrew/setup.sh -${DOTFILES}/ssh/setup.sh -${DOTFILES}/git/setup.sh -${DOTFILES}/NAS_mounts/setup.sh +${DOTFILES}/system/setup.sh +${DOTFILES}/network/setup.sh ${DOTFILES}/terminal/setup.sh -${DOTFILES}/fish/setup.sh ${DOTFILES}/wm/setup.sh diff --git a/NAS_mounts/auto_nas b/network/NAS_mounts/auto_nas similarity index 100% rename from NAS_mounts/auto_nas rename to network/NAS_mounts/auto_nas diff --git a/NAS_mounts/fix_mounts.sh b/network/NAS_mounts/fix_mounts.sh similarity index 100% rename from NAS_mounts/fix_mounts.sh rename to network/NAS_mounts/fix_mounts.sh diff --git a/NAS_mounts/org.autonomous.fixmounts.plist b/network/NAS_mounts/org.autonomous.fixmounts.plist similarity index 100% rename from NAS_mounts/org.autonomous.fixmounts.plist rename to network/NAS_mounts/org.autonomous.fixmounts.plist diff --git a/NAS_mounts/setup.sh b/network/NAS_mounts/setup.sh similarity index 91% rename from NAS_mounts/setup.sh rename to network/NAS_mounts/setup.sh index b77bc00..3c856b4 100755 --- a/NAS_mounts/setup.sh +++ b/network/NAS_mounts/setup.sh @@ -4,6 +4,8 @@ source ${DOTFILES}/helpers.sh function main() { + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + print_info "Setting up user homedir mounts" makedir "${HOME}/mnt" @@ -26,7 +28,7 @@ function main() sed -e "s/\[\[USERNAME\]\]/${NAS_USERNAME}/" \ -e "s/\[\[PASSWORD\]\]/${NAS_PASSWORD}/" \ -e "s/\[\[UNAME\]\]/$(whoami)/" \ - < "${DOTFILES}/NAS_mounts/auto_nas" \ + < "${scriptdir}/auto_nas" \ | sudo tee "/etc/${auto_file}" \ > /dev/null @@ -59,7 +61,7 @@ function main() # Copy and set up mount-fixing script if [ ! -f "${script}" ]; then sed -e "s/\[\[USERNAME\]\]/$(whoami)/" \ - < "${DOTFILES}/NAS_mounts/fix_mounts.sh" \ + < "${scriptdir}/fix_mounts.sh" \ > "${script}" chmod +x "${script}" fi @@ -67,13 +69,15 @@ function main() # Install a launchd service to run it every 15 seconds if [ ! -f "${plistloc}" ]; then sed -e "s/\[\[USERNAME\]\]/$(whoami)/" \ - < "${DOTFILES}/NAS_mounts/${plist}" \ + < "${scriptdir}/${plist}" \ | sudo tee "${plistloc}" \ > /dev/null sudo chmod 644 "${plistloc}" sudo launchctl load "${plistloc}" + + sudo autmount -vc fi print_ok "User homedir mounts set up" diff --git a/git/gitconfig b/network/git/gitconfig similarity index 100% rename from git/gitconfig rename to network/git/gitconfig diff --git a/git/gitignore_global b/network/git/gitignore_global similarity index 100% rename from git/gitignore_global rename to network/git/gitignore_global diff --git a/git/setup.sh b/network/git/setup.sh similarity index 63% rename from git/setup.sh rename to network/git/setup.sh index 6737220..998251a 100755 --- a/git/setup.sh +++ b/network/git/setup.sh @@ -4,6 +4,8 @@ source ${DOTFILES}/helpers.sh function main() { + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + print_info "Configuring git" brewget git @@ -11,9 +13,9 @@ function main() if [ ! -f "${HOME}/.gitconfig" ]; then cat << EOF > ${HOME}/.gitconfig [include] - path = ${DOTFILES}/git/gitconfig + path = ${scriptdir}/gitconfig [core] - excludesfile = ${DOTFILES}/git/gitignore_global + excludesfile = ${scriptdir}/gitignore_global EOF fi diff --git a/network/setup.sh b/network/setup.sh new file mode 100755 index 0000000..edaeba7 --- /dev/null +++ b/network/setup.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +source ${DOTFILES}/helpers.sh + +function main() +{ + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + + ${scriptdir}/ssh/setup.sh + ${scriptdir}/git/setup.sh + ${scriptdir}/NAS_mounts/setup.sh + + brewget arp-scan +} + +main "$@" diff --git a/ssh/config b/network/ssh/config similarity index 100% rename from ssh/config rename to network/ssh/config diff --git a/ssh/setup.sh b/network/ssh/setup.sh similarity index 69% rename from ssh/setup.sh rename to network/ssh/setup.sh index bb1110f..4c7e9a8 100755 --- a/ssh/setup.sh +++ b/network/ssh/setup.sh @@ -4,12 +4,14 @@ source ${DOTFILES}/helpers.sh function main() { + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + print_info "Setting up SSH" # copy private key to .ssh # cp ${KEYFILE} ~/.ssh/thomas_rsa # chmod 400 ~/.ssh/thomas_rsa # ssh-add -K ~/.ssh/thomas_rsa - linkfile ${DOTFILES}/ssh/config ${HOME}/.ssh/config + linkfile ${scriptdir}/config ${HOME}/.ssh/config print_ok "SSH settings installed" } diff --git a/system/setup.sh b/system/setup.sh new file mode 100644 index 0000000..cb1a094 --- /dev/null +++ b/system/setup.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +source ${DOTFILES}/helpers.sh + +function main() +{ + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + + ${scriptdir}/setup_homebrew.sh + + caskget google-chrome + caskget docker + +} + +main "$@" diff --git a/homebrew/setup.sh b/system/setup_homebrew.sh similarity index 62% rename from homebrew/setup.sh rename to system/setup_homebrew.sh index b981db3..e3d2d3e 100755 --- a/homebrew/setup.sh +++ b/system/setup_homebrew.sh @@ -4,7 +4,7 @@ source ${DOTFILES}/helpers.sh function main() { - print_info "Setting up homebrew and brewing misc stuff" + print_info "Setting up homebrew" if ! which brew>/dev/null; then echo "Installing Homebrew" @@ -16,15 +16,7 @@ function main() brew tap caskroom/cask fi - - caskget google-chrome - caskget docker - caskget caskroom/drivers/logitech-options - - brewget arp-scan - brewget neovim - - print_ok "Homebrew and misc. brews insalled" + print_ok "Homebrew insalled" } main "$@" diff --git a/fish/config.fish b/terminal/fish/config.fish similarity index 100% rename from fish/config.fish rename to terminal/fish/config.fish diff --git a/terminal/fish/fishd.10ddb19c5a35 b/terminal/fish/fishd.10ddb19c5a35 new file mode 100644 index 0000000..93eb0b8 --- /dev/null +++ b/terminal/fish/fishd.10ddb19c5a35 @@ -0,0 +1,31 @@ +# This file is automatically generated by the fish. +# Do NOT edit it directly, your changes will be overwritten. +SET __fish_init_2_39_8:\x1d +SET __fish_init_2_3_0:\x1d +SET fish_color_autosuggestion:555\x1ebrblack +SET fish_color_cancel:\x2dr +SET fish_color_command:\x2d\x2dbold +SET fish_color_comment:red +SET fish_color_cwd:green +SET fish_color_cwd_root:red +SET fish_color_end:brmagenta +SET fish_color_error:brred +SET fish_color_escape:bryellow\x1e\x2d\x2dbold +SET fish_color_history_current:\x2d\x2dbold +SET fish_color_host:normal +SET fish_color_match:\x2d\x2dbackground\x3dbrblue +SET fish_color_normal:normal +SET fish_color_operator:bryellow +SET fish_color_param:cyan +SET fish_color_quote:yellow +SET fish_color_redirection:brblue +SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SET fish_color_user:brgreen +SET fish_color_valid_path:\x2d\x2dunderline +SET fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell +SET fish_key_bindings:fish_default_key_bindings +SET fish_pager_color_completion:\x1d +SET fish_pager_color_description:B3A06D\x1eyellow +SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/fish/functions/bubu.fish b/terminal/fish/functions/bubu.fish similarity index 100% rename from fish/functions/bubu.fish rename to terminal/fish/functions/bubu.fish diff --git a/fish/functions/fish_greeting.fish b/terminal/fish/functions/fish_greeting.fish similarity index 100% rename from fish/functions/fish_greeting.fish rename to terminal/fish/functions/fish_greeting.fish diff --git a/fish/functions/fish_prompt.fish b/terminal/fish/functions/fish_prompt.fish similarity index 100% rename from fish/functions/fish_prompt.fish rename to terminal/fish/functions/fish_prompt.fish diff --git a/fish/functions/fish_right_prompt.fish b/terminal/fish/functions/fish_right_prompt.fish similarity index 100% rename from fish/functions/fish_right_prompt.fish rename to terminal/fish/functions/fish_right_prompt.fish diff --git a/fish/functions/fish_user_key_bindings.fish b/terminal/fish/functions/fish_user_key_bindings.fish similarity index 100% rename from fish/functions/fish_user_key_bindings.fish rename to terminal/fish/functions/fish_user_key_bindings.fish diff --git a/fish/functions/g.fish b/terminal/fish/functions/g.fish similarity index 100% rename from fish/functions/g.fish rename to terminal/fish/functions/g.fish diff --git a/fish/functions/greb.fish b/terminal/fish/functions/greb.fish similarity index 100% rename from fish/functions/greb.fish rename to terminal/fish/functions/greb.fish diff --git a/fish/functions/man.fish b/terminal/fish/functions/man.fish similarity index 100% rename from fish/functions/man.fish rename to terminal/fish/functions/man.fish diff --git a/fish/functions/mcd.fish b/terminal/fish/functions/mcd.fish similarity index 100% rename from fish/functions/mcd.fish rename to terminal/fish/functions/mcd.fish diff --git a/fish/functions/try_subst.fish b/terminal/fish/functions/try_subst.fish similarity index 100% rename from fish/functions/try_subst.fish rename to terminal/fish/functions/try_subst.fish diff --git a/fish/setup.sh b/terminal/fish/setup.sh similarity index 63% rename from fish/setup.sh rename to terminal/fish/setup.sh index fd81806..1aac98a 100755 --- a/fish/setup.sh +++ b/terminal/fish/setup.sh @@ -4,6 +4,8 @@ source ${DOTFILES}/helpers.sh function main() { + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + print_info "Installing fish shell" # Install fish shell @@ -18,11 +20,11 @@ function main() # Install configuration files makedir ${HOME}/.config - if ! head -n 1 ${DOTFILES}/fish/config.fish | grep ${DOTFILES} >/dev/null; then - sed -i '' "1s;.*;set -x DOTFILES ${DOTFILES};" ${DOTFILES}/fish/config.fish + if ! head -n 1 ${scriptdir}/config.fish | grep ${DOTFILES} >/dev/null; then + sed -i '' "1s;.*;set -x DOTFILES ${DOTFILES};" ${scriptdir}/config.fish fi - linkfile ${DOTFILES}/fish ${HOME}/.config/fish + linkfile ${scriptdir} ${HOME}/.config/fish print_ok "Fish shell installed" } diff --git a/terminal/kitty.conf b/terminal/kitty/kitty.conf similarity index 100% rename from terminal/kitty.conf rename to terminal/kitty/kitty.conf diff --git a/terminal/kitty/setup.sh b/terminal/kitty/setup.sh new file mode 100755 index 0000000..900a73e --- /dev/null +++ b/terminal/kitty/setup.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +source ${DOTFILES}/helpers.sh + +function main() +{ + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + + print_info "Installing kitty terminal" + + # Copy kitty.app to /Applications + # cp ${KITTY_PATH} /Applications/. + + # Install configuration file + linkfile ${scriptdir}/kitty.conf ${HOME}/Library/Preferences/kitty/kitty.conf + + print_ok "Kitty terminal installed" + +} + +main "$@" diff --git a/terminal/setup.sh b/terminal/setup.sh index 2ca07d9..fdfd938 100755 --- a/terminal/setup.sh +++ b/terminal/setup.sh @@ -4,21 +4,16 @@ source ${DOTFILES}/helpers.sh function main() { - print_info "Installing kitty terminal" + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" - # Copy kitty.app to /Applications - # cp ${KITTY_PATH} /Applications/. - - # Install configuration file - linkfile ${DOTFILES}/terminal/kitty.conf ${HOME}/Library/Preferences/kitty/kitty.conf - - print_ok "Kitty terminal installed" + ${scriptdir}/kitty/setup.sh + ${scriptdir}/fish/setup.sh print_info "Installing terminal applications" - brewget tmux - + brewget neovim print_ok "Terminal applications installed" + } main "$@" diff --git a/wm/setup.sh b/wm/setup.sh index 5450d99..cb9ac6d 100755 --- a/wm/setup.sh +++ b/wm/setup.sh @@ -4,22 +4,27 @@ source ${DOTFILES}/helpers.sh function main() { + local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" + print_info "Installing window manager" # Install chunkwm and khd brewget crisidev/homebrew-chunkwm/chunkwm brewget keokeishiya/formulae/khd # Link configuration files - linkfile ${DOTFILES}/wm/khdrc ${HOME}/.khdrc - linkfile ${DOTFILES}/wm/chunkwmrc ${HOME}/.chunkwmrc + linkfile ${scriptdir}/khdrc ${HOME}/.khdrc + linkfile ${scriptdir}/chunkwmrc ${HOME}/.chunkwmrc # Start services if ! brew services list | grep chunkwm >/dev/null; then brew services start khd brew services start chunkwm fi - print_ok "Window manager installed and activated" + + print_info "Installing logitech drivers" + caskget caskroom/drivers/logitech-options + print_ok "Logitech drivers installed" } main "$@"