diff --git a/dot_config/jj/config.toml b/dot_config/jj/config.toml index 43fd6ec..bd48ddd 100644 --- a/dot_config/jj/config.toml +++ b/dot_config/jj/config.toml @@ -12,7 +12,7 @@ diff-formatter = ":git" 'nearby(x)' = 'descendants(ancestors(@, x))::' [revsets] -log = "nearby(8) | @..main@origin | main@origin::@ | @:: | visible_heads() ~ bookmarks()" +log = "nearby(8) | @..main@origin | main@origin::@ | @:: | (visible_heads() & mine())" [colors] diff --git a/dot_tmux.conf b/dot_tmux.conf index 0e138c4..c2aeef0 100644 --- a/dot_tmux.conf +++ b/dot_tmux.conf @@ -8,13 +8,13 @@ setw -g pane-base-index 1 set -sg escape-time 10 bind-key C-o last-window -bind-key C-a select-pane -t :.+ +# bind-key C-a select-pane -t :.+ bind-key a send-prefix bind r source-file ~/.tmux.conf -bind -n M-j select-pane -D -bind -n M-k select-pane -U -bind -n M-h select-pane -L -bind -n M-l select-pane -R +bind -n M-j select-pane -t :.+ +bind -n M-k select-pane -t :.- +#bind -n M-h select-pane -L +#bind -n M-l select-pane -R bind -n M-n next-window bind -n M-p previous-window bind-key C-n next-window