diff --git a/Xresources b/Xresources index 9743752..aaa5534 100644 --- a/Xresources +++ b/Xresources @@ -13,6 +13,7 @@ rofi.run-command: fish -c '{cmd}' ! urxvt urxvt*internalBorder: 12 +urxvt*borderColor: #00000000 urxvt*loginShell: true urxvt*scrollBar: false urxvt*secondaryScroll: true @@ -27,4 +28,5 @@ urxvt*boldFont: xft:Iosevka Nerd Font:Bold:size=8,xft:Siji:Regular:size=8 ! Colors urxvt*depth: 32 urxvt*foreground: #ffffff -urxvt*background: rgba:0000/0000/0000/dddd +urxvt*transparent: true +urxvt*shading: 10 diff --git a/alacritty.yml b/alacritty.yml index ea2d171..aeee4bb 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -24,8 +24,8 @@ window: # Units are physical pixels; this is not DPI aware. # (change requires restart) padding: - x: 2 - y: 2 + x: 12 + y: 12 # Window decorations # Setting this to false will result in window without borders and title bar. @@ -158,7 +158,7 @@ visual_bell: duration: 0 # Background opacity -background_opacity: 0.8 +background_opacity: 0.9 # Mouse bindings # diff --git a/bin/old_visimeet b/bin/old_visimeet index 0477603..4bbe8e9 100755 --- a/bin/old_visimeet +++ b/bin/old_visimeet @@ -1,4 +1,4 @@ #!/bin/sh export IGVERBOSE=3 [ -s /opt/visimeet/visimeet ] && /opt/visimeet/visimeet --nologin & -[ -s /Applications/Visimeet.app/Contents/MacOS/visimeet ] && /Applications/Visimeet\.app/Contents/MacOS/visimeet --nologin --remote-debugging-port=1234 & +[ -s /Applications/Visimeet\ Old.app/Contents/MacOS/visimeet ] && /Applications/Visimeet\ Old\.app/Contents/MacOS/visimeet --nologin --remote-debugging-port=1234 & diff --git a/i3 b/i3 index 391547f..5195b43 100644 --- a/i3 +++ b/i3 @@ -7,6 +7,14 @@ smart_borders on for_window [class="^.*"] border pixel 0 new_window pixel 1 +for_window [class="mpv"] floating enable +for_window [class="mpv"] resize set 1500px 1000px +for_window [class="mpv"] move absolute position center + +for_window [class="feh"] floating enable +for_window [class="feh"] resize set 1500px 1000px +for_window [class="feh"] move absolute position center + font pango:Iosevka Nerd Font Regular 8 # Use Mouse+$mod to drag floating windows to their wanted position @@ -131,16 +139,16 @@ mode "resize" { # Pressing right will grow the window’s width. # Pressing up will shrink the window’s height. # Pressing down will grow the window’s height. - bindsym h resize shrink width 5 px or 5 ppt - bindsym k resize grow height 5 px or 5 ppt - bindsym j resize shrink height 5 px or 5 ppt - bindsym l resize grow width 5 px or 5 ppt + bindsym h resize shrink width 2 px or 2 ppt + bindsym k resize grow height 2 px or 2 ppt + bindsym j resize shrink height 2 px or 2 ppt + bindsym l resize grow width 2 px or 2 ppt # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt + bindsym Left resize shrink width 2 px or 2 ppt + bindsym Down resize grow height 2 px or 2 ppt + bindsym Up resize shrink height 2 px or 2 ppt + bindsym Right resize grow width 2 px or 2 ppt # back to normal: Enter or Escape or $mod+r bindsym Return mode "default" diff --git a/mailcap b/mailcap new file mode 100644 index 0000000..76887ca --- /dev/null +++ b/mailcap @@ -0,0 +1,70 @@ +# 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 it 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 -g 640x480 %s; test=test -n "$DISPLAY" +image/gif; mpv '%s' --autofit 640x480 --loop=inf; test=test -n "$DISPLAY" +image/*; feh -g 640x480 '%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; vlc '%s' --width 640 --height 480; test=test -n "$DISPLAY" +video/x-youtube; mpv --ytdl-format=best '%s' --autofit 640x480; test=test -n "$DISPLAY" + +# Mpv is a simple and effective video streamer +video/*; mpv '%s' --autofit 640x480 --loop=inf; test=test -n "$DISPLAY" + +############################################################################### +# Commands below this point will attempt to display media directly in the +# terminal when a desktop is not available (e.g. inside of an SSH session) +############################################################################### + +# 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/polybar b/polybar index 68f7600..adf053d 100644 --- a/polybar +++ b/polybar @@ -8,11 +8,11 @@ ;===================================================== [colors] -background = ${xrdb:color0:#222} +background = ${xrdb:color0:#000} ;background = #88000000 background-alt = #444444 -foreground = ${xrdb:color7:#222} -;foreground = #ffffff +;foreground = ${xrdb:color7:#222} +foreground = #ffffff foreground-alt = #aaaaaa primary = #0a6cf5 secondary = #e60053 diff --git a/qutebrowser.py b/qutebrowser.py index c648a30..f75f4de 100644 --- a/qutebrowser.py +++ b/qutebrowser.py @@ -46,44 +46,44 @@ c.colors.webpage.bg = 'white' # Font used in the completion categories. # Type: Font -c.fonts.completion.category = 'bold 12pt monospace' +c.fonts.completion.category = 'bold 9pt monospace' # Font used in the completion widget. # Type: Font -c.fonts.completion.entry = '12pt monospace' +c.fonts.completion.entry = '9pt monospace' # Font used for the debugging console. # Type: QtFont -c.fonts.debug_console = '12pt monospace' +c.fonts.debug_console = '9pt monospace' # Font used for the downloadbar. # Type: Font -c.fonts.downloads = '12pt monospace' +c.fonts.downloads = '9pt monospace' # Font used for the hints. # Type: Font -c.fonts.hints = 'bold 10pt monospace' +c.fonts.hints = 'bold 9pt monospace' # Font used in the keyhint widget. # Type: Font -c.fonts.keyhint = '12pt monospace' +c.fonts.keyhint = '9pt monospace' # Font used for error messages. # Type: Font -c.fonts.messages.error = '12pt monospace' +c.fonts.messages.error = '9pt monospace' # Font used for info messages. # Type: Font -c.fonts.messages.info = '12pt monospace' +c.fonts.messages.info = '9pt monospace' # Font used for warning messages. # Type: Font -c.fonts.messages.warning = '12pt monospace' +c.fonts.messages.warning = '9pt monospace' # Default monospace fonts. Whenever "monospace" is used in a font # setting, it's replaced with the fonts listed here. # Type: Font -c.fonts.monospace = '"Iosevka Nerd Font"' +c.fonts.monospace = 'Iosevka Nerd Font' # Font used for prompts. # Type: Font @@ -91,11 +91,11 @@ c.fonts.prompts = '8pt sans-serif' # Font used in the statusbar. # Type: Font -c.fonts.statusbar = '12pt monospace' +c.fonts.statusbar = '9pt monospace' # Font used in the tab bar. # Type: QtFont -c.fonts.tabs = '12pt monospace' +c.fonts.tabs = '9pt monospace' # Open new tabs (middleclick/ctrl+click) in the background. # Type: Bool diff --git a/rtv.cfg b/rtv.cfg new file mode 100644 index 0000000..fcae9ce --- /dev/null +++ b/rtv.cfg @@ -0,0 +1,2 @@ +[rtv] +enable_media = True diff --git a/spacemacs b/spacemacs index 622e93d..fdce05e 100644 --- a/spacemacs +++ b/spacemacs @@ -393,7 +393,7 @@ you should place your code here." (spaceline-all-the-icons-theme)) (setq neo-theme 'icons) - (setq monokai-background "#000000") + ;; (setq monokai-background "#000000") ;; fix Fish prompts (add-hook 'term-mode-hook 'spacemacs/toggle-truncate-lines-on) @@ -415,7 +415,7 @@ you should place your code here." (use-package vue-mode) - (spacemacs/enable-transparency) + ;; (spacemacs/enable-transparency) (defun my-focus-new-frame (frame) (spacemacs/toggle-transparent-frame)) diff --git a/symlinks.sh b/symlinks.sh index 8a00dbf..d33b449 100644 --- a/symlinks.sh +++ b/symlinks.sh @@ -6,6 +6,7 @@ curl -Lo ~/.config/fish/functions/fisher.fish --create-dirs https://git.io/fishe ln -sf ~/dotfiles/fishfile ~/.config/fish/fishfile mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf ln -sf ~/dotfiles/gitconfig ~/.gitconfig +git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf mkdir -p ~/.config/khal; ln -sf ~/dotfiles/khal.conf ~/.config/khal/config mkdir ~/.config/vdirsyncer; ln -sf ~/dotfiles/vdirsyncer/config ~/.config/vdirsyncer/config @@ -14,6 +15,8 @@ mkdir ~/.ssh; ln -sf ~/dotfiles/ssh/config ~/.ssh/config mkdir -p ~/.config/khard; ln -sf ~/dotfiles/khard.conf ~/.config/khard/khard.conf mkdir -p ~/.config/qutebrowser; ln -sf ~/dotfiles/qutebrowser.py ~/.config/qutebrowser/config.py mkdir -p ~/.config/alacritty; ln -sf ~/dotfiles/alacritty.yml ~/.config/alacritty/alacritty.py +mkdir -p ~/.config/rtv; ln -sf ~/dotfiles/rtv.cfg ~/.config/rtv.cfg +ln -sf ~/dotfiles/mailcap ~/.mailcap # Mail stuff ln -sf ~/dotfiles/offlineimaprc ~/.offlineimaprc diff --git a/tmux.conf b/tmux.conf index 90044c9..16a248c 100644 --- a/tmux.conf +++ b/tmux.conf @@ -43,6 +43,8 @@ set -g @plugin 'jbnicolai/tmux-urlview' set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'nhdaly/tmux-better-mouse-mode' +set -g @continuum-restore 'on' + set -g status-right '' set -g status-left '' @@ -85,4 +87,3 @@ set-option -g mouse on # Initialize TMUX plugin manager run '~/.tmux/plugins/tpm/tpm' - diff --git a/xprofile b/xprofile index 4bb48ba..53894e9 100644 --- a/xprofile +++ b/xprofile @@ -1,7 +1,7 @@ setxkbmap -option ctrl:nocaps -option compose:ralt xcape -e 'Control_L=Escape' xmodmap -e "keycode 96 = dead_greek dead_greek dead_greek dead_greek" -compton -cGb --inactive-opacity 0.75 +compton -b --inactive-opacity 0.90 sh ~/dotfiles/logitech_linux_mouse.sh xsetroot -solid black -cursor_name left_ptr nitrogen --restore &