diff --git a/.config/alacritty/base.toml b/.config/alacritty/base.toml index 5d3064e..715fc53 100644 --- a/.config/alacritty/base.toml +++ b/.config/alacritty/base.toml @@ -6,17 +6,17 @@ unfocused_hollow = false size = 11.0 [font.bold] -family = "JetBrains Mono" +family = "JetBrainsMono Nerd Font" [font.glyph_offset] x = 0 y = 0 [font.italic] -family = "JetBrains Mono" +family = "JetBrainsMono Nerd Font" [font.normal] -family = "JetBrains Mono" +family = "JetBrainsMono Nerd Font" [font.offset] x = 0 @@ -24,6 +24,7 @@ y = 0 [window] dynamic_padding = true +option_as_alt = "Both" [window.padding] x = 12 diff --git a/.gitignore b/.gitignore index eb1464e..8282f22 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,8 @@ !Wallpapers/* **/__pycache__ + +!.tmux.conf +!.tmux/* +!.tmux/plugins/* +!.tmux/plugins/tpm/* diff --git a/.gitmodules b/.gitmodules index f366391..2b0137f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "src/pikaur"] path = src/pikaur url = https://github.com/actionless/pikaur +[submodule ".tmux/plugins/tpm"] + path = .tmux/plugins/tpm + url = https://github.com/tmux-plugins/tpm diff --git a/.tmux.conf b/.tmux.conf new file mode 100644 index 0000000..12ea183 --- /dev/null +++ b/.tmux.conf @@ -0,0 +1,34 @@ +unbind r + +bind r source-file ~/.tmux.conf + +set -g prefix C-s + +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'catppuccin/tmux' +bind-key h select-pane -L +bind-key j select-pane -D +bind-key k select-pane -U +bind-key l select-pane -R + + +set -g @catppucin_flavour 'mocha' +set -g @catppuccin_window_left_separator "█" +set -g @catppuccin_window_right_separator "█ " +set -g @catppuccin_window_number_position "right" +set -g @catppuccin_window_middle_separator " █" + +set -g @catppuccin_window_default_fill "number" + +set -g @catppuccin_window_current_fill "number" +set -g @catppuccin_window_current_text "#{pane_current_path}" + +set -g @catppuccin_status_modules_right "application session date_time" +set -g @catppuccin_status_left_separator "" +set -g @catppuccin_status_right_separator " " +set -g @catppuccin_status_right_separator_inverse "yes" +set -g @catppuccin_status_fill "all" +set -g @catppuccin_status_connect_separator "no" +set -g @catppuccin_directory_text "#{pane_current_path}" + +run '~/.tmux/plugins/tpm/tpm' diff --git a/.tmux/plugins/tpm b/.tmux/plugins/tpm new file mode 160000 index 0000000..99469c4 --- /dev/null +++ b/.tmux/plugins/tpm @@ -0,0 +1 @@ +Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/.zshrc b/.zshrc index 8a19b8e..a84a5c4 100644 --- a/.zshrc +++ b/.zshrc @@ -25,6 +25,8 @@ backward-kill-dir () { zle -N backward-kill-dir bindkey '^[^?' backward-kill-dir +bindkey \^K kill-line + # ZSH enhancements source ~/zsh-stuff/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source ~/zsh-stuff/spaceship-prompt/spaceship.zsh diff --git a/scripts/machine-specific-zsh/armin.zsh b/scripts/machine-specific-zsh/armin.zsh index dae848f..1249f80 100644 --- a/scripts/machine-specific-zsh/armin.zsh +++ b/scripts/machine-specific-zsh/armin.zsh @@ -16,4 +16,6 @@ export PATH="/opt/homebrew/opt/erlang@25/bin:$PATH" # asdf . $(brew --prefix asdf)/libexec/asdf.sh +export DARK_MODE=True + export PATH=$PATH:/Users/lizzy/.spicetify