From aeab08899db673792f26a97a762094cdbc6e0bb7 Mon Sep 17 00:00:00 2001 From: Flo Date: Fri, 15 May 2020 10:51:31 +0200 Subject: [PATCH] Fix make_symlinks --- .bashrc | 1 + .gitconfig | 1 + .p10k.zsh | 1 + .screenrc | 1 + .vim | 1 + .vimrc | 1 + .zshrc | 1 + make_symlinks.sh | 23 ++++++++++++++--------- zshrc | 4 ++++ 9 files changed, 25 insertions(+), 9 deletions(-) create mode 120000 .bashrc create mode 120000 .gitconfig create mode 120000 .p10k.zsh create mode 120000 .screenrc create mode 120000 .vim create mode 120000 .vimrc create mode 120000 .zshrc diff --git a/.bashrc b/.bashrc new file mode 120000 index 0000000..9b35881 --- /dev/null +++ b/.bashrc @@ -0,0 +1 @@ +/home/flo/dotfiles/bashrc \ No newline at end of file diff --git a/.gitconfig b/.gitconfig new file mode 120000 index 0000000..ae1bd52 --- /dev/null +++ b/.gitconfig @@ -0,0 +1 @@ +/home/flo/dotfiles/gitconfig \ No newline at end of file diff --git a/.p10k.zsh b/.p10k.zsh new file mode 120000 index 0000000..6e40ebb --- /dev/null +++ b/.p10k.zsh @@ -0,0 +1 @@ +/home/flo/dotfiles/p10k.zsh \ No newline at end of file diff --git a/.screenrc b/.screenrc new file mode 120000 index 0000000..64b7fee --- /dev/null +++ b/.screenrc @@ -0,0 +1 @@ +/home/flo/dotfiles/screenrc \ No newline at end of file diff --git a/.vim b/.vim new file mode 120000 index 0000000..33dc7f5 --- /dev/null +++ b/.vim @@ -0,0 +1 @@ +/home/flo/dotfiles/vim \ No newline at end of file diff --git a/.vimrc b/.vimrc new file mode 120000 index 0000000..ed131ce --- /dev/null +++ b/.vimrc @@ -0,0 +1 @@ +/home/flo/dotfiles/vimrc \ No newline at end of file diff --git a/.zshrc b/.zshrc new file mode 120000 index 0000000..a1a375f --- /dev/null +++ b/.zshrc @@ -0,0 +1 @@ +/home/flo/dotfiles/zshrc \ No newline at end of file diff --git a/make_symlinks.sh b/make_symlinks.sh index ac49809..92b5cfc 100755 --- a/make_symlinks.sh +++ b/make_symlinks.sh @@ -8,26 +8,31 @@ dir=~/dotfiles # dotfiles directory olddir=~/dotfiles_old # old dotfiles backup directory # list of files/folders to symlink in homedir -files="bashrc vimrc zshrc screenrc vim gitconfig" +files="bashrc vimrc zshrc screenrc vim gitconfig p10k.zsh" + +echo "Starting ..." # create dotfiles_old in homedir -echo "Creating $olddir for backup of any existing dotfiles in ~" +echo "> Creating $olddir for backup of any existing dotfiles in ~ ..." mkdir -p $olddir -echo "...done" +echo " ... done" # change to the dotfiles directory -echo "Changing to the $dir directory" +echo "> Changing to the $dir directory ..." cd $dir -echo "...done" +echo " ... done" -# move any existing dotfiles in homedir to dotfiles_old directory, then create symlinks +# move any existing dotfiles in homedir to dotfiles_old directory, then create symlinks for file in $files; do - echo "Moving any existing dotfiles from ~ to $olddir" - mv ~/.$file ~/dotfiles_old/ - echo "Creating symlink to $file in home directory." + # TODO stupid if simlink + echo "> Moving file ~/.$file to backup $olddir/$file" + mv ~/.$file $olddir/$file + echo " Creating symlink ~/.$file with target $dir/$file" ln -s $dir/$file ~/.$file done # oh my zsh custom themes mkdir -p $HOME/.oh-my-zsh/custom/themes ln -sf $PWD/oh-my-zsh/custom/themes/agnoster.zsh-theme $HOME/.oh-my-zsh/custom/themes/agnoster.zsh-theme + +echo "All done" diff --git a/zshrc b/zshrc index 1720fe6..b330fd3 100644 --- a/zshrc +++ b/zshrc @@ -124,3 +124,7 @@ alias screen="screen -U" # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +if [ $TILIX_ID ] || [ $VTE_VERSION ]; then + source /etc/profile.d/vte.sh +fi