Skip to content

Commit

Permalink
Migrate from Alacritty with tmux to warp
Browse files Browse the repository at this point in the history
  • Loading branch information
pkissling committed Mar 1, 2024
1 parent 3bc9da0 commit f329af2
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 105 deletions.
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: alacritty brew git gpg k9s nvim rust sdkman ssh starship tmux vscode zsh
.PHONY: alacritty brew git gpg k9s nvim rust sdkman ssh starship vscode zsh
default: .PHONY

bootstrap:
Expand Down Expand Up @@ -48,11 +48,7 @@ ssh: bootstrap
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
Expand Down
13 changes: 2 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ 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/)
- [zsh](https://ohmyz.sh/)

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

Expand Down Expand Up @@ -125,14 +124,6 @@ make starship

Install starship shell prompt, create symlinks.

##### tmux

```bash
make tmux
```

Install tpm (tmux plugin manager), create symlinks.

##### vscode

```bash
Expand Down
1 change: 0 additions & 1 deletion brew/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ brew "supabase/tap/supabase"
brew "tfenv"
brew "the_silver_searcher"
brew "tldr"
brew "tmux"
brew "tree"
brew "typescript"
brew "unbound"
Expand Down
1 change: 1 addition & 0 deletions brew/Brewfile.work
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions starship/starship.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
format = """\
$time\
$kubernetes\
$directory\
$git_branch\
Expand All @@ -9,8 +10,6 @@ format = """\
$jobs\
$cmd_duration\
$line_break\
$battery\
$time\
$character\
"""

Expand Down Expand Up @@ -63,7 +62,7 @@ format = """\
style = "bold"

[kubernetes]
format = '[$context]($style) '
format = '» [$context]($style) '
disabled = false
style = "bold"
contexts = [
Expand Down
33 changes: 0 additions & 33 deletions tmux/.tmux.conf

This file was deleted.

10 changes: 0 additions & 10 deletions tmux/idea-tmux-shell

This file was deleted.

17 changes: 0 additions & 17 deletions tmux/install.sh

This file was deleted.

5 changes: 0 additions & 5 deletions tmux/vscode-tmux-shell

This file was deleted.

2 changes: 1 addition & 1 deletion vscode/install.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/bash
set -ex

# create symlinks
Expand Down
10 changes: 1 addition & 9 deletions vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,11 @@
"**/node_modules": true,
"**/target": true
},
"security.promptForLocalFileProtocolHandling": false,
"terminal.external.osxExec": "Alacritty.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,
Expand Down
5 changes: 5 additions & 0 deletions warp/install.sh
Original file line number Diff line number Diff line change
@@ -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
32 changes: 32 additions & 0 deletions warp/settings.plist
Original file line number Diff line number Diff line change
@@ -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;
}
9 changes: 0 additions & 9 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,13 @@ plugins=(
git
git-auto-fetch
terraform
tmux
zoxide
)

# init zsh
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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit f329af2

Please sign in to comment.