aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.ssh/config27
-rw-r--r--.vim/addons-settings.vim4
-rwxr-xr-xbin/i3lock19
3 files changed, 45 insertions, 5 deletions
diff --git a/.ssh/config b/.ssh/config
index b28fdf2..3eb25cc 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -40,7 +40,7 @@ Host apu-access-unlock
ControlPath ~/.ssh/socket-%r@%h:%p
Host apu-serve-unlock
- HostName apu-serve-unlock
+ HostName apu-serve-unlock.apu
Port 22
User root
ServerAliveInterval 120
@@ -416,3 +416,28 @@ Host linuxaudio.berlin
Compression yes
ControlMaster auto
ControlPath ~/.ssh/socket-%r@%h:%p
+
+# c-base
+Host soundserv.c-base.org
+ Hostname soundserv.cbrp3.c-base.org
+ Port 22
+ user dave
+ ForwardAgent yes
+ IdentitiesOnly yes
+ ServerAliveInterval 120
+ Compression yes
+ ControlMaster auto
+ ControlPath ~/.ssh/socket-%r@%h:%p
+ ProxyCommand ssh tunnel.c-base.org -W 10.0.0.150:%p
+
+Host shell.c-base.org
+ Hostname shell.c-base.org
+ Port 22
+ user dave
+ ForwardAgent yes
+ IdentitiesOnly yes
+ ServerAliveInterval 120
+ Compression yes
+ ControlMaster auto
+ ControlPath ~/.ssh/socket-%r@%h:%p
+
diff --git a/.vim/addons-settings.vim b/.vim/addons-settings.vim
index d83bed9..b61938a 100644
--- a/.vim/addons-settings.vim
+++ b/.vim/addons-settings.vim
@@ -128,6 +128,10 @@ if v:version > '702'
set undofile
endif
+" ================ Nerdcommenter settings ================
+let g:NERDDefaultAlign = 'left'
+let g:NERDCommentEmptyLines = 1
+
" ================ showmarks settings ================
" Tell showmarks to not include the various brace marks (),{}, etc
let g:showmarks_include = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXY"
diff --git a/bin/i3lock b/bin/i3lock
index fcee43c..375e838 100755
--- a/bin/i3lock
+++ b/bin/i3lock
@@ -2,9 +2,20 @@
set -euo pipefail
+image_fallback=/usr/share/archlinux/wallpaper/archlinux-underground.jpg
image_location=$XDG_RUNTIME_DIR/screen-lock.png
-/usr/bin/xset b off
-/usr/bin/scrot -q 100 $image_location
-/usr/bin/convert -quality 1 -implode 1 -motion-blur 16x10 $image_location $image_location
-/usr/bin/i3lock -i $image_location -ef
+function create_background()
+{
+ /usr/bin/xset b off
+ /usr/bin/scrot -q 100 $image_location
+ /usr/bin/convert -quality 1 -implode 1 -motion-blur 16x10 $image_location $image_location
+}
+
+function lock_screen()
+{
+ /usr/bin/i3lock -i $image_location -ef
+}
+
+create_background
+lock_screen