mirror of https://github.com/sgoudham/nvim.git
removed extras
Pocco81
3 years ago
parent
931a91878d
commit
da17cefdc0
@ -1,29 +0,0 @@
|
|||||||
# Alacritty Themes
|
|
||||||
|
|
||||||
Making your Alacritty terminal emulator colors match your Catppucino colors is
|
|
||||||
easy! Simply copy the values from the respective `.yml` file in this directory
|
|
||||||
and paste it over the `colors` configuration in your `alacritty.yml` file.
|
|
||||||
|
|
||||||
## `tmux` Users
|
|
||||||
|
|
||||||
If you use `tmux` inside of Alacritty you may notice that your terminal colors
|
|
||||||
don't match your Catppucino colors. The solution is two-fold. First, make sure
|
|
||||||
you have the following set in `alacritty.yml`:
|
|
||||||
|
|
||||||
```yml
|
|
||||||
env:
|
|
||||||
TERM: xterm-256color
|
|
||||||
```
|
|
||||||
|
|
||||||
Second, make sure you have the following in your `tmux.conf`:
|
|
||||||
|
|
||||||
```
|
|
||||||
set -g default-terminal "xterm-256color"
|
|
||||||
set-option -ga terminal-overrides ",xterm-256color:Tc"
|
|
||||||
```
|
|
||||||
|
|
||||||
Now you should be all set!
|
|
||||||
|
|
||||||
## References
|
|
||||||
+ Original issue with discussion: https://github.com/Pocco81/Catppuccino.nvim/pull/9
|
|
||||||
+ Alacritty-tmux true colors: https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
# Catppuccino Light Melya
|
|
||||||
colors:
|
|
||||||
# Default colors
|
|
||||||
primary:
|
|
||||||
background: '0x1B1623'
|
|
||||||
foreground: '0xB9C4E3'
|
|
||||||
|
|
||||||
# Colors the cursor will use if `custom_cursor_colors` is true
|
|
||||||
cursor:
|
|
||||||
text: '0x221E2F'
|
|
||||||
cursor: '0xADD692'
|
|
||||||
|
|
||||||
# Normal colors
|
|
||||||
normal:
|
|
||||||
black: '0x0E0C13'
|
|
||||||
red: '0xE28D8D'
|
|
||||||
green: '0xADD692'
|
|
||||||
yellow: '0xF0DC89'
|
|
||||||
blue: '0x84A5CB'
|
|
||||||
magenta: '0xAE9AD6'
|
|
||||||
cyan: '0xF0A8E4'
|
|
||||||
white: '0xF0F0F5'
|
|
||||||
|
|
||||||
# Bright colors
|
|
||||||
bright:
|
|
||||||
black: '0x221E2F'
|
|
||||||
red: '0xE28D8D'
|
|
||||||
green: '0xADD692'
|
|
||||||
yellow: '0xF0DC89'
|
|
||||||
blue: '0x84A5CB'
|
|
||||||
magenta: '0xAE9AD6'
|
|
||||||
cyan: '0xF0A8E4'
|
|
||||||
white: '0xF0F0F5'
|
|
||||||
|
|
||||||
indexed_colors:
|
|
||||||
- { index: 16, color: '0xF0DC89' }
|
|
||||||
- { index: 17, color: '0xE28D8D' }
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
# main colors
|
|
||||||
background #1B1623
|
|
||||||
foreground #B9C4E3
|
|
||||||
selection_background #312C44
|
|
||||||
selection_foreground #F0A8E4
|
|
||||||
url_color #82A4CA
|
|
||||||
cursor #ADD692
|
|
||||||
|
|
||||||
# tabs
|
|
||||||
active_tab_background #1B1624
|
|
||||||
active_tab_foreground #F0F0F5
|
|
||||||
inactive_tab_background #221e2f
|
|
||||||
inactive_tab_foreground #B6C2E2
|
|
||||||
tab_bar_background #0E0C13
|
|
||||||
|
|
||||||
# normal
|
|
||||||
color0 #0E0C13
|
|
||||||
color1 #E28D8D
|
|
||||||
color2 #ADD692
|
|
||||||
color3 #F0DC89
|
|
||||||
color4 #84A5CB
|
|
||||||
color5 #AE9AD6
|
|
||||||
color6 #F0A8E4
|
|
||||||
color7 #F0F0F5
|
|
||||||
|
|
||||||
# bright
|
|
||||||
color8 #221E2F
|
|
||||||
color9 #E28D8D
|
|
||||||
color10 #ADD692
|
|
||||||
color11 #F0DC89
|
|
||||||
color12 #84A5CB
|
|
||||||
color13 #AE9AD6
|
|
||||||
color14 #F0A8E4
|
|
||||||
color15 #F0F0F5
|
|
||||||
|
|
||||||
# extended colors
|
|
||||||
color16 #F0DC89
|
|
||||||
color17 #E28D8D
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
# these are general settings for Tmux unrelated to Catppuccin
|
|
||||||
# Dependencies:
|
|
||||||
# + xclip
|
|
||||||
|
|
||||||
# ----------------------------=== Settings ===--------------------------
|
|
||||||
|
|
||||||
# --------=== General
|
|
||||||
# set -g default-terminal "screen-256color" # colors!
|
|
||||||
# set -g default-terminal "xterm-kitty" # colors!
|
|
||||||
# set -g default-terminal "xterm-256color" # colors!, DON't USE THIS generates problems with keyboard and other stuff
|
|
||||||
set -g default-terminal "tmux-256color"
|
|
||||||
|
|
||||||
# useful for fixing mismatching nvim colors while on Alacritty and other terminals. Follow: https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6
|
|
||||||
set -ag terminal-overrides ",xterm-256color:RGB"
|
|
||||||
# set-option -ga terminal-overrides ",tmux-256color:Tc"
|
|
||||||
setw -g xterm-keys on
|
|
||||||
set -s focus-events on
|
|
||||||
|
|
||||||
# faster command sequences aka no delay when pressing certain keys (e.g. Esc)
|
|
||||||
set -sg escape-time 0
|
|
||||||
set -sg repeat-time 400 # increase repeat timeout
|
|
||||||
|
|
||||||
# --------=== Other
|
|
||||||
|
|
||||||
# Automatically set window title
|
|
||||||
set-window-option -g automatic-rename on
|
|
||||||
set-option -g set-titles on
|
|
||||||
set -g history-limit 50000
|
|
||||||
set -g mouse on
|
|
||||||
setw -q -g utf8 on # charset
|
|
||||||
|
|
||||||
# --------=== Display
|
|
||||||
|
|
||||||
set -g base-index 1 # start windows numbering at 1
|
|
||||||
setw -g pane-base-index 1 # make pane numbering consistent with windows
|
|
||||||
set -g renumber-windows on # renumber windows when a window is closed
|
|
||||||
set -g set-titles on # set terminal title
|
|
||||||
set -g display-panes-time 800 # slightly longer pane indicators display time
|
|
||||||
set -g display-time 1000 # slightly longer status messages display time
|
|
||||||
set -g status-interval 0 # redraw status line every 10 seconds
|
|
||||||
|
|
||||||
# --------=== Activity
|
|
||||||
set -g monitor-activity on
|
|
||||||
set -g visual-activity off
|
|
||||||
# set -g bell-action none
|
|
||||||
# set -g visual-bell off
|
|
||||||
# set -g visual-silence off
|
|
||||||
|
|
||||||
# ----------------------------=== Key Bindings ===--------------------------
|
|
||||||
|
|
||||||
# see `man tmux`
|
|
||||||
# NOTE: -n: no prefix
|
|
||||||
# NOTE: -r: prefix not required after being pressed for `repeat-time`
|
|
||||||
|
|
||||||
set-option -g prefix M-f # change default tmux prefix from Ctrl+b to Alt+f
|
|
||||||
|
|
||||||
bind r source-file ~/.tmux.conf # source .tmux.conf at $HOME
|
|
||||||
|
|
||||||
bind-key v split-window -h -c "#{pane_current_path}" # horizontally split current window
|
|
||||||
bind-key s split-window -v -c "#{pane_current_path}" # vertically split current window
|
|
||||||
|
|
||||||
bind-key -r b set-option status # toggle statusline
|
|
||||||
|
|
||||||
bind-key g display-popup -E "tmux new-session -A -s scratch" # aka floating terminal
|
|
||||||
|
|
||||||
# thanks https://unix.stackexchange.com/a/525770
|
|
||||||
bind -n M-PageDown swap-window -d -t -1 # Move current window to the left and switch to it
|
|
||||||
bind -n M-PageUp swap-window -d -t +1 # Move current window to the right and switch to it
|
|
||||||
# bind -n C-S-Left swap-window -d -t -1
|
|
||||||
# bind -n C-S-Right swap-window -d -t +1
|
|
||||||
|
|
||||||
bind-key j choose-tree -swZ # TUI for moving around open windows
|
|
||||||
|
|
||||||
bind-key J resize-pane -D 5
|
|
||||||
bind-key K resize-pane -U 5
|
|
||||||
bind-key H resize-pane -L 5
|
|
||||||
bind-key L resize-pane -R 5
|
|
||||||
|
|
||||||
bind-key -n -r M-t new-window -c "#{pane_current_path}" # spawn a window in cwd
|
|
||||||
bind-key -n -r M-w kill-window # kill current window
|
|
||||||
bind-key -n -r M-c kill-pane # kill current pane
|
|
||||||
|
|
||||||
bind-key -n M-1 select-window -t 1
|
|
||||||
bind-key -n M-2 select-window -t 2
|
|
||||||
bind-key -n M-3 select-window -t 3
|
|
||||||
bind-key -n M-4 select-window -t 4
|
|
||||||
bind-key -n M-5 select-window -t 5
|
|
||||||
bind-key -n M-6 select-window -t 6
|
|
||||||
bind-key -n M-7 select-window -t 7
|
|
||||||
bind-key -n M-8 select-window -t 8
|
|
||||||
bind-key -n M-9 select-window -t 9
|
|
||||||
bind-key -n M-0 select-window -t 0
|
|
||||||
|
|
||||||
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' # use system clipboard
|
|
||||||
|
|
||||||
|
|
||||||
# bind-key -n M-S-Left resize-pane -D
|
|
||||||
# bind-key -n M-S-Right resize-pane -U
|
|
||||||
# bind-key -n M-S-Up resize-pane -L
|
|
||||||
# bind-key -n M-S-Down resize-pane -R
|
|
||||||
|
|
||||||
# Use Alt-arrow keys without the prefix to switch panes
|
|
||||||
bind -n M-Left select-pane -L
|
|
||||||
bind -n M-Right select-pane -R
|
|
||||||
bind -n M-Up select-pane -U
|
|
||||||
bind -n M-Down select-pane -D
|
|
||||||
|
|
||||||
# Shift arrow to switch windows
|
|
||||||
bind -n S-Left previous-window
|
|
||||||
bind -n S-Right next-window
|
|
||||||
|
|
||||||
# ----------------------------=== Modes ===--------------------------
|
|
||||||
|
|
||||||
set -g status-keys vi # vi status
|
|
||||||
setw -g mode-keys vi # vi shortcuts
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
# Tmux Themes
|
|
||||||
|
|
||||||
Making your Tmux multiplexer colors match your Catppucino colors is easy! Simply copy the `.conf` file into your `.tmux.conf` (which should be located under `$HOME`).
|
|
||||||
|
|
||||||
The themes include the base color palette for the respective theme, most notably used for Tmux's statusline.
|
|
||||||
|
|
||||||
## Base config
|
|
||||||
|
|
||||||
In this directory you'd also find a [base config for Tmux](https://github.com/Pocco81/Catppuccino.nvim/blob/dev/extra/tmux/.tmux.conf) with useful comment to get you started if you don't already have one. In case you decide to use the base config, make sure to paste it in your `.tmux.conf` before the Catppucino theme you chose. You may as well copy the base first and then source the theme with the `source-file` on your `.tmux.conf`.
|
|
||||||
|
|
||||||
## Alacritty/Kitty Incompatibility
|
|
||||||
|
|
||||||
If you are having issues with the colors not displaying accordingly, see the [README from the Catppucino themes for Alacritty](https://github.com/Pocco81/Catppuccino.nvim/tree/main/extra/alacritty)
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
# NOTE: you can use vars with $<var> and ${<var>} as long as the str is double quoted: ""
|
|
||||||
# WARNING: hex colors can't contain capital letters
|
|
||||||
|
|
||||||
# --> Catppuccin (some colors)
|
|
||||||
thm_bg="#1b1624"
|
|
||||||
thm_fg="#B9C4E3"
|
|
||||||
thm_white="#f0f0f5"
|
|
||||||
thm_black="#0E0C13"
|
|
||||||
thm_gray="#312C44"
|
|
||||||
thm_magenta="#ae9ad6"
|
|
||||||
thm_pink="#f0a8e4"
|
|
||||||
thm_red="#e28d8d"
|
|
||||||
thm_green="#add692"
|
|
||||||
thm_yellow="#f0dc89"
|
|
||||||
thm_blue="#84a5cb"
|
|
||||||
thm_orange="#e7a988"
|
|
||||||
|
|
||||||
# ----------------------------=== Theme ===--------------------------
|
|
||||||
|
|
||||||
# status
|
|
||||||
set -g status-position top
|
|
||||||
set -g status "on"
|
|
||||||
set -g status-bg "${thm_bg}"
|
|
||||||
set -g status-justify "left"
|
|
||||||
set -g status-left-length "100"
|
|
||||||
set -g status-right-length "100"
|
|
||||||
|
|
||||||
# messages
|
|
||||||
set -g message-style fg="${thm_white}",bg="${thm_gray}",align="centre"
|
|
||||||
set -g message-command-style fg="${thm_white}",bg="${thm_gray}",align="centre"
|
|
||||||
|
|
||||||
# panes
|
|
||||||
set -g pane-border-style fg="${thm_gray}"
|
|
||||||
set -g pane-active-border-style fg="${thm_blue}"
|
|
||||||
|
|
||||||
# windows
|
|
||||||
setw -g window-status-activity-style fg="${thm_fg}",bg="${thm_bg}",none
|
|
||||||
setw -g window-status-separator ""
|
|
||||||
setw -g window-status-style fg="${thm_fg}",bg="${thm_bg}",none
|
|
||||||
|
|
||||||
# --------=== Statusline
|
|
||||||
|
|
||||||
set -g status-left ""
|
|
||||||
set -g status-right "#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red],#[fg=$thm_green]}#[bg=$thm_gray]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green]}#[fg=$thm_bg] #[fg=$thm_fg,bg=$thm_gray] #S "
|
|
||||||
|
|
||||||
# current_dir
|
|
||||||
setw -g window-status-format "#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} "
|
|
||||||
setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_white,bg=$thm_bg] #{b:pane_current_path} "
|
|
||||||
|
|
||||||
# parent_dir/current_dir
|
|
||||||
# setw -g window-status-format "#[fg=colour232,bg=colour111] #I #[fg=colour222,bg=colour235] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
|
|
||||||
# setw -g window-status-current-format "#[fg=colour232,bg=colour208] #I #[fg=colour255,bg=colour237] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
|
|
||||||
|
|
||||||
# --------=== Modes
|
|
||||||
setw -g clock-mode-colour "${thm_blue}"
|
|
||||||
setw -g mode-style "fg=${thm_yellow} bg=${thm_bg} bold"
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
# Xresource Themes
|
|
||||||
|
|
||||||
Making your generic X11 application match your Catppuccin colors is easy! Simply copy the `Xresources` file to `$HOME/.Xresources` (or anywhere else if desired) and run `xrdb ~/.Xresources`.
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
*background: #1B1623
|
|
||||||
*foreground: #B9C4E3
|
|
||||||
! Blacks
|
|
||||||
*color0: #0E0C13
|
|
||||||
*color8: #221E2F
|
|
||||||
! Reds
|
|
||||||
*color1: #E28D8D
|
|
||||||
*color9: #E28D8D
|
|
||||||
! Greens
|
|
||||||
*color2: #ADD692
|
|
||||||
*color10: #ADD692
|
|
||||||
! Yellows
|
|
||||||
*color3: #F0DC89
|
|
||||||
*color11: #F0DC89
|
|
||||||
! Blues
|
|
||||||
*color4: #84A5CB
|
|
||||||
*color13: #84A5CB
|
|
||||||
! Magentas
|
|
||||||
*color5: #AE9AD6
|
|
||||||
*color14: #AE9AD6
|
|
||||||
! Cyans
|
|
||||||
*color6: #F0A8E4
|
|
||||||
*color14: #F0A8E4
|
|
||||||
! Whites
|
|
||||||
*color7: #F0F0F5
|
|
||||||
*color15: #F0F0F5
|
|
||||||
Loading…
Reference in New Issue