From 8070b33be7d884976c4911f1032a2f2c3834093b Mon Sep 17 00:00:00 2001 From: Johannes Merz Date: Fri, 1 Sep 2023 15:40:09 +0200 Subject: [PATCH] changed folderlayout to work with stow --- config.fish | 13 ------------- fish/.config/fish/config.fish | 17 +++++++++++++++++ fish/.config/fish/functions/dcd.fish | 4 ++++ fish/.config/fish/functions/dce.fish | 4 ++++ fish/.config/fish/functions/dcl.fish | 4 ++++ fish/.config/fish/functions/dcps.fish | 4 ++++ fish/.config/fish/functions/dcu.fish | 4 ++++ fish/.config/fish/functions/dcud.fish | 4 ++++ setup.sh | 25 ------------------------- .tmux.conf => tmux/.tmux.conf | 9 ++++++++- .vimrc => vim/.vimrc | 2 ++ 11 files changed, 51 insertions(+), 39 deletions(-) delete mode 100644 config.fish create mode 100644 fish/.config/fish/config.fish create mode 100644 fish/.config/fish/functions/dcd.fish create mode 100644 fish/.config/fish/functions/dce.fish create mode 100644 fish/.config/fish/functions/dcl.fish create mode 100644 fish/.config/fish/functions/dcps.fish create mode 100644 fish/.config/fish/functions/dcu.fish create mode 100644 fish/.config/fish/functions/dcud.fish delete mode 100755 setup.sh rename .tmux.conf => tmux/.tmux.conf (93%) rename .vimrc => vim/.vimrc (99%) diff --git a/config.fish b/config.fish deleted file mode 100644 index d7bf2e2..0000000 --- a/config.fish +++ /dev/null @@ -1,13 +0,0 @@ -if status is-interactive - # Commands to run in interactive sessions can go here -end - -# Custom aliases -alias cat='bat --style changes,numbers' -alias ls='exa' -alias ll='exa -bgla' -alias la='exa -bgla' -# alias clear='command clear; task limit:3 next; echo ""; echo ""' -# alias tui='taskwarrior-tui' - -clear diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish new file mode 100644 index 0000000..3f3bef3 --- /dev/null +++ b/fish/.config/fish/config.fish @@ -0,0 +1,17 @@ +if status is-interactive + # Commands to run in interactive sessions can go here +end + +# Custom aliases +alias cat='bat --style changes,numbers' +alias ls='exa' +alias ll='exa -bgla' +alias la='exa -bgla' +alias clear='command clear; task limit:5 next; echo ""; echo ""' + +function seconds + bash -c 'while true; do echo $(date +%S) | toilet -f smmono12; done' + #bash -c 'while true; do printf \' %s\r\' "$(date +%S)" | toilet -f smmono12 ; done' +end + +clear diff --git a/fish/.config/fish/functions/dcd.fish b/fish/.config/fish/functions/dcd.fish new file mode 100644 index 0000000..03031a7 --- /dev/null +++ b/fish/.config/fish/functions/dcd.fish @@ -0,0 +1,4 @@ +# Defined in - @ line 1 +function dcd --wraps='docker compose down' --description 'alias dcd=docker compose down' + docker compose down $argv; +end diff --git a/fish/.config/fish/functions/dce.fish b/fish/.config/fish/functions/dce.fish new file mode 100644 index 0000000..11d2806 --- /dev/null +++ b/fish/.config/fish/functions/dce.fish @@ -0,0 +1,4 @@ +# Defined in - @ line 1 +function dce --wraps='docker compose exec' --description 'alias dce=docker compose exec' + docker compose exec $argv; +end diff --git a/fish/.config/fish/functions/dcl.fish b/fish/.config/fish/functions/dcl.fish new file mode 100644 index 0000000..be15697 --- /dev/null +++ b/fish/.config/fish/functions/dcl.fish @@ -0,0 +1,4 @@ +# Defined in - @ line 1 +function dcl --wraps='docker compose logs -f' --description 'alias dcl=docker compose logs -f' + docker compose logs -f $argv; +end diff --git a/fish/.config/fish/functions/dcps.fish b/fish/.config/fish/functions/dcps.fish new file mode 100644 index 0000000..7b1727b --- /dev/null +++ b/fish/.config/fish/functions/dcps.fish @@ -0,0 +1,4 @@ +# Defined in - @ line 1 +function dcps --wraps='docker compose ps' --description 'alias dcps=docker compose ps' + docker compose ps $argv; +end diff --git a/fish/.config/fish/functions/dcu.fish b/fish/.config/fish/functions/dcu.fish new file mode 100644 index 0000000..894052b --- /dev/null +++ b/fish/.config/fish/functions/dcu.fish @@ -0,0 +1,4 @@ +# Defined in - @ line 1 +function dcu --wraps='docker compose up' --description 'alias dcu=docker compose up' + docker compose up $argv; +end diff --git a/fish/.config/fish/functions/dcud.fish b/fish/.config/fish/functions/dcud.fish new file mode 100644 index 0000000..330ef80 --- /dev/null +++ b/fish/.config/fish/functions/dcud.fish @@ -0,0 +1,4 @@ +# Defined in - @ line 1 +function dcud --wraps='docker compose up -d' --description 'alias dcud=docker compose up -d' + docker compose up -d $argv; +end diff --git a/setup.sh b/setup.sh deleted file mode 100755 index a32b86a..0000000 --- a/setup.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e - - -# install -sudo apt-get update -sudo apt-get install tmux vim exa bat git ripgrep - - -# install vundle and all packages -if [ ! -d "$HOME/.vim/bundle/Vundle.vim" ]; then - git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim -else - echo "Vundle already installed" -fi - -vim +'PlugInstall --sync' +qa - - -# link files - -ln -s $PWD/.tmux.conf $HOME/ -ln -s $PWD/.vimrc $HOME/ -mkdir -p $HOME/.config/fish/ -ln -s $PWD/config.fish $HOME/.config/fish/ diff --git a/.tmux.conf b/tmux/.tmux.conf similarity index 93% rename from .tmux.conf rename to tmux/.tmux.conf index 0d932c0..e070940 100644 --- a/.tmux.conf +++ b/tmux/.tmux.conf @@ -82,7 +82,14 @@ set -g message-style fg=colour232,bg=colour166,bold # } #set -g default-shell /bin/zsh -set -g default-shell /usr/bin/fish +#set -g default-shell /opt/homebrew/bin/fish # scrollback limit set-option -g history-limit 20000 + +if-shell 'uname | grep -q Darwin' { + set -g default-shell /opt/homebrew/bin/fish +} { + set -g default-shell /usr/bin/fish +} + diff --git a/.vimrc b/vim/.vimrc similarity index 99% rename from .vimrc rename to vim/.vimrc index 9dcfba6..e86338e 100644 --- a/.vimrc +++ b/vim/.vimrc @@ -18,6 +18,8 @@ Plugin 'fatih/vim-go' Plugin 'machakann/vim-sandwich' Plugin 'junegunn/vim-easy-align' Plugin 'darfink/vim-plist' +Plugin 'skanehira/docker-compose.vim' +Plugin 'dag/vim-fish' call vundle#end()