summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaïm Favier <fnaim42@gmail.com>2020-07-09 20:06:14 +0200
committerNaïm Favier <fnaim42@gmail.com>2020-07-09 20:06:14 +0200
commitbead2ca3040a51d6757ab116e18a6e8302580b50 (patch)
tree714e64324ef9050c55f0e5ef1671f2ff905f63a1
parent2081ae9bebf2a19b7416d9f704e4529a35bf7e56 (diff)
VMS must die!
-rw-r--r--Makefile4
-rw-r--r--bash/functions2
-rw-r--r--firefox/user.js6
-rw-r--r--firefox/userChrome.css.template10
-rw-r--r--firefox/userContent.css.template8
-rw-r--r--ghc/ghci1
-rwxr-xr-xscripts/le2
-rwxr-xr-x[-rw-r--r--]scripts/theme22
-rwxr-xr-xscripts/upload4
-rw-r--r--sxhkd/sxhkdrc6
-rw-r--r--vim/vimrc6
-rw-r--r--x/XCompose1
-rw-r--r--x/Xresources1
-rw-r--r--xdg/applications/userapp-img.desktop2
-rw-r--r--xdg/mimeapps.list1
-rw-r--r--xdg/thumbnailers/ffmpegthumbnailer.thumbnailer3
16 files changed, 62 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index fd1111b..2acd865 100644
--- a/Makefile
+++ b/Makefile
@@ -290,7 +290,5 @@ yay: ~/.config/yay/config.json
# Templating
#
-THEME := $(shell . scripts/theme && echo "$$theme")
-
-%:: %.template scripts/templum scripts/theme themes/$(THEME).sh xdg/user-dirs.dirs
+%:: %.template scripts/templum scripts/theme xdg/user-dirs.dirs
scripts/templum -s scripts/theme -o $@ $<
diff --git a/bash/functions b/bash/functions
index 3d7b1be..9a1b70c 100644
--- a/bash/functions
+++ b/bash/functions
@@ -200,7 +200,7 @@ irc() {
grep)
local where=$1
shift
- ssh monade.li "grep --color=always ${*@Q} ~/.weechat/logs/$where.weechatlog" | less -FR;;
+ ssh monade.li "cd ~/.weechat/logs && grep --color=always ${*@Q} $where.weechatlog" | less -FR;;
*)
echo "Unknown action $cmd" >&2
return 1;;
diff --git a/firefox/user.js b/firefox/user.js
index 9d9df83..0b15ee7 100644
--- a/firefox/user.js
+++ b/firefox/user.js
@@ -7,7 +7,7 @@ user_pref('browser.newtabpage.enhanced', false);
user_pref('browser.onboarding.enabled', false);
user_pref('browser.startup.homepage', 'about:home');
user_pref('browser.tabs.warnOnClose', false);
-user_pref('browser.uiCustomization.state', '{"placements":{"widget-overflow-fixed-list":[],"nav-bar":["back-button","forward-button","stop-reload-button","home-button","urlbar-container","downloads-button","bookmarks-menu-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["personal-bookmarks"]},"seen":["developer-button","ublock0_raymondhill_net-browser-action"],"dirtyAreaCache":["PersonalToolbar","nav-bar","TabsToolbar","toolbar-menubar"],"currentVersion":16,"newElementCount":5}');
+user_pref('browser.uiCustomization.state', '{"placements":{"widget-overflow-fixed-list":[],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","downloads-button","bookmarks-menu-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["personal-bookmarks"]},"seen":["developer-button","ublock0_raymondhill_net-browser-action"],"dirtyAreaCache":["PersonalToolbar","nav-bar","TabsToolbar","toolbar-menubar"],"currentVersion":16,"newElementCount":6}');
user_pref('browser.urlbar.clickSelectsAll', true);
user_pref('browser.urlbar.doubleClickSelectsAll', false);
user_pref('browser.urlbar.maxRichResults', '5');
@@ -15,8 +15,12 @@ user_pref('browser.urlbar.suggest.openpage', false);
user_pref('browser.urlbar.suggest.searches', false);
user_pref('devtools.debugger.prompt-connection', false);
user_pref('extensions.pocket.enabled', false);
+user_pref('full-screen-api.warning.timeout', '0');
user_pref('general.autoScroll', true);
user_pref('general.warnOnAboutConfig', false);
user_pref('gfx.color_management.mode', '0');
+user_pref('layers.acceleration.force-enabled', true);
user_pref('security.dialog_enable_delay', '0');
+user_pref('security.fileuri.strict_origin_policy', false);
+user_pref('security.mixed_content.block_active_content', false);
user_pref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
diff --git a/firefox/userChrome.css.template b/firefox/userChrome.css.template
index caffd89..168273f 100644
--- a/firefox/userChrome.css.template
+++ b/firefox/userChrome.css.template
@@ -16,6 +16,11 @@
--tabs-border-color: transparent !important;
}
+ ::selection {
+ background-color: {{ "$color4" }};
+ color: white;
+ }
+
toolbar {
--tab-min-height: 28px !important;
--tabs-border-color: transparent !important;
@@ -126,6 +131,10 @@
transition: border-color 0.1s ease-in-out;
}
+ #urlbar:not(:-moz-lwtheme):not([focused="true"]) > #urlbar-background, #searchbar:not(:-moz-lwtheme):not(:focus-within) {
+ border: none !important;
+ }
+
#urlbar *|*.textbox-input::-moz-placeholder {
color: transparent !important;
}
@@ -139,6 +148,7 @@
/* } */
#urlbar:not(.megabar), #urlbar.megabar > #urlbar-background, #searchbar {
+ background-color: var(--bg) !important;
border: none !important;
}
diff --git a/firefox/userContent.css.template b/firefox/userContent.css.template
index 65a9c55..beb399b 100644
--- a/firefox/userContent.css.template
+++ b/firefox/userContent.css.template
@@ -40,6 +40,14 @@
}
}
+@-moz-document url-prefix(https://github.com/) {
+ .blob-num, .blob-code-inner {
+ font-family: monospace !important;
+ font-size: 13px !important;
+ vertical-align: middle !important;
+ }
+}
+
@-moz-document url-prefix(https://boards.4chan.org/) {
html, body {
max-width: 800px !important;
diff --git a/ghc/ghci b/ghc/ghci
index 186a389..409f7bf 100644
--- a/ghc/ghci
+++ b/ghc/ghci
@@ -1,3 +1,4 @@
:set prompt "> "
:set prompt-cont "| "
:set +t
+:m + Control.Applicative Control.Arrow Control.Monad Data.Bifunctor Data.Bool Data.Char Data.Complex Data.Either Data.Foldable Data.Function Data.Functor Data.Functor.Identity Data.List Data.Maybe Data.Monoid Data.Ratio Data.Semigroup Data.String Data.Traversable Data.Tuple Data.Void System.IO System.Exit System.Environment System.Random Text.Read
diff --git a/scripts/le b/scripts/le
index 2c77199..696286b 100755
--- a/scripts/le
+++ b/scripts/le
@@ -18,7 +18,7 @@ case $1 in
urxvt &
;;
chat|irc)
- focus urxvt -i chat || { urxvt -name chat -title chat -e ssh -qt sigma tmux -u attach -t weechat & }
+ focus urxvt -i chat || { LANG=en_US.UTF-8 MOSH_TITLE_NOPREFIX=y urxvt -name chat -title chat -e mosh monade.li -- tmux attach -t weechat & }
;;
text|editor)
focus urxvt -n '* - vim' || { urxvt -name editor -e vim & }
diff --git a/scripts/theme b/scripts/theme
index 78205e1..70a33b8 100644..100755
--- a/scripts/theme
+++ b/scripts/theme
@@ -1,6 +1,22 @@
-theme=off-world
+#!/bin/bash
+color0='#000507'
+color8='#404040'
+color1='#ff00dd'
+color9=$color1
+color2='#20f0df'
+color10=$color2
+color3=$color1
+color11=$color1
+color4=$color2
+color12=$color4
+color5=$color1
+color13=$color5
+color6=$color4
+color14=$color4
+color7='#ffffff'
+color15='#ffffff'
-. ~/.dots/themes/"$theme".sh
+dark=0
if (( dark )); then
color7='#303030'
@@ -11,7 +27,7 @@ if (( dark )); then
foreground_alt=$color8
else
color7='#cccccc'
- color8='#eeeeee'
+ color8='#e9e9e9'
background=$color15
foreground=$color0
background_alt=$color8
diff --git a/scripts/upload b/scripts/upload
index 1ecd76b..741ff9e 100755
--- a/scripts/upload
+++ b/scripts/upload
@@ -53,11 +53,11 @@ elif [[ $destination != *.* ]]; then
fi
if [[ $destination == */* ]]; then
- ssh "$host" mkdir -p -- "$uploads_dir/${destination%/*}"
+ printf 'mkdir -p -- %q\n' "$uploads_dir/${destination%/*}" | ssh "$host" bash
fi
if (( ! force )) && [[ $source == "$HOME"/@(my|pictures|music|camera|uploads)/* ]]; then
- ssh "$host" rsync -vrs --chmod=D755,F644 "${source#"$HOME"/}" "$uploads_dir/$destination" || exit 1
+ printf 'rsync -vrs --chmod=D755,F644 ~/%q %q\n' "${source#"$HOME"/}" "$uploads_dir/$destination" | ssh "$host" bash || exit 1
else
rsync -Pvrs --chmod=D755,F644 "$source" "$host:$uploads_dir/$destination" || exit 1
fi
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 27a5d27..29f19e7 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -55,6 +55,12 @@ super + {t,shift + t,s,l}
super + y
bspc node -g sticky
+super + h
+ bspc node -g hidden
+
+super + shift + h
+ bspc node any.hidden -g hidden=off
+
super + less
bspc node -l "$(bspc query -T -n | jq -r 'if .client.layer == "above" then "normal" else "below" end')"
diff --git a/vim/vimrc b/vim/vimrc
index eb7d899..198e4ef 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -63,13 +63,13 @@ set smartindent
set softtabstop=4
set splitbelow
set splitright
-set suffixes+=.hi
+set suffixes+=.hi,.dyn_hi,.dyn_o,.cmi,.cmo
set tabstop=4
set title
set ttimeoutlen=10
set ttymouse=xterm2
set whichwrap=b,s,<,>,[,]
-set wildignore+=.o,.hi
+set wildignore+=**/dist-newstyle/**
set wildignorecase
set visualbell
@@ -88,7 +88,7 @@ if $TERM =~ '^rxvt'
let &t_SR = "\<Esc>[3 q"
endif
-colorscheme dual
+colorscheme peachpuff
" Mappings
diff --git a/x/XCompose b/x/XCompose
index e285cf1..fe2f88d 100644
--- a/x/XCompose
+++ b/x/XCompose
@@ -12,6 +12,7 @@ include "%L"
<Multi_key> <l> <e> : "( ͡° ͜ʖ ͡°)"
<Multi_key> <m> <e> <h> : "ಠ_ಠ"
<Multi_key> <t> <f> : "(╯°□°)╯︵ ┻━┻"
+<Multi_key> <q> <t> : "(◕‿◕)"
<Multi_key> <i> <n> <f> : "∞"
<Multi_key> <f> <l> : "❧"
<Multi_key> <o> <k> : "✓"
diff --git a/x/Xresources b/x/Xresources
index b1f02fd..80afcf1 100644
--- a/x/Xresources
+++ b/x/Xresources
@@ -43,7 +43,6 @@ URxvt.scrollTtyOutput: false
URxvt.scrollWithBuffer: true
URxvt.scrollTtyKeypress: true
URxvt.skipBuiltinGlyphs: true
-URxvt.colorUL: _color14
URxvt.keysym.Control-Up: \033[1;5A
URxvt.keysym.Control-Down: \033[1;5B
URxvt.keysym.Control-Left: \033[1;5D
diff --git a/xdg/applications/userapp-img.desktop b/xdg/applications/userapp-img.desktop
index 40e5503..01c0388 100644
--- a/xdg/applications/userapp-img.desktop
+++ b/xdg/applications/userapp-img.desktop
@@ -4,5 +4,5 @@ Name=img
Exec=img
Categories=Other;
NoDisplay=true
-MimeType=image/png;image/jpeg
+MimeType=image/png;image/jpeg;image/webp
Terminal=false
diff --git a/xdg/mimeapps.list b/xdg/mimeapps.list
index 83719b7..0647c0b 100644
--- a/xdg/mimeapps.list
+++ b/xdg/mimeapps.list
@@ -13,6 +13,7 @@ application/x-extension-xht=firefox.desktop
application/pdf=firefox.desktop
image/jpeg=userapp-img.desktop
image/png=userapp-img.desktop
+image/webp=userapp-img.desktop
image/gif=mpv.desktop
text/plain=userapp-vim.desktop
audio/mpeg=mpv.desktop
diff --git a/xdg/thumbnailers/ffmpegthumbnailer.thumbnailer b/xdg/thumbnailers/ffmpegthumbnailer.thumbnailer
index a28d618..5ca8d86 100644
--- a/xdg/thumbnailers/ffmpegthumbnailer.thumbnailer
+++ b/xdg/thumbnailers/ffmpegthumbnailer.thumbnailer
@@ -1,4 +1,5 @@
[Thumbnailer Entry]
TryExec=ffmpegthumbnailer
Exec=ffmpegthumbnailer -i %i -o %o -s %s -m
-MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;audio/mpeg;audio/x-wav;audio/flac
+MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;application/vnd.rn-realmedia;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg
+