diff options
| -rw-r--r-- | git/.gitconfig | 4 | ||||
| -rw-r--r-- | i3/.config/i3/config | 3 | ||||
| -rw-r--r-- | xorg/.Xresources | 8 | ||||
| -rw-r--r-- | zsh/.zshrc | 7 |
4 files changed, 14 insertions, 8 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index ddb0166..e27d9d4 100644 --- a/git/.gitconfig +++ b/git/.gitconfig | |||
| @@ -8,4 +8,6 @@ | |||
| 8 | permission-reset = "!git diff -p | grep -E \"^(diff|old mode|new mode)\" | sed -e \"s/^old/NEW/;s/^new/old/;s/^NEW/new/\" | git apply" | 8 | permission-reset = "!git diff -p | grep -E \"^(diff|old mode|new mode)\" | sed -e \"s/^old/NEW/;s/^new/old/;s/^NEW/new/\" | git apply" |
| 9 | [rerere] | 9 | [rerere] |
| 10 | enabled = 1 | 10 | enabled = 1 |
| 11 | autoupdate = 1 \ No newline at end of file | 11 | autoupdate = 1 |
| 12 | [magit] | ||
| 13 | hideCampaign = true | ||
diff --git a/i3/.config/i3/config b/i3/.config/i3/config index abada2f..26f8178 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config | |||
| @@ -167,8 +167,7 @@ exec run-once synclient PalmDetect=1 | |||
| 167 | exec run-once synclient HorizTwoFingerScroll=1 | 167 | exec run-once synclient HorizTwoFingerScroll=1 |
| 168 | #exec run-once fetchmail -d 60 | 168 | #exec run-once fetchmail -d 60 |
| 169 | exec run-once qasmixer -t | 169 | exec run-once qasmixer -t |
| 170 | # exec run-once tresorit --hidden | ||
| 171 | # exec run-once xfce4-power-manager | 170 | # exec run-once xfce4-power-manager |
| 172 | exec run-once blueman-applet | 171 | exec run-once blueman-applet |
| 173 | exec run-once feh --bg-scale "/home/jason/Tresors/SpiderOak Hive/wallpaper/wallhaven-3601.jpg" | 172 | exec run-once feh --bg-scale "/home/jason/Tresors/SpiderOak Hive/wallpaper/wallhaven-3601.jpg" |
| 174 | exec run-once run_vmtoolsd | 173 | # exec run-once run_vmtoolsd |
diff --git a/xorg/.Xresources b/xorg/.Xresources index f64a307..2521844 100644 --- a/xorg/.Xresources +++ b/xorg/.Xresources | |||
| @@ -24,13 +24,13 @@ URxvt.perl-ext-common: default,matcher,clipboard | |||
| 24 | 24 | ||
| 25 | ! Open URLs with Control+Left Click | 25 | ! Open URLs with Control+Left Click |
| 26 | URxvt.url-launcher: /usr/bin/xdg-open | 26 | URxvt.url-launcher: /usr/bin/xdg-open |
| 27 | !URxvt.matcher.button: C1 | 27 | URxvt.matcher.button: C1 |
| 28 | URxvt.matcher.button: 3 | ||
| 29 | URxvt.url-select.underline: false | 28 | URxvt.url-select.underline: false |
| 30 | 29 | ||
| 31 | 30 | ||
| 32 | URxvt.keysym.C-C: perl:clipboard:copy | 31 | URxvt.perl-lib: /usr/lib/urxvt/perl |
| 33 | URxvt.keysym.C-V: perl:clipboard:paste | 32 | URxvt.keysym.Shift-Control-C: perl:clipboard:copy |
| 33 | URxvt.keysym.Shift-Control-V: perl:clipboard:paste | ||
| 34 | URxvt.keysym.C-A-V: perl:clipboard:paste_escaped | 34 | URxvt.keysym.C-A-V: perl:clipboard:paste_escaped |
| 35 | !disable Ctrl+Shift shortcut that enters ISO14755 mode | 35 | !disable Ctrl+Shift shortcut that enters ISO14755 mode |
| 36 | URxvt.iso14755: false | 36 | URxvt.iso14755: false |
| @@ -53,11 +53,16 @@ ZSH=~/.oh-my-zsh | |||
| 53 | 53 | ||
| 54 | source $ZSH/oh-my-zsh.sh | 54 | source $ZSH/oh-my-zsh.sh |
| 55 | 55 | ||
| 56 | # maybe this stuff should go in .profile. Emacs seems to read from that | ||
| 56 | export RUST_SRC_PATH="$HOME/Code/rust-lang/src" | 57 | export RUST_SRC_PATH="$HOME/Code/rust-lang/src" |
| 57 | source $HOME/.cargo/env | 58 | source $HOME/.cargo/env |
| 58 | 59 | ||
| 60 | export GOROOT=/usr/local/go/ | ||
| 61 | export GOPATH=$HOME/Code/go | ||
| 62 | |||
| 59 | export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/go/bin/:$PATH" | 63 | export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/go/bin/:$PATH" |
| 60 | export PATH="$PATH:$(go env GOPATH)/bin" | 64 | export PATH="$PATH:$GOROOT/bin:$(go env GOPATH)/bin" |
| 65 | |||
| 61 | export MANPATH="/usr/local/man:$MANPATH" | 66 | export MANPATH="/usr/local/man:$MANPATH" |
| 62 | 67 | ||
| 63 | export LANG=en_US.UTF-8 | 68 | export LANG=en_US.UTF-8 |