From 637fd71e3cdf0d06024b61e6c1e176dd23bee0e4 Mon Sep 17 00:00:00 2001 From: Charles Gould Date: Tue, 22 Nov 2022 00:56:51 -0500 Subject: [PATCH] install: undo mirroring $HOME --- {.config/fish => fish}/.gitignore | 0 {.config/fish => fish}/completions/fisher.fish | 0 {.config/fish => fish}/completions/license.fish | 0 {.config/fish => fish}/completions/replay.fish | 0 {.config/fish => fish}/completions/sdk.fish | 0 {.config/fish => fish}/completions/set_cursor.fish | 0 {.config/fish => fish}/conf.d/fzf.fish | 0 {.config/fish => fish}/conf.d/nix-env.fish | 0 {.config/fish => fish}/conf.d/sdk.fish | 0 {.config/fish => fish}/conf.d/xdg.fish | 0 {.config/fish => fish}/config.fish | 0 {.config/fish => fish}/fish_plugins | 0 {.config/fish => fish}/functions/battery.fish | 0 .../fish => fish}/functions/broken_symlinks.fish | 0 {.config/fish => fish}/functions/class_version.fish | 0 {.config/fish => fish}/functions/clone.fish | 0 {.config/fish => fish}/functions/confirm.fish | 0 {.config/fish => fish}/functions/diff.fish | 0 {.config/fish => fish}/functions/dns_flush.fish | 0 {.config/fish => fish}/functions/edit.fish | 0 {.config/fish => fish}/functions/expand_dots.fish | 0 {.config/fish => fish}/functions/fbrew.fish | 0 {.config/fish => fish}/functions/fish_colors.fish | 0 .../fish => fish}/functions/fish_colors_check.fish | 0 {.config/fish => fish}/functions/fish_vars.fish | 0 {.config/fish => fish}/functions/fisher.fish | 0 {.config/fish => fish}/functions/fishy.fish | 0 {.config/fish => fish}/functions/fkill.fish | 0 {.config/fish => fish}/functions/forget.fish | 0 {.config/fish => fish}/functions/hbrake.fish | 0 {.config/fish => fish}/functions/hr.fish | 0 {.config/fish => fish}/functions/license.fish | 0 {.config/fish => fish}/functions/man.fish | 0 {.config/fish => fish}/functions/manifest.fish | 0 {.config/fish => fish}/functions/mansearch.fish | 0 {.config/fish => fish}/functions/md5sum.fish | 0 {.config/fish => fish}/functions/mkcd.fish | 0 {.config/fish => fish}/functions/motd.fish | 0 {.config/fish => fish}/functions/nix_upgrade.fish | 0 {.config/fish => fish}/functions/npm_upgrade.fish | 0 {.config/fish => fish}/functions/pip_upgrade.fish | 0 {.config/fish => fish}/functions/port_listener.fish | 0 {.config/fish => fish}/functions/replay.fish | 0 {.config/fish => fish}/functions/sbt_clean.fish | 0 {.config/fish => fish}/functions/sdk.fish | 0 {.config/fish => fish}/functions/set_cursor.fish | 0 {.config/fish => fish}/functions/sha256sum.fish | 0 {.config/fish => fish}/functions/which.fish | 0 {.config/git => git}/config | 0 {.config/git => git}/ignore | 0 {.config/helix => helix}/config.toml | 0 {.config/helix => helix}/languages.toml | 0 install/install-nix-packages.sh | 2 +- install/install-symlinks.sh | 13 ++++++++++--- {.config/nix => nix}/nix.conf | 0 {.config/nix => nix}/packages.nix | 0 {.config/sbt => sbt}/plugins/.gitignore | 0 {.config/sbt => sbt}/plugins/plugins.sbt | 0 {.config/sbt => sbt}/settings/aliases.sbt | 0 {.config/sbt => sbt}/settings/prompt.sbt | 0 60 files changed, 11 insertions(+), 4 deletions(-) rename {.config/fish => fish}/.gitignore (100%) rename {.config/fish => fish}/completions/fisher.fish (100%) rename {.config/fish => fish}/completions/license.fish (100%) rename {.config/fish => fish}/completions/replay.fish (100%) rename {.config/fish => fish}/completions/sdk.fish (100%) rename {.config/fish => fish}/completions/set_cursor.fish (100%) rename {.config/fish => fish}/conf.d/fzf.fish (100%) rename {.config/fish => fish}/conf.d/nix-env.fish (100%) rename {.config/fish => fish}/conf.d/sdk.fish (100%) rename {.config/fish => fish}/conf.d/xdg.fish (100%) rename {.config/fish => fish}/config.fish (100%) rename {.config/fish => fish}/fish_plugins (100%) rename {.config/fish => fish}/functions/battery.fish (100%) rename {.config/fish => fish}/functions/broken_symlinks.fish (100%) rename {.config/fish => fish}/functions/class_version.fish (100%) rename {.config/fish => fish}/functions/clone.fish (100%) rename {.config/fish => fish}/functions/confirm.fish (100%) rename {.config/fish => fish}/functions/diff.fish (100%) rename {.config/fish => fish}/functions/dns_flush.fish (100%) rename {.config/fish => fish}/functions/edit.fish (100%) rename {.config/fish => fish}/functions/expand_dots.fish (100%) rename {.config/fish => fish}/functions/fbrew.fish (100%) rename {.config/fish => fish}/functions/fish_colors.fish (100%) rename {.config/fish => fish}/functions/fish_colors_check.fish (100%) rename {.config/fish => fish}/functions/fish_vars.fish (100%) rename {.config/fish => fish}/functions/fisher.fish (100%) rename {.config/fish => fish}/functions/fishy.fish (100%) rename {.config/fish => fish}/functions/fkill.fish (100%) rename {.config/fish => fish}/functions/forget.fish (100%) rename {.config/fish => fish}/functions/hbrake.fish (100%) rename {.config/fish => fish}/functions/hr.fish (100%) rename {.config/fish => fish}/functions/license.fish (100%) rename {.config/fish => fish}/functions/man.fish (100%) rename {.config/fish => fish}/functions/manifest.fish (100%) rename {.config/fish => fish}/functions/mansearch.fish (100%) rename {.config/fish => fish}/functions/md5sum.fish (100%) rename {.config/fish => fish}/functions/mkcd.fish (100%) rename {.config/fish => fish}/functions/motd.fish (100%) rename {.config/fish => fish}/functions/nix_upgrade.fish (100%) rename {.config/fish => fish}/functions/npm_upgrade.fish (100%) rename {.config/fish => fish}/functions/pip_upgrade.fish (100%) rename {.config/fish => fish}/functions/port_listener.fish (100%) rename {.config/fish => fish}/functions/replay.fish (100%) rename {.config/fish => fish}/functions/sbt_clean.fish (100%) rename {.config/fish => fish}/functions/sdk.fish (100%) rename {.config/fish => fish}/functions/set_cursor.fish (100%) rename {.config/fish => fish}/functions/sha256sum.fish (100%) rename {.config/fish => fish}/functions/which.fish (100%) rename {.config/git => git}/config (100%) rename {.config/git => git}/ignore (100%) rename {.config/helix => helix}/config.toml (100%) rename {.config/helix => helix}/languages.toml (100%) rename {.config/nix => nix}/nix.conf (100%) rename {.config/nix => nix}/packages.nix (100%) rename {.config/sbt => sbt}/plugins/.gitignore (100%) rename {.config/sbt => sbt}/plugins/plugins.sbt (100%) rename {.config/sbt => sbt}/settings/aliases.sbt (100%) rename {.config/sbt => sbt}/settings/prompt.sbt (100%) diff --git a/.config/fish/.gitignore b/fish/.gitignore similarity index 100% rename from .config/fish/.gitignore rename to fish/.gitignore diff --git a/.config/fish/completions/fisher.fish b/fish/completions/fisher.fish similarity index 100% rename from .config/fish/completions/fisher.fish rename to fish/completions/fisher.fish diff --git a/.config/fish/completions/license.fish b/fish/completions/license.fish similarity index 100% rename from .config/fish/completions/license.fish rename to fish/completions/license.fish diff --git a/.config/fish/completions/replay.fish b/fish/completions/replay.fish similarity index 100% rename from .config/fish/completions/replay.fish rename to fish/completions/replay.fish diff --git a/.config/fish/completions/sdk.fish b/fish/completions/sdk.fish similarity index 100% rename from .config/fish/completions/sdk.fish rename to fish/completions/sdk.fish diff --git a/.config/fish/completions/set_cursor.fish b/fish/completions/set_cursor.fish similarity index 100% rename from .config/fish/completions/set_cursor.fish rename to fish/completions/set_cursor.fish diff --git a/.config/fish/conf.d/fzf.fish b/fish/conf.d/fzf.fish similarity index 100% rename from .config/fish/conf.d/fzf.fish rename to fish/conf.d/fzf.fish diff --git a/.config/fish/conf.d/nix-env.fish b/fish/conf.d/nix-env.fish similarity index 100% rename from .config/fish/conf.d/nix-env.fish rename to fish/conf.d/nix-env.fish diff --git a/.config/fish/conf.d/sdk.fish b/fish/conf.d/sdk.fish similarity index 100% rename from .config/fish/conf.d/sdk.fish rename to fish/conf.d/sdk.fish diff --git a/.config/fish/conf.d/xdg.fish b/fish/conf.d/xdg.fish similarity index 100% rename from .config/fish/conf.d/xdg.fish rename to fish/conf.d/xdg.fish diff --git a/.config/fish/config.fish b/fish/config.fish similarity index 100% rename from .config/fish/config.fish rename to fish/config.fish diff --git a/.config/fish/fish_plugins b/fish/fish_plugins similarity index 100% rename from .config/fish/fish_plugins rename to fish/fish_plugins diff --git a/.config/fish/functions/battery.fish b/fish/functions/battery.fish similarity index 100% rename from .config/fish/functions/battery.fish rename to fish/functions/battery.fish diff --git a/.config/fish/functions/broken_symlinks.fish b/fish/functions/broken_symlinks.fish similarity index 100% rename from .config/fish/functions/broken_symlinks.fish rename to fish/functions/broken_symlinks.fish diff --git a/.config/fish/functions/class_version.fish b/fish/functions/class_version.fish similarity index 100% rename from .config/fish/functions/class_version.fish rename to fish/functions/class_version.fish diff --git a/.config/fish/functions/clone.fish b/fish/functions/clone.fish similarity index 100% rename from .config/fish/functions/clone.fish rename to fish/functions/clone.fish diff --git a/.config/fish/functions/confirm.fish b/fish/functions/confirm.fish similarity index 100% rename from .config/fish/functions/confirm.fish rename to fish/functions/confirm.fish diff --git a/.config/fish/functions/diff.fish b/fish/functions/diff.fish similarity index 100% rename from .config/fish/functions/diff.fish rename to fish/functions/diff.fish diff --git a/.config/fish/functions/dns_flush.fish b/fish/functions/dns_flush.fish similarity index 100% rename from .config/fish/functions/dns_flush.fish rename to fish/functions/dns_flush.fish diff --git a/.config/fish/functions/edit.fish b/fish/functions/edit.fish similarity index 100% rename from .config/fish/functions/edit.fish rename to fish/functions/edit.fish diff --git a/.config/fish/functions/expand_dots.fish b/fish/functions/expand_dots.fish similarity index 100% rename from .config/fish/functions/expand_dots.fish rename to fish/functions/expand_dots.fish diff --git a/.config/fish/functions/fbrew.fish b/fish/functions/fbrew.fish similarity index 100% rename from .config/fish/functions/fbrew.fish rename to fish/functions/fbrew.fish diff --git a/.config/fish/functions/fish_colors.fish b/fish/functions/fish_colors.fish similarity index 100% rename from .config/fish/functions/fish_colors.fish rename to fish/functions/fish_colors.fish diff --git a/.config/fish/functions/fish_colors_check.fish b/fish/functions/fish_colors_check.fish similarity index 100% rename from .config/fish/functions/fish_colors_check.fish rename to fish/functions/fish_colors_check.fish diff --git a/.config/fish/functions/fish_vars.fish b/fish/functions/fish_vars.fish similarity index 100% rename from .config/fish/functions/fish_vars.fish rename to fish/functions/fish_vars.fish diff --git a/.config/fish/functions/fisher.fish b/fish/functions/fisher.fish similarity index 100% rename from .config/fish/functions/fisher.fish rename to fish/functions/fisher.fish diff --git a/.config/fish/functions/fishy.fish b/fish/functions/fishy.fish similarity index 100% rename from .config/fish/functions/fishy.fish rename to fish/functions/fishy.fish diff --git a/.config/fish/functions/fkill.fish b/fish/functions/fkill.fish similarity index 100% rename from .config/fish/functions/fkill.fish rename to fish/functions/fkill.fish diff --git a/.config/fish/functions/forget.fish b/fish/functions/forget.fish similarity index 100% rename from .config/fish/functions/forget.fish rename to fish/functions/forget.fish diff --git a/.config/fish/functions/hbrake.fish b/fish/functions/hbrake.fish similarity index 100% rename from .config/fish/functions/hbrake.fish rename to fish/functions/hbrake.fish diff --git a/.config/fish/functions/hr.fish b/fish/functions/hr.fish similarity index 100% rename from .config/fish/functions/hr.fish rename to fish/functions/hr.fish diff --git a/.config/fish/functions/license.fish b/fish/functions/license.fish similarity index 100% rename from .config/fish/functions/license.fish rename to fish/functions/license.fish diff --git a/.config/fish/functions/man.fish b/fish/functions/man.fish similarity index 100% rename from .config/fish/functions/man.fish rename to fish/functions/man.fish diff --git a/.config/fish/functions/manifest.fish b/fish/functions/manifest.fish similarity index 100% rename from .config/fish/functions/manifest.fish rename to fish/functions/manifest.fish diff --git a/.config/fish/functions/mansearch.fish b/fish/functions/mansearch.fish similarity index 100% rename from .config/fish/functions/mansearch.fish rename to fish/functions/mansearch.fish diff --git a/.config/fish/functions/md5sum.fish b/fish/functions/md5sum.fish similarity index 100% rename from .config/fish/functions/md5sum.fish rename to fish/functions/md5sum.fish diff --git a/.config/fish/functions/mkcd.fish b/fish/functions/mkcd.fish similarity index 100% rename from .config/fish/functions/mkcd.fish rename to fish/functions/mkcd.fish diff --git a/.config/fish/functions/motd.fish b/fish/functions/motd.fish similarity index 100% rename from .config/fish/functions/motd.fish rename to fish/functions/motd.fish diff --git a/.config/fish/functions/nix_upgrade.fish b/fish/functions/nix_upgrade.fish similarity index 100% rename from .config/fish/functions/nix_upgrade.fish rename to fish/functions/nix_upgrade.fish diff --git a/.config/fish/functions/npm_upgrade.fish b/fish/functions/npm_upgrade.fish similarity index 100% rename from .config/fish/functions/npm_upgrade.fish rename to fish/functions/npm_upgrade.fish diff --git a/.config/fish/functions/pip_upgrade.fish b/fish/functions/pip_upgrade.fish similarity index 100% rename from .config/fish/functions/pip_upgrade.fish rename to fish/functions/pip_upgrade.fish diff --git a/.config/fish/functions/port_listener.fish b/fish/functions/port_listener.fish similarity index 100% rename from .config/fish/functions/port_listener.fish rename to fish/functions/port_listener.fish diff --git a/.config/fish/functions/replay.fish b/fish/functions/replay.fish similarity index 100% rename from .config/fish/functions/replay.fish rename to fish/functions/replay.fish diff --git a/.config/fish/functions/sbt_clean.fish b/fish/functions/sbt_clean.fish similarity index 100% rename from .config/fish/functions/sbt_clean.fish rename to fish/functions/sbt_clean.fish diff --git a/.config/fish/functions/sdk.fish b/fish/functions/sdk.fish similarity index 100% rename from .config/fish/functions/sdk.fish rename to fish/functions/sdk.fish diff --git a/.config/fish/functions/set_cursor.fish b/fish/functions/set_cursor.fish similarity index 100% rename from .config/fish/functions/set_cursor.fish rename to fish/functions/set_cursor.fish diff --git a/.config/fish/functions/sha256sum.fish b/fish/functions/sha256sum.fish similarity index 100% rename from .config/fish/functions/sha256sum.fish rename to fish/functions/sha256sum.fish diff --git a/.config/fish/functions/which.fish b/fish/functions/which.fish similarity index 100% rename from .config/fish/functions/which.fish rename to fish/functions/which.fish diff --git a/.config/git/config b/git/config similarity index 100% rename from .config/git/config rename to git/config diff --git a/.config/git/ignore b/git/ignore similarity index 100% rename from .config/git/ignore rename to git/ignore diff --git a/.config/helix/config.toml b/helix/config.toml similarity index 100% rename from .config/helix/config.toml rename to helix/config.toml diff --git a/.config/helix/languages.toml b/helix/languages.toml similarity index 100% rename from .config/helix/languages.toml rename to helix/languages.toml diff --git a/install/install-nix-packages.sh b/install/install-nix-packages.sh index f7707de..ce080d5 100755 --- a/install/install-nix-packages.sh +++ b/install/install-nix-packages.sh @@ -9,7 +9,7 @@ found_nix_command=0 for profile in "$HOME/.nix-profile" "/nix/var/nix/profiles/default" do if test -x "$profile/bin/nix-env"; then - "$profile/bin/nix-env" --install --remove-all --file "$ROOTDIR/.config/nix/packages.nix" + "$profile/bin/nix-env" --install --remove-all --file "$ROOTDIR/nix/packages.nix" found_nix_command=1 break fi diff --git a/install/install-symlinks.sh b/install/install-symlinks.sh index 7f9a24c..b6647c2 100755 --- a/install/install-symlinks.sh +++ b/install/install-symlinks.sh @@ -7,8 +7,9 @@ ROOTDIR=$(cd "$(dirname "$0")/.." && pwd) # Create config directory if not present mkdir -p "$HOME/.config" -for srcdir in $(find "$ROOTDIR/.config" -mindepth 1 -maxdepth 1 -type d); do - dstdir="$HOME/.config/$(basename $srcdir)" +install_symlink() { + local srcdir="$1" + local dstdir="$2" # Backup configs that are not already symlinked if [ -e "$dstdir" ] && [ ! -L "$dstdir" ]; then @@ -17,6 +18,12 @@ for srcdir in $(find "$ROOTDIR/.config" -mindepth 1 -maxdepth 1 -type d); do # Create symlinks, forcing updates ln -fnsv "$srcdir" "$dstdir" -done +} + +install_symlink "$ROOTDIR/fish" "$HOME/.config/fish" +install_symlink "$ROOTDIR/git" "$HOME/.config/git" +install_symlink "$ROOTDIR/helix" "$HOME/.config/helix" +install_symlink "$ROOTDIR/nix" "$HOME/.config/nix" +install_symlink "$ROOTDIR/sbt" "$HOME/.config/sbt" echo diff --git a/.config/nix/nix.conf b/nix/nix.conf similarity index 100% rename from .config/nix/nix.conf rename to nix/nix.conf diff --git a/.config/nix/packages.nix b/nix/packages.nix similarity index 100% rename from .config/nix/packages.nix rename to nix/packages.nix diff --git a/.config/sbt/plugins/.gitignore b/sbt/plugins/.gitignore similarity index 100% rename from .config/sbt/plugins/.gitignore rename to sbt/plugins/.gitignore diff --git a/.config/sbt/plugins/plugins.sbt b/sbt/plugins/plugins.sbt similarity index 100% rename from .config/sbt/plugins/plugins.sbt rename to sbt/plugins/plugins.sbt diff --git a/.config/sbt/settings/aliases.sbt b/sbt/settings/aliases.sbt similarity index 100% rename from .config/sbt/settings/aliases.sbt rename to sbt/settings/aliases.sbt diff --git a/.config/sbt/settings/prompt.sbt b/sbt/settings/prompt.sbt similarity index 100% rename from .config/sbt/settings/prompt.sbt rename to sbt/settings/prompt.sbt