]> git.sev.monster Git - dotfiles.git/commitdiff
update scripts, vim plugins, fonts, firefox, tint2
authords6 <git@ds6.pw>
Thu, 19 Sep 2019 03:28:25 +0000 (22:28 -0500)
committersev <git@sev.monster>
Fri, 5 Apr 2024 21:27:39 +0000 (16:27 -0500)
remove references to Dina, change to monospace; fontconfig changes have
broken various bcf/pcf fonts and being able to change fonts by only
adjusting the remaining two hard references (fonts.conf and .Xresources)
is very much preferred.

updated various scripts and rc's
added setup-perl5 to quickly initialize local::lib
update Dina font to 2.93, update LICENSE and add NEWS (changelog)
explicitly set rgb pixel alignment
remove fonts.scale and fonts.dir
replace i3bar with tint2
update tint2 config
remove Luakit config
update subprojects
update Firefox theme, script loader, and user.js

43 files changed:
.gitignore
base/.Xresources
base/.gtkrc-2.0
base/.vim/pack/repeat.vim/start/vim-repeat
base/.vim/pack/speeddating.vim/start/vim-speeddating
base/.vim/pack/surround.vim/start/vim-surround
base/.xinitrc
base/.zprofile
base/.zsh/prompt_ds6_setup
base/.zshenv
bin/dmenu
bin/redon
bin/rotate
bin/setup-perl5 [new file with mode: 0755]
bin/tint2-alsa
firefox/chrome/theme.as.css
firefox/chrome/userChrome.xml
firefox/user-js-updater.sh
firefox/user-overrides.js
fonts/Dina/Dina_i400-10.pcf.gz
fonts/Dina/Dina_i400-8.pcf.gz
fonts/Dina/Dina_i400-9.pcf.gz
fonts/Dina/Dina_i700-10.pcf.gz
fonts/Dina/Dina_i700-8.pcf.gz
fonts/Dina/Dina_i700-9.pcf.gz
fonts/Dina/Dina_r400-10.pcf.gz
fonts/Dina/Dina_r400-6.pcf.gz
fonts/Dina/Dina_r400-8.pcf.gz
fonts/Dina/Dina_r400-9.pcf.gz
fonts/Dina/Dina_r700-10.pcf.gz
fonts/Dina/Dina_r700-8.pcf.gz
fonts/Dina/Dina_r700-9.pcf.gz
fonts/Dina/LICENSE
fonts/Dina/NEWS [new file with mode: 0644]
fonts/Dina/fonts.dir [deleted file]
fonts/Dina/fonts.scale [deleted file]
xdg/dunst/dunstrc
xdg/fontconfig/fonts.conf
xdg/i3/config
xdg/i3status/tint2-cpu-net
xdg/luakit/rc.lua [deleted file]
xdg/tint2/tint2rc
xorg/icons/paper-icon-theme

index 5e6dcc9b14cd47c7d6b0e98357869cd46e595ae7..8b8426caa6c8249d31628077a82d4d1721b8e6b4 100644 (file)
@@ -8,3 +8,5 @@ base/.vim/.netrwhist
 
 # fontconfig
 /fonts/**/.uuid
 
 # fontconfig
 /fonts/**/.uuid
+/fonts/**/fonts.dir
+/fonts/**/fonts.scale
index 12aab42f4b3d22a5103bcb9d082fc1fac656a117..25934a09a84e019c941a801dc4e36d20c645dc0b 100644 (file)
@@ -6,7 +6,7 @@ Xft.antialias:            true
 Xft.dpi:                  96
 Xft.hinting:              true
 Xft.hintstyle:            hintslight
 Xft.dpi:                  96
 Xft.hinting:              true
 Xft.hintstyle:            hintslight
-Xft.rgba:                 none
+Xft.rgba:                 rgb
 
 ! theming
 Xcursor.theme:            Paper-Mono-Dark
 
 ! theming
 Xcursor.theme:            Paper-Mono-Dark
index 0db08e593ef2278f9c410419f3b13c0b98dbce4f..a701f5f9623158090d8d5a7be75f401af507ded4 100644 (file)
@@ -1,4 +1,4 @@
 gtk-theme-name="Blackbird"
 gtk-icon-theme-name="Paper-Mono-Dark"
 gtk-theme-name="Blackbird"
 gtk-icon-theme-name="Paper-Mono-Dark"
-gtk-font-name="Dina 10"
+gtk-font-name="monospace-10"
 gtk-cursor-theme-name="Paper-Mono-Dark"
 gtk-cursor-theme-name="Paper-Mono-Dark"
index 43d2678fa59d068c815d8298331c195e850ff5a7..ae361bea990e27d5beade3a8d9fa22e25cec3100 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 43d2678fa59d068c815d8298331c195e850ff5a7
+Subproject commit ae361bea990e27d5beade3a8d9fa22e25cec3100
index 799cd3473bc64adcb6b556bf349f549570666b62..ce2f1aae9f2be128b4ca322a8e797be3ae40c30b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 799cd3473bc64adcb6b556bf349f549570666b62
+Subproject commit ce2f1aae9f2be128b4ca322a8e797be3ae40c30b
index 597068870b8f093a8b2d11536c62ff31222ee8d0..fab8621670f71637e9960003af28365129b1dfd0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 597068870b8f093a8b2d11536c62ff31222ee8d0
+Subproject commit fab8621670f71637e9960003af28365129b1dfd0
index 72661b433d652be032c87989b257d7ee081cbb13..97c5c14abe0a185f52ff24f6c50a022fb7ea6aba 100644 (file)
@@ -29,8 +29,8 @@ xset m 1/1 0 &
 xset s off
 xset dpms 0 0 600
 
 xset s off
 xset dpms 0 0 600
 
-find -L "${XDG_DATA_HOME:-~/share}/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
-       xset +fp $x/
+find -L "${XDG_DATA_HOME:-~/share}/fonts" -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+       [ -f "$x/fonts.dir" ] && xset +fp $x
 done
 xset fp rehash
 
 done
 xset fp rehash
 
index 3c1d2e0047ae5ccebbd939e33ce4debe9a7e3ad5..3cc9587f4a8ca226db0490aa259a41ac6bf7f791 100644 (file)
@@ -1,4 +1,4 @@
-#XXX: $PATH gets unset on alpine???
+#XXX: ensure we override /etc/profile, gets loaded after .zshenv
 source ~/.zshenv
 
 t="/tmp/home-$LOGNAME"
 source ~/.zshenv
 
 t="/tmp/home-$LOGNAME"
index 77c1a6d2e85688f655475b689d774c4d4e6b25cf..b1f561311c8bcdd1ffea1bccdb35772df2e19cd7 100644 (file)
@@ -70,6 +70,7 @@ function prompt_ds6_setup() {
     zstyle ':vcs_info:git*' unstagedstr "%F{$r}*"
 
     add-zsh-hook precmd prompt_ds6_precmd
     zstyle ':vcs_info:git*' unstagedstr "%F{$r}*"
 
     add-zsh-hook precmd prompt_ds6_precmd
+    add-zsh-hook preexec prompt_ds6_preexec
     zle -N zle-line-init
     zle -A zle-line-init zle-keymap-select
 }
     zle -N zle-line-init
     zle -A zle-line-init zle-keymap-select
 }
@@ -80,10 +81,14 @@ function zle-line-init {
     zle reset-prompt
 }
 
     zle reset-prompt
 }
 
-function prompt_ds6_precmd() {
+function prompt_ds6_precmd {
     # TODO: check if vcs_info is autoloaded
     vcs_info
 }
 
     # TODO: check if vcs_info is autoloaded
     vcs_info
 }
 
