diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 62a9480..81750d4 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,3 +1,11 @@ +import = [ + "~/.config/alacritty/themes/themes/tokyo-night.toml", + "~/.config/alacritty/themes/themes/gruvbox_dark.toml", +] + +[shell] +program = "/opt/homebrew/bin/tmux" +args = ["new-session", "-A", "-s", "general"] + [window] -opacity = 0.75 -padding = { x = 5, y = 5 } +opacity = 0.60 diff --git a/.tmux.conf b/.tmux.conf new file mode 100644 index 0000000..8269e3f --- /dev/null +++ b/.tmux.conf @@ -0,0 +1,4 @@ +set -g mouse on +set -ga terminal-overrides ',*256color*:smcup@:rmcup@' +set -g history-limit 100000 +set -g status-style fg=green,bg=default diff --git a/.vimrc b/.vimrc index 205123e..f43ca33 100644 --- a/.vimrc +++ b/.vimrc @@ -114,7 +114,8 @@ autocmd BufRead,BufNewFile *.{graphql,gql} setlocal filetype=graphql " Fix prettier let g:prettier#config#tab_width = 2 let g:prettier#config#single_quote = 'false' -let g:prettier#config#semi = 'false' +let g:prettier#config#semi = 'true' +let g:prettier#config#trailing_comma = 'all' let g:prettier#config#print_width = 80 au BufRead,BufNewFile *.md setlocal textwidth=80 diff --git a/.zshrc b/.zshrc index d3d476d..fd65c32 100644 --- a/.zshrc +++ b/.zshrc @@ -2,25 +2,11 @@ # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/Users/niels/.oh-my-zsh" +export ZSH="/Users/nielsmokkenstorm/.oh-my-zsh" alias ngrok='/Applications/ngrok' alias cat='bat' -# time all commands -preexec() { - timer=$(gdate +%s.%N) -} - -precmd() { - if [ -n "$timer" ]; then - now=$(gdate +%s.%N) - elapsed=$(echo "$now - $timer" | bc) - timer_show=$(printf "%.2f" $elapsed) - echo "Execution time: ${timer_show}s" - unset timer - fi -} # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -28,6 +14,10 @@ precmd() { # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="robbyrussell" +export NVM_DIR="$HOME/.nvm" +[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" # This loads nvm +[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion + # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load # a theme from this variable instead of looking in $ZSH/themes/ diff --git a/install.sh b/install.sh index 0e63bc9..87f784f 100644 --- a/install.sh +++ b/install.sh @@ -1,16 +1,16 @@ #!/usr/bin/env bash -root=$(pwd) - # install oh-my-zsh sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" # symlink dots -ln -sf $root/.vimrc ~/.vimrc -ln -sf $root/.zshrc ~/.zshrc +ln -sf ~/.vimrc ~/.vimrc +ln -sf ~/.zshrc ~/.zshrc -mkdir -p $root/.config -mkdir -p $root/.config/alacritty +mkdir -p ~.config +mkdir -p ~/.config/alacritty +mkdir -p ~/.config/alacritty/themes +git clone https://github.com/alacritty/alacritty-theme ~/.config/alacritty/themes ln -sf $root/.config/alacritty/alacritty.toml ~/.config/alacritty/alacritty.toml