diff options
| -rw-r--r-- | Common/alacritty/alacritty.yml | 6 | ||||
| -rw-r--r-- | Common/sway/config | 1 | ||||
| -rw-r--r-- | Common/zshrc | 6 | ||||
| -rw-r--r-- | linux/tmux.conf | 45 |
4 files changed, 41 insertions, 17 deletions
diff --git a/Common/alacritty/alacritty.yml b/Common/alacritty/alacritty.yml index 7423485..b89296b 100644 --- a/Common/alacritty/alacritty.yml +++ b/Common/alacritty/alacritty.yml @@ -1,8 +1,8 @@ live_config_reload: true import: - - ~/.config/alacritty/papercolor-light.yaml - #- ~/.config/alacritty/atom_one_light.yaml + #- ~/.config/alacritty/papercolor-light.yaml + - ~/.config/alacritty/atom_one_light.yaml #- ~/.config/alacritty/papertheme.yaml #- ~/.config/alacritty/solarized_light.yaml @@ -13,7 +13,7 @@ font: normal: family: RobotoMono Nerd Font Mono - size: 10 + size: 8 window: padding: diff --git a/Common/sway/config b/Common/sway/config index 3e0fc33..7520ba8 100644 --- a/Common/sway/config +++ b/Common/sway/config @@ -13,6 +13,7 @@ include touchpad # border & title for_window [title="^.*"] border none, title_format "<b> %class >> %title </b>" +for_window [floating] border 1 default_border none # gaps diff --git a/Common/zshrc b/Common/zshrc index dca8124..ee0ff91 100644 --- a/Common/zshrc +++ b/Common/zshrc @@ -7,6 +7,7 @@ fi # If you come from bash you might have to change your $PATH. export PATH=$HOME/bin:/usr/local/bin:$HOME/.local/bin:$PATH +export KEYTIMEOUT=1 # Check if env setup file exists if [ ! -f ~/.zsh_env_setup ]; then @@ -69,6 +70,11 @@ alias ls="tput setaf 3 && echo \"'lsa' for 'ls -la', \n'lsg' for 'ls | grep',\n' alias notes="vim ~/Documents/notes.txt" alias todo="vim ~/Documents/todo.txt" +alias _vi=$(which vi) +alias _vim=$(which vim) +alias vi=nvim +alias vim=nvim + # man pages in colors man() { LESS_TERMCAP_md=$'\e[01;31m' \ diff --git a/linux/tmux.conf b/linux/tmux.conf index 35f249b..b1bb2cb 100644 --- a/linux/tmux.conf +++ b/linux/tmux.conf @@ -1,19 +1,15 @@ # -- general ------------------------------------------------------------------- -#set -g default-terminal "xterm-256color" -set -g default-terminal "screen-256color" -#set -g default-terminal "xterm-256color" +#set -g default-terminal "screen-256color" +#set -g default-terminal "screen-256color-bce" +set -g default-terminal "xterm-256color" #set -as terminal-overrides ",*:U8=0" #set-option -sa terminal-overrides ',xterm-256color:RGB' set-option -ga terminal-overrides ",xterm-256color:Tc" -set -s escape-time 10 # faster command sequences +set -s escape-time 0 # faster command sequences set -s focus-events on -#run-shell "powerline-daemon -q" -#source "/usr/local/lib/python3.7/site-packages/powerline/bindings/tmux/powerline.conf" -source "/home/jakob/.local/lib/python3.9/site-packages/powerline/bindings/tmux/powerline.conf" - # -- display ------------------------------------------------------------------- set -g base-index 1 setw -g pane-base-index 1 @@ -23,13 +19,10 @@ set -g renumber-windows on # renumber windows when a window is closed 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 10 # redraw status line every 10 seconds +set -g status-interval 10 # redraw status linebg every 10 seconds set-option -g default-shell /usr/bin/zsh -#set-option -g display-panes-active-colour colour33 -#set-option -g display-panes-colour colour166 - # activity set -g monitor-activity on set -g visual-activity off @@ -42,6 +35,7 @@ set -g visual-activity on unbind C-b set -g prefix C-a +bind C-a send-prefix bind -n C-M-h resize-pane -L 2 bind -n C-M-j resize-pane -D 2 @@ -80,7 +74,7 @@ set -g mouse on bind-key = set-window-option synchronize-panes # -- macros -------------------------------------------------------------------- -bind-key a send-keys \"jakob.stendahl\ <jakob.stendahl@infomedia.dk>\" +bind-key s send-keys \"jakob.stendahl\ <jakob.stendahl@infomedia.dk>\" # -- vim-tmux-navigator -------------------------------------------------------- # Smart pane switching with awareness of Vim splits. @@ -104,4 +98,27 @@ bind-key -T copy-mode-vi 'C-l' select-pane -R bind-key -T copy-mode-vi 'C-\' select-pane -l # -- Utility ------------------------------------------------------------------ -bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded" +bind-key r source-file ~/.tmux.conf + +# -- Theme -------------------------------------------------------------------- +set -g status-justify left +set -g status-interval 2 +set -g status-position bottom +set -g status-bg '#f8f8f8' +set -g status-fg colour16 + +set -g status-left '#[default] #[fg=colour0,bg=colour7,bold][#S]#[bg=colour15] ' +set -g status-left-length 20 + +set -g status-right '#[fg=colour0,bg=colour7,bold] #(hostname) #[default] #[fg=colour0,bg=colour7,bold] %d/%m/%y #[default] #[fg=colour0,bg=colour7,bold] %H:%M:%S #[default] #[bg=colour7,bold] #(cat /sys/class/power_supply/BAT0/capacity)% #[default] #[fg=colour232,bg=colour202,bold]#{?client_prefix, <Prefix> ,}' +set -g status-right-length 50 + +setw -g window-status-format ' #I:#W#F ' +setw -g window-status-current-format ' #I:#W#F ' + +setw -g window-status-current-style "bg=colour0,fg=colour15" +setw -g window-status-style "bg=colour7,fg=colour15" +setw -g window-status-bell-style "bg=colour23,fg=colour15" +setw -g window-status-activity-style "bg=colour23,fg=colour15" + + |