changed folderlayout to work with stow

config.fish

@@ -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

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

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

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

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

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

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

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

setup.sh

@@ -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/

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
+}
+

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()