From ecc95cf917c31aaf04743571a43b22f338d679be Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 8 Mar 2021 09:25:55 -0600 Subject: [PATCH] Cleanup and clarification --- common/bin/ezln | 5 +-- common/fish/.gitignore | 3 +- common/fish/fish_plugins | 2 -- common/fish/fish_variables | 71 -------------------------------------- readme.md | 2 ++ 5 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 common/fish/fish_plugins delete mode 100644 common/fish/fish_variables diff --git a/common/bin/ezln b/common/bin/ezln index 97036b3..acd54b6 100755 --- a/common/bin/ezln +++ b/common/bin/ezln @@ -1,5 +1,6 @@ #!/usr/bin/env bash -SOURCE=$(realpath "$1") # this one exists -DEST=$(realpath -m "$2") # this is the link to what exists +SOURCE="$(realpath "$1")" # this one exists +DEST="$(realpath -m "$2")" # this is the link to what exists +mkdir -p "$(dirname "$2")" ln -s "$SOURCE" "$DEST" diff --git a/common/fish/.gitignore b/common/fish/.gitignore index 1cc8a73..0fcf980 100644 --- a/common/fish/.gitignore +++ b/common/fish/.gitignore @@ -1,2 +1 @@ -fish_variables -functions +fish_* diff --git a/common/fish/fish_plugins b/common/fish/fish_plugins deleted file mode 100644 index acce9e2..0000000 --- a/common/fish/fish_plugins +++ /dev/null @@ -1,2 +0,0 @@ -jorgebucaran/fisher -evanlucas/fish-kubectl-completions diff --git a/common/fish/fish_variables b/common/fish/fish_variables deleted file mode 100644 index c4319ab..0000000 --- a/common/fish/fish_variables +++ /dev/null @@ -1,71 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR --export BROWSER:firefox\x2ddeveloper\x2dedition -SETUVAR --export CLUTTER_BACKEND:wayland -SETUVAR --export --path DOTFILES_PATH:/home/daniel/\x2ehome/\x2econfig/lytedev\x2ddotfiles -SETUVAR --export EDITOR:nvim -SETUVAR --export --path ENV_PATH:/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv -SETUVAR --export ERL_AFLAGS:\x2dkernel\x20shell_history\x20enabled\x20\x2dkernel\x20shell_history_file_bytes\x201024000 -SETUVAR --export EXA_COLORS:\x2a\x3d0 -SETUVAR --export --path FISH_PATH:/home/daniel/\x2ehome/\x2econfig/fish -SETUVAR --export --path GOPATH:/home/daniel/\x2ehome/\x2ego -SETUVAR --export LESS:\x2dr -SETUVAR --export LS_COLORS:ow\x3d01\x3b36\x3b40 -SETUVAR --export MANPAGER:env\x20MANWIDTH\x3d\x22\x22\x20nvim\x20\x2d\x2dcmd\x20\x22let\x20g\x3aprosession_on_startup\x3d0\x22\x20\x2bMan\x21 -SETUVAR --export MOZ_ENABLE_WAYLAND:1 -SETUVAR --export NICE_HOME:/home/daniel -SETUVAR --export --path NIX_PATH:\x1d -SETUVAR --export NNN_COLORS:1234 -SETUVAR --export NNN_FCOLORS:030304020005050805030501 -SETUVAR --export NNN_OPTS:EHacdx -SETUVAR --export NNN_PLUG:p\x3apreview -SETUVAR --export --path NOTES_PATH:/home/daniel/doc/notes -SETUVAR --export PAGER:less -SETUVAR --export --path SCROTS_PATH:/home/daniel/img/scrots -SETUVAR --export SDL_VIDEODRIVER:wayland -SETUVAR --export TERMINAL:kitty -SETUVAR --export --path TMUX_PLUGIN_MANAGER_PATH:/home/daniel/\x2ehome/\x2econfig/tmux/plugins/ -SETUVAR --export --path USER_LOGS_PATH:/home/daniel/doc/logs -SETUVAR --export VISUAL:nvim -SETUVAR --export XDG_CONFIG_HOME:/home/daniel/\x2ehome/\x2econfig -SETUVAR --export XDG_DESKTOP_DIR:/home/daniel/\x2ehome/desktop -SETUVAR --export XDG_DOCUMENTS_DIR:/home/daniel/doc -SETUVAR --export XDG_DOWNLOAD_DIR:/home/daniel/dl -SETUVAR --export XDG_GAMES_DIR:/home/daniel/games -SETUVAR --export XDG_MUSIC_DIR:/home/daniel/music -SETUVAR --export XDG_PICTURES_DIR:/home/daniel/img -SETUVAR --export XDG_PUBLICSHARE_DIR:/home/daniel/\x2ehome/public -SETUVAR --export XDG_TEMPLATES_DIR:/home/daniel/\x2ehome/templates -SETUVAR --export XDG_VIDEOS_DIR:/home/daniel/video -SETUVAR --export _JAVA_AWT_WM_NONREPARENTING:1 -SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:666\x1ebrblack -SETUVAR fish_color_cancel:333\x1ebrblack -SETUVAR fish_color_command:white -SETUVAR fish_color_comment:666\x1ebrblack -SETUVAR fish_color_cwd:magenta -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:red -SETUVAR fish_color_escape:yellow -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_match:blue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:blue -SETUVAR fish_color_param:white -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:blue -SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3d333 -SETUVAR fish_color_selection:blue -SETUVAR fish_color_status:red -SETUVAR fish_color_user:blue -SETUVAR fish_color_valid_path:yellow -SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_completion:white -SETUVAR fish_pager_color_description:magenta -SETUVAR fish_pager_color_prefix:blue -SETUVAR fish_pager_color_progress:white\x1e\x2d\x2dbackground\x3d333 -SETUVAR fish_user_paths:/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2ego\x1e/home/daniel/\x2ehome/\x2ego/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2ddotfiles/common/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/\x2ehidden/bin\x1e/home/daniel/\x2ehome/\x2ebin\x1e/home/daniel/\x2ehome/\x2ecargo/bin\x1e/home/daniel/\x2ehome/\x2enimble/bin\x1e/home/daniel/\x2ehome/\x2eyarn/bin\x1e/home/daniel/\x2ehome/\x2enetlify/helper/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/linux/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/third/bin diff --git a/readme.md b/readme.md index ff1153c..ecb8598 100644 --- a/readme.md +++ b/readme.md @@ -29,6 +29,8 @@ git clone https://git.lyte.dev/lytedev/dotfiles.git $dfp && cd $dfp ./common/bin/dotfiles-setup # symlink host/os-specific directories ezln ./os/linux $ENV_PATH/linux +# setup again once env has all the layers you want +dotfiles-setup ``` # Basic Usage