+function prompt_ds6_preexec {
+    print -Pn "%F{red}<<<%f "
+}
+
 prompt_ds6_setup "$@"
 #  vim: set et fenc=utf-8 ft=zsh sts=4 sw=4 ts=8 tw=0 :
 prompt_ds6_setup "$@"
 #  vim: set et fenc=utf-8 ft=zsh sts=4 sw=4 ts=8 tw=0 :
index 6ab4a581ca2997e11ae1a387ea8edb8545bbb74f..7a5982f2ee2e0fd45c9885ea097255c4df5c95de 100644 (file)
@@ -21,6 +21,8 @@ export XDG_RUNTIME_DIR=~/tmp
 
 ### applications
 export PYTHONSTARTUP=~/.pythonrc
 
 ### applications
 export PYTHONSTARTUP=~/.pythonrc
+## perl
+eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5)
 
 ### freebsd
 if [[ "$OSTYPE" =~ "^freebsd" ]]; then
 
 ### freebsd
 if [[ "$OSTYPE" =~ "^freebsd" ]]; then
index 171f8c5ca3a0a92b29fd3b232be4effcd4b2a8ac..95039d461722abae6eb3c338869ac352a64f871c 100755 (executable)
--- a/bin/dmenu
+++ b/bin/dmenu
@@ -1,2 +1,2 @@
 #!/bin/sh
 #!/bin/sh
-exec `which -a dmenu | grep -iv ~ | head -1` -fn 'Dina-10' -nb \#110800 -nf \#93a1a1 -sb \#aa5500 -sf \#eee8d5 "$@"
+exec `which -a dmenu | grep -iv ~ | head -1` -b -f -fn 'monospace-10' -nb \#110800 -nf \#93a1a1 -sb \#aa5500 -sf \#eee8d5 "$@"
index 72119f263382a8189750db84bb79e89041aebaa8..966f172f04c661159f0a594312933b9343890bc0 100755 (executable)
--- a/bin/redon
+++ b/bin/redon
@@ -1,3 +1,3 @@
 #!/bin/sh
 pkill redshift > /dev/null 2>&1
 #!/bin/sh
 pkill redshift > /dev/null 2>&1
-redshift -l manual:lat=38.95171:lon=-92.33407 -m randr -t 6600:4000 -r &
+redshift -l manual:lat=38:lon=-92 -m randr -t 6600:4000 -r &
index 2e6e4aa7dcd0ad77f5b03cf61f412161e78610eb..83b71473bb9e0eb7a2898072a45230a7b684465c 100755 (executable)
@@ -69,7 +69,7 @@ num_to_rot $((($rot0 + 4) % 4))
 
 xrandr --output $output --rotation $rot1
 # x220t
 
 xrandr --output $output --rotation $rot1
 # x220t
-if [ -x /usr/local/bin/xsetwacom ]; then
+if which xsetwacom >/dev/null; then
        xsetwacom --set stylus Rotate $rot2
        xsetwacom --set eraser Rotate $rot2
        xsetwacom --set touch  Rotate $rot2
        xsetwacom --set stylus Rotate $rot2
        xsetwacom --set eraser Rotate $rot2
        xsetwacom --set touch  Rotate $rot2
diff --git a/bin/setup-perl5 b/bin/setup-perl5
new file mode 100755 (executable)
index 0000000..ce69beb
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+cpanm --local-lib=$XDG_DATA_HOME/perl5 local::lib
index 2a18b5c7d4e714c52302a6567a351ea629651f2d..1e851f29129701c27be338804261f3ca8e3d57c5 100755 (executable)
@@ -5,6 +5,7 @@ medium=$base-medium.svg
    low=$base-low.svg
  muted=$base-muted.svg
 
    low=$base-low.svg
  muted=$base-muted.svg
 
+# TODO: doesn't work if no master mixer, eg usb dac
 ident="iface=MIXER,name=Master Playback Volume"
 eval $(amixer cget "$ident" | grep -o 'max=\d\+')
 
 ident="iface=MIXER,name=Master Playback Volume"
 eval $(amixer cget "$ident" | grep -o 'max=\d\+')
 
index f5807bf1c7b6db9c51f0d97204740ba36ff9e2e8..75f6953908b39d54f8e117cd305c7b991946bfb1 100644 (file)
@@ -1,7 +1,9 @@
 /*** Dark theme ***/
 /* inspired by https://github.com/Izheil/Quantum-Nox-Firefox-Dark-Full-Theme */
 /*** Dark theme ***/
 /* inspired by https://github.com/Izheil/Quantum-Nox-Firefox-Dark-Full-Theme */
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 
-*|*:root {
+/* adjust internal vars */
+*:root {
     /*TODO: eventually change to use lwt/chrome/-moz colors*/
     --in-content-page-color: #ccc !important;
     --in-content-page-background: #222 !important;
     /*TODO: eventually change to use lwt/chrome/-moz colors*/
     --in-content-page-color: #ccc !important;
     --in-content-page-background: #222 !important;
@@ -12,6 +14,8 @@
     --in-content-box-background-hover: #555 !important;
     --in-content-box-background-active: #333 !important;
     --in-content-box-border-color: #777 !important;
     --in-content-box-background-hover: #555 !important;
     --in-content-box-background-active: #333 !important;
     --in-content-box-border-color: #777 !important;
+    --info-box-background-color: var(--in-content-box-background) !important;
+    --info-box-border-color: var(--in-content-box-border-color) !important;
     /* --in-content-item-hover: rgba(0,149,221,0.25); */
     --in-content-item-selected: -moz-cellhighlight !important;
     /* --in-content-border-highlight: #0a84ff; */
     /* --in-content-item-hover: rgba(0,149,221,0.25); */
     --in-content-item-selected: -moz-cellhighlight !important;
     /* --in-content-border-highlight: #0a84ff; */
         background: var(--in-content-box-background) !important;
     }
 }
         background: var(--in-content-box-background) !important;
     }
 }
-@-moz-document url(about:plugins) {
-    body {
+@-moz-document url(about:plugins), url(about:restartrequired),
+               url(about:serviceworkers), url(about:webrtc) {
+    html, body {
+        /* XXX: doesnt always apply */
         background-color: var(--in-content-background-color) !important;
     }
 }
         background-color: var(--in-content-background-color) !important;
     }
 }
-/*todo: RESTARTREQUIRED*/
-
-/* These variable changes the scrollbars size and color.
- * The scrollbars-width only has 3 acceptable values:
- *     auto: default OS size
- *     thin: half the width (will be hidden in about: pages)
- *     none: hidden scrollbar
- */
-*|*:root {
-    --scrollbars-width: thin;
-    --scrollbars-thumb-color: #05a;
-    --scrollbars-track-color: #252525;
-    scrollbar-color: var(--scrollbars-thumb-color) var(--scrollbars-track-color) !important;
-    scrollbar-width: var(--scrollbars-width) !important;
+@-moz-document url(about:webrtc) {
+    .stats, .log {
+        background-color: var(--info-box-background-color) !important;
+        border-color: var(--info-box-border-color) !important;
+    }
 }
 }
-*|* {
-    scrollbar-width: var(--scrollbars-width) !important;
+@-moz-document url(about:preferences), url(about:addons) {
+    .info-panel, .extension-controlled {
+        background-color: var(--info-box-background-color) !important;
+        border-color: var(--info-box-border-color) !important;
+    }
+}
+
+/* Scrollbar */
+xul|page, xul|scrollbar, *:root {
+    /* scrollbar-color: rgb(210, 210, 210) rgb(46, 54, 69) !important; */
+    scrollbar-color: #05a #252525 !important;
+    scrollbar-width: none !important;
 }
 
 /* This should change the "not found" page image colors */
 }
 
 /* This should change the "not found" page image colors */
