From d461bd6c1dea4677c3f1c113948c1fe71b304752 Mon Sep 17 00:00:00 2001 From: Nathan Knowler Date: Fri, 30 Oct 2020 00:01:38 -0500 Subject: [PATCH] Use the bare repo method --- system/macos/Brewfile => .Brewfile | 0 {config => .config}/alacritty/alacritty.yml | 0 {config => .config}/git/gitconfig | 0 {config => .config}/nvim/init.vim | 0 {config => .config}/starship.toml | 0 {config => .config}/sway/config | 0 .../tmux/colorschemes/iceberg.minimal.conf | 0 {config => .config}/tmux/tmux.conf | 0 {config => .config}/waybar/config | 0 {config => .config}/waybar/style.css | 0 system/manjaro/packages.txt => .pkglist.txt | 0 .scripts/_link.sh | 17 +++++++++++++++++ start.sh => .scripts/start.sh | 8 ++------ config/zsh/zlogin => .zlogin | 0 config/zsh/zlogout => .zlogout | 0 config/zsh/zpreztorc => .zpreztorc | 0 config/zsh/zprofile => .zprofile | 0 config/zsh/zshenv => .zshenv | 0 config/zsh/zshrc => .zshrc | 4 ++++ 19 files changed, 23 insertions(+), 6 deletions(-) rename system/macos/Brewfile => .Brewfile (100%) rename {config => .config}/alacritty/alacritty.yml (100%) rename {config => .config}/git/gitconfig (100%) rename {config => .config}/nvim/init.vim (100%) rename {config => .config}/starship.toml (100%) rename {config => .config}/sway/config (100%) rename {config => .config}/tmux/colorschemes/iceberg.minimal.conf (100%) rename {config => .config}/tmux/tmux.conf (100%) rename {config => .config}/waybar/config (100%) rename {config => .config}/waybar/style.css (100%) rename system/manjaro/packages.txt => .pkglist.txt (100%) create mode 100755 .scripts/_link.sh rename start.sh => .scripts/start.sh (77%) rename config/zsh/zlogin => .zlogin (100%) rename config/zsh/zlogout => .zlogout (100%) rename config/zsh/zpreztorc => .zpreztorc (100%) rename config/zsh/zprofile => .zprofile (100%) rename config/zsh/zshenv => .zshenv (100%) rename config/zsh/zshrc => .zshrc (91%) diff --git a/system/macos/Brewfile b/.Brewfile similarity index 100% rename from system/macos/Brewfile rename to .Brewfile diff --git a/config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml similarity index 100% rename from config/alacritty/alacritty.yml rename to .config/alacritty/alacritty.yml diff --git a/config/git/gitconfig b/.config/git/gitconfig similarity index 100% rename from config/git/gitconfig rename to .config/git/gitconfig diff --git a/config/nvim/init.vim b/.config/nvim/init.vim similarity index 100% rename from config/nvim/init.vim rename to .config/nvim/init.vim diff --git a/config/starship.toml b/.config/starship.toml similarity index 100% rename from config/starship.toml rename to .config/starship.toml diff --git a/config/sway/config b/.config/sway/config similarity index 100% rename from config/sway/config rename to .config/sway/config diff --git a/config/tmux/colorschemes/iceberg.minimal.conf b/.config/tmux/colorschemes/iceberg.minimal.conf similarity index 100% rename from config/tmux/colorschemes/iceberg.minimal.conf rename to .config/tmux/colorschemes/iceberg.minimal.conf diff --git a/config/tmux/tmux.conf b/.config/tmux/tmux.conf similarity index 100% rename from config/tmux/tmux.conf rename to .config/tmux/tmux.conf diff --git a/config/waybar/config b/.config/waybar/config similarity index 100% rename from config/waybar/config rename to .config/waybar/config diff --git a/config/waybar/style.css b/.config/waybar/style.css similarity index 100% rename from config/waybar/style.css rename to .config/waybar/style.css diff --git a/system/manjaro/packages.txt b/.pkglist.txt similarity index 100% rename from system/manjaro/packages.txt rename to .pkglist.txt diff --git a/.scripts/_link.sh b/.scripts/_link.sh new file mode 100755 index 0000000..c7c520d --- /dev/null +++ b/.scripts/_link.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +_link() { + local _source=$(readlink -f $1) + local _dest=$2 + + echo "Linking $1 -> $_dest" + + # Create destination parent directories + mkdir -p $(dirname $_dest) + + # Remove destination file if it already exists + [ -e $_dest ] && unlink $_dest + + # Forcibly, symbolically link file + ln -sf "$_source" "$_dest" +} diff --git a/start.sh b/.scripts/start.sh similarity index 77% rename from start.sh rename to .scripts/start.sh index 6efa6b4..530d4dd 100755 --- a/start.sh +++ b/.scripts/start.sh @@ -2,7 +2,6 @@ # Work in progress... - # macOS install if [[ $OSTYPE =~ "darwin" ]]; then echo "Install for macOS" @@ -23,16 +22,13 @@ if [[ $OSTYPE =~ "linux" ]]; then echo "Install for Linux" # Install packages - pacman -S --needed - < ./system/manjaro/packages.txt + pacman -S --needed - < ../system/manjaro/packages.txt fi -# Install Volta (a Node version manager) +# Install Node, NPM, and Yarn which volta &>/dev/null if [[ $? == 1 ]]; then - curl -fsSL https://get.volta.sh/ | bash - - # Install Node, NPM, and Yarn volta install node volta install yarn fi diff --git a/config/zsh/zlogin b/.zlogin similarity index 100% rename from config/zsh/zlogin rename to .zlogin diff --git a/config/zsh/zlogout b/.zlogout similarity index 100% rename from config/zsh/zlogout rename to .zlogout diff --git a/config/zsh/zpreztorc b/.zpreztorc similarity index 100% rename from config/zsh/zpreztorc rename to .zpreztorc diff --git a/config/zsh/zprofile b/.zprofile similarity index 100% rename from config/zsh/zprofile rename to .zprofile diff --git a/config/zsh/zshenv b/.zshenv similarity index 100% rename from config/zsh/zshenv rename to .zshenv diff --git a/config/zsh/zshrc b/.zshrc similarity index 91% rename from config/zsh/zshrc rename to .zshrc index e8da6cc..57e4f58 100644 --- a/config/zsh/zshrc +++ b/.zshrc @@ -27,6 +27,9 @@ fi alias o="open" +alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' +alias dots=dotfiles + # Quickly change to a sub-directory within the git project gd() { _dirs=$(fd --type d --hidden --follow --exclude .git) @@ -53,3 +56,4 @@ export PATH="$VOLTA_HOME/bin:$PATH" export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git' eval "$(starship init zsh)" +eval "$(trellis shell-init zsh)" -- 2.51.2