diff --git a/.chezmoiignore b/.chezmoiignore old mode 100755 new mode 100644 diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/dot_Xmodmap b/dot_Xmodmap old mode 100755 new mode 100644 diff --git a/dot_Xmodmap-laptop b/dot_Xmodmap-laptop old mode 100755 new mode 100644 diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl old mode 100755 new mode 100644 diff --git a/dot_bashrc b/dot_bashrc old mode 100755 new mode 100644 diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index 06ec33d..29e81e2 100755 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -8,7 +8,7 @@ set $term_alt st exec dunst exec compton exec imwheel -xec numlockx on +exec numlockx on exec xbacklight -set 10 # exec wal -i "$(/home/kevin/scripts/shuffler \"/home/kevin/Pictures/Backgrounds/dim/non-editing\")" exec wal -i $(/home/kevin/scripts/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing") diff --git a/dot_gitconfig b/dot_gitconfig old mode 100755 new mode 100644 diff --git a/dot_imwheelrc b/dot_imwheelrc old mode 100755 new mode 100644 diff --git a/dot_inputrc b/dot_inputrc old mode 100755 new mode 100644 diff --git a/dot_tmux.conf b/dot_tmux.conf new file mode 100644 index 0000000..b9e47f9 --- /dev/null +++ b/dot_tmux.conf @@ -0,0 +1,67 @@ +# basic {{{ + +# reload config file (change file location to your the tmux.conf you want to use) +bind r source-file ~/.tmux.conf +# prefix +unbind C-b +set-option -g prefix C-Space +bind-key C-Space send-prefix +# Enable mouse mode (tmux 2.1 and above) +set -g mouse on +# clear rename prompt +bind-key , command-prompt "rename-window '%%'" + +# }}} # + +# panes{{{ + +bind h split-window -h +bind v split-window -v +unbind '"' +unbind % + +# vim-tmux-navigator{{{ +is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ + | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" +bind-key -n C-Left if-shell "$is_vim" "send-keys C-Left" "select-pane -L" +bind-key -n C-Down if-shell "$is_vim" "send-keys C-Down" "select-pane -D" +bind-key -n C-Up if-shell "$is_vim" "send-keys C-Up" "select-pane -U" +bind-key -n C-Right if-shell "$is_vim" "send-keys C-Right" "select-pane -R" +bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l" +bind-key -T copy-mode-vi C-Left select-pane -L +bind-key -T copy-mode-vi C-Down select-pane -D +bind-key -T copy-mode-vi C-Up select-pane -U +bind-key -T copy-mode-vi C-Right select-pane -R +bind-key -T copy-mode-vi C-\ select-pane -l +# bind-key -T copy-mode-vi M-h select-pane -L +# bind-key -T copy-mode-vi M-j select-pane -D +# bind-key -T copy-mode-vi M-k select-pane -U +# bind-key -T copy-mode-vi M-l select-pane -R +# bind-key -T copy-mode-vi M-\ select-pane -l +# }}} + +# kill panes without confirmation +bind-key x kill-pane +bind-key & kill-window + +# switch panes using Alt-arrow without prefix +# bind -n C-Down select-pane -D +# bind -n C-Up select-pane -U +# bind -n C-Left select-pane -L +# bind -n C-l select-pane -R + +# }}} + +# plugins {{{ + +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' + +set -g @plugin 'jimeh/tmux-themepack' +set -g @themepack 'powerline/double/blue' + +set -g @plugin 'christoomey/vim-tmux-navigator' + +run -b '~/.tmux/plugins/tpm/tpm' + +# }}} plugins # diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl old mode 100755 new mode 100644 index ef74a23..a5ca305 --- a/dot_vimrc.tmpl +++ b/dot_vimrc.tmpl @@ -309,7 +309,6 @@ colorscheme gotham256 nnoremap v nnoremap Q @@ -" folds nnoremap , za " indenting diff --git a/dot_xinitrc.tmpl b/dot_xinitrc.tmpl old mode 100755 new mode 100644 diff --git a/dot_zshrc b/dot_zshrc old mode 100755 new mode 100644 diff --git a/key_aliases.tmpl b/key_aliases.tmpl old mode 100755 new mode 100644 index 72d2cf9..197b835 --- a/key_aliases.tmpl +++ b/key_aliases.tmpl @@ -48,6 +48,7 @@ ctltd "sudo systemctl status dhcpcd" ctlr "sudo systemctl restart" nct "sudo netctl" +nctf "sudo ip link set dev wlp3s0 down" nctr "sudo systemctl restart netctl-auto@wlp4s0.service" # ]]] systemctl # @@ -328,12 +329,11 @@ grmor "rm (fd -e orig --no-ignore -H)" # diff/log [[[ # gd "git diff -w" -gdc "git diff -w --cached" +gdc "git diff --cached -w" gdh "git diff --cached -w HEAD~1" gds "git diff --stat" gdt "git difftool -w --tool=vimdiff" gdtc "git difftool -w --cached --tool=vimdiff" - gl "git log" glm "git log master" gsl "git shortlog" diff --git a/key_dirs.tmpl b/key_dirs.tmpl old mode 100755 new mode 100644 diff --git a/key_files.tmpl b/key_files.tmpl old mode 100755 new mode 100644