-.illustrated #errorPageContainer:not(.button-container),
-#lic-info .license-header:not(a) {
+#errorPageContainer:not(.button-container),
+#your-rights .rights-header,
+#lic-info .license-header {
     filter: invert(95%) hue-rotate(200deg)
 }
 @-moz-document url(about:devtools) {
     filter: invert(95%) hue-rotate(200deg)
 }
 @-moz-document url(about:devtools) {
     }
 }
 /* This fixes the inverted colors caused by the image filter */
     }
 }
 /* This fixes the inverted colors caused by the image filter */
-.illustrated #errorPageContainer .button-container,
-.illustrated #errorPageContainer #text-container,
-#lic-info .license-header p,
-#lic-info .license-header h1 {
+#errorPageContainer .button-container,
+#errorPageContainer #text-container,
+#your-rights .rights-header div,
+#lic-info .license-header div {
     filter: invert(95%) hue-rotate(-200deg)
 }
 
 /* View source */
     filter: invert(95%) hue-rotate(-200deg)
 }
 
 /* View source */
-@-moz-document url-prefix(view-source:){
-html {
-    background: #222 !important;
-    color: #ccc !important}
-
+@-moz-document url-prefix(view-source:) {
+    html {
+        background: #222 !important;
+        color: #ccc !important;
+    }
     .attribute-name {color: #093 !important}
     .start-tag, .end-tag {color: #f93 !important}
     .attribute-value {color: #09f !important}
     .attribute-name {color: #093 !important}
     .start-tag, .end-tag {color: #f93 !important}
     .attribute-value {color: #09f !important}
index 45c4745a69ce34cf44f82ce99ca0f4f6bdc06f50..0ba60ad80be25d4aa693d4358a0eede7fb9775e7 100644 (file)
@@ -4,47 +4,47 @@ Available for use under the MIT License:
 https://opensource.org/licenses/MIT
  -->
 
 https://opensource.org/licenses/MIT
  -->
 
-<!-- Run userChrome.js/userChrome.xul and .uc.js/.uc.xul/.css files  -->
+<!-- Run userChrome.js/userChrome.xul and .uc.js/.uc.xul/as.css files  -->
 <bindings xmlns="http://www.mozilla.org/xbl">
 <bindings xmlns="http://www.mozilla.org/xbl">
-    <binding id="js" extends="chrome://global/content/bindings/toolbarbutton.xml#menu">
-        <implementation>
-            <constructor><![CDATA[
-                if(window.userChromeJsMod) return;
-                window.userChromeJsMod = true;
-                
-                var chromeFiles = FileUtils.getDir("UChrm", []).directoryEntries;
-                var xulFiles = [];
-                var sss = Cc['@mozilla.org/content/style-sheet-service;1'].getService(Ci.nsIStyleSheetService);
-                
-                while(chromeFiles.hasMoreElements()) {
-                    var file = chromeFiles.getNext().QueryInterface(Ci.nsIFile);
-                    var fileURI = Services.io.newFileURI(file);
-                    
-                    if(file.isFile()) {
-                        if(/(^userChrome|\.uc)\.js$/i.test(file.leafName)) {
-                            Services.scriptloader.loadSubScriptWithOptions(fileURI.spec, {target: window, ignoreCache: true});
-                        }
-                        else if(/(^userChrome|\.uc)\.xul$/i.test(file.leafName)) {
-                            xulFiles.push(fileURI.spec);
-                        }
-                        else if(/\.as\.css$/i.test(file.leafName)) {
-                            if(!sss.sheetRegistered(fileURI, sss.AGENT_SHEET))
-                                sss.loadAndRegisterSheet(fileURI, sss.AGENT_SHEET);
-                        }
-                        else if(/^(?!(userChrome|userContent)\.css$).+\.css$/i.test(file.leafName)) {
-                            if(!sss.sheetRegistered(fileURI, sss.USER_SHEET))
-                                sss.loadAndRegisterSheet(fileURI, sss.USER_SHEET);
-                        }
-                    }
-                }
-                
-                setTimeout(function loadXUL() {
-                    if(xulFiles.length > 0) {
-                        document.loadOverlay(xulFiles.shift(), null);
-                        setTimeout(loadXUL, 5);
-                    }
-                }, 0);
-            ]]></constructor>
-        </implementation>
-    </binding>
+  <binding id="js" extends="chrome://global/content/bindings/toolbarbutton.xml#menu">
+    <implementation>
+      <constructor><![CDATA[
+        if(window.userChromeJsMod) return;
+        window.userChromeJsMod = true;
+
+        var chromeFiles = FileUtils.getDir("UChrm", []).directoryEntries;
+        var xulFiles = [];
+        var sss = Cc['@mozilla.org/content/style-sheet-service;1'].getService(Ci.nsIStyleSheetService);
+
+        while(chromeFiles.hasMoreElements()) {
+          var file = chromeFiles.getNext().QueryInterface(Ci.nsIFile);
+          var fileURI = Services.io.newFileURI(file);
+
+          if(file.isFile()) {
+            if(/(^userChrome|\.uc)\.js$/i.test(file.leafName)) {
+              Services.scriptloader.loadSubScriptWithOptions(fileURI.spec, {target: window, ignoreCache: true});
+            }
+            else if(/(^userChrome|\.uc)\.xul$/i.test(file.leafName)) {
+              xulFiles.push(fileURI.spec);
+            }
+            else if(/\.as\.css$/i.test(file.leafName)) {
+              if(!sss.sheetRegistered(fileURI, sss.AGENT_SHEET))
+                sss.loadAndRegisterSheet(fileURI, sss.AGENT_SHEET);
+            }
+            else if(/^(?!(userChrome|userContent)\.css$).+\.css$/i.test(file.leafName)) {
+              if(!sss.sheetRegistered(fileURI, sss.USER_SHEET))
+                sss.loadAndRegisterSheet(fileURI, sss.USER_SHEET);
+            }
+          }
+        }
+
+        setTimeout(function loadXUL() {
+          if(xulFiles.length > 0) {
+            document.loadOverlay(xulFiles.shift(), null);
+            setTimeout(loadXUL, 5);
+          }
+        }, 0);
+      ]]></constructor>
+    </implementation>
+  </binding>
 </bindings>
 </bindings>
index 58594d4e797fc3e29660a6094ee58c56ce666bc8..a7390d40a485347b51a5579f9e7f39f80bf86b34 100755 (executable)
@@ -9,4 +9,5 @@ else
 fi
 echo >> user.js
 cat user-overrides.js >> user.js
 fi
 echo >> user.js
 cat user-overrides.js >> user.js
+echo Updated!
 diff user.js.bak user.js 2>/dev/null
 diff user.js.bak user.js 2>/dev/null
index 79a392e789926c4a5948b95083526d29737adf8a..cf467ef9f062dbd99c1523c704a78651c2de55f2 100644 (file)
@@ -38,13 +38,6 @@ user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", "data:
 // 0105d
 user_pref("browser.library.activity-stream.enabled", false);
 
 // 0105d
 user_pref("browser.library.activity-stream.enabled", false);
 
-// 0420: uMatrix
-user_pref("privacy.trackingprotection.pbmode.enabled", false);
-user_pref("privacy.trackingprotection.enabled", false);
-// 0422: uMatrix
-user_pref("urlclassifier.trackingTable", "");
-
-
 // 0515
 user_pref("extensions.screenshots.disabled", true);
 user_pref("extensions.screenshots.upload-disabled", true);
 // 0515
 user_pref("extensions.screenshots.disabled", true);
 user_pref("extensions.screenshots.upload-disabled", true);
@@ -56,12 +49,6 @@ user_pref("network.trr.mode", 0);
 user_pref("network.trr.bootstrapAddress", "");
 user_pref("network.trr.uri", "");
 
 user_pref("network.trr.bootstrapAddress", "");
 user_pref("network.trr.uri", "");
 
-// 0850a
-user_pref("browser.urlbar.autocomplete.enabled", true);
-user_pref("browser.urlbar.suggest.history", true);
-user_pref("browser.urlbar.suggest.bookmark", true);
-user_pref("browser.urlbar.suggest.openpage", true);
-
 // 0901
 user_pref("signon.rememberSignons", false);
 // 0903
 // 0901
 user_pref("signon.rememberSignons", false);
 // 0903
@@ -86,22 +73,23 @@ user_pref("security.ssl3.ecdhe_rsa_aes_128_sha", false);
 // 1263
 user_pref("security.ssl3.dhe_rsa_aes_128_sha", false);
 user_pref("security.ssl3.dhe_rsa_aes_256_sha", false);
 // 1263
 user_pref("security.ssl3.dhe_rsa_aes_128_sha", false);
 user_pref("security.ssl3.dhe_rsa_aes_256_sha", false);
+// 1264
+user_pref("security.ssl3.rsa_aes_128_sha", false);
+user_pref("security.ssl3.rsa_aes_256_sha", false);
 
 // 1401
 
 // 1401
-//user_pref("browser.display.use_document_fonts", 1);
-user_pref("font.name.serif.x-unicode", "Source Serif Pro");
-user_pref("font.name.serif.x-western", "Source Serif Pro");
-user_pref("font.name.sans-serif.x-unicode", "Source Sans Pro");
-user_pref("font.name.sans-serif.x-western", "Source Sans pro");
-user_pref("font.name.monospace.x-unicode", "Dina");
-user_pref("font.name.monospace.x-western", "Dina");
+user_pref("browser.display.use_document_fonts", 1);
+//user_pref("font.name.serif.x-unicode", "Source Serif Pro");
+//user_pref("font.name.serif.x-western", "Source Serif Pro");
+//user_pref("font.name.sans-serif.x-unicode", "Source Sans Pro");
+//user_pref("font.name.sans-serif.x-western", "Source Sans pro");
+//user_pref("font.name.monospace.x-unicode", "Dina");
+//user_pref("font.name.monospace.x-western", "Dina");
 // 1406
 // 1406
-//user_pref("layout.css.font-loading-api.enabled", true);
+user_pref("layout.css.font-loading-api.enabled", true);
 
 // 1603: uMatrix
 user_pref("network.http.referer.XOriginPolicy", 0);
 
 // 1603: uMatrix
 user_pref("network.http.referer.XOriginPolicy", 0);
-// 1606: uMatrix
-user_pref("network.http.referer.spoofSource", true);
 
 // 2212
 user_pref("dom.popup_allowed_events", "click dblclick notificationclick");
 
 // 2212
 user_pref("dom.popup_allowed_events", "click dblclick notificationclick");
@@ -111,20 +99,9 @@ user_pref("dom.serviceWorkers.enabled", true);
 user_pref("dom.webnotifications.enabled", true);
 user_pref("dom.webnotifications.serviceworker.enabled", true);
 
 user_pref("dom.webnotifications.enabled", true);
 user_pref("dom.webnotifications.serviceworker.enabled", true);
 
-// 2401
-//user_pref("dom.event.contextmenu.enabled", false);
 // 2402
 user_pref("dom.event.clipboardevents.enabled", true);
 
 // 2402
 user_pref("dom.event.clipboardevents.enabled", true);
 
-// 2508
-user_pref("layers.acceleration.disabled", false);
-// 2609
-user_pref("mathml.disabled", false);
-// 2610
-user_pref("middlemouse.contentLoadURL", true);
-// 2618
-user_pref("ui.use_standins_for_native_colors", false);
-
 // 2662
 user_pref("extensions.webextensions.restrictedDomains", "");
 
 // 2662
 user_pref("extensions.webextensions.restrictedDomains", "");
 
@@ -138,6 +115,9 @@ user_pref("privacy.clearOnShutdown.downloads", false);
 user_pref("privacy.cpd.history", false);
 user_pref("privacy.cpd.downloads", false);
 
 user_pref("privacy.cpd.history", false);
 user_pref("privacy.cpd.downloads", false);
 
+// 4504
+user_pref("privacy.resistFingerprinting.letterboxing", false);
+
 // 5000
 /* WELCOME & WHAT's NEW NOTICES ***/
 user_pref("browser.startup.homepage_override.mstone", "ignore");
 // 5000
 /* WELCOME & WHAT's NEW NOTICES ***/
 user_pref("browser.startup.homepage_override.mstone", "ignore");
@@ -147,9 +127,12 @@ user_pref("startup.homepage_override_url", "");
 /* WARNINGS ***/
 user_pref("full-screen-api.warning.delay", 0);
 user_pref("full-screen-api.warning.timeout", 0);
 /* WARNINGS ***/
 user_pref("full-screen-api.warning.delay", 0);
 user_pref("full-screen-api.warning.timeout", 0);
+user_pref("general.warnOnAboutConfig", false);
+user_pref("general.aboutConfig.showWarning", false);
 /* APPEARANCE ***/
 user_pref("browser.download.autohideButton", false);
 user_pref("toolkit.cosmeticAnimations.enabled", false);
 /* APPEARANCE ***/
 user_pref("browser.download.autohideButton", false);
 user_pref("toolkit.cosmeticAnimations.enabled", false);
+user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
 /* CONTENT BEHAVIOR ***/
 user_pref("layout.spellcheckDefault", 2);
 /* UX BEHAVIOR ***/
 /* CONTENT BEHAVIOR ***/
 user_pref("layout.spellcheckDefault", 2);
 /* UX BEHAVIOR ***/
@@ -158,6 +141,8 @@ user_pref("browser.tabs.closeWindowWithLastTab", false);
 user_pref("browser.tabs.loadBookmarksInTabs", true);
 /* OTHER ***/
 user_pref("browser.bookmarks.max_backups", 2);
 user_pref("browser.tabs.loadBookmarksInTabs", true);
 /* OTHER ***/
 user_pref("browser.bookmarks.max_backups", 2);
+user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
+user_pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
 user_pref("identity.fxaccounts.enabled", false);
 user_pref("network.manage-offline-status", false);
 user_pref("reader.parse-on-load.enabled", false);
 user_pref("identity.fxaccounts.enabled", false);
 user_pref("network.manage-offline-status", false);
 user_pref("reader.parse-on-load.enabled", false);
@@ -165,10 +150,12 @@ user_pref("reader.parse-on-load.enabled", false);
 // 10000
 user_pref("browser.altClickSave", true);
 user_pref("browser.preferences.instantApply", false);
 // 10000
 user_pref("browser.altClickSave", true);
 user_pref("browser.preferences.instantApply", false);
+user_pref("browser.onboarding.enabled", false);
 user_pref("devtools.onboarding.telemetry.logged", false);
 user_pref("devtools.onboarding.telemetry.logged", false);
+user_pref("extensions.ui.dictionary.hidden", false);
 user_pref("extensions.ui.experiment.hidden", false);
 user_pref("extensions.ui.experiment.hidden", false);
+user_pref("extensions.ui.locale.hidden", false);
 user_pref("reader.errors.includeURLs", false);
 user_pref("reader.errors.includeURLs", false);
-user_pref("ui.key.menuAccessKeyFocuses", true); //default
 user_pref("font.default.x-unicode", "sans-serif");
 user_pref("font.default.x-western", "sans-serif");
 user_pref("zoom.maxPercent", 500);
 user_pref("font.default.x-unicode", "sans-serif");
 user_pref("font.default.x-western", "sans-serif");
 user_pref("zoom.maxPercent", 500);
index cf53b5e3b75935d0dfb436988b75809e3e5460fa..cc9a7944b508f9cfba6b1be4c9f9ead326ea131f 100644 (file)
Binary files a/fonts/Dina/Dina_i400-10.pcf.gz and b/fonts/Dina/Dina_i400-10.pcf.gz differ
index f289553246688b842c4984a5f5fc8166e17e7c6c..0d74f40bb09784ac0dfb0843b2a9aac8e11534db 100644 (file)
Binary files a/fonts/Dina/Dina_i400-8.pcf.gz and b/fonts/Dina/Dina_i400-8.pcf.gz differ
index 1841d03e6fca65758f393b52130ce235678a5103..783ca256c290693da0039461393a04c7531e90e5 100644 (file)
Binary files a/fonts/Dina/Dina_i400-9.pcf.gz and b/fonts/Dina/Dina_i400-9.pcf.gz differ
index f4959dc22f3b15a4084443e04ef1ee411cb4b2da..47376df76e7242976cddce65b6c983c804fcb904 100644 (file)
Binary files a/fonts/Dina/Dina_i700-10.pcf.gz and b/fonts/Dina/Dina_i700-10.pcf.gz differ
index 933dad9986108d229d543e2885cbe447a6d39bbe..c4b84241ef21a616035ad984dc909bc9ed93e913 100644 (file)
Binary files a/fonts/Dina/Dina_i700-8.pcf.gz and b/fonts/Dina/Dina_i700-8.pcf.gz differ
index 9b2c6b42974b7a8933ec6054d87ab3dcb7f8c92f..48e55deb20bc948b5eabf21a509156b257af83c7 100644 (file)
Binary files a/fonts/Dina/Dina_i700-9.pcf.gz and b/fonts/Dina/Dina_i700-9.pcf.gz differ
index 4dd7e4c7e33e40d38da6d4e925536771d9023b90..15aa2121ef592cd56e85644d1f0e4f94cc469e78 100644 (file)
Binary files a/fonts/Dina/Dina_r400-10.pcf.gz and b/fonts/Dina/Dina_r400-10.pcf.gz differ
index 9c6ad4bcd3b21318fb5cc49472c3067ff540976a..07c8cb5fefad5333d7a8676e3e55b6aab684fb6f 100644 (file)
Binary files a/fonts/Dina/Dina_r400-6.pcf.gz and b/fonts/Dina/Dina_r400-6.pcf.gz differ
index 9e8ca461ed4192a533df3415c7a62b244ea494b3..b9584c1fd3c61bcfdb34febcdceb5fd0677f6820 100644 (file)
Binary files a/fonts/Dina/Dina_r400-8.pcf.gz and b/fonts/Dina/Dina_r400-8.pcf.gz differ
index 92554d079a71f9014faacfc9bc1ca6f7a00d4ae0..f0d28e9e5d7623381ae84aa30d861437fe71cc47 100644 (file)
Binary files a/fonts/Dina/Dina_r400-9.pcf.gz and b/fonts/Dina/Dina_r400-9.pcf.gz differ
index 3a01a3c627b129951f87e1a2db30239eeddfa761..6ad91ebd9e1e3f6f685f04a45b6c7fc9618fe33a 100644 (file)
Binary files a/fonts/Dina/Dina_r700-10.pcf.gz and b/fonts/Dina/Dina_r700-10.pcf.gz differ
index 98243740e18d10fe1d05e794e8c62ca556eea21f..79c4b5c0a74cd86416b2fa673f9ddac7b80d7035 100644 (file)
Binary files a/fonts/Dina/Dina_r700-8.pcf.gz and b/fonts/Dina/Dina_r700-8.pcf.gz differ
index 2c1f6bedd41c11b7b4ba6905481bd1d8ddd33dd6..8fda64282b8637c74adcf66b568968a0131b9db9 100644 (file)
Binary files a/fonts/Dina/Dina_r700-9.pcf.gz and b/fonts/Dina/Dina_r700-9.pcf.gz differ
index 4e247ec8ba1220f7bbdcd3187c207b3d68cc82f7..661ce4901d01fcae7b92c6344e789c3e7c045a22 100644 (file)
@@ -1,5 +1,20 @@
-https://www.dcmembers.com/jibsen/download/61/
-
-The Dina font is free. You are welcome to use, distribute and modify it however you want, just don't use it for anything illegal or claim that you made it.
-
-The Dina font is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this font.
+\r
+Copyright (c) 2005-2013 Joergen Ibsen\r
+\r
+Permission is hereby granted, free of charge, to any person obtaining a copy\r
+of this software and associated documentation files (the "Software"), to deal\r
+in the Software without restriction, including without limitation the rights\r
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
+copies of the Software, and to permit persons to whom the Software is\r
+furnished to do so, subject to the following conditions:\r
+\r
+The above copyright notice and this permission notice shall be included in\r
+all copies or substantial portions of the Software.\r
+\r
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
+THE SOFTWARE.\r
diff --git a/fonts/Dina/NEWS b/fonts/Dina/NEWS
new file mode 100644 (file)
index 0000000..a5fb68f
--- /dev/null
@@ -0,0 +1,26 @@
+Dina 2.93 (2013.09.10)\r
+\r
+  * Added OEM codepage 437 and 850 versions for Windows command prompts\r
+\r
+Dina 2.92 (2013.09.07)\r
+\r
+  * Moved bold, italic, and bold italic styles to separate files\r
+  * Updated BDF files\r
+\r
+Dina 2.91 (2013.08.25)\r
+\r
+  * Fixed `&` in Dina 10 regular\r
+  * Updated copyright strings in all fonts\r
+\r
+Dina 2.90 (2013.08.23)\r
+\r
+  * Added a 6 point version of Dina regular\r
+  * Extended top line in `j` to make it easier to distinguish from `i`\r
+  * Moved top part of `&` right and adjusted height\r
+  * Moved `%` up\r
+  * Changed `ø` and `Ø` to look less like `0`\r
+  * Changed `æ` and `ß` to look more harmonious in text\r
+  * Moved down starting question and exclamation marks\r
+  * Fixed single and double text quotes\r
+  * Fixed positioning of degree, ordinals, and powers\r
+  * Fixed various other symbols\r
diff --git a/fonts/Dina/fonts.dir b/fonts/Dina/fonts.dir
deleted file mode 100644 (file)
index f2e6377..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-13
-Dina_i400-10.pcf.gz -windows-dina-medium-i-normal--13-100-96-96-c-80-microsoft-cp1252
-Dina_i400-8.pcf.gz -windows-dina-medium-i-normal--10-80-96-96-c-70-microsoft-cp1252
-Dina_i400-9.pcf.gz -windows-dina-medium-i-normal--12-90-96-96-c-70-microsoft-cp1252
-Dina_i700-10.pcf.gz -windows-dina-bold-i-normal--13-100-96-96-c-80-microsoft-cp1252
-Dina_i700-8.pcf.gz -windows-dina-bold-i-normal--10-80-96-96-c-70-microsoft-cp1252
-Dina_i700-9.pcf.gz -windows-dina-bold-i-normal--12-90-96-96-c-70-microsoft-cp1252
-Dina_r400-10.pcf.gz -windows-dina-medium-r-normal--13-100-96-96-c-80-microsoft-cp1252
-Dina_r400-6.pcf.gz -windows-dina-medium-r-normal--8-60-96-96-c-60-microsoft-cp1252
-Dina_r400-8.pcf.gz -windows-dina-medium-r-normal--10-80-96-96-c-70-microsoft-cp1252
-Dina_r400-9.pcf.gz -windows-dina-medium-r-normal--12-90-96-96-c-70-microsoft-cp1252
-Dina_r700-10.pcf.gz -windows-dina-bold-r-normal--13-100-96-96-c-80-microsoft-cp1252
-Dina_r700-8.pcf.gz -windows-dina-bold-r-normal--10-80-96-96-c-70-microsoft-cp1252
-Dina_r700-9.pcf.gz -windows-dina-bold-r-normal--12-90-96-96-c-70-microsoft-cp1252
diff --git a/fonts/Dina/fonts.scale b/fonts/Dina/fonts.scale
deleted file mode 100644 (file)
index 573541a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-0
index d278eb4c6c0df8a53ca5e9805d5e57175957b857..6b0bb54095771e8a99bdf2cf12bdade845eb5968 100644 (file)
@@ -3,7 +3,7 @@ geometry = "400x0-30-30"
 follow = keyboard
 sort = yes
 
 follow = keyboard
 sort = yes
 
-font = "Dina, DejaVu Sans Mono, monospace 9"
+font = "monospace 9"
 markup = no
 format = "<b>%s</b> %p <span size='5120' color='#586e75'>%a</span>\n%b"
 show_age_threshold = 5
 markup = no
 format = "<b>%s</b> %p <span size='5120' color='#586e75'>%a</span>\n%b"
 show_age_threshold = 5
index 8fd5375f99dc9b44e2a9acb139dbdacfc545d6f6..44f52a1e9684e6ff516bbc74832282b159da1c8e 100644 (file)
@@ -1,6 +1,33 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <description>prefer Source, Noto, DejaVu, Free; monospace Dina</description>
+
+  <!-- rgb pixel alignment -->
+  <match target="font">
+    <edit name="rgba" mode="assign">
+      <const>rgb</const>
+    </edit>
+  </match>
+
+  <!-- preface 60-generic.conf and prefer no color. 
+       this value is actually not that useful due to implementation detail...
+    -->
+  <match>
+    <test name="lang">
+      <string>und-zsye</string>
+    </test>
+    <test qual="all" name="color" compare="not_eq">
+      <bool>true</bool>
+    </test>
+    <test qual="all" name="color" compare="not_eq">
+      <bool>false</bool>
+    </test>
+    <edit name="color" mode="append">
+      <bool>false</bool>
+    </edit>
+  </match>
+
   <!-- fuck helvetica -->
   <match>
     <test name="family">
   <!-- fuck helvetica -->
   <match>
     <test name="family">
   </match>
 
   <!-- set up preferred aliases -->
   </match>
 
   <!-- set up preferred aliases -->
-  <alias><family>emoji</family>
+  <alias binding="same">
+    <family>emoji</family>
     <prefer>
       <family>Noto Emoji</family>
     </prefer>
   </alias>
     <prefer>
       <family>Noto Emoji</family>
     </prefer>
   </alias>
-  <alias><family>sans-serif</family>
+  <alias binding="same">
+    <family>sans-serif</family>
     <prefer>
       <family>Source Sans Pro</family>
       <family>Noto Sans Display</family>
       <family>Noto Sans</family>
       <family>DejaVu Sans</family>
     <prefer>
       <family>Source Sans Pro</family>
       <family>Noto Sans Display</family>
       <family>Noto Sans</family>
       <family>DejaVu Sans</family>
+      <family>FreeSans</family>
     </prefer>
   </alias>
     </prefer>
   </alias>
-  <alias><family>serif</family>
+  <alias binding="same">
+    <family>serif</family>
     <prefer>
       <family>Source Serif Pro</family>
       <family>Noto Serif Display</family>
       <family>Noto Serif</family>
       <family>DejaVu Serif</family>
     <prefer>
       <family>Source Serif Pro</family>
       <family>Noto Serif Display</family>
       <family>Noto Serif</family>
       <family>DejaVu Serif</family>
+      <family>FreeSerif</family>
     </prefer>
   </alias>
     </prefer>
   </alias>
-  <alias><family>monospace</family>
+  <alias binding="same">
+    <family>monospace</family>
     <prefer>
     <prefer>
-      <family>Dina</family>
+      <!-- fontconfig 2.10 broke Dina - ->
+      <family>Dina</family> -->
       <family>Noto Sans Mono</family>
       <family>Noto Sans Mono</family>
-      <family>DejaVu Mono</family>
-      <family>Ubuntu Mono</family>
+      <family>DejaVu Sans Mono</family>
+      <family>FreeMono</family>
     </prefer>
   </alias>
 </fontconfig>
 
     </prefer>
   </alias>
 </fontconfig>
 
-<!-- vim: set et fenc=utf-8 ft=xml sts=2 sw=2 ts=8 tw=0 :
+
+<!-- vim: set et ft=xml sts=2 sw=2 ts=8 tw=0 :
 -->
 -->
index af19cae2c18532bfcbae463d07c2a31f3844a804..8b7b33c8cccbc8a2a2737c65f15014d285d53c7e 100644 (file)
@@ -185,7 +185,7 @@ bindsym $mod+r mode "translate"
 
 ### appearance ###
 # font
 
 ### appearance ###
 # font
-font pango:Dina 7
+font pango:monospace 7
 
 # windows
 for_window [class="Gsimplecal"] floating enable
 
 # windows
 for_window [class="Gsimplecal"] floating enable
@@ -226,27 +226,27 @@ set $b_fg  #fdf6e3
 set $b_ind #264db2
 set $b_chb #4466ff
 
 set $b_ind #264db2
 set $b_chb #4466ff
 
-# TODO: deprecate in favor of tint2
-bar {
-       position top
-       output LVDS1
-       tray_output primary
-       status_command i3status
-       separator_symbol "|"
-
-       colors {
-               background $bg
-               statusline $fg
-               separator  $b_ind
-
-               # class            border  backgr. text
-               focused_workspace  $f_bdr  $f_bg   $f_fg
-               active_workspace   $i_bdr  $i_bg   $i_fg
-               inactive_workspace $i_bdr  $i_bg   $i_fg
-               urgent_workspace   $u_bdr  $u_bg   $u_fg
-               binding_mode       $b_bdr  $b_bg   $b_fg
-       }
-}
+# deprecated in favor of tint2
+#bar {
+#      position top
+#      output LVDS1
+#      tray_output primary
+#      status_command i3status
+#      separator_symbol "|"
+#
+#      colors {
+#              background $bg
+#              statusline $fg
+#              separator  $b_ind
+#
+#              # class            border  backgr. text
+#              focused_workspace  $f_bdr  $f_bg   $f_fg
+#              active_workspace   $i_bdr  $i_bg   $i_fg
+#              inactive_workspace $i_bdr  $i_bg   $i_fg
+#              urgent_workspace   $u_bdr  $u_bg   $u_fg
+#              binding_mode       $b_bdr  $b_bg   $b_fg
+#      }
+#}
 
 # apply colors
 # class                 border  backgr. text    indicator child_border
 
 # apply colors
 # class                 border  backgr. text    indicator child_border
index 3fd1e7d6740e3b03391b855b168a7ce3f0cfe385..73034b8dbc1956228d6e153faac2fb6cf43d8f60 100644 (file)
@@ -26,11 +26,11 @@ load {
 }
 
 wireless wlan0 {
 }
 
 wireless wlan0 {
-       format_up = "<span font='6'>%essid %ip</span>"
-       format_down = "<span font='6'>wlan down</span>"
+       format_up = "%essid %ip"
+       format_down = "wlan down"
 }
 
 ethernet em0 {
 }
 
 ethernet em0 {
-       format_up = " <span font='6'>%ip</span>"
+       format_up = " <span color='$color_degraded'>%ip</span>"
        format_down = ""
 }
        format_down = ""
 }
diff --git a/xdg/luakit/rc.lua b/xdg/luakit/rc.lua
deleted file mode 100644 (file)
index ea644b7..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-------------------------------------------------------------------------------
--- luakit configuration file, more information at https://luakit.github.io/ --
-------------------------------------------------------------------------------
-
-require "lfs"
-
-require "unique_instance"
-
--- Set the number of web processes to use. A value of 0 means 'no limit'.
-luakit.process_limit = 4
--- Set the cookie storage location
-soup.cookies_storage = luakit.data_dir .. "/cookies.db"
-
--- Load library of useful functions for luakit
-local lousy = require "lousy"
-
--- Load users theme
--- ("$XDG_CONFIG_HOME/luakit/theme.lua" or "/etc/xdg/luakit/theme.lua")
-lousy.theme.init(lousy.util.find_config("theme.lua"))
-assert(lousy.theme.get(), "failed to load theme")
-
--- Load users window class
--- ("$XDG_CONFIG_HOME/luakit/window.lua" or "/etc/xdg/luakit/window.lua")
-local window = require "window"
-
--- Load users webview class
--- ("$XDG_CONFIG_HOME/luakit/webview.lua" or "/etc/xdg/luakit/webview.lua")
-local webview = require "webview"
-
--- Add luakit;//log/ chrome page
-local log_chrome = require "log_chrome"
-
-window.add_signal("build", function (w)
-    local widgets, l, r = require "lousy.widget", w.sbar.l, w.sbar.r
-
-    -- Left-aligned status bar widgets
-    l.layout:pack(widgets.uri())
-    l.layout:pack(widgets.hist())
-    l.layout:pack(widgets.progress())
-
-    -- Right-aligned status bar widgets
-    r.layout:pack(widgets.buf())
-    r.layout:pack(log_chrome.widget())
-    r.layout:pack(widgets.ssl())
-    r.layout:pack(widgets.tabi())
-    r.layout:pack(widgets.scroll())
-end)
-
--- Load luakit binds and modes
-local modes = require "modes"
-local binds = require "binds"
-
-local settings = require "settings"
-require "settings_chrome"
-
-----------------------------------
--- Optional user script loading --
-----------------------------------
-
--- Add adblock
-local adblock = require "adblock"
-local adblock_chrome = require "adblock_chrome"
-
-local webinspector = require "webinspector"
-
--- Add uzbl-like form filling
-local formfiller = require "formfiller"
-
--- Add proxy support & manager
-local proxy = require "proxy"
-
--- Add quickmarks support & manager
-local quickmarks = require "quickmarks"
-
--- Add session saving/loading support
-local session = require "session"
-
--- Add command to list closed tabs & bind to open closed tabs
-local undoclose = require "undoclose"
-
--- Add command to list tab history items
-local tabhistory = require "tabhistory"
-
--- Add greasemonkey-like javascript userscript support
-local userscripts = require "userscripts"
-
--- Add bookmarks support
-local bookmarks = require "bookmarks"
-local bookmarks_chrome = require "bookmarks_chrome"
-
--- Add download support
-local downloads = require "downloads"
-local downloads_chrome = require "downloads_chrome"
-
--- Add automatic PDF downloading and opening
-local viewpdf = require "viewpdf"
-
--- Example using xdg-open for opening downloads / showing download folders
-downloads.add_signal("open-file", function (file)
-    luakit.spawn(string.format("xdg-open %q", file))
-    return true
-end)
-
--- Add vimperator-like link hinting & following
-local follow = require "follow"
-
--- Add command history
-local cmdhist = require "cmdhist"
-
--- Add search mode & binds
-local search = require "search"
-
--- Add ordering of new tabs
-local taborder = require "taborder"
-
--- Save web history
-local history = require "history"
-local history_chrome = require "history_chrome"
-
-local help_chrome = require "help_chrome"
-local binds_chrome = require "binds_chrome"
-
--- Add command completion
-local completion = require "completion"
-
--- Press Control-E while in insert mode to edit the contents of the currently
--- focused <textarea> or <input> element, using `xdg-open`
-local open_editor = require "open_editor"
-
--- NoScript plugin, toggle scripts and or plugins on a per-domain basis.
--- `,ts` to toggle scripts, `,tp` to toggle plugins, `,tr` to reset.
--- If you use this module, don't use any site-specific `enable_scripts` or
--- `enable_plugins` settings, as these will conflict.
-require "noscript"
-
-local follow_selected = require "follow_selected"
-local go_input = require "go_input"
-local go_next_prev = require "go_next_prev"
-local go_up = require "go_up"
-
--- Filter Referer HTTP header if page domain does not match Referer domain
-require_web_module("referer_control_wm")
-
-local error_page = require "error_page"
-
--- Add userstyles loader
-local styles = require "styles"
-
--- Hide scrollbars on all pages
-local hide_scrollbars = require "hide_scrollbars"
-
--- Add a stylesheet when showing images
-local image_css = require "image_css"
-
--- Add a new tab page
-local newtab_chrome = require "newtab_chrome"
-
--- Add tab favicons mod
-local tab_favicons = require "tab_favicons"
-
--- Add :view-source command
-local view_source = require "view_source"
-
------------------------------
--- End user script loading --
------------------------------
-
-settings.window.search_engines = {
-    ddg = "https://duckduckgo.com/?q=%s",
-    gh  = "https://github.com/search?q=%s",
-    w   = "https://en.wikipedia.org/wiki/Special:Search?search=%s"
-}
-settings.window.search_engines.default = settings.window.search_engines.ddg
-
--- change tab text
-require("lousy.widget.tab").label_format = '<span foreground="{index_fg}" font-weight="bold">{index}</span> {title}'
-
--- Restore last saved session
-local w = (not luakit.nounique) and (session and session.restore())
-if w then
-    for i, uri in ipairs(uris) do
-        w:new_tab(uri, { switch = i == 1 })
-    end
-else
-    -- Or open new window
-    window.new(uris)
-end
-
--- vim: et:sw=4:ts=8:sts=4:tw=80
index 7b580b9cbc7c1512de0dbde6bffed4ba2badbad3..2ed82b1624092cebbca8a3e72c656fb5ae73cbaf 100644 (file)
@@ -1,8 +1,13 @@
-#---- Generated by tint2conf cf0f ----
+#---- Generated by tint2conf 7ffd ----
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
 # Gradients
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
 # Gradients
+# Gradient 1
+gradient = vertical
+start_color = #110800 100
+end_color = #110800 1
+
 #-------------------------------------
 # Backgrounds
 # Background 1: Inactive desktop name, Tooltip
 #-------------------------------------
 # Backgrounds
 # Background 1: Inactive desktop name, Tooltip
@@ -37,8 +42,9 @@ border_width = 0
 border_sides = 
 border_content_tint_weight = 0
 background_content_tint_weight = 0
 border_sides = 
 border_content_tint_weight = 0
 background_content_tint_weight = 0
-background_color = #110800 100
+background_color = #110800 0
 border_color = #000000 0
 border_color = #000000 0
+gradient_id = 1
 background_color_hover = #000000 0
 border_color_hover = #000000 0
 background_color_pressed = #000000 0
 background_color_hover = #000000 0
 border_color_hover = #000000 0
 background_color_pressed = #000000 0
@@ -72,14 +78,15 @@ border_color_pressed = #000000 0
 
 #-------------------------------------
 # Panel
 
 #-------------------------------------
 # Panel
-panel_items = ET:SEEECB
+panel_items = ET:SLEEECB
 panel_size = 100% 28
 panel_margin = 0 0
 panel_padding = 0 1 0
 panel_background_id = 3
 wm_menu = 1
 panel_dock = 1
 panel_size = 100% 28
 panel_margin = 0 0
 panel_padding = 0 1 0
 panel_background_id = 3
 wm_menu = 1
 panel_dock = 1
-panel_position = top center horizontal
+panel_pivot_struts = 0
+panel_position = top left horizontal
 panel_layer = top
 panel_monitor = all
 panel_shrink = 0
 panel_layer = top
 panel_monitor = all
 panel_shrink = 0
@@ -87,7 +94,7 @@ autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
 autohide_height = 1
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
 autohide_height = 1
-strut_policy = minimum
+strut_policy = follow_size
 panel_window_name = tint2
 disable_transparency = 1
 mouse_effects = 0
 panel_window_name = tint2
 disable_transparency = 1
 mouse_effects = 0
@@ -100,23 +107,23 @@ scale_relative_to_screen_height = 0
 #-------------------------------------
 # Taskbar
 taskbar_mode = multi_desktop
 #-------------------------------------
 # Taskbar
 taskbar_mode = multi_desktop
-taskbar_hide_if_empty = 0
+taskbar_hide_if_empty = 1
 taskbar_padding = 0 0 1
 taskbar_background_id = 0
 taskbar_active_background_id = 0
 taskbar_name = 1
 taskbar_hide_inactive_tasks = 0
 taskbar_padding = 0 0 1
 taskbar_background_id = 0
 taskbar_active_background_id = 0
 taskbar_name = 1
 taskbar_hide_inactive_tasks = 0
-taskbar_hide_different_monitor = 0
+taskbar_hide_different_monitor = 1
 taskbar_hide_different_desktop = 0
 taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 4 0
 taskbar_name_background_id = 1
 taskbar_name_active_background_id = 4
 taskbar_hide_different_desktop = 0
 taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 4 0
 taskbar_name_background_id = 1
 taskbar_name_active_background_id = 4
-taskbar_name_font = Dina 8
+taskbar_name_font = monospace 8
 taskbar_name_font_color = #93a1a1 100
 taskbar_name_active_font_color = #eee8d5 100
 taskbar_distribute_size = 1
 taskbar_name_font_color = #93a1a1 100
 taskbar_name_active_font_color = #eee8d5 100
 taskbar_distribute_size = 1
-taskbar_sort_order = none
+taskbar_sort_order = center
 task_align = left
 
 #-------------------------------------
 task_align = left
 
 #-------------------------------------
@@ -127,7 +134,7 @@ task_centered = 0
 urgent_nb_of_blink = 10
 task_maximum_size = 150 0
 task_padding = 1 0 2
 urgent_nb_of_blink = 10
 task_maximum_size = 150 0
 task_padding = 1 0 2
-task_font = Dina 8
+task_font = monospace 8
 task_tooltip = 1
 task_thumbnail = 0
 task_thumbnail_size = 210
 task_tooltip = 1
 task_thumbnail = 0
 task_thumbnail_size = 210
@@ -153,7 +160,7 @@ systray_background_id = 0
 systray_sort = ascending
 systray_icon_size = 0
 systray_icon_asb = 100 0 0
 systray_sort = ascending
 systray_icon_size = 0
 systray_icon_asb = 100 0 0
-systray_monitor = 1
+systray_monitor = primary
 systray_name_filter = 
 
 #-------------------------------------
 systray_name_filter = 
 
 #-------------------------------------
@@ -163,23 +170,23 @@ launcher_background_id = 0
 launcher_icon_background_id = 0
 launcher_icon_size = 0
 launcher_icon_asb = 100 0 0
 launcher_icon_background_id = 0
 launcher_icon_size = 0
 launcher_icon_asb = 100 0 0
-launcher_icon_theme = Paper-Mono-Dark
 launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
 launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
+launcher_item_app = /usr/share/applications/xvkbd.desktop
 
 #-------------------------------------
 # Clock
 time1_format = %H:%M:%S
 time2_format = %a %d/%m/%Y
 
 #-------------------------------------
 # Clock
 time1_format = %H:%M:%S
 time2_format = %a %d/%m/%Y
-time1_font = Dina 8
+time1_font = monospace 8
 time1_timezone = 
 time2_timezone = 
 time1_timezone = 
 time2_timezone = 
-time2_font = Dina 6
+time2_font = monospace 6
 clock_font_color = #93a1a1 100
 clock_padding = 6 0
 clock_background_id = 0
 clock_font_color = #93a1a1 100
 clock_padding = 6 0
 clock_background_id = 0
-clock_tooltip = 
+clock_tooltip = %A, %B %d, %Y
 clock_tooltip_timezone = 
 clock_lclick_command = gsimplecal
 clock_rclick_command = 
 clock_tooltip_timezone = 
 clock_lclick_command = gsimplecal
 clock_rclick_command = 
@@ -192,10 +199,9 @@ clock_dwheel_command =
 battery_tooltip = 1
 battery_low_status = 5
 battery_low_cmd = notify-send -u critical -t 0 -a system -i battery-low 'Battery critical'
 battery_tooltip = 1
 battery_low_status = 5
 battery_low_cmd = notify-send -u critical -t 0 -a system -i battery-low 'Battery critical'
-
 battery_full_cmd = notify-send -t 10000 -a system -i battery-full 'Battery full'
 battery_full_cmd = notify-send -t 10000 -a system -i battery-full 'Battery full'
-bat1_font = Dina 8
-bat2_font = Dina 6
+bat1_font = monospace 8
+bat2_font = monospace 6
 battery_font_color = #93a1a1 100
 bat1_format = %p %h:%m
 bat2_format = %s
 battery_font_color = #93a1a1 100
 bat1_format = %p %h:%m
 bat2_format = %s
@@ -222,7 +228,7 @@ separator_padding = 5 0
 #-------------------------------------
 # Executor 1
 execp = new
 #-------------------------------------
 # Executor 1
 execp = new
-execp_command = ~/bin/i3-mode
+execp_command = ~/bin/i3-mode hide-default
 execp_interval = 0
 execp_has_icon = 0
 execp_cache_icon = 0
 execp_interval = 0
 execp_has_icon = 0
 execp_cache_icon = 0
@@ -234,7 +240,7 @@ execp_rclick_command =
 execp_mclick_command = 
 execp_uwheel_command = 
 execp_dwheel_command = 
 execp_mclick_command = 
 execp_uwheel_command = 
 execp_dwheel_command = 
-execp_font = Dina 10
+execp_font = monospace 10
 execp_font_color = #fdf6e3 100
 execp_padding = 10 0
 execp_background_id = 5
 execp_font_color = #fdf6e3 100
 execp_padding = 10 0
 execp_background_id = 5
@@ -274,7 +280,7 @@ execp_cache_icon = 1
 execp_continuous = 1
 execp_markup = 0
 execp_tooltip = 
 execp_continuous = 1
 execp_markup = 0
 execp_tooltip = 
-execp_lclick_command = wifimgr
+execp_lclick_command = sh -c 'wifimgr || urxvtc -e sudo wifish'
 execp_rclick_command = 
 execp_mclick_command = 
 execp_uwheel_command = 
 execp_rclick_command = 
 execp_mclick_command = 
 execp_uwheel_command = 
@@ -296,12 +302,12 @@ execp_cache_icon = 0
 execp_continuous = 2
 execp_markup = 1
 execp_tooltip = 
 execp_continuous = 2
 execp_markup = 1
 execp_tooltip = 
-execp_lclick_command = wifimgr
+execp_lclick_command = urxvtc -e sh -c 'htop || top'
 execp_rclick_command = 
 execp_mclick_command = 
 execp_uwheel_command = 
 execp_dwheel_command = 
 execp_rclick_command = 
 execp_mclick_command = 
 execp_uwheel_command = 
 execp_dwheel_command = 
-execp_font = Dina 8
+execp_font = monospace 6
 execp_font_color = #93a1a1 100
 execp_padding = 0 0
 execp_background_id = 0
 execp_font_color = #93a1a1 100
 execp_padding = 0 0
 execp_background_id = 0
@@ -316,5 +322,5 @@ tooltip_hide_timeout = 0
 tooltip_padding = 2 0
 tooltip_background_id = 1
 tooltip_font_color = #eee8d5 100
 tooltip_padding = 2 0
 tooltip_background_id = 1
 tooltip_font_color = #eee8d5 100
-tooltip_font = Dina 10
+tooltip_font = monospace 10
 
 
index 8c7bf8d295a72e45d81ca3d5c1ac5d69a65b0154..ab51c46f2b562e0860eef0c2b2d673fd9811acdd 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 8c7bf8d295a72e45d81ca3d5c1ac5d69a65b0154
+Subproject commit ab51c46f2b562e0860eef0c2b2d673fd9811acdd
This page took 0.157234 seconds and 4 git commands to generate.