diff --git a/.github/screenshots/alacritty_tmux_zsh_starship.png b/.github/screenshots/alacritty_tmux_zsh_starship.png deleted file mode 100644 index 2a27dc8..0000000 Binary files a/.github/screenshots/alacritty_tmux_zsh_starship.png and /dev/null differ diff --git a/.github/screenshots/nvim.png b/.github/screenshots/nvim.png index 9d43f87..c3154f9 100644 Binary files a/.github/screenshots/nvim.png and b/.github/screenshots/nvim.png differ diff --git a/.github/screenshots/warp_zsh_starship.png b/.github/screenshots/warp_zsh_starship.png new file mode 100644 index 0000000..5201190 Binary files /dev/null and b/.github/screenshots/warp_zsh_starship.png differ diff --git a/Makefile b/Makefile index eaa2ebb..ce141d5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: alacritty brew git gpg k9s nvim rust sdkman ssh starship tmux vscode zsh +.PHONY: brew git gpg k9s nvim rust sdkman ssh starship vscode zsh default: .PHONY bootstrap: @@ -9,10 +9,6 @@ ifeq (,$(wildcard ${HOME}/dotfiles/.profile)) @read line; echo $$line > ${HOME}/dotfiles/.profile endif -alacritty: bootstrap - @chmod +x alacritty/install.sh - @./alacritty/install.sh - brew: bootstrap @chmod +x brew/install.sh @./brew/install.sh @@ -49,10 +45,6 @@ starship: bootstrap brew @chmod +x starship/install.sh @./starship/install.sh -tmux: bootstrap brew - @chmod +x tmux/install.sh - @./tmux/install.sh - vscode: bootstrap brew @chmod +x vscode/install.sh @./vscode/install.sh diff --git a/README.md b/README.md index c32edb1..b8e98c9 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ This repository contains my personal Dotfiles with configuration for the following tools: -- [alacritty](https://github.com/alacritty/alacritty) - [brew](https://brew.sh/) - [cask](https://github.com/Homebrew/homebrew-cask) - [git](https://git-scm.com/) @@ -17,8 +16,8 @@ for the following tools: - [sdkman](https://sdkman.io/) - [ssh](https://www.ssh.com/) - [starship](https://starship.rs/) -- [tmux](https://github.com/tmux/tmux) - [vscode](https://code.visualstudio.com/) +- [warp](https://warp.dev/) - [zsh](https://ohmyz.sh/) Each of the folders present contains a dedicated `install.sh` script which @@ -26,9 +25,9 @@ can be used to install the tool and its corresponding configuration manually. ### Screenshots -#### Alacritty with tmux, zsh and Starship +#### Warp with zsh and Starship -![Alacritty with tmux, zsh and Starship](/.github/screenshots/alacritty_tmux_zsh_starship.png) +![Warp with zsh and Starship](/.github/screenshots/warp_zsh_starship.png) #### nvim @@ -42,16 +41,6 @@ can be used to install the tool and its corresponding configuration manually. make ``` -#### Individual targets - -##### alacritty - -```bash -make alacritty -``` - -Create symlinks for alacritty config. - ##### brew ```bash @@ -125,21 +114,21 @@ make starship Install starship shell prompt, create symlinks. -##### tmux +##### vscode ```bash -make tmux +make vscode ``` -Install tpm (tmux plugin manager), create symlinks. +Create symlinks for vscode configuration, install extensions. -##### vscode +##### warp ```bash -make vscode +make warp ``` -Create symlinks for vscode configuration, install extensions. +Apply warp configuration. ##### zsh diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml deleted file mode 100644 index 272e774..0000000 --- a/alacritty/alacritty.toml +++ /dev/null @@ -1,60 +0,0 @@ -import = ["~/.config/alacritty/color.toml"] - -[cursor] -style = "Beam" - -[font] -size = 12 - -[font.bold] -family = "Iosevka Term Extended" -style = "Bold" - -[font.italic] -family = "Iosevka Term Extended" -style = "Italic" - -[font.normal] -family = "Iosevka Term Extended" -style = "Extended" - -[[keyboard.bindings]] -chars = "\u001BF" -key = "Right" -mods = "Alt" - -[[keyboard.bindings]] -chars = "\u001BB" -key = "Left" -mods = "Alt" - -[[keyboard.bindings]] -chars = "\u001BOH" -key = "Left" -mode = "AppCursor" -mods = "Command" - -[[keyboard.bindings]] -chars = "\u001BOF" -key = "Right" -mode = "AppCursor" -mods = "Command" - -[[keyboard.bindings]] -chars = "\r" -key = "NumpadEnter" - -[scrolling] -history = 10000 - -[shell] -program = "/bin/zsh" - -[window] -decorations = "full" -startup_mode = "Windowed" -opacity = 0.95 - -[window.padding] -x = 5 -y = 5 diff --git a/alacritty/color.toml b/alacritty/color.toml deleted file mode 100644 index 11ff4f2..0000000 --- a/alacritty/color.toml +++ /dev/null @@ -1,60 +0,0 @@ -[colors.bright] -black = "#6272a4" -blue = "#d6acff" -cyan = "#a4ffff" -green = "#69ff94" -magenta = "#ff92df" -red = "#ff6e6e" -white = "#ffffff" -yellow = "#ffffa5" - -[colors.cursor] -cursor = "CellForeground" -text = "CellBackground" - -[colors.hints.end] -background = "#282a36" -foreground = "#f1fa8c" - -[colors.hints.start] -background = "#f1fa8c" -foreground = "#282a36" - -[colors.line_indicator] -background = "None" -foreground = "None" - -[colors.normal] -black = "#21222c" -blue = "#bd93f9" -cyan = "#8be9fd" -green = "#50fa7b" -magenta = "#ff79c6" -red = "#ff5555" -white = "#f8f8f2" -yellow = "#f1fa8c" - -[colors.primary] -background = "#282a36" -bright_foreground = "#ffffff" -foreground = "#f8f8f2" - -[colors.search.focused_match] -background = "#ffb86c" -foreground = "#44475a" - -[colors.footer_bar] -background = "#282a36" -foreground = "#f8f8f2" - -[colors.search.matches] -background = "#50fa7b" -foreground = "#44475a" - -[colors.selection] -background = "#44475a" -text = "CellForeground" - -[colors.vi_mode_cursor] -cursor = "CellForeground" -text = "CellBackground" diff --git a/alacritty/install.sh b/alacritty/install.sh deleted file mode 100755 index 25f0fff..0000000 --- a/alacritty/install.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# create .config/alacritty folder, if not exist -mkdir -p "${HOME}"/.config/alacritty - -# create symlinks for alacritty config file -ln -sfv "${HOME}"/dotfiles/alacritty/color.toml "${HOME}"/.config/alacritty -ln -sfv "${HOME}"/dotfiles/alacritty/alacritty.toml "${HOME}"/.config/alacritty diff --git a/brew/Brewfile b/brew/Brewfile index 575fd0f..a9d6754 100644 --- a/brew/Brewfile +++ b/brew/Brewfile @@ -53,7 +53,6 @@ brew "supabase/tap/supabase" brew "tfenv" brew "the_silver_searcher" brew "tldr" -brew "tmux" brew "tree" brew "typescript" brew "unbound" @@ -70,7 +69,6 @@ brew "zsh" brew "zsh-autosuggestions" brew "zsh-syntax-highlighting" cask "1password-cli" -cask "alacritty" cask "boop" cask "cursor" cask "firefox" diff --git a/brew/Brewfile.work b/brew/Brewfile.work index 5ce67dd..c30d469 100644 --- a/brew/Brewfile.work +++ b/brew/Brewfile.work @@ -15,5 +15,6 @@ cask "google-chrome" cask "mattermost" cask "postman" cask "stats" +cask "warp" instance_eval(File.read(ENV['HOME'] + "/dotfiles/brew/Brewfile")) # include core Brefile mas "EasyRes", id: 688211836 diff --git a/nvim/init.vim b/nvim/init.vim index eab2fb5..873b850 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -22,7 +22,7 @@ Plugin 'airblade/vim-gitgutter' " Git annotations in editor Plugin 'preservim/nerdtree' " File tree Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' -Plugin 'dracula/vim', { 'name': 'dracula' } " Dracula Theme +Plugin 'nordtheme/vim' Plugin 'tpope/vim-fugitive' " Git integration Plugin 'ctrlpvim/ctrlp.vim' " CTRLP Plugin 'terryma/vim-expand-region' " Expand selection @@ -43,9 +43,6 @@ map :NERDTreeToggle " Bind NERDtree to CTRL + n " Rust let g:rustfmt_autosave = 1 " format upon save -" Theme -colorscheme dracula - " Airline let g:airline_solarized_bg='dark' let g:airline_powerline_fonts = 1 diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf deleted file mode 100644 index 340a548..0000000 --- a/tmux/.tmux.conf +++ /dev/null @@ -1,33 +0,0 @@ -# List of plugins -set -g @plugin 'dracula/tmux' -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'nhdaly/tmux-better-mouse-mode' - -# https://github.com/tmux-plugins/tpm/issues/17 -set-environment -g PATH "${HOMEBREW_PREFIX}/bin:/usr/local/bin:/bin:/usr/bin" - -# allow mouse wheel scrolling -setw -g mouse on -set -g @scroll-speed-num-lines-per-scroll 1 - -# grey out inactive pane -set -g window-style "bg=#44475a" -set -g window-active-style "bg=terminal" - -# status bar in terminal color -set -g status-bg "terminal" - -# dracula -set -g @dracula-plugins " " # disable all plugins -set -g @dracula-show-left-icon window -set -g @dracula-show-powerline false - -# set color -set -g default-terminal "screen-256color" - -# set default shell -set -g default-command /bin/zsh - -# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) -run '~/.tmux/plugins/tpm/tpm' diff --git a/tmux/idea-tmux-shell b/tmux/idea-tmux-shell deleted file mode 100755 index 2a12061..0000000 --- a/tmux/idea-tmux-shell +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# from https://medium.com/@joaomoreno/persistent-terminal-sessions-in-vs-code-8fc469ed6b41 -if [ "$(arch)" = "arm64" ]; then - eval "$(/opt/homebrew/bin/brew shellenv)" - else - eval "$(/usr/local/bin/brew shellenv)" - fi -SESSION=$(echo "idea-$(pwd)" | sed 's/\./_/g') -tmux attach-session -d -t "$SESSION" || tmux new-session -s "$SESSION" diff --git a/tmux/install.sh b/tmux/install.sh deleted file mode 100755 index 67092d3..0000000 --- a/tmux/install.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -set -ex - -# create .tmux folder, if not exist -mkdir -p "${HOME}"/.tmux/plugins - -# checkout tpm git repo, if not exist -if [ ! -d "${HOME}"/.tmux/plugins/tpm ]; then - git clone https://github.com/tmux-plugins/tpm "${HOME}"/.tmux/plugins/tpm - tmux source "${HOME}"/dotfiles/tmux/.tmux.conf -fi - -# create symlink -ln -sfv "${HOME}"/dotfiles/tmux/.tmux.conf "${HOME}" - -# install all tmux plugins defined in `.tmux.conf` -"${HOME}"/.tmux/plugins/tpm/bin/install_plugins diff --git a/tmux/vscode-tmux-shell b/tmux/vscode-tmux-shell deleted file mode 100755 index af084fa..0000000 --- a/tmux/vscode-tmux-shell +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# from https://medium.com/@joaomoreno/persistent-terminal-sessions-in-vs-code-8fc469ed6b41 -SESSION=$(echo "vscode-$(pwd)" | sed 's/\./_/g') -"${HOMEBREW_PREFIX}"/bin/tmux attach-session -t "$SESSION" || "${HOMEBREW_PREFIX}"/bin/tmux new-session -s "$SESSION" diff --git a/vscode/install.sh b/vscode/install.sh index 1bf8472..e689c52 100755 --- a/vscode/install.sh +++ b/vscode/install.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash set -ex # create symlinks diff --git a/vscode/settings.json b/vscode/settings.json index a34525d..1169241 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -124,19 +124,11 @@ "**/node_modules": true, "**/target": true }, - "terminal.external.osxExec": "Alacritty.app", + "security.promptForLocalFileProtocolHandling": false, + "terminal.external.osxExec": "Warp.app", "terminal.integrated.defaultProfile.osx": "zsh", "terminal.integrated.enableMultiLinePasteWarning": false, "terminal.integrated.fontFamily": "Iosevka Term Extended", - "terminal.integrated.macOptionClickForcesSelection": true, - "terminal.integrated.profiles.osx": { - "zsh": { - "args": [ - "${env:HOME}/dotfiles/tmux/vscode-tmux-shell" - ], - "path": "zsh" - } - }, "terraform.languageServer.enable": true, "typescript.updateImportsOnFileMove.enabled": "always", "window.autoDetectColorScheme": true, diff --git a/warp/install.sh b/warp/install.sh new file mode 100644 index 0000000..b4e2d4a --- /dev/null +++ b/warp/install.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -ex + +defaults write dev.warp.Warp-Stable -string "${HOME}"/dotfiles/warp/settings.plist +defaults read dev.warp.Warp-Stable > "${HOME}"/dotfiles/warp/settings.plist diff --git a/warp/settings.plist b/warp/settings.plist new file mode 100644 index 0000000..d7f8a17 --- /dev/null +++ b/warp/settings.plist @@ -0,0 +1,32 @@ +{ + AIAssistantRequestLimitInfo = "{\\"limit\\":100,\\"num_requests_used_since_refresh\\":0,\\"next_refresh_time\\":\\"2024-02-29T20:54:51.257228Z\\"}"; + AliasExpansionBannerSeen = true; + ApplePressAndHoldEnabled = false; + AutosuggestionAcceptedCount = 2; + ChangelogVersions = "{\\"v0.2024.02.20.08.01.stable_02\\":true,\\"v0.2024.02.27.08.01.stable_03\\":true}"; + CompletionsOpenWhileTyping = false; + EnforceMinimumContrast = "\\"OnlyNamedColors\\""; + ExperimentId = "debf66fd-580f-476b-b5e8-3665465bd402"; + FontName = "\\"Iosevka Fixed\\""; + FontSize = "14.0"; + HasAutoOpenedWelcomeFolder = true; + HonorPS1 = true; + LinkTooltip = true; + Notifications = "{\\"mode\\":\\"Enabled\\",\\"is_long_running_enabled\\":true,\\"long_running_threshold\\":{\\"secs\\":30,\\"nanos\\":0},\\"is_password_prompt_enabled\\":true}"; + OpenFileEditor = "\\"VSCode\\""; + OverrideBlur = 1; + OverrideOpacity = 80; + ReceivedReferralTheme = "\\"Inactive\\""; + SavedPrompt = "{\\"CustomChipSelection\\":{\\"chips\\":[{\\"chip\\":\\"Time24\\",\\"config\\":{}},{\\"chip\\":\\"WorkingDirectory\\",\\"config\\":{}},{\\"chip\\":\\"ShellGitBranch\\",\\"config\\":{}},{\\"chip\\":\\"GitDirtyFiles\\",\\"config\\":{}}]}}"; + SelectedSystemThemes = "{\\"light\\":\\"CyberWave\\",\\"dark\\":\\"CyberWave\\"}"; + Shortcuts = true; + ShouldDimInactivePanes = true; + ShowIndicatorsButton = true; + Spacing = "\\"Normal\\""; + SystemTheme = true; + UseThinStrokes = "\\"OnHighDpiDisplays\\""; + VimKeybindingsBannerState = "\\"Dismissed\\""; + WelcomeTipsCompleted = true; + WelcomeTipsFeaturesUsed = "[{\\"Action\\":\\"SplitPane\\"},{\\"Action\\":\\"OpenWarpDrive\\"},{\\"Action\\":\\"ThemePicker\\"},{\\"Hint\\":\\"CreateBlock\\"},{\\"Hint\\":\\"BlockSelect\\"},{\\"Hint\\":\\"BlockAction\\"},{\\"Action\\":\\"CommandPalette\\"},{\\"Action\\":\\"WarpAI\\"},{\\"Action\\":\\"CommandSearch\\"}]"; + WorkflowsBoxOpen = true; +} diff --git a/zsh/.zshrc b/zsh/.zshrc index 6352c93..e5d5994 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -8,7 +8,6 @@ plugins=( git git-auto-fetch terraform - tmux zoxide ) @@ -16,11 +15,6 @@ plugins=( export ZSH=~/.oh-my-zsh source $ZSH/oh-my-zsh.sh -# create new tmux default session -if [ -z "$TMUX" ]; then - tmux attach -t default || tmux new -s default\; split-window -v \; split-window -h \; select-pane -t 1 \; -fi - # configure zsh export DISABLE_AUTO_UPDATE=true export DISABLE_MAGIC_FUNCTIONS=true @@ -102,9 +96,6 @@ function kx() { export GIT_CONFIG_COUNT=1 export GIT_CONFIG_KEY_0="gpg.program" GIT_CONFIG_VALUE_0="${HOMEBREW_PREFIX}/bin/gpg" -# save all tmux sessions in the global history -export PROMPT_COMMAND='history -a; history -r' - # Aliases (must be one of the last commands to overwrite zsh aliases) alias cat="bat" alias g="git"