diff options
author | Jesse Luehrs <doy@tozt.net> | 2018-10-29 03:03:29 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2018-10-29 03:03:29 -0400 |
commit | db8dd3e6140e66db46f309bff9054ba137eb797a (patch) | |
tree | 889147780271b8a9ea1283cea782d118e1b09cf1 | |
parent | 40956ae026974be3fb746eb48f141b8eb14470da (diff) | |
download | conf-db8dd3e6140e66db46f309bff9054ba137eb797a.tar.gz conf-db8dd3e6140e66db46f309bff9054ba137eb797a.zip |
move around some type-specific scripts
-rw-r--r-- | bashrc | 2 | ||||
-rwxr-xr-x | bin/laptop/gpg (renamed from bin/gpg) | 0 | ||||
l--------- | bin/laptop/gpg2 (renamed from bin/gpg2) | 0 | ||||
-rwxr-xr-x | bin/laptop/i3-switch-workspace (renamed from bin/i3-switch-workspace) | 0 | ||||
-rwxr-xr-x | bin/laptop/kill_focused (renamed from bin/kill_focused) | 0 | ||||
-rwxr-xr-x | bin/laptop/numkeys (renamed from bin/numkeys) | 0 | ||||
-rwxr-xr-x | bin/laptop/pass (renamed from bin/pass) | 0 | ||||
l--------- | bin/laptop/scp (renamed from bin/scp) | 0 | ||||
-rwxr-xr-x | bin/laptop/setup-inputs (renamed from bin/setup-inputs) | 2 | ||||
l--------- | bin/laptop/sftp (renamed from bin/sftp) | 0 | ||||
-rwxr-xr-x | bin/laptop/ssh (renamed from bin/ssh) | 0 | ||||
-rwxr-xr-x | bin/laptop/ssh-add-helper (renamed from bin/ssh-add-helper) | 0 | ||||
-rwxr-xr-x | bin/laptop/ssh-key-unlock (renamed from bin/ssh-key-unlock) | 0 | ||||
-rwxr-xr-x | bin/laptop/status (renamed from bin/status) | 0 | ||||
-rwxr-xr-x | bin/laptop/svdn (renamed from bin/svdn) | 0 | ||||
-rwxr-xr-x | bin/laptop/svget (renamed from bin/svget) | 0 | ||||
-rwxr-xr-x | bin/laptop/svkill (renamed from bin/svkill) | 0 | ||||
-rwxr-xr-x | bin/laptop/svlog (renamed from bin/svlog) | 0 | ||||
-rwxr-xr-x | bin/laptop/svre (renamed from bin/svre) | 0 | ||||
-rwxr-xr-x | bin/laptop/svst (renamed from bin/svst) | 0 | ||||
-rwxr-xr-x | bin/laptop/svstop (renamed from bin/svstop) | 0 | ||||
-rwxr-xr-x | bin/laptop/svup (renamed from bin/svup) | 0 | ||||
-rwxr-xr-x | bin/laptop/update-weather (renamed from bin/update-weather) | 0 | ||||
-rwxr-xr-x | bin/laptop/update_mail (renamed from bin/update_mail) | 0 | ||||
-rwxr-xr-x | bin/laptop/volume (renamed from bin/volume) | 0 | ||||
-rwxr-xr-x | bin/laptop/weather (renamed from bin/weather) | 0 | ||||
-rwxr-xr-x | bin/laptop/webcam (renamed from bin/webcam) | 0 | ||||
-rwxr-xr-x | bin/laptop/wifi (renamed from bin/wifi) | 0 | ||||
-rwxr-xr-x | bin/server/learn_spam (renamed from bin/learn_spam) | 0 | ||||
-rw-r--r-- | i3/config | 6 | ||||
-rw-r--r-- | sh/env | 4 | ||||
-rw-r--r-- | zshrc | 2 |
32 files changed, 8 insertions, 8 deletions
@@ -5,7 +5,7 @@ type rbenv > /dev/null 2>&1 && eval "$(rbenv init -)" test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH" # }}} # environment {{{ -export PATH="/usr/share/git/diff-highlight:${HOME}/.bin/local:${HOME}/.bin:/usr/lib/ccache/bin:$PATH" +export PATH="${HOME}/.bin/local:${HOME}/.bin/$(cat "${HOME}/conf/.conf-type"):${HOME}/.bin:/usr/lib/ccache/bin:/usr/share/git/diff-highlight:$PATH" [ -f "$HOME/.sh/env" ] && source $HOME/.sh/env # }}} # Test for an interactive shell. {{{ diff --git a/bin/gpg2 b/bin/laptop/gpg2 index a7506d6..a7506d6 120000 --- a/bin/gpg2 +++ b/bin/laptop/gpg2 diff --git a/bin/i3-switch-workspace b/bin/laptop/i3-switch-workspace index 8e77cf2..8e77cf2 100755 --- a/bin/i3-switch-workspace +++ b/bin/laptop/i3-switch-workspace diff --git a/bin/kill_focused b/bin/laptop/kill_focused index 06010d4..06010d4 100755 --- a/bin/kill_focused +++ b/bin/laptop/kill_focused diff --git a/bin/numkeys b/bin/laptop/numkeys index ab9dc14..ab9dc14 100755 --- a/bin/numkeys +++ b/bin/laptop/numkeys diff --git a/bin/pass b/bin/laptop/pass index fd4a9aa..fd4a9aa 100755 --- a/bin/pass +++ b/bin/laptop/pass diff --git a/bin/setup-inputs b/bin/laptop/setup-inputs index 4afd5a7..6aaa19f 100755 --- a/bin/setup-inputs +++ b/bin/laptop/setup-inputs @@ -4,7 +4,7 @@ setxkbmap -option ctrl:nocaps setxkbmap -option compose:caps xmodmap $HOME/.Xmodmap -$HOME/.bin/numkeys on +"$(dirname "$0")"/numkeys on # trackpad settings xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Accel Speed" 0.4 diff --git a/bin/sftp b/bin/laptop/sftp index ffd8d03..ffd8d03 120000 --- a/bin/sftp +++ b/bin/laptop/sftp diff --git a/bin/ssh-add-helper b/bin/laptop/ssh-add-helper index cae6f27..cae6f27 100755 --- a/bin/ssh-add-helper +++ b/bin/laptop/ssh-add-helper diff --git a/bin/ssh-key-unlock b/bin/laptop/ssh-key-unlock index e2654f1..e2654f1 100755 --- a/bin/ssh-key-unlock +++ b/bin/laptop/ssh-key-unlock diff --git a/bin/status b/bin/laptop/status index 062455d..062455d 100755 --- a/bin/status +++ b/bin/laptop/status diff --git a/bin/svdn b/bin/laptop/svdn index ce6f4c4..ce6f4c4 100755 --- a/bin/svdn +++ b/bin/laptop/svdn diff --git a/bin/svget b/bin/laptop/svget index 77c18f4..77c18f4 100755 --- a/bin/svget +++ b/bin/laptop/svget diff --git a/bin/svkill b/bin/laptop/svkill index 060d2c7..060d2c7 100755 --- a/bin/svkill +++ b/bin/laptop/svkill diff --git a/bin/svlog b/bin/laptop/svlog index 436b25a..436b25a 100755 --- a/bin/svlog +++ b/bin/laptop/svlog diff --git a/bin/svre b/bin/laptop/svre index e57576e..e57576e 100755 --- a/bin/svre +++ b/bin/laptop/svre diff --git a/bin/svst b/bin/laptop/svst index 92d20c1..92d20c1 100755 --- a/bin/svst +++ b/bin/laptop/svst diff --git a/bin/svstop b/bin/laptop/svstop index 36c0132..36c0132 100755 --- a/bin/svstop +++ b/bin/laptop/svstop diff --git a/bin/svup b/bin/laptop/svup index c49a99e..c49a99e 100755 --- a/bin/svup +++ b/bin/laptop/svup diff --git a/bin/update-weather b/bin/laptop/update-weather index e3a6bc3..e3a6bc3 100755 --- a/bin/update-weather +++ b/bin/laptop/update-weather diff --git a/bin/update_mail b/bin/laptop/update_mail index b909d9f..b909d9f 100755 --- a/bin/update_mail +++ b/bin/laptop/update_mail diff --git a/bin/volume b/bin/laptop/volume index bc37b45..bc37b45 100755 --- a/bin/volume +++ b/bin/laptop/volume diff --git a/bin/weather b/bin/laptop/weather index a0a9d14..a0a9d14 100755 --- a/bin/weather +++ b/bin/laptop/weather diff --git a/bin/webcam b/bin/laptop/webcam index 48ee3f3..48ee3f3 100755 --- a/bin/webcam +++ b/bin/laptop/webcam diff --git a/bin/wifi b/bin/laptop/wifi index 38c70ee..38c70ee 100755 --- a/bin/wifi +++ b/bin/laptop/wifi diff --git a/bin/learn_spam b/bin/server/learn_spam index ab5603a..ab5603a 100755 --- a/bin/learn_spam +++ b/bin/server/learn_spam @@ -39,8 +39,8 @@ bindsym $mod+f fullscreen bindsym $mod+Shift+space floating toggle bindsym $mod+space focus mode_toggle -bindsym $mod+bracketleft exec ~/.bin/i3-switch-workspace prev -bindsym $mod+bracketright exec ~/.bin/i3-switch-workspace next +bindsym $mod+bracketleft exec ~/.bin/laptop/i3-switch-workspace prev +bindsym $mod+bracketright exec ~/.bin/laptop/i3-switch-workspace next bindsym $mod+1 workspace 1 bindsym $mod+2 workspace 2 @@ -68,7 +68,7 @@ bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcu bar { tray_output primary - status_command ~/.bin/status + status_command ~/.bin/laptop/status font xft:DejaVuSansMono 10 } @@ -3,8 +3,8 @@ export MPD_HOST=bishamon export MANPAGER="$HOME/.bin/vimmanpager" export PERLDOC_PAGER="$HOME/.bin/vimmanpager" export EDITOR=$(/usr/bin/which vim) -export GIT_SSH="$HOME/.bin/ssh" -export RSYNC_RSH="$HOME/.bin/ssh" +[ "$(cat "${HOME}/conf/.conf-type")" = "laptop" ] && export GIT_SSH="$HOME/.bin/laptop/ssh" +[ "$(cat "${HOME}/conf/.conf-type")" = "laptop" ] && export RSYNC_RSH="$HOME/.bin/laptop/ssh" export TEXINPUTS=".:$HOME/conf/tex:" export LESS='-QR' export NOPASTE_SERVICES="ssh" @@ -7,7 +7,7 @@ test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH" # environment {{{ # not using .zshenv, because it runs before /etc/profile, and /etc/profile # tends to hard-set $PATH and such -export PATH="/usr/share/git/diff-highlight:${HOME}/.bin/local:${HOME}/.bin:/usr/lib/ccache/bin:$PATH" +export PATH="${HOME}/.bin/local:${HOME}/.bin/$(cat "${HOME}/conf/.conf-type"):${HOME}/.bin:/usr/lib/ccache/bin:/usr/share/git/diff-highlight:$PATH" [ -f "$HOME/.sh/env" ] && source $HOME/.sh/env # }}} # Change the window title of X terminals {{{ |