From ae1e8fd8511b70c1a8a37e211f644869d21d9a19 Mon Sep 17 00:00:00 2001 From: Vasili Sviridov Date: Thu, 5 Mar 2015 14:40:22 -0500 Subject: [PATCH 1/6] fixed email --- gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitconfig b/gitconfig index 95abae9..89c6b48 100644 --- a/gitconfig +++ b/gitconfig @@ -1,6 +1,6 @@ [user] - name = Vasili Svirydau - email = vasili.svirydau@move.com + name = Vasili Sviridov + email = vasili@sviridov.ca [push] default = simple From f1221bbe3b78d5bc910f9e66ba3db4fe95411d3a Mon Sep 17 00:00:00 2001 From: Vasili Svirydau Date: Wed, 24 Jun 2015 18:47:51 -0700 Subject: [PATCH 2/6] changed stuff --- gitconfig | 17 ++++++++++++++++- htoprc | 22 ++++++++++++++++++++++ tmux.conf | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 htoprc diff --git a/gitconfig b/gitconfig index 95abae9..c0163b8 100644 --- a/gitconfig +++ b/gitconfig @@ -1,6 +1,21 @@ [user] name = Vasili Svirydau - email = vasili.svirydau@move.com + email = vsviridov@exceede.com [push] default = simple +[difftool "bcompare-mac"] + cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare"\" +[mergetool "bcompare-mac"] + cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"" + trustExitCode = true + +[difftool "sourcetree"] + cmd = opendiff \"$LOCAL\" \"$REMOTE\" + # path = +[mergetool "sourcetree"] + cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" + trustExitCode = true + +[core] + editor = /usr/bin/vim diff --git a/htoprc b/htoprc new file mode 100644 index 0000000..8858044 --- /dev/null +++ b/htoprc @@ -0,0 +1,22 @@ +# Beware! This file is rewritten every time htop exits. +# The parser is also very primitive, and not human-friendly. +# (I know, it's in the todo list). +fields=0 48 17 18 38 39 40 2 46 47 49 1 +sort_key=47 +sort_direction=1 +hide_threads=0 +hide_kernel_threads=1 +hide_userland_threads=1 +shadow_other_users=1 +highlight_base_name=1 +highlight_megabytes=1 +highlight_threads=1 +tree_view=0 +header_margin=1 +detailed_cpu_time=0 +color_scheme=0 +delay=15 +left_meters=AllCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 2 diff --git a/tmux.conf b/tmux.conf index 4fe6741..58ec45e 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,3 +1,4 @@ +set -g default-command "reattach-to-user-namespace -l $SHELL" set -g default-terminal "screen-256color" set -g base-index 1 if-shell '[ "$(tmux -V | awk '{print $2*10}')" -ge 17 ]' 'set -g pane-base-index 1' From 0d02d60068a35af48f7f80fc10d55419e75f0de3 Mon Sep 17 00:00:00 2001 From: Vasili Sviridov Date: Thu, 3 Sep 2015 02:14:02 +0000 Subject: [PATCH 3/6] make install script shellcheck compliant --- gitconfig | 6 +++--- setup.sh | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gitconfig b/gitconfig index 95abae9..cf898d8 100644 --- a/gitconfig +++ b/gitconfig @@ -1,6 +1,6 @@ [user] - name = Vasili Svirydau - email = vasili.svirydau@move.com + name = Vasili Sviridov + email = vasili@sviridov.ca [push] - default = simple + default = simple diff --git a/setup.sh b/setup.sh index 71804ae..ed96531 100755 --- a/setup.sh +++ b/setup.sh @@ -1,17 +1,18 @@ -#!/bin/sh +#!/bin/bash # From aaronjensen/dotfiles -cd `dirname $0` -F=`pwd |sed -e "s#$HOME/\?##"` +cd "$(dirname "$0")" +F=$( pwd |sed -e "s#$HOME/\?##" ) for P in * do # skip setup if [ "$P" = "setup.sh" ]; then continue; fi + if [ "$P" = "README.md" ]; then continue; fi # ensure permissions - chmod -R o-rwx,g-rwx $P + chmod -R o-rwx,g-rwx "$P" # skip existing links if [ -h "$HOME/.$P" ]; then continue; fi From 8ebc4286fdbb6de34cc4f1bc70f9b06b1a2af455 Mon Sep 17 00:00:00 2001 From: Vasili Sviridov Date: Thu, 22 Oct 2015 16:11:25 -0700 Subject: [PATCH 4/6] Now with rubocop --- htoprc | 2 +- rubocop.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 rubocop.yml diff --git a/htoprc b/htoprc index 8858044..99e2ace 100644 --- a/htoprc +++ b/htoprc @@ -11,7 +11,7 @@ shadow_other_users=1 highlight_base_name=1 highlight_megabytes=1 highlight_threads=1 -tree_view=0 +tree_view=1 header_margin=1 detailed_cpu_time=0 color_scheme=0 diff --git a/rubocop.yml b/rubocop.yml new file mode 100644 index 0000000..c441045 --- /dev/null +++ b/rubocop.yml @@ -0,0 +1,2 @@ +Metrics/LineLength: + Enabled: false From f82e59737d558c309110def6768afcc85e3be22c Mon Sep 17 00:00:00 2001 From: Vasili Sviridov Date: Fri, 17 Jun 2016 17:04:42 -0700 Subject: [PATCH 5/6] tmux shenanigans --- tmux.conf | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/tmux.conf b/tmux.conf index 58ec45e..db70d0f 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,30 +1,22 @@ -set -g default-command "reattach-to-user-namespace -l $SHELL" +set -g default-command "reattach-to-user-namespace -l fish" set -g default-terminal "screen-256color" +run "~/.dotfiles/tmux.sh" set -g base-index 1 -if-shell '[ "$(tmux -V | awk '{print $2*10}')" -ge 17 ]' 'set -g pane-base-index 1' set -g set-titles on set -g status-keys vi # Faster Command Sequences set -s escape-time 0 -# mouse can be used to select panes -set -g mouse-select-pane on -# mouse can be used to select windows (by clicking in the status bar) -set -g mouse-select-window on -# mouse can be used to resize panes (by dragging dividers) -set -g mouse-resize-pane on -# not really sure what this does, but with it, the scrollwheel works inside Vim -set -g mouse-utf8 on + set -g set-clipboard on set -g history-limit 50000 +set -g mouse-utf8 on setw -g utf8 on setw -g xterm-keys on setw -g automatic-rename on setw -g monitor-activity on setw -g aggressive-resize on -# allow mouse to enter copy mode and initiate selection -setw -g mode-mouse on unbind C-a unbind C-b @@ -38,7 +30,7 @@ bind a send-key C-a set -g xterm-keys on -bind | split-window -h # split horiz -bind _ split-window -v # split vert +bind | split-window -h -c "#{pane_current_path}"# split horiz +bind _ split-window -v -c "#{pane_current_path}"# split vert bind A command-prompt "rename-window '%%'" From 99050a2e0efc9db3ac6d5d626e517d0bbb34427b Mon Sep 17 00:00:00 2001 From: Vasili Sviridov Date: Tue, 15 Nov 2016 08:56:35 -0800 Subject: [PATCH 6/6] tmux sessions, bcomp --- gitconfig | 16 ++++++++++++---- tmux.conf | 5 ++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gitconfig b/gitconfig index 12e829f..5328889 100644 --- a/gitconfig +++ b/gitconfig @@ -1,9 +1,17 @@ [user] - name = Vasili Sviridov - email = vasili@sviridov.ca + name = Vasili Sviridov + email = vasili@sviridov.ca [push] - default = simple + default = simple [core] - editor = /usr/bin/vim + editor = /usr/bin/vim +[diff] + tool = bcomp +[merge] + tool = bcomp + +[mergetool "bcomp"] + trustExitCode = true + cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" diff --git a/tmux.conf b/tmux.conf index db70d0f..31c133e 100644 --- a/tmux.conf +++ b/tmux.conf @@ -10,9 +10,6 @@ set -s escape-time 0 set -g set-clipboard on set -g history-limit 50000 -set -g mouse-utf8 on - -setw -g utf8 on setw -g xterm-keys on setw -g automatic-rename on setw -g monitor-activity on @@ -34,3 +31,5 @@ bind | split-window -h -c "#{pane_current_path}"# split horiz bind _ split-window -v -c "#{pane_current_path}"# split vert bind A command-prompt "rename-window '%%'" + +new-session # always create a session (can always `tmux a`)