From 2f254e8c7f564f246190f48372b4c317651ce764 Mon Sep 17 00:00:00 2001
From: Nguyễn Gia Phong <vn.mcsinyx@gmail.com>
Date: Sun, 26 Nov 2017 15:41:07 +0700
Subject: Update 2017-11-26

---
 meta/.Xdefaults  | 24 --------------------
 meta/.Xresources | 24 ++++++++++++++++++++
 meta/.bashrc     |  1 -
 meta/.mailcap    | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 meta/.xinitrc    |  5 +++-
 5 files changed, 97 insertions(+), 26 deletions(-)
 delete mode 100644 meta/.Xdefaults
 create mode 100644 meta/.Xresources
 create mode 100644 meta/.mailcap

(limited to 'meta')

diff --git a/meta/.Xdefaults b/meta/.Xdefaults
deleted file mode 100644
index 6efc901..0000000
--- a/meta/.Xdefaults
+++ /dev/null
@@ -1,24 +0,0 @@
-*background:  #fbf1c7
-*foreground:  #3c3836
-*color0:      #fbf1c7
-*color1:      #cc241d
-*color2:      #98971a
-*color3:      #d79921
-*color4:      #458588
-*color5:      #b16286
-*color6:      #689d6a
-*color7:      #a89984
-*color8:      #928374
-*color9:      #9d0006
-*color10:     #79740e
-*color11:     #b57614
-*color12:     #076678
-*color13:     #8f3f71
-*color14:     #427b58
-*color15:     #3c3836
-UXTerm*faceName:    Space Mono:size=9.5
-UXTerm*loginShell:  true
-UXTerm*scrollBar:   false
-UXTerm*saveLines:   1024
-UXTerm*cursorBlink: false
-UXTerm*jumpScroll:  true
diff --git a/meta/.Xresources b/meta/.Xresources
new file mode 100644
index 0000000..6efc901
--- /dev/null
+++ b/meta/.Xresources
@@ -0,0 +1,24 @@
+*background:  #fbf1c7
+*foreground:  #3c3836
+*color0:      #fbf1c7
+*color1:      #cc241d
+*color2:      #98971a
+*color3:      #d79921
+*color4:      #458588
+*color5:      #b16286
+*color6:      #689d6a
+*color7:      #a89984
+*color8:      #928374
+*color9:      #9d0006
+*color10:     #79740e
+*color11:     #b57614
+*color12:     #076678
+*color13:     #8f3f71
+*color14:     #427b58
+*color15:     #3c3836
+UXTerm*faceName:    Space Mono:size=9.5
+UXTerm*loginShell:  true
+UXTerm*scrollBar:   false
+UXTerm*saveLines:   1024
+UXTerm*cursorBlink: false
+UXTerm*jumpScroll:  true
diff --git a/meta/.bashrc b/meta/.bashrc
index 93593d4..fcb265e 100644
--- a/meta/.bashrc
+++ b/meta/.bashrc
@@ -102,7 +102,6 @@ alias fpc='fpc -O1 -XS -gl'
 alias mpa='mpv --no-video --loop=inf'
 alias mount='udevil mount'
 alias umount='udevil umount'
-alias x='cd ~ && startx'
 alias flare='cd ~/.local/flare-game/ && ./flare && cd -'
 TF_ALIAS=fuck alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
 if [ -f ~/.bash_aliases ]; then
