From 116467fd2cdd0ffe89304c776a71f219fb1593de Mon Sep 17 00:00:00 2001 From: ds6 Date: Wed, 18 Sep 2019 22:28:25 -0500 Subject: [PATCH 1/1] update scripts, vim plugins, fonts, firefox, tint2 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 --- .gitignore | 2 + base/.Xresources | 2 +- base/.gtkrc-2.0 | 2 +- base/.vim/pack/repeat.vim/start/vim-repeat | 2 +- .../speeddating.vim/start/vim-speeddating | 2 +- .../.vim/pack/surround.vim/start/vim-surround | 2 +- base/.xinitrc | 4 +- base/.zprofile | 2 +- base/.zsh/prompt_ds6_setup | 7 +- base/.zshenv | 2 + bin/dmenu | 2 +- bin/redon | 2 +- bin/rotate | 2 +- bin/setup-perl5 | 2 + bin/tint2-alsa | 1 + firefox/chrome/theme.as.css | 68 ++++--- firefox/chrome/userChrome.xml | 84 ++++---- firefox/user-js-updater.sh | 1 + firefox/user-overrides.js | 57 ++---- fonts/Dina/Dina_i400-10.pcf.gz | Bin 5010 -> 5010 bytes fonts/Dina/Dina_i400-8.pcf.gz | Bin 4917 -> 4917 bytes fonts/Dina/Dina_i400-9.pcf.gz | Bin 5015 -> 5015 bytes fonts/Dina/Dina_i700-10.pcf.gz | Bin 5026 -> 5026 bytes fonts/Dina/Dina_i700-8.pcf.gz | Bin 4842 -> 4842 bytes fonts/Dina/Dina_i700-9.pcf.gz | Bin 4928 -> 4928 bytes fonts/Dina/Dina_r400-10.pcf.gz | Bin 4776 -> 4776 bytes fonts/Dina/Dina_r400-6.pcf.gz | Bin 4488 -> 4488 bytes fonts/Dina/Dina_r400-8.pcf.gz | Bin 4634 -> 4634 bytes fonts/Dina/Dina_r400-9.pcf.gz | Bin 4677 -> 4677 bytes fonts/Dina/Dina_r700-10.pcf.gz | Bin 4712 -> 4712 bytes fonts/Dina/Dina_r700-8.pcf.gz | Bin 4669 -> 4669 bytes fonts/Dina/Dina_r700-9.pcf.gz | Bin 4733 -> 4733 bytes fonts/Dina/LICENSE | 25 ++- fonts/Dina/NEWS | 26 +++ fonts/Dina/fonts.dir | 14 -- fonts/Dina/fonts.scale | 1 - xdg/dunst/dunstrc | 2 +- xdg/fontconfig/fonts.conf | 51 ++++- xdg/i3/config | 44 ++-- xdg/i3status/tint2-cpu-net | 6 +- xdg/luakit/rc.lua | 189 ------------------ xdg/tint2/tint2rc | 54 ++--- xorg/icons/paper-icon-theme | 2 +- 43 files changed, 273 insertions(+), 387 deletions(-) create mode 100755 bin/setup-perl5 create mode 100644 fonts/Dina/NEWS delete mode 100644 fonts/Dina/fonts.dir delete mode 100644 fonts/Dina/fonts.scale delete mode 100644 xdg/luakit/rc.lua diff --git a/.gitignore b/.gitignore index 5e6dcc9..8b8426c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ base/.vim/.netrwhist # fontconfig /fonts/**/.uuid +/fonts/**/fonts.dir +/fonts/**/fonts.scale diff --git a/base/.Xresources b/base/.Xresources index 12aab42..25934a0 100644 --- a/base/.Xresources +++ b/base/.Xresources @@ -6,7 +6,7 @@ Xft.antialias: true Xft.dpi: 96 Xft.hinting: true Xft.hintstyle: hintslight -Xft.rgba: none +Xft.rgba: rgb ! theming Xcursor.theme: Paper-Mono-Dark diff --git a/base/.gtkrc-2.0 b/base/.gtkrc-2.0 index 0db08e5..a701f5f 100644 --- a/base/.gtkrc-2.0 +++ b/base/.gtkrc-2.0 @@ -1,4 +1,4 @@ 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" diff --git a/base/.vim/pack/repeat.vim/start/vim-repeat b/base/.vim/pack/repeat.vim/start/vim-repeat index 43d2678..ae361be 160000 --- a/base/.vim/pack/repeat.vim/start/vim-repeat +++ b/base/.vim/pack/repeat.vim/start/vim-repeat @@ -1 +1 @@ -Subproject commit 43d2678fa59d068c815d8298331c195e850ff5a7 +Subproject commit ae361bea990e27d5beade3a8d9fa22e25cec3100 diff --git a/base/.vim/pack/speeddating.vim/start/vim-speeddating b/base/.vim/pack/speeddating.vim/start/vim-speeddating index 799cd34..ce2f1aa 160000 --- a/base/.vim/pack/speeddating.vim/start/vim-speeddating +++ b/base/.vim/pack/speeddating.vim/start/vim-speeddating @@ -1 +1 @@ -Subproject commit 799cd3473bc64adcb6b556bf349f549570666b62 +Subproject commit ce2f1aae9f2be128b4ca322a8e797be3ae40c30b diff --git a/base/.vim/pack/surround.vim/start/vim-surround b/base/.vim/pack/surround.vim/start/vim-surround index 5970688..fab8621 160000 --- a/base/.vim/pack/surround.vim/start/vim-surround +++ b/base/.vim/pack/surround.vim/start/vim-surround @@ -1 +1 @@ -Subproject commit 597068870b8f093a8b2d11536c62ff31222ee8d0 +Subproject commit fab8621670f71637e9960003af28365129b1dfd0 diff --git a/base/.xinitrc b/base/.xinitrc index 72661b4..97c5c14 100644 --- a/base/.xinitrc +++ b/base/.xinitrc @@ -29,8 +29,8 @@ xset m 1/1 0 & 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 diff --git a/base/.zprofile b/base/.zprofile index 3c1d2e0..3cc9587 100644 --- a/base/.zprofile +++ b/base/.zprofile @@ -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" diff --git a/base/.zsh/prompt_ds6_setup b/base/.zsh/prompt_ds6_setup index 77c1a6d..b1f5613 100644 --- a/base/.zsh/prompt_ds6_setup +++ b/base/.zsh/prompt_ds6_setup @@ -70,6 +70,7 @@ function prompt_ds6_setup() { 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 } @@ -80,10 +81,14 @@ function zle-line-init { zle reset-prompt } -function prompt_ds6_precmd() { +function prompt_ds6_precmd { # 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 : diff --git a/base/.zshenv b/base/.zshenv index 6ab4a58..7a5982f 100644 --- a/base/.zshenv +++ b/base/.zshenv @@ -21,6 +21,8 @@ export XDG_RUNTIME_DIR=~/tmp ### 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 diff --git a/bin/dmenu b/bin/dmenu index 171f8c5..95039d4 100755 --- a/bin/dmenu +++ b/bin/dmenu @@ -1,2 +1,2 @@ #!/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 "$@" diff --git a/bin/redon b/bin/redon index 72119f2..966f172 100755 --- a/bin/redon +++ b/bin/redon @@ -1,3 +1,3 @@ #!/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 & diff --git a/bin/rotate b/bin/rotate index 2e6e4aa..83b7147 100755 --- a/bin/rotate +++ b/bin/rotate @@ -69,7 +69,7 @@ num_to_rot $((($rot0 + 4) % 4)) 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 diff --git a/bin/setup-perl5 b/bin/setup-perl5 new file mode 100755 index 0000000..ce69beb --- /dev/null +++ b/bin/setup-perl5 @@ -0,0 +1,2 @@ +#!/bin/sh +cpanm --local-lib=$XDG_DATA_HOME/perl5 local::lib diff --git a/bin/tint2-alsa b/bin/tint2-alsa index 2a18b5c..1e851f2 100755 --- a/bin/tint2-alsa +++ b/bin/tint2-alsa @@ -5,6 +5,7 @@ medium=$base-medium.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\+') diff --git a/firefox/chrome/theme.as.css b/firefox/chrome/theme.as.css index f5807bf..75f6953 100644 --- a/firefox/chrome/theme.as.css +++ b/firefox/chrome/theme.as.css @@ -1,7 +1,9 @@ /*** 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; @@ -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; + --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; */ @@ -48,33 +52,37 @@ 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; } } -/*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 */ -.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) { @@ -83,19 +91,19 @@ } } /* 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 */ -@-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} diff --git a/firefox/chrome/userChrome.xml b/firefox/chrome/userChrome.xml index 45c4745..0ba60ad 100644 --- a/firefox/chrome/userChrome.xml +++ b/firefox/chrome/userChrome.xml @@ -4,47 +4,47 @@ Available for use under the MIT License: https://opensource.org/licenses/MIT --> - + - - - 0) { - document.loadOverlay(xulFiles.shift(), null); - setTimeout(loadXUL, 5); - } - }, 0); - ]]> - - + + + 0) { + document.loadOverlay(xulFiles.shift(), null); + setTimeout(loadXUL, 5); + } + }, 0); + ]]> + + diff --git a/firefox/user-js-updater.sh b/firefox/user-js-updater.sh index 58594d4..a7390d4 100755 --- a/firefox/user-js-updater.sh +++ b/firefox/user-js-updater.sh @@ -9,4 +9,5 @@ else fi echo >> user.js cat user-overrides.js >> user.js +echo Updated! diff user.js.bak user.js 2>/dev/null diff --git a/firefox/user-overrides.js b/firefox/user-overrides.js index 79a392e..cf467ef 100644 --- a/firefox/user-overrides.js +++ b/firefox/user-overrides.js @@ -38,13 +38,6 @@ user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", "data: // 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); @@ -56,12 +49,6 @@ user_pref("network.trr.mode", 0); 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 @@ -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); +// 1264 +user_pref("security.ssl3.rsa_aes_128_sha", false); +user_pref("security.ssl3.rsa_aes_256_sha", false); // 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 -//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); -// 1606: uMatrix -user_pref("network.http.referer.spoofSource", true); // 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); -// 2401 -//user_pref("dom.event.contextmenu.enabled", false); // 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", ""); @@ -138,6 +115,9 @@ user_pref("privacy.clearOnShutdown.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"); @@ -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); +user_pref("general.warnOnAboutConfig", false); +user_pref("general.aboutConfig.showWarning", 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 ***/ @@ -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.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); @@ -165,10 +150,12 @@ user_pref("reader.parse-on-load.enabled", 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("extensions.ui.dictionary.hidden", false); user_pref("extensions.ui.experiment.hidden", false); +user_pref("extensions.ui.locale.hidden", 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); diff --git a/fonts/Dina/Dina_i400-10.pcf.gz b/fonts/Dina/Dina_i400-10.pcf.gz index cf53b5e3b75935d0dfb436988b75809e3e5460fa..cc9a7944b508f9cfba6b1be4c9f9ead326ea131f 100644 GIT binary patch delta 17 YcmbQFK1rQJzMF$#L40uZMvg9F04`kxFaQ7m delta 17 WcmbQFK1rQJzMF#q1U7PX2?GEl3j>1y diff --git a/fonts/Dina/Dina_i400-8.pcf.gz b/fonts/Dina/Dina_i400-8.pcf.gz index f289553246688b842c4984a5f5fc8166e17e7c6c..0d74f40bb09784ac0dfb0843b2a9aac8e11534db 100644 GIT binary patch delta 17 Ycmdn0wpEQozMF$#L40uZMh;zJ05RnS7XSbN delta 17 Wcmdn0wpEQozMF#q1U7Q$3IhNplLKl1 diff --git a/fonts/Dina/Dina_i400-9.pcf.gz b/fonts/Dina/Dina_i400-9.pcf.gz index 1841d03e6fca65758f393b52130ce235678a5103..783ca256c290693da0039461393a04c7531e90e5 100644 GIT binary patch delta 17 YcmbQPK3$zdzMF$#L40uZMvi`A051mxKL7v# delta 17 WcmbQPK3$zdzMF#q1U7Q?3j+WnwF8m> diff --git a/fonts/Dina/Dina_i700-10.pcf.gz b/fonts/Dina/Dina_i700-10.pcf.gz index f4959dc22f3b15a4084443e04ef1ee411cb4b2da..47376df76e7242976cddce65b6c983c804fcb904 100644 GIT binary patch delta 17 YcmZ3azDS)zzMF$#L40uZMvhs+05E+8U;qFB delta 17 WcmZ3azDS)zzMF#q1U7Qa5(WSzD+99t diff --git a/fonts/Dina/Dina_i700-8.pcf.gz b/fonts/Dina/Dina_i700-8.pcf.gz index 933dad9986108d229d543e2885cbe447a6d39bbe..c4b84241ef21a616035ad984dc909bc9ed93e913 100644 GIT binary patch delta 17 YcmaE*`bw2UzMF$#L40uZMvg~906EYGGXMYp delta 17 WcmaE*`bw2UzMF#q1U7O!5&{4&eguX9 diff --git a/fonts/Dina/Dina_i700-9.pcf.gz b/fonts/Dina/Dina_i700-9.pcf.gz index 9b2c6b42974b7a8933ec6054d87ab3dcb7f8c92f..48e55deb20bc948b5eabf21a509156b257af83c7 100644 GIT binary patch delta 17 YcmX@0c0i3ozMF$#L40uZMh**M05e+!H~;_u delta 17 WcmX@0c0i3ozMF#q1U7P52m=5p2?L7& diff --git a/fonts/Dina/Dina_r400-10.pcf.gz b/fonts/Dina/Dina_r400-10.pcf.gz index 4dd7e4c7e33e40d38da6d4e925536771d9023b90..15aa2121ef592cd56e85644d1f0e4f94cc469e78 100644 GIT binary patch delta 17 YcmZ3Xx&Z2$lO delta 17 WcmZ3Xx)!2kdN delta 17 WcmbQGGE0R+zMF#q1U7OA2>}2izylNj diff --git a/fonts/Dina/Dina_r400-9.pcf.gz b/fonts/Dina/Dina_r400-9.pcf.gz index 92554d079a71f9014faacfc9bc1ca6f7a00d4ae0..f0d28e9e5d7623381ae84aa30d861437fe71cc47 100644 GIT binary patch delta 17 YcmX@Aa#V#wzMF$#L40uZMh;sc05ix1LI3~& delta 17 WcmX@Aa#V#wzMF#q1U7Qm3IPBpb_10F diff --git a/fonts/Dina/Dina_r700-10.pcf.gz b/fonts/Dina/Dina_r700-10.pcf.gz index 3a01a3c627b129951f87e1a2db30239eeddfa761..6ad91ebd9e1e3f6f685f04a45b6c7fc9618fe33a 100644 GIT binary patch delta 17 YcmaE%@hjJzMF$#L40uZMvhV;06RDZ>Hq)$ delta 17 WcmeyX@>hjJzMF#q1U7P%3IPBw<^(+e diff --git a/fonts/Dina/LICENSE b/fonts/Dina/LICENSE index 4e247ec..661ce49 100644 --- a/fonts/Dina/LICENSE +++ b/fonts/Dina/LICENSE @@ -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. + +Copyright (c) 2005-2013 Joergen Ibsen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/fonts/Dina/NEWS b/fonts/Dina/NEWS new file mode 100644 index 0000000..a5fb68f --- /dev/null +++ b/fonts/Dina/NEWS @@ -0,0 +1,26 @@ +Dina 2.93 (2013.09.10) + + * Added OEM codepage 437 and 850 versions for Windows command prompts + +Dina 2.92 (2013.09.07) + + * Moved bold, italic, and bold italic styles to separate files + * Updated BDF files + +Dina 2.91 (2013.08.25) + + * Fixed `&` in Dina 10 regular + * Updated copyright strings in all fonts + +Dina 2.90 (2013.08.23) + + * Added a 6 point version of Dina regular + * Extended top line in `j` to make it easier to distinguish from `i` + * Moved top part of `&` right and adjusted height + * Moved `%` up + * Changed `ø` and `Ø` to look less like `0` + * Changed `æ` and `ß` to look more harmonious in text + * Moved down starting question and exclamation marks + * Fixed single and double text quotes + * Fixed positioning of degree, ordinals, and powers + * Fixed various other symbols diff --git a/fonts/Dina/fonts.dir b/fonts/Dina/fonts.dir deleted file mode 100644 index f2e6377..0000000 --- a/fonts/Dina/fonts.dir +++ /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 index 573541a..0000000 --- a/fonts/Dina/fonts.scale +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/xdg/dunst/dunstrc b/xdg/dunst/dunstrc index d278eb4..6b0bb54 100644 --- a/xdg/dunst/dunstrc +++ b/xdg/dunst/dunstrc @@ -3,7 +3,7 @@ geometry = "400x0-30-30" follow = keyboard sort = yes -font = "Dina, DejaVu Sans Mono, monospace 9" +font = "monospace 9" markup = no format = "%s %p %a\n%b" show_age_threshold = 5 diff --git a/xdg/fontconfig/fonts.conf b/xdg/fontconfig/fonts.conf index 8fd5375..44f52a1 100644 --- a/xdg/fontconfig/fonts.conf +++ b/xdg/fontconfig/fonts.conf @@ -1,6 +1,33 @@ + prefer Source, Noto, DejaVu, Free; monospace Dina + + + + + rgb + + + + + + + und-zsye + + + true + + + false + + + false + + + @@ -12,36 +39,44 @@ - emoji + + emoji Noto Emoji - sans-serif + + sans-serif Source Sans Pro Noto Sans Display Noto Sans DejaVu Sans + FreeSans - serif + + serif Source Serif Pro Noto Serif Display Noto Serif DejaVu Serif + FreeSerif - monospace + + monospace - Dina + Noto Sans Mono - DejaVu Mono - Ubuntu Mono + DejaVu Sans Mono + FreeMono - diff --git a/xdg/i3/config b/xdg/i3/config index af19cae..8b7b33c 100644 --- a/xdg/i3/config +++ b/xdg/i3/config @@ -185,7 +185,7 @@ bindsym $mod+r mode "translate" ### appearance ### # font -font pango:Dina 7 +font pango:monospace 7 # windows for_window [class="Gsimplecal"] floating enable @@ -226,27 +226,27 @@ set $b_fg #fdf6e3 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 diff --git a/xdg/i3status/tint2-cpu-net b/xdg/i3status/tint2-cpu-net index 3fd1e7d..73034b8 100644 --- a/xdg/i3status/tint2-cpu-net +++ b/xdg/i3status/tint2-cpu-net @@ -26,11 +26,11 @@ load { } wireless wlan0 { - format_up = "%essid %ip" - format_down = "wlan down" + format_up = "%essid %ip" + format_down = "wlan down" } ethernet em0 { - format_up = " %ip" + format_up = " %ip" format_down = "" } diff --git a/xdg/luakit/rc.lua b/xdg/luakit/rc.lua deleted file mode 100644 index ea644b7..0000000 --- a/xdg/luakit/rc.lua +++ /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