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 3fa52b1
Show file tree
Hide file tree
Showing 20 changed files with 52 additions and 249 deletions.
Binary file removed .github/screenshots/alacritty_tmux_zsh_starship.png
Binary file not shown.
Binary file modified .github/screenshots/nvim.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/screenshots/warp_zsh_starship.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 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: brew git gpg k9s nvim rust sdkman ssh starship vscode zsh
default: .PHONY

bootstrap:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
29 changes: 9 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand All @@ -17,18 +16,18 @@ 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
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 All @@ -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
Expand Down Expand Up @@ -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

Expand Down
60 changes: 0 additions & 60 deletions alacritty/alacritty.toml

This file was deleted.

60 changes: 0 additions & 60 deletions alacritty/color.toml

This file was deleted.

9 changes: 0 additions & 9 deletions alacritty/install.sh

This file was deleted.

2 changes: 0 additions & 2 deletions 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 All @@ -70,7 +69,6 @@ brew "zsh"
brew "zsh-autosuggestions"
brew "zsh-syntax-highlighting"
cask "1password-cli"
cask "alacritty"
cask "boop"
cask "cursor"
cask "firefox"
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: 1 addition & 4 deletions nvim/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,9 +43,6 @@ map <C-n> :NERDTreeToggle<CR> " 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
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
12 changes: 2 additions & 10 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
},
"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,
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
Loading

0 comments on commit 3fa52b1

Please sign in to comment.