diff --git a/meta/.mailcap b/meta/.mailcap
new file mode 100644
index 0000000..b54b674
--- /dev/null
+++ b/meta/.mailcap
@@ -0,0 +1,69 @@
+# Example mailcap file for Reddit Terminal Viewer
+# https://github.com/michael-lazar/rtv/
+#
+# Copy the contents of this file to {HOME}/.mailcap, or point to using $MAILCAPS
+# Then launch RTV using the --enable-media flag. All shell commands defined in
+# this file depend on external programs that must be installed on your system.
+#
+# HELP REQUESTED! If you come up with your own commands (especially for OS X)
+# and would like to share, please post an issue on the GitHub tracker and we
+# can get them added to this file as references.
+#
+#
+#                              Mailcap 101
+# - The first entry with a matching MIME type will be executed, * is a wildcard
+# - %s will be replaced with the image or video url
+# - Add ``test=test -n "$DISPLAY"`` if your command opens a new window
+# - Add ``needsterminal`` for commands that use the terminal
+# - Add ``copiousoutput`` for commands that dump text to stdout
+
+###############################################################################
+# Commands below this point will open media in a separate window without
+# pausing execution of RTV.
+###############################################################################
+
+# Feh is a simple and effective image viewer
+# Note that rtv returns a list of urls for imgur albums, so we don't put quotes
+# around the `%s`
+image/x-imgur-album; feh %s; test=test -n "$DISPLAY"
+image/gif; mpv '%s' --loop=inf; test=test -n "$DISPLAY"
+#image/*; feh '%s'; test=test -n "$DISPLAY"
+
+# Youtube videos are assigned a custom mime-type, which can be streamed with
+# vlc or youtube-dl.
+video/x-youtube; mpv '%s'; test=test -n "$DISPLAY"
+
+# Mpv is a simple and effective video streamer
+video/*; mpv '%s' --loop=inf; test=test -n "$DISPLAY"
+
+###############################################################################
+# Commands below this point will attempt to display media directly in the
+# terminal when X is not available.
+###############################################################################
+
+# View images directly in your terminal with iTerm2
+# curl -L https://iterm2.com/misc/install_shell_integration_and_utilities.sh | bash
+# image/*; curl -s %s | ~/.iterm2/imgcat && read -n 1; needsterminal
+
+# View true images in the terminal, supported by rxvt-unicode, xterm and st
+# Requires the w3m-img package
+image/*; w3m -o 'ext_image_viewer=off' '%s'; needsterminal
+
+# Don't have a solution for albums yet
+image/x-imgur-album; echo
+
+# 256 color images using half-width unicode characters
+# Much higher quality that img2txt, but must be built from source
+# https://github.com/rossy/img2xterm
+image/*; curl -s '%s' | convert -resize 80x80 - jpg:/tmp/rtv.jpg && img2xterm /tmp/rtv.jpg; needsterminal; copiousoutput
+
+# Display images in classic ascii using img2txt and lib-caca
+image/*; curl -s '%s' | convert - jpg:/tmp/rtv.jpg && img2txt -f utf8 /tmp/rtv.jpg; needsterminal; copiousoutput
+
+# Full motion videos - requires a framebuffer to view
+video/x-youtube; mpv -vo drm -quiet '%s'; needsterminal
+video/*; mpv -vo drm -quiet '%s'; needsterminal
+
+# Ascii videos
+# video/x-youtube; youtube-dl -q -o - '%s' | mplayer -cache 8192 -vo caca -quiet -; needsterminal
+# video/*; wget '%s' -O - | mplayer -cache 8192 -vo caca -quiet -; needsterminal
diff --git a/meta/.xinitrc b/meta/.xinitrc
index 7aefafb..296c708 100644
--- a/meta/.xinitrc
+++ b/meta/.xinitrc
@@ -1,6 +1,8 @@
 #!/bin/sh
+cd $HOME
+xrdb -merge ~/.Xresources
 setxkbmap -option caps:swapescape
-xrandr --output VGA-0 --mode 1600x900 --primary
+xrandr --output VGA-0 --mode 1600x900 --primary --right-of LVDS
 synclient TapButton1=1 VertEdgeScroll=1 HorizEdgeScroll=1 VertTwoFingerScroll=0
 keynav &
 redshift-gtk &
@@ -8,3 +10,4 @@ ibus-daemon -drx
 connman-ui-gtk &
 clipit &
 exec awesome
+cd -
-- 
cgit 1.4.1