config sync

7 files changed, 26 insertions, 11 deletions

diff --git a/config/nvim b/config/nvim
-Subproject 369b93318934373ff1c27bc9a87ff3968827312
+Subproject f4e3d643384cb9e0d40329e8ce8eb6c64c9d544
diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py
index 7dcfb12..119c5ba 100644
--- a/config/qutebrowser/config.py
+++ b/config/qutebrowser/config.py
@@ -80,6 +80,8 @@ c.input.spatial_navigation = False
 
 c.content.dns_prefetch = True # Use dns prefetching for speed
 
+c.content.pdfjs = True
+
 # Editor
 c.editor.command = ['sensible-terminal', '-e', 'sensible-editor', '{}']
 c.input.insert_mode.auto_enter = True
@@ -87,11 +89,17 @@ c.input.insert_mode.auto_leave = True
 c.input.insert_mode.auto_load = True
 c.input.insert_mode.leave_on_load = True
 
+# File selector
+lf_file_picker = ['sensible-terminal', '-c', 'lf-selector', '-g', '170x40+50+50', '-e', 'lf', '-selection-path', '{}']
+c.fileselect.handler = 'external'
+c.fileselect.single_file.command = lf_file_picker
+c.fileselect.multiple_files.command = lf_file_picker
+
 # Hints
 c.hints.auto_follow = 'always'
 c.hints.chars = 'azsxdclmknjb'
 c.hints.auto_follow = 'unique-match'
-c.content.pdfjs = True
+c.hints.mode = 'number' # letter
 
 nunmap('m')
 nunmap('M')
@@ -163,11 +171,8 @@ nmap(leader + 'sw', ':cmd-set-text -s :session-save');
 #### Navigation {{{
 
 # Highlight inputs
-nmap('gi', 'hint inputs')
-
-# Selected
-nmap(localleader + 'gl', 'follow-selected') # Follow selected link
-nmap(localleader + 'gL', 'follow-selected --tab') # Follow selected link
+nmap('gi', 'hint inputs --mode letter')
+nmap('<Ctrl-f>', 'hint --mode=number --rapid links tab-bg')
 
 # Increment pagination
 nmap(localleader + 'nn', 'navigate increment')
@@ -182,6 +187,7 @@ nmap('P', 'open -- {clipboard}') # Open link in clipboard in the same tab
 #### TABS {{{
 c.tabs.show = 'multiple'
 c.tabs.title.format = '{perc}{private} {audio}{index}: {host} - {current_title}'
+c.tabs.title.format_pinned = '{index}'
 c.tabs.tooltips = True
 c.tabs.background = True
 c.tabs.select_on_remove = 'next'
@@ -207,7 +213,7 @@ nmap('<Ctrl-k>', 'tab-prev')
 nmap('<Ctrl-j>', 'tab-next')
 nmap('<Ctrl-Shift-k>', 'tab-move -')
 nmap('<Ctrl-Shift-j>', 'tab-move +')
-nmap('b', 'cmd-set-text -s :tab-select') # List buffers by index
+nmap(localleader + 'b', 'cmd-set-text -s :tab-select') # List buffers by index
 
 for i in range(1, 10 + 1):
     key = 0 if i == 10 else i
@@ -316,6 +322,8 @@ c.aliases['view-google-cache'] = 'open --tab http://www.google.com/search?q=cach
 #  c.aliases['xa'] = 'quit --save'
 c.aliases['h'] = 'help'
 
+c.aliases['mark-resource'] = 'spawn --userscript bookmark resource'
+nmap(localleader + 'tm', 'mark-resource')
 # }}}
 
 #### Dev {{{
diff --git a/config/qutebrowser/userscripts/bookmark b/config/qutebrowser/userscripts/bookmark
index 8695551..480aed9 100755
--- a/config/qutebrowser/userscripts/bookmark
+++ b/config/qutebrowser/userscripts/bookmark
@@ -12,5 +12,9 @@ case "$1" in
   new)
     echo "$QUTE_URL" >> "$BOOKMARKS_PATH"
   ;;
-esac
+  resource)
+    ~/dev/projects/nvim-ts-peek/bin/nvim-peek dmenu "$QUTE_URL" "$QUTE_TITLE" \
+      && notify-send "Saved $QUTE_URL";
+  ;;
+esac || true
 
diff --git a/config/zsh/aliases/system.zsh b/config/zsh/aliases/system.zsh
index 9e562dd..bc1b247 100644
--- a/config/zsh/aliases/system.zsh
+++ b/config/zsh/aliases/system.zsh
@@ -3,6 +3,7 @@
 
 alias update="sudo nixos-rebuild switch --upgrade";
 alias auto-remove="sudo nix-collect-garbage -d";
+alias clean-boot-entries="sudo /run/current-system/bin/switch-to-configuration boot";
 
 alias rebuild="sudo nixos-rebuild switch";
 alias list-gens="sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
diff --git a/extras/notes b/extras/notes
-Subproject 7475fe7d45a14db08218572e22c69696444b0a4
+Subproject 986072e287aca47c5715f9be7f80be97a5d2b97
diff --git a/packages/dwm/source b/packages/dwm/source
-Subproject 2ab2932b6adf0e4a70fc4db3e21db52ebad2cfa
+Subproject cbe8a3e3fe5284b75fa5339b84c26d0b8076454
diff --git a/packages/sensible-apps/install.sh b/packages/sensible-apps/install.sh
index ec13109..ab66e01 100644
--- a/packages/sensible-apps/install.sh
+++ b/packages/sensible-apps/install.sh
@@ -1,17 +1,19 @@
 apps="
-sensible-terminal           $TERMINAL
-sensible-editor             $EDITOR
+sensible-terminal           exec $TERMINAL
+sensible-editor             exec $EDITOR
 sensible-browser            $BROWSER
 sensible-private-browser    $PRIVATE_BROWSER
 ";
 
 BIN=$out/bin;
 
+mkdir -p $BIN;
+
 echo -e "$apps" | while read app bin; do
   if [[ ! -z "$bin" ]]; then
     echo "[SENSIBLE_APPS]:: Setting $app to $bin ($BIN/$bin)";
     mkdir -p $BIN;
-    echo -e "#!/usr/bin/env sh\nexec $bin \"\$@\"" > $BIN/$app;
+    echo -e "#!/usr/bin/env sh\n $bin \"\$@\"" > $BIN/$app;
     chmod +x $BIN/$app;
   fi;
 done;