diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index c9af03d..0f4ce53 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -2,7 +2,7 @@ window: opacity: 0.85 font: - size: 12 + size: 20 normal: family: FiraCode Nerd Font style: Regular diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 24af215..06939c5 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -13,6 +13,6 @@ require("lazy").setup( -- install = { colorscheme = { "gruvbox", "ayu", "melange", } } } ) -- loads each lua/plugin/* - +vim.cmd 'hi Normal guibg=NONE ctermbg=NONE' require("clint") -- loads lua/clint/init.lua require('dap-python').setup('~/.virtualenvs/debugpy/bin/python') diff --git a/tmux/.config/tmux/custom.conf b/tmux/.config/tmux/custom.conf new file mode 100644 index 0000000..e69de29 diff --git a/tmux/.config/tmux/statusline.conf b/tmux/.config/tmux/statusline.conf index 03acf66..0b15bc4 100644 --- a/tmux/.config/tmux/statusline.conf +++ b/tmux/.config/tmux/statusline.conf @@ -1,22 +1,25 @@ # general -# set -g default-terminal "screen-256color" # left status -set-window-option -g status-left " [ #S ] " -set-window-option -g status-left-style "fg=blue bg=black" +set-window-option -g status-left " #S #[fg=brightred bg=black]>> " +set-window-option -g status-left-style "fg=white bg=black" set-window-option -g status-left-length 30 # right status -set-window-option -g status-right " %I:%M%p %d-%b-%y " -set-window-option -g status-right-style "fg=blue bg=black" +set-window-option -g status-right "#[fg=brightred bg=black] #[fg=white bg=black] #{weather} #[fg=brightred bg=black] #[fg=colour179 bg=black]🖥 CPU:#{cpu_percentage} MEM:#{ram_percentage} #[fg=brightred bg=black] #[fg=white bg=black]📅%Y-%m-%d 🕗%I:%m%p" +set-window-option -g status-right-style "fg=white bg=black" +set-option -g status-right # inactive windows set-window-option -g window-status-format " #I: #W " +set-window-option -g window-status-style "bg=black fg=white" # active windows set-window-option -g window-status-current-format " #I: #W " -set-window-option -g window-status-current-style "bg=black fg=blue bright" +set-window-option -g window-status-current-style "bg=white fg=black bold" # main bg color -set -g status-bg blue +set -g status-bg black + +##             diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index 7aa087b..f72d463 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -1,14 +1,12 @@ -# remap prefix from 'C-b' to 'C-a' +# remap prefix from 'C-b' to '`' unbind C-b -# set-option -g prefix C-a -# bind-key C-a send-prefix set-option -g prefix '`' bind-key '`' send-prefix # mouse scrolling setw -g mouse on -# 0 is too far from Ctrl-a. +# 1-indexed windows set -g base-index 1 # 1-indexed panes to match the windows. @@ -40,22 +38,38 @@ bind-key -n S-Right next-window set-option -sg escape-time 10 # Plugins +# Install: I +# Uninstall: u set -g @plugin 'tmux-plugins/tpm' # tmux plugin manager -# # Things to plugin -# set -g @plugin 'jimeh/tmux-themepack' -# set -g @themepack 'powerline/default/yellow' +# turn off detach session on destroy +set-option -g detach-on-destroy off -# source ~/.config/tmux/statusline.conf +# Copy stuff from terminal +# Copy view: +# Copy to tmux register: lower case letter +# Paste instantly: upper case letter +# Paste from tmux register: = +set -g @plugin 'fcsonline/tmux-thumbs' + +# Weather data set -g @plugin 'xamut/tmux-weather' -set-option -g status-right "#{weather}" +set-option -g @tmux-weather-units "u" -set -g @plugin 'egel/tmux-gruvbox' -set -g @tmux-gruvbox 'dark' # or 'light' +# CPU +set -g @plugin 'tmux-plugins/tmux-cpu' +# Custom statusline +source ~/.config/tmux/statusline.conf + +# set -g @plugin 'egel/tmux-gruvbox' +# set -g @tmux-gruvbox 'dark' # or 'light' + +# Save and restore sessions +# +r to restore set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @resurrect-strategy-nvim 'session' -# initializes tmux plugin manager - keep this at the bottom +# Initializes tmux plugin manager - keep this at the bottom run '~/.config/tmux/plugins/tpm/tpm' diff --git a/zsh/.zshrc b/zsh/.zshrc index 14947c5..581635c 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -12,7 +12,7 @@ if [ -f ~/.keys ]; then fi # aliases -alias python="/Library/Frameworks/Python.framework/Versions/3.10/bin/python3" +# alias python="/Library/Frameworks/Python.framework/Versions/3.10/bin/python3" alias cp="cp -i" alias more="less" alias weather="curl wttr.in" @@ -71,8 +71,6 @@ eval "$(pyenv init --path)" eval "$(pyenv init -)" # eval "$(pyenv virtualenv-init -)" - source ~/powerlevel10k/powerlevel10k.zsh-theme -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +macchina