From e9f7fef7880b7f37c9da0b2be5e1ab5b08b23f6c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 22 Aug 2012 11:55:27 -0400 Subject: add .prefix.`arch` and .local.`arch` directories --- .git.info.exclude | 1 + .profile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.git.info.exclude b/.git.info.exclude index 4576b6f..9b65125 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -94,6 +94,7 @@ history.* .gem .offlineimap .prefix +.prefix.* .terminfo .wine* diff --git a/.profile b/.profile index d05ae5e..d6a07e3 100644 --- a/.profile +++ b/.profile @@ -9,7 +9,7 @@ umask 022 ## Paths ############################################################# # Unix -bins=`echo $HOME/bin $HOME/.local/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin` +bins=$(echo $HOME/bin $HOME/.local.`arch`/bin $HOME/.local/bin $HOME/.prefix.`arch`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) for dir in $bins; do if [ -d "$dir" ]; then export PATH="$dir:$PATH" -- cgit v1.1-4-g5e80 From 9e4c6dfa62435895d777c658b71aafb67638c549 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 30 Aug 2012 19:34:27 -0400 Subject: add a few mail filters --- .maildirproc/default.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 24f51e8..a323e5e 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -102,6 +102,10 @@ def my_filters(mail): mail.move(".software.parabola-dev") return + if (mail["List-Id"].matches("pacman-dev@archlinux.org")): + mail.move(".software.pacman-dev") + return + for subject_re in [ "\[Stow-[^\]]*\].*", ]: @@ -148,6 +152,7 @@ def my_filters(mail): or is_to_or_from(mail,"eldredmac@comcast.net")# MacDonell or is_to_or_from(mail,"mitchprather@sbcglobal.net") or is_to_or_from(mail,"oa_wap@yahoo.com") + or is_to_or_from(mail,"mytroop.us") ): mail.move(".Troop276") return @@ -221,6 +226,8 @@ def my_filters(mail): "canonical.org", "foocorp.net", "cnuk.org", + "@archlinux.org", + "@github.com", ]: if is_to_or_from(mail,address): mail.move(".software") -- cgit v1.1-4-g5e80 From c9e73feae3f2f452cbca92193cc297276b36d59f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 30 Aug 2012 19:34:40 -0400 Subject: fix 2 bugs in wmiirc --- .wmii/wmiirc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.wmii/wmiirc b/.wmii/wmiirc index 82c424b..92adb8b 100755 --- a/.wmii/wmiirc +++ b/.wmii/wmiirc @@ -47,7 +47,8 @@ Event() { # might complain about /etc/mtab if the x server has already stopped fusermount -u "$WMII_DIR" 2>>/dev/null echo " -> rmdir'ing WMII_DIR=$WMII_DIR..." - rmdir "$WMII_DIR";; + rmdir "$WMII_DIR" + exit;; Warning) ## $@=string notify-send "wmii warning: $*";; Key) ## $1=keystroke @@ -226,7 +227,7 @@ Key() { sel=$(sed 1q $WMII_DIR/client/sel/ctl) { tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return - wmiir xwrite /client/$sel/tags $tag + wmiir xwrite /client/$sel/tags "$tag" }& ;; esac } ## End Key -- cgit v1.1-4-g5e80 From b19df9f8d1194c76e6c8bc2ce60929022e8c4632 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Sep 2012 20:13:37 -0400 Subject: .bash_logout: that's where .alsa.save was coming from! --- .bash_logout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bash_logout b/.bash_logout index 5ca7df0..a8b88c1 100644 --- a/.bash_logout +++ b/.bash_logout @@ -6,4 +6,4 @@ if [ "$SHLVL" = 1 ]; then [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q fi -alsactl --file $HOME/.alsa.save store +make -C "$HOME" -- cgit v1.1-4-g5e80 From 719b4d14dd22e3ff9136fb587572aaa79c9871a8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Sep 2012 20:14:12 -0400 Subject: .maildirproc: give Jade her own folder --- .maildirproc/default.rc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index a323e5e..65ba8c6 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -162,6 +162,14 @@ def my_filters(mail): mail.move(".misc.Mom") return + if address in [ + "justicejade10@aol.com", + "parsonsjade@aol.com", + ]: + if mail["From"].contains(address): + mail.move(".misc.Jade") + return + for address in [ "nintendo.com", "nintendo-news.com", @@ -195,7 +203,6 @@ def my_filters(mail): "@usfirst.org", "gamefreak207@gmail.com", # Brett Leedy "tswilson4801@att.net", - "justicejade10@aol.com", "silioso@gmail.com", "cdewalt3@yahoo.com", "bryanbonahoom@gmail.com", -- cgit v1.1-4-g5e80 From ad5c8c7f2f7ea08579692f55fd4e2faac62ba6f7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Sep 2012 20:15:22 -0400 Subject: add .wicd --- .wicd/WHEREAREMYFILES | 1 + 1 file changed, 1 insertion(+) create mode 120000 .wicd/WHEREAREMYFILES diff --git a/.wicd/WHEREAREMYFILES b/.wicd/WHEREAREMYFILES new file mode 120000 index 0000000..5e06b02 --- /dev/null +++ b/.wicd/WHEREAREMYFILES @@ -0,0 +1 @@ +/var/lib/wicd/WHEREAREMYFILES \ No newline at end of file -- cgit v1.1-4-g5e80 From 74e11a21ec9e941c16dcfafb1e7aa5ef5dd4abb9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 4 Sep 2012 10:50:01 -0400 Subject: make Makefile a little more flexible --- Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8c0ffa9..3cecf33 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ -CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/ -NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK))))) +SHELL = /bin/bash + +NANO_BIN_PREFIX = $(patsubst %/bin/nano,%,$(shell which nano)) +NANO_CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:$(NANO_BIN_PREFIX) +NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(NANO_CHECK))))) ALSACTL=$(firstword $(shell . $(HOME)/.profile &>/dev/null; which alsactl) echo) @@ -19,7 +22,7 @@ clean: ( echo '..'; find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@' .crontab.cookie: .crontab .crontab.local - (cat $^; echo) | crontab - + -(cat $^; echo) | crontab - 2>/dev/null date > '$@' # don't do anything, just create these if they doesn't exist @@ -31,12 +34,6 @@ Maildir/%: | Maildir mkdir -p '$@'/{cur,new,tmp} touch '$@'/maildirfolder -commit: - git commit -a - -pull: - git pull - $(MAKE) - -.PHONY: FORCE +.PHONY: FORCE PHONY FORCE: ; +PHONY: ; -- cgit v1.1-4-g5e80 From ba388bffc3b970aea52ba67a54f4b4eaec7a69c4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 16 Sep 2012 21:49:21 -0400 Subject: .maildirproc: fix --- .maildirproc/default.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 65ba8c6..71bc00c 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -102,7 +102,7 @@ def my_filters(mail): mail.move(".software.parabola-dev") return - if (mail["List-Id"].matches("pacman-dev@archlinux.org")): + if (mail["List-Id"].matches("pacman-dev.archlinux.org")): mail.move(".software.pacman-dev") return @@ -162,7 +162,7 @@ def my_filters(mail): mail.move(".misc.Mom") return - if address in [ + for address in [ "justicejade10@aol.com", "parsonsjade@aol.com", ]: -- cgit v1.1-4-g5e80 From bf3efc6c7131617ae288fa94bca9d6271fb6a287 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 16 Sep 2012 21:53:19 -0400 Subject: ignore .config/vlc --- .config/vlc/vlcrc | 4620 ----------------------------------------------------- .git.info.exclude | 2 +- 2 files changed, 1 insertion(+), 4621 deletions(-) delete mode 100644 .config/vlc/vlcrc diff --git a/.config/vlc/vlcrc b/.config/vlc/vlcrc deleted file mode 100644 index 21a90e4..0000000 --- a/.config/vlc/vlcrc +++ /dev/null @@ -1,4620 +0,0 @@ -### -### vlc 2.0.3 -### - -### -### lines beginning with a '#' character are comments -### - -[access_output_livehttp] # HTTP Live streaming output - -# Segment length (integer) -#sout-livehttp-seglen=10 - -# Number of segments (integer) -#sout-livehttp-numsegs=0 - -# Split segments anywhere (boolean) -#sout-livehttp-splitanywhere=0 - -# Delete segments (boolean) -#sout-livehttp-delsegs=1 - -# Use muxers rate control mechanism (boolean) -#sout-livehttp-ratecontrol=0 - -# Index file (string) -#sout-livehttp-index= - -# Full URL to put in index file (string) -#sout-livehttp-index-url= - -[access_output_http] # HTTP stream output - -# Username (string) -#sout-http-user= - -# Password (string) -#sout-http-pwd= - -# Mime (string) -#sout-http-mime= - -[access_output_udp] # UDP stream output - -# Caching value (ms) (integer) -#sout-udp-caching=300 - -# Group packets (integer) -#sout-udp-group=1 - -[access_output_file] # File stream output - -# Append to file (boolean) -#sout-file-append=0 - -# Synchronous writing (boolean) -#sout-file-sync=0 - -[access_output_shout] # IceCAST output - -# Stream name (string) -#sout-shout-name=VLC media player - Live stream - -# Stream description (string) -#sout-shout-description=Live stream from VLC media player - -# Stream MP3 (boolean) -#sout-shout-mp3=0 - -# Genre description (string) -#sout-shout-genre=Alternative - -# URL description (string) -#sout-shout-url=http://www.videolan.org/vlc - -# Bitrate (string) -#sout-shout-bitrate= - -# Samplerate (string) -#sout-shout-samplerate= - -# Number of channels (string) -#sout-shout-channels= - -# Ogg Vorbis Quality (string) -#sout-shout-quality= - -# Stream public (boolean) -#sout-shout-public=0 - -[mux_mp4] # MP4/MOV muxer - -# Create "Fast Start" files (boolean) -#sout-mp4-faststart=1 - -[mux_ts] # TS muxer (libdvbpsi) - -# Video PID (integer) -#sout-ts-pid-video=0 - -# Audio PID (integer) -#sout-ts-pid-audio=0 - -# SPU PID (integer) -#sout-ts-pid-spu=0 - -# PMT PID (integer) -#sout-ts-pid-pmt=0 - -# TS ID (integer) -#sout-ts-tsid=0 - -# NET ID (integer) -#sout-ts-netid=0 - -# PMT Program numbers (string) -#sout-ts-program-pmt= - -# Set PID to ID of ES (boolean) -#sout-ts-es-id-pid=0 - -# Mux PMT (requires --sout-ts-es-id-pid) (string) -#sout-ts-muxpmt= - -# SDT Descriptors (requires --sout-ts-es-id-pid) (string) -#sout-ts-sdtdesc= - -# Data alignment (boolean) -#sout-ts-alignment=1 - -# Shaping delay (ms) (integer) -#sout-ts-shaping=200 - -# Use keyframes (boolean) -#sout-ts-use-key-frames=0 - -# PCR interval (ms) (integer) -#sout-ts-pcr=70 - -# Minimum B (deprecated) (integer) -#sout-ts-bmin=0 - -# Maximum B (deprecated) (integer) -#sout-ts-bmax=0 - -# DTS delay (ms) (integer) -#sout-ts-dts-delay=400 - -# Crypt audio (boolean) -#sout-ts-crypt-audio=1 - -# Crypt video (boolean) -#sout-ts-crypt-video=1 - -# CSA Key (string) -#sout-ts-csa-ck= - -# Second CSA Key (string) -#sout-ts-csa2-ck= - -# CSA Key in use (string) -#sout-ts-csa-use=1 - -# Packet size in bytes to encrypt (integer) -#sout-ts-csa-pkt=188 - -[mux_asf] # ASF muxer - -# Title (string) -#sout-asf-title= - -# Author (string) -#sout-asf-author= - -# Copyright (string) -#sout-asf-copyright= - -# Comment (string) -#sout-asf-comment= - -# Rating (string) -#sout-asf-rating= - -# Packet Size (integer) -#sout-asf-packet-size=4096 - -# Bitrate override (integer) -#sout-asf-bitrate-override=0 - -[mux_ps] # PS muxer - -# DTS delay (ms) (integer) -#sout-ps-dts-delay=200 - -# PES maximum size (integer) -#sout-ps-pes-max-size=65500 - -[amem] # Audio memory output - -# Sample format (string) -#amem-format=S16N - -# Sample rate (integer) -#amem-rate=44100 - -# Channels count (integer) -#amem-channels=2 - -[alsa] # ALSA audio output - -# Audio output device (string) -#alsa-audio-device=default - -# Audio output channels (integer) -#alsa-audio-channels=6 - -[oss] # Open Sound System - -# OSS DSP device (string) -#oss-audio-device=/dev/dsp - -[portaudio] # PORTAUDIO audio output - -# Output device (integer) -#portaudio-audio-device=0 - -[jack] # JACK audio output - -# Automatically connect to writable clients (boolean) -#jack-auto-connect=1 - -# Connect to clients matching (string) -#jack-connect-regex=system - -[aout_file] # File audio output - -# Output file (string) -#audiofile-file=audiofile.wav - -# Output format (string) -#audiofile-format=s16 - -# Number of output channels (integer) -#audiofile-channels=0 - -# Add WAVE header (boolean) -#audiofile-wav=1 - -[stream_out_es] # Elementary stream output - -# Output access method (string) -#sout-es-access= - -# Output muxer (string) -#sout-es-mux= - -# Output URL (string) -#sout-es-dst= - -# Audio output access method (string) -#sout-es-access-audio= - -# Audio output muxer (string) -#sout-es-mux-audio= - -# Audio output URL (string) -#sout-es-dst-audio= - -# Video output access method (string) -#sout-es-access-video= - -# Video output muxer (string) -#sout-es-mux-video= - -# Video output URL (string) -#sout-es-dst-video= - -[stream_out_standard] # Standard stream output - -# Output access method (string) -#sout-standard-access= - -# Output muxer (string) -#sout-standard-mux= - -# Output destination (string) -#sout-standard-dst= - -# address to bind to (helper setting for dst) (string) -#sout-standard-bind= - -# filename for stream (helper setting for dst) (string) -#sout-standard-path= - -# SAP announcing (boolean) -#sout-standard-sap=0 - -# Session name (string) -#sout-standard-name= - -# Session description (string) -#sout-standard-description= - -# Session URL (string) -#sout-standard-url= - -# Session email (string) -#sout-standard-email= - -# Session phone number (string) -#sout-standard-phone= - -[stream_out_setid] # Change the id of an elementary stream - -# Elementary Stream ID (integer) -#sout-setid-id=0 - -# New ES ID (integer) -#sout-setid-new-id=0 - -# Elementary Stream ID (integer) -#sout-setlang-id=0 - -# Language (string) -#sout-setlang-lang=eng - -[stream_out_delay] # Delay a stream - -# Elementary Stream ID (integer) -#sout-delay-id=0 - -# Delay of the ES (ms) (integer) -#sout-delay-delay=0 - -[stream_out_mosaic_bridge] # Mosaic bridge stream output - -# ID (string) -#sout-mosaic-bridge-id=Id - -# Video width (integer) -#sout-mosaic-bridge-width=0 - -# Video height (integer) -#sout-mosaic-bridge-height=0 - -# Sample aspect ratio (string) -#sout-mosaic-bridge-sar=1:1 - -# Image chroma (string) -#sout-mosaic-bridge-chroma= - -# Video filter (string) -#sout-mosaic-bridge-vfilter= - -# Transparency (integer) -#sout-mosaic-bridge-alpha=255 - -# X offset (integer) -#sout-mosaic-bridge-x=-1 - -# Y offset (integer) -#sout-mosaic-bridge-y=-1 - -[stream_out_record] # Record stream output - -# Destination prefix (string) -#sout-record-dst-prefix= - -[stream_out_select] # Select individual es to enable or disable from stream - -# Command UDP port (integer) -#sout-select-port=5001 - -# Disable ES id (integer) -#sout-select-disable=-1 - -# Enable ES id (integer) -#sout-select-enable=-1 - -[stream_out_transcode] # Transcode stream output - -# Video encoder (string) -#sout-transcode-venc= - -# Destination video codec (string) -#sout-transcode-vcodec= - -# Video bitrate (integer) -#sout-transcode-vb=0 - -# Video scaling (float) -#sout-transcode-scale=0.000000 - -# Video frame-rate (float) -#sout-transcode-fps=0.000000 - -# Hurry up (boolean) -#sout-transcode-hurry-up=1 - -# Deinterlace video (boolean) -#sout-transcode-deinterlace=0 - -# Deinterlace module (string) -#sout-transcode-deinterlace-module=deinterlace - -# Video width (integer) -#sout-transcode-width=0 - -# Video height (integer) -#sout-transcode-height=0 - -# Maximum video width (integer) -#sout-transcode-maxwidth=0 - -# Maximum video height (integer) -#sout-transcode-maxheight=0 - -# Video filter (string) -#sout-transcode-vfilter= - -# Audio encoder (string) -#sout-transcode-aenc= - -# Destination audio codec (string) -#sout-transcode-acodec= - -# Audio bitrate (integer) -#sout-transcode-ab=96 - -# Audio Language (string) -#sout-transcode-alang= - -# Audio channels (integer) -#sout-transcode-channels=0 - -# Audio sample rate (integer) -#sout-transcode-samplerate=0 - -# Synchronise on audio track (boolean) -#sout-transcode-audio-sync=0 - -# Audio filter (string) -#sout-transcode-afilter= - -# Subtitles encoder (string) -#sout-transcode-senc= - -# Destination subtitles codec (string) -#sout-transcode-scodec= - -# Destination subtitles codec (boolean) -#sout-transcode-soverlay=0 - -# Overlays (string) -#sout-transcode-sfilter= - -# OSD menu (boolean) -#sout-transcode-osd=0 - -# Number of threads (integer) -#sout-transcode-threads=0 - -# High priority (boolean) -#sout-transcode-high-priority=0 - -[stream_out_raop] # Remote Audio Output Protocol stream output - -# Host (string) -#sout-raop-host= - -# Password (string) -#sout-raop-password= - -# Password file (string) -#sout-raop-password-file= - -# Volume (integer) -#sout-raop-volume=100 - -[stream_out_display] # Display stream output - -# Enable audio (boolean) -#sout-display-audio=1 - -# Enable video (boolean) -#sout-display-video=1 - -# Delay (ms) (integer) -#sout-display-delay=100 - -[stream_out_smem] # Stream output to memory buffer - -# Time Synchronized output (boolean) -#sout-smem-time-sync=1 - -[stream_out_bridge] # Bridge stream output - -# ID (integer) -#sout-bridge-out-id=0 - -# Destination bridge-in name (string) -#sout-bridge-out-in-name=default - -# Delay (integer) -#sout-bridge-in-delay=0 - -# ID Offset (integer) -#sout-bridge-in-id-offset=8192 - -# Name of current instance (string) -#sout-bridge-in-name=default - -# Fallback to placeholder stream when out of data (boolean) -#sout-bridge-in-placeholder=0 - -# Placeholder delay (integer) -#sout-bridge-in-placeholder-delay=200 - -# Wait for I frame before toggling placeholder (boolean) -#sout-bridge-in-placeholder-switch-on-iframe=1 - -[stream_out_langfromtelx] # Dynamic language setting from teletext - -# Elementary Stream ID (integer) -#sout-langfromtelx-id=0 - -# Magazine (integer) -#sout-langfromtelx-magazine=7 - -# Page (integer) -#sout-langfromtelx-page=153 - -# Row (integer) -#sout-langfromtelx-row=1 - -[stream_out_rtp] # RTP stream output - -# Destination (string) -#sout-rtp-dst= - -# SDP (string) -#sout-rtp-sdp= - -# Muxer (string) -#sout-rtp-mux= - -# SAP announcing (boolean) -#sout-rtp-sap=0 - -# Session name (string) -#sout-rtp-name= - -# Session category (string) -#sout-rtp-cat= - -# Session description (string) -#sout-rtp-description= - -# Session URL (string) -#sout-rtp-url= - -# Session email (string) -#sout-rtp-email= - -# Session phone number (string) -#sout-rtp-phone= - -# Transport protocol (string) -#sout-rtp-proto=udp - -# Port (integer) -#sout-rtp-port=5004 - -# Audio port (integer) -#sout-rtp-port-audio=0 - -# Video port (integer) -#sout-rtp-port-video=0 - -# Hop limit (TTL) (integer) -#sout-rtp-ttl=-1 - -# RTP/RTCP multiplexing (boolean) -#sout-rtp-rtcp-mux=0 - -# Caching value (ms) (integer) -#sout-rtp-caching=300 - -# SRTP key (hexadecimal) (string) -#sout-rtp-key= - -# SRTP salt (hexadecimal) (string) -#sout-rtp-salt= - -# MP4A LATM (boolean) -#sout-rtp-mp4a-latm=0 - -# RTSP session timeout (s) (integer) -#rtsp-timeout=60 - -# Username (string) -#sout-rtsp-user= - -# Password (string) -#sout-rtsp-pwd= - -[xcb_xv] # XVideo output (XCB) - -# XVideo adaptor number (integer) -#xvideo-adaptor=-1 - -# XVideo format id (integer) -#xvideo-format-id=0 - -[fb] # GNU/Linux framebuffer video output - -# Framebuffer device (string) -#fbdev=/dev/fb0 - -# Run fb on current tty (boolean) -#fb-tty=1 - -# Image format (default RGB) (string) -#fb-chroma= - -# Framebuffer resolution to use (integer) -#fb-mode=4 - -# Framebuffer uses hw acceleration (boolean) -#fb-hw-accel=1 - -[xcb_window] # X11 video window (XCB) - -# X11 display (string) -#x11-display= - -[vdummy] # Dummy video output - -# Dummy image chroma format (string) -#dummy-chroma= - -[vout_sdl] # Simple DirectMedia Layer video output - -# SDL chroma format (string) -#sdl-chroma= - -[xcb_x11] # X11 video output (XCB) - -[yuv] # YUV video output - -# device, fifo or filename (string) -#yuv-file=stream.yuv - -# Chroma used (string) -#yuv-chroma= - -# YUV4MPEG2 header (default disabled) (boolean) -#yuv-yuv4mpeg2=0 - -[vmem] # Video memory output - -# Width (integer) -#vmem-width=320 - -# Height (integer) -#vmem-height=200 - -# Pitch (integer) -#vmem-pitch=640 - -# Chroma (string) -#vmem-chroma=RV16 - -[folder] # Folder meta data - -# Album art filename (string) -#album-art-filename= - -[packetizer_mpegvideo] # MPEG-I/II video packetizer - -# Sync on Intra Frame (boolean) -#packetizer-mpegvideo-sync-iframe=0 - -[notify] # LibNotify Notification Plugin - -# Timeout (ms) (integer) -#notify-timeout=4000 - -[telepathy] # Telepathy "Now Playing" (MissionControl) - -[oldrc] # Remote control interface - -# Show stream position (boolean) -#rc-show-pos=0 - -# Fake TTY (boolean) -#rc-fake-tty=0 - -# UNIX socket command input (string) -#rc-unix= - -# TCP command input (string) -#rc-host= - -[motion] # motion control interface - -# Use the rotate video filter instead of transform (boolean) -#motion-use-rotate=0 - -[netsync] # Network synchronization - -# Network master clock (boolean) -#netsync-master=0 - -# Master server ip address (string) -#netsync-master-ip= - -# UDP timeout (in ms) (integer) -#netsync-timeout=500 - -[gestures] # Mouse gestures control interface - -# Motion threshold (10-100) (integer) -#gestures-threshold=30 - -# Trigger button (string) -#gestures-button=right - -[hotkeys] # Hotkeys management interface - -# MouseWheel up-down axis Control (integer) -#hotkeys-mousewheel-mode=0 - -[lirc] # Infrared remote control interface - -# Change the lirc configuration file (string) -#lirc-file= - -[dbus] # D-Bus control interface - -# Unique DBUS service id (org.mpris.vlc-) (boolean) -#dbus-unique-service-id=0 - -[transform] # Video transformation filter - -# Transform type (string) -#transform-type=90 - -[hqdn3d] # High Quality 3D Denoiser filter - -# Spatial luma strength (0-254) (float) -#hqdn3d-luma-spat=4.000000 - -# Spatial chroma strength (0-254) (float) -#hqdn3d-chroma-spat=3.000000 - -# Temporal luma strength (0-254) (float) -#hqdn3d-luma-temp=6.000000 - -# Temporal chroma strength (0-254) (float) -#hqdn3d-chroma-temp=4.500000 - -[croppadd] # Video scaling filter - -# Pixels to crop from top (integer) -#croppadd-croptop=0 - -# Pixels to crop from bottom (integer) -#croppadd-cropbottom=0 - -# Pixels to crop from left (integer) -#croppadd-cropleft=0 - -# Pixels to crop from right (integer) -#croppadd-cropright=0 - -# Pixels to padd to top (integer) -#croppadd-paddtop=0 - -# Pixels to padd to bottom (integer) -#croppadd-paddbottom=0 - -# Pixels to padd to left (integer) -#croppadd-paddleft=0 - -# Pixels to padd to right (integer) -#croppadd-paddright=0 - -[alphamask] # Alpha mask video filter - -# Transparency mask (string) -#alphamask-mask= - -[motionblur] # Motion blur filter - -# Blur factor (1-127) (integer) -#blur-factor=80 - -[osdmenu] # On Screen Display menu - -# X coordinate (integer) -#osdmenu-x=-1 - -# Y coordinate (integer) -#osdmenu-y=-1 - -# Menu position (integer) -#osdmenu-position=8 - -# Configuration file (string) -#osdmenu-file=/usr/share/vlc/osdmenu/default.cfg - -# Path to OSD menu images (string) -#osdmenu-file-path= - -# Menu timeout (integer) -#osdmenu-timeout=15 - -# Menu update interval (integer) -#osdmenu-update=300 - -# Alpha transparency value (default 255) (integer) -#osdmenu-alpha=255 - -[ball] # Ball video filter - -# Ball color (string) -#ball-color=red - -# Ball speed (integer) -#ball-speed=4 - -# Ball size (integer) -#ball-size=10 - -# Gradient threshold (integer) -#ball-gradient-threshold=40 - -# Edge visible (boolean) -#ball-edge-visible=1 - -[sepia] # Sepia video filter - -# Sepia intensity (integer) -#sepia-intensity=120 - -[adjust] # Image properties filter - -# Image contrast (0-2) (float) -#contrast=1.000000 - -# Image brightness (0-2) (float) -#brightness=1.000000 - -# Image hue (0-360) (integer) -#hue=0 - -# Image saturation (0-3) (float) -#saturation=1.000000 - -# Image gamma (0-10) (float) -#gamma=1.000000 - -# Brightness threshold (boolean) -#brightness-threshold=0 - -[panoramix] # Panoramix: wall with overlap video filter - -# Number of columns (integer) -#panoramix-cols=-1 - -# Number of rows (integer) -#panoramix-rows=-1 - -# length of the overlapping area (in %) (integer) -#panoramix-bz-length=100 - -# height of the overlapping area (in %) (integer) -#panoramix-bz-height=100 - -# Attenuation (boolean) -#panoramix-attenuate=1 - -# Attenuation, begin (in %) (integer) -#panoramix-bz-begin=0 - -# Attenuation, middle (in %) (integer) -#panoramix-bz-middle=50 - -# Attenuation, end (in %) (integer) -#panoramix-bz-end=100 - -# middle position (in %) (integer) -#panoramix-bz-middle-pos=50 - -# Gamma (Red) correction (float) -#panoramix-bz-gamma-red=1.000000 - -# Gamma (Green) correction (float) -#panoramix-bz-gamma-green=1.000000 - -# Gamma (Blue) correction (float) -#panoramix-bz-gamma-blue=1.000000 - -# Black Crush for Red (integer) -#panoramix-bz-blackcrush-red=140 - -# Black Crush for Green (integer) -#panoramix-bz-blackcrush-green=140 - -# Black Crush for Blue (integer) -#panoramix-bz-blackcrush-blue=140 - -# White Crush for Red (integer) -#panoramix-bz-whitecrush-red=200 - -# White Crush for Green (integer) -#panoramix-bz-whitecrush-green=200 - -# White Crush for Blue (integer) -#panoramix-bz-whitecrush-blue=200 - -# Black Level for Red (integer) -#panoramix-bz-blacklevel-red=150 - -# Black Level for Green (integer) -#panoramix-bz-blacklevel-green=150 - -# Black Level for Blue (integer) -#panoramix-bz-blacklevel-blue=150 - -# White Level for Red (integer) -#panoramix-bz-whitelevel-red=0 - -# White Level for Green (integer) -#panoramix-bz-whitelevel-green=0 - -# White Level for Blue (integer) -#panoramix-bz-whitelevel-blue=0 - -# Active windows (string) -#panoramix-active= - -[puzzle] # Puzzle interactive game video filter - -# Number of puzzle rows (integer) -#puzzle-rows=4 - -# Number of puzzle columns (integer) -#puzzle-cols=4 - -# Make one tile a black slot (boolean) -#puzzle-black-slot=0 - -[dynamicoverlay] # Dynamic video overlay - -# Input FIFO (string) -#overlay-input= - -# Output FIFO (string) -#overlay-output= - -[swscale] # Video scaling filter - -# Scaling mode (integer) -#swscale-mode=2 - -[canvas] # Canvas video filter - -# Output width (integer) -#canvas-width=0 - -# Output height (integer) -#canvas-height=0 - -# Output picture aspect ratio (string) -#canvas-aspect= - -# Pad video (boolean) -#canvas-padd=1 - -[clone] # Clone video filter - -# Number of clones (integer) -#clone-count=2 - -# Video output modules (string) -#clone-vout-list= - -[postproc] # Video post processing filter - -# Post processing quality (integer) -#postproc-q=6 - -# FFmpeg post processing filter chains (string) -#postproc-name=default - -[remoteosd] # Remote-OSD over VNC - -# VNC Host (string) -#rmtosd-host=myvdr - -# VNC Port (integer) -#rmtosd-port=20001 - -# VNC Password (string) -#rmtosd-password= - -# VNC poll interval (integer) -#rmtosd-update=1000 - -# VNC polling (boolean) -#rmtosd-vnc-polling=0 - -# Mouse events (boolean) -#rmtosd-mouse-events=0 - -# Key events (boolean) -#rmtosd-key-events=0 - -# Alpha transparency value (default 255) (integer) -#rmtosd-alpha=255 - -[colorthres] # Color threshold filter - -# Color (integer) -#colorthres-color=16711680 - -# Saturation threshold (integer) -#colorthres-saturationthres=20 - -# Similarity threshold (integer) -#colorthres-similaritythres=15 - -[erase] # Erase video filter - -# Image mask (string) -#erase-mask= - -# X coordinate (integer) -#erase-x=0 - -# Y coordinate (integer) -#erase-y=0 - -[audiobargraph_v] # Audio Bar Graph Video sub source - -# Value of the audio channels levels (string) -#audiobargraph_v-i_values= - -# X coordinate (integer) -#audiobargraph_v-x=0 - -# Y coordinate (integer) -#audiobargraph_v-y=0 - -# Transparency of the bargraph (integer) -#audiobargraph_v-transparency=255 - -# Bargraph position (integer) -#audiobargraph_v-position=-1 - -# Alarm (integer) -#audiobargraph_v-alarm=0 - -# Bar width in pixel (default : 10) (integer) -#audiobargraph_v-barWidth=10 - -[gaussianblur] # Gaussian blur video filter - -# Gaussian's std deviation (float) -#gaussianblur-sigma=2.000000 - -[sharpen] # Sharpen video filter - -# Sharpen strength (0-2) (float) -#sharpen-sigma=0.050000 - -[posterize] # Posterize video filter - -# Posterize level (integer) -#posterize-level=6 - -[wall] # Wall video filter - -# Number of columns (integer) -#wall-cols=3 - -# Number of rows (integer) -#wall-rows=3 - -# Active windows (string) -#wall-active= - -# Element aspect ratio (string) -#wall-element-aspect=16:9 - -[mosaic] # Mosaic video sub source - -# Transparency (integer) -#mosaic-alpha=255 - -# Height (integer) -#mosaic-height=100 - -# Width (integer) -#mosaic-width=100 - -# Mosaic alignment (integer) -#mosaic-align=5 - -# Top left corner X coordinate (integer) -#mosaic-xoffset=0 - -# Top left corner Y coordinate (integer) -#mosaic-yoffset=0 - -# Border width (integer) -#mosaic-borderw=0 - -# Border height (integer) -#mosaic-borderh=0 - -# Positioning method (integer) -#mosaic-position=0 - -# Number of rows (integer) -#mosaic-rows=2 - -# Number of columns (integer) -#mosaic-cols=2 - -# Keep aspect ratio (boolean) -#mosaic-keep-aspect-ratio=0 - -# Keep original size (boolean) -#mosaic-keep-picture=0 - -# Elements order (string) -#mosaic-order= - -# Offsets in order (string) -#mosaic-offsets= - -# Delay (integer) -#mosaic-delay=0 - -[antiflicker] # antiflicker video filter - -# Window size (integer) -#antiflicker-window-size=10 - -# Softening value (integer) -#antiflicker-softening-size=10 - -[subsdelay] # Subtitles delay - -# Delay calculation mode (integer) -#subsdelay-mode=1 - -# Calculation factor (float) -#subsdelay-factor=2.000000 - -# Maximum overlapping subtitles (integer) -#subsdelay-overlap=3 - -# Minimum alpha value (integer) -#subsdelay-min-alpha=70 - -# Interval between two disappearances (integer) -#subsdelay-min-stops=1000 - -# Interval between appearance and disappearance (integer) -#subsdelay-min-start-stop=1000 - -# Interval between disappearance and appearance (integer) -#subsdelay-min-stop-start=1000 - -[rss] # RSS and Atom feed display - -# Feed URLs (string) -#rss-urls= - -# X offset (integer) -#rss-x=0 - -# Y offset (integer) -#rss-y=0 - -# Text position (integer) -#rss-position=-1 - -# Opacity (integer) -#rss-opacity=255 - -# Color (integer) -#rss-color=16777215 - -# Font size, pixels (integer) -#rss-size=-1 - -# Speed of feeds (integer) -#rss-speed=100000 - -# Max length (integer) -#rss-length=60 - -# Refresh time (integer) -#rss-ttl=1800 - -# Feed images (boolean) -#rss-images=1 - -# Title display mode (integer) -#rss-title=-1 - -[deinterlace] # Deinterlacing video filter - -# Streaming deinterlace mode (string) -#sout-deinterlace-mode=blend - -# Phosphor chroma mode for 4:2:0 input (integer) -#sout-deinterlace-phosphor-chroma=2 - -# Phosphor old field dimmer strength (integer) -#sout-deinterlace-phosphor-dimmer=2 - -[marq] # Marquee display - -# Text (string) -#marq-marquee=VLC - -# X offset (integer) -#marq-x=0 - -# Y offset (integer) -#marq-y=0 - -# Marquee position (integer) -#marq-position=-1 - -# Opacity (integer) -#marq-opacity=255 - -# Color (integer) -#marq-color=16777215 - -# Font size, pixels (integer) -#marq-size=-1 - -# Timeout (integer) -#marq-timeout=0 - -# Refresh period in ms (integer) -#marq-refresh=1000 - -[atmo] # AtmoLight Filter - -# Device type (integer) -#atmo-device=1 - -# Serial Port/Device (string) -#atmo-serialdev=/dev/ttyUSB0 - -# Color when paused (boolean) -#atmo-usepausecolor=0 - -# Pause-Red (integer) -#atmo-pcolor-red=0 - -# Pause-Green (integer) -#atmo-pcolor-green=0 - -# Pause-Blue (integer) -#atmo-pcolor-blue=192 - -# Pause-Fadesteps (integer) -#atmo-fadesteps=50 - -# End-Red (integer) -#atmo-ecolor-red=192 - -# End-Green (integer) -#atmo-ecolor-green=192 - -# End-Blue (integer) -#atmo-ecolor-blue=192 - -# End-Fadesteps (integer) -#atmo-efadesteps=50 - -# Count of AtmoLight channels (integer) -#atmo-dmx-channels=5 - -# DMX address for each channel (string) -#atmo-dmx-chbase=0,3,6,9,12 - -# Count of channels (integer) -#atmo-momo-channels=3 - -# Count of fnordlicht's (integer) -#atmo-fnordlicht-amount=2 - -# Number of zones on top (integer) -#atmo-zones-top=1 - -# Number of zones on bottom (integer) -#atmo-zones-bottom=1 - -# Zones on left / right side (integer) -#atmo-zones-lr=1 - -# Calculate a average zone (boolean) -#atmo-zone-summary=0 - -# Edge Weightning (integer) -#atmo-edgeweightning=3 - -# Brightness (integer) -#atmo-brightness=100 - -# Darkness Limit (integer) -#atmo-darknesslimit=3 - -# Hue windowing (integer) -#atmo-huewinsize=3 - -# Sat windowing (integer) -#atmo-satwinsize=3 - -# Output Color filter mode (integer) -#atmo-filtermode=1 - -# Filter length (ms) (integer) -#atmo-meanlength=300 - -# Filter threshold (integer) -#atmo-meanthreshold=40 - -# Filter Smoothness (in %) (integer) -#atmo-percentnew=50 - -# Frame delay (ms) (integer) -#atmo-framedelay=18 - -# Channel 0: summary (integer) -#atmo-channel_0=4 - -# Channel 1: left (integer) -#atmo-channel_1=3 - -# Channel 2: right (integer) -#atmo-channel_2=1 - -# Channel 3: top (integer) -#atmo-channel_3=0 - -# Channel 4: bottom (integer) -#atmo-channel_4=2 - -# Channel / Zone Assignment (string) -#atmo-channels= - -# Use Software White adjust (boolean) -#atmo-whiteadj=1 - -# White Red (integer) -#atmo-white-red=255 - -# White Green (integer) -#atmo-white-green=255 - -# White Blue (integer) -#atmo-white-blue=255 - -# Zone 0: Top gradient (string) -#atmo-gradient_zone_0= - -# Zone 1: Right gradient (string) -#atmo-gradient_zone_1= - -# Zone 2: Bottom gradient (string) -#atmo-gradient_zone_2= - -# Zone 3: Left gradient (string) -#atmo-gradient_zone_3= - -# Zone 4: Summary gradient (string) -#atmo-gradient_zone_4= - -# Gradient bitmap searchpath (string) -#atmo-gradient_path= - -# Extracted Image Width (integer) -#atmo-width=64 - -# Extracted Image Height (integer) -#atmo-height=48 - -# Mark analyzed pixels (boolean) -#atmo-showdots=0 - -[rotate] # Rotate video filter - -# Angle in degrees (integer) -#rotate-angle=30 - -[extract] # Extract RGB component video filter - -# RGB component to extract (integer) -#extract-component=16711680 - -[gradient] # Gradient video filter - -# Distort mode (string) -#gradient-mode=gradient - -# Gradient image type (integer) -#gradient-type=0 - -# Apply cartoon effect (boolean) -#gradient-cartoon=1 - -[scene] # Scene video filter - -# Image format (string) -#scene-format=png - -# Image width (integer) -#scene-width=-1 - -# Image height (integer) -#scene-height=-1 - -# Filename prefix (string) -#scene-prefix=scene - -# Directory path prefix (string) -#scene-path= - -# Always write to the same file (boolean) -#scene-replace=0 - -# Recording ratio (integer) -#scene-ratio=50 - -[blendbench] # Blending benchmark filter - -# Number of time to blend (integer) -#blendbench-loops=1000 - -# Alpha of the blended image (integer) -#blendbench-alpha=128 - -# Image to be blended onto (string) -#blendbench-base-image= - -# Chroma for the base image (string) -#blendbench-base-chroma=I420 - -# Image which will be blended (string) -#blendbench-blend-image= - -# Chroma for the blend image (string) -#blendbench-blend-chroma=YUVA - -[grain] # Grain video filter - -# Variance (float) -#grain-variance=2.000000 - -# Minimal period (integer) -#grain-period-min=1 - -# Maximal period (integer) -#grain-period-max=48 - -[logo] # Logo sub source - -# Logo filenames (string) -#logo-file= - -# X coordinate (integer) -#logo-x=-1 - -# Y coordinate (integer) -#logo-y=-1 - -# Logo individual image time in ms (integer) -#logo-delay=1000 - -# Logo animation # of loops (integer) -#logo-repeat=-1 - -# Opacity of the logo (integer) -#logo-opacity=255 - -# Logo position (integer) -#logo-position=-1 - -[gradfun] # Gradfun video filter - -# Radius (integer) -#gradfun-radius=16 - -# Strength (float) -#gradfun-strength=1.200000 - -[mirror] # Mirror video filter - -# Mirror orientation (integer) -#mirror-split=0 - -# Direction (integer) -#mirror-direction=0 - -[bluescreen] # Bluescreen video filter - -# Bluescreen U value (integer) -#bluescreen-u=120 - -# Bluescreen V value (integer) -#bluescreen-v=90 - -# Bluescreen U tolerance (integer) -#bluescreen-ut=17 - -# Bluescreen V tolerance (integer) -#bluescreen-vt=17 - -[playlist] # Playlist - -# Skip ads (boolean) -#playlist-skip-ads=1 - -# Show shoutcast adult content (boolean) -#shoutcast-show-adult=0 - -[vc1] # VC1 video demuxer - -# Frames per Second (float) -#vc1-fps=25.000000 - -[ps] # MPEG-PS demuxer - -# Trust MPEG timestamps (boolean) -#ps-trust-timestamps=1 - -[live555] # RTP/RTSP/SDP demuxer (using Live555) - -# Use RTP over RTSP (TCP) (boolean) -#rtsp-tcp=0 - -# Client port (integer) -#rtp-client-port=-1 - -# Force multicast RTP via RTSP (boolean) -#rtsp-mcast=0 - -# Tunnel RTSP and RTP over HTTP (boolean) -#rtsp-http=0 - -# HTTP tunnel port (integer) -#rtsp-http-port=80 - -# Kasenna RTSP dialect (boolean) -#rtsp-kasenna=0 - -# WMServer RTSP dialect (boolean) -#rtsp-wmserver=0 - -# RTSP user name (string) -#rtsp-user= - -# RTSP password (string) -#rtsp-pwd= - -[subtitle] # Text subtitles parser - -# Frames per second (float) -#sub-fps=0.000000 - -# Subtitles delay (integer) -#sub-delay=0 - -# Subtitles format (string) -#sub-type=auto - -# Subtitles description (string) -#sub-description= - -[mkv] # Matroska stream demuxer - -# Respect ordered chapters (boolean) -#mkv-use-ordered-chapters=1 - -# Chapter codecs (boolean) -#mkv-use-chapter-codec=1 - -# Preload MKV files in the same directory (boolean) -#mkv-preload-local-dir=1 - -# Seek based on percent not time (boolean) -#mkv-seek-percent=0 - -# Dummy Elements (boolean) -#mkv-use-dummy=0 - -[mod] # MOD demuxer (libmodplug) - -# Noise reduction (boolean) -#mod-noisereduction=1 - -# Reverb (boolean) -#mod-reverb=0 - -# Reverberation level (integer) -#mod-reverb-level=0 - -# Reverberation delay (integer) -#mod-reverb-delay=40 - -# Mega bass (boolean) -#mod-megabass=0 - -# Mega bass level (integer) -#mod-megabass-level=0 - -# Mega bass cutoff (integer) -#mod-megabass-range=10 - -# Surround (boolean) -#mod-surround=0 - -# Surround level (integer) -#mod-surround-level=0 - -# Surround delay (ms) (integer) -#mod-surround-delay=5 - -[rawaud] # Raw audio demuxer - -# Audio channels (integer) -#rawaud-channels=2 - -# Audio samplerate (Hz) (integer) -#rawaud-samplerate=48000 - -# FOURCC code of raw input format (string) -#rawaud-fourcc=s16l - -# Forces the audio language (string) -#rawaud-lang=eng - -[h264] # H264 video demuxer - -# Frames per Second (float) -#h264-fps=25.000000 - -[mjpeg] # M-JPEG camera demuxer - -# Frames per Second (float) -#mjpeg-fps=0.000000 - -[avi] # AVI demuxer - -# Force interleaved method (boolean) -#avi-interleaved=0 - -# Force index creation (integer) -#avi-index=0 - -[es] # MPEG-I/II/4 / A52 / DTS / MLP audio - -# Frames per Second (float) -#es-fps=25.000000 - -[rawvid] # Raw video demuxer - -# Frames per Second (string) -#rawvid-fps= - -# Width (integer) -#rawvid-width=0 - -# Height (integer) -#rawvid-height=0 - -# Force chroma (Use carefully) (string) -#rawvid-chroma= - -# Aspect ratio (string) -#rawvid-aspect-ratio= - -[image] # Image demuxer - -# ES ID (integer) -#image-id=-1 - -# Group (integer) -#image-group=0 - -# Decode (boolean) -#image-decode=1 - -# Forced chroma (string) -#image-chroma= - -# Duration in seconds (float) -#image-duration=10.000000 - -# Frame rate (string) -#image-fps=10/1 - -# Real-time (boolean) -#image-realtime=0 - -[rawdv] # DV (Digital Video) demuxer - -# Hurry up (boolean) -#rawdv-hurry-up=0 - -[ts] # MPEG Transport Stream demuxer - -# Extra PMT (string) -#ts-extra-pmt= - -# Set id of ES to PID (boolean) -#ts-es-id-pid=1 - -# Fast udp streaming (string) -#ts-out= - -# MTU for out mode (integer) -#ts-out-mtu=1400 - -# CSA Key (string) -#ts-csa-ck= - -# Second CSA Key (string) -#ts-csa2-ck= - -# Packet size in bytes to decrypt (integer) -#ts-csa-pkt=188 - -# Silent mode (boolean) -#ts-silent=0 - -# Filename of dump (string) -#ts-dump-file= - -# Append (boolean) -#ts-dump-append=0 - -# Dump buffer size (integer) -#ts-dump-size=16384 - -# Separate sub-streams (boolean) -#ts-split-es=1 - -# Seek based on percent not time (boolean) -#ts-seek-percent=0 - -[dirac] # Dirac video demuxer - -# Value to adjust dts by (integer) -#dirac-dts-offset=0 - -[avformat] # Avformat demuxer - -# Format name (string) -#ffmpeg-format= - -# Avformat mux (string) -#ffmpeg-mux= - -[demuxdump] # File dumper - -# Dump filename (string) -#demuxdump-file=stream-demux.dump - -# Append to existing file (boolean) -#demuxdump-append=0 - -[audiobargraph_a] # Audio part of the BarGraph function - -# TCP address to use (default localhost) (string) -#audiobargraph_a-address=localhost - -# TCP port to use (default 12345) (integer) -#audiobargraph_a-port=12345 - -# Defines if BarGraph information should be sent (default 1) (integer) -#audiobargraph_a-bargraph=1 - -# Sends the barGraph information every n audio packets (default 4) (integer) -#audiobargraph_a-bargraph_repetition=4 - -# Defines if silence alarm information should be sent (default 1) (integer) -#audiobargraph_a-silence=1 - -# Time window to use in ms (default 5000) (integer) -#audiobargraph_a-time_window=5000 - -# Minimum Audio level to raise the alarm (default 0.1) (float) -#audiobargraph_a-alarm_threshold=0.100000 - -# Time between two alarm messages in ms (default 2000) (integer) -#audiobargraph_a-repetition_time=2000 - -# Force connection reset regularly (default 1) (integer) -#audiobargraph_a-connection_reset=1 - -[chorus_flanger] # Sound Delay - -# Delay time (float) -#delay-time=40.000000 - -# Sweep Depth (float) -#sweep-depth=6.000000 - -# Sweep Rate (float) -#sweep-rate=6.000000 - -# Feedback Gain (float) -#feedback-gain=0.500000 - -# Wet mix (float) -#wet-mix=0.400000 - -# Dry Mix (float) -#dry-mix=0.400000 - -[mono] # Audio filter for stereo to mono conversion - -# Use downmix algorithm (boolean) -#sout-mono-downmix=1 - -# Select channel to keep (integer) -#sout-mono-channel=-1 - -[scaletempo] # Audio tempo scaler synched with rate - -# Stride Length (integer) -#scaletempo-stride=30 - -# Overlap Length (float) -#scaletempo-overlap=0.200000 - -# Search Length (integer) -#scaletempo-search=14 - -[normvol] # Volume normalizer - -# Number of audio buffers (integer) -#norm-buff-size=20 - -# Maximal volume level (float) -#norm-max-level=2.000000 - -[param_eq] # Parametric Equalizer - -# Low freq (Hz) (float) -#param-eq-lowf=100.000000 - -# Low freq gain (dB) (float) -#param-eq-lowgain=0.000000 - -# High freq (Hz) (float) -#param-eq-highf=10000.000000 - -# High freq gain (dB) (float) -#param-eq-highgain=0.000000 - -# Freq 1 (Hz) (float) -#param-eq-f1=300.000000 - -# Freq 1 gain (dB) (float) -#param-eq-gain1=0.000000 - -# Freq 1 Q (float) -#param-eq-q1=3.000000 - -# Freq 2 (Hz) (float) -#param-eq-f2=1000.000000 - -# Freq 2 gain (dB) (float) -#param-eq-gain2=0.000000 - -# Freq 2 Q (float) -#param-eq-q2=3.000000 - -# Freq 3 (Hz) (float) -#param-eq-f3=3000.000000 - -# Freq 3 gain (dB) (float) -#param-eq-gain3=0.000000 - -# Freq 3 Q (float) -#param-eq-q3=3.000000 - -[headphone_channel_mixer] # Headphone virtual spatialization effect - -# Characteristic dimension (integer) -#headphone-dim=10 - -# Compensate delay (boolean) -#headphone-compensate=0 - -# No decoding of Dolby Surround (boolean) -#headphone-dolby=0 - -[speex_resampler] # Speex resampler - -# Resampling quality (integer) -#speex-resampler-quality=4 - -[dtstofloat32] # DTS Coherent Acoustics audio decoder - -# DTS dynamic range compression (boolean) -#dts-dynrng=1 - -[spatializer] # Audio Spatializer - -# Room size (float) -#spatializer-roomsize=0.850000 - -# Room width (float) -#spatializer-width=1.000000 - -# Wet (float) -#spatializer-wet=0.400000 - -# Dry (float) -#spatializer-dry=0.500000 - -# Damp (float) -#spatializer-damp=0.500000 - -[a52tofloat32] # ATSC A/52 (AC-3) audio decoder - -# A/52 dynamic range compression (boolean) -#a52-dynrng=1 - -# Enable internal upmixing (boolean) -#a52-upmix=0 - -[compressor] # Dynamic range compressor - -# RMS/peak (float) -#compressor-rms-peak=0.000000 - -# Attack time (float) -#compressor-attack=25.000000 - -# Release time (float) -#compressor-release=100.000000 - -# Threshold level (float) -#compressor-threshold=-11.000000 - -# Ratio (float) -#compressor-ratio=8.000000 - -# Knee radius (float) -#compressor-knee=2.500000 - -# Makeup gain (float) -#compressor-makeup-gain=7.000000 - -[samplerate] # Secret Rabbit Code (libsamplerate) resampler - -# Sample rate converter type (integer) -#src-converter-type=2 - -[equalizer] # Equalizer with 10 bands - -# Equalizer preset (string) -#equalizer-preset=flat - -# Bands gain (string) -#equalizer-bands= - -# Two pass (boolean) -#equalizer-2pass=0 - -# Global gain (float) -#equalizer-preamp=12.000000 - -[theora] # Theora video decoder - -# Encoding quality (integer) -#sout-theora-quality=2 - -[zvbi] # VBI and Teletext decoder - -# Teletext page (integer) -#vbi-page=100 - -# Teletext transparency (boolean) -#vbi-opaque=1 - -# Teletext alignment (integer) -#vbi-position=4 - -# Teletext text subtitles (boolean) -#vbi-text=0 - -[spudec] # DVD subtitles decoder - -# Disable DVD subtitle transparency (boolean) -#dvdsub-transparency=0 - -[dvbsub] # DVB subtitles decoder - -# Subpicture position (integer) -#dvbsub-position=8 - -# Decoding X coordinate (integer) -#dvbsub-x=-1 - -# Decoding Y coordinate (integer) -#dvbsub-y=-1 - -# Encoding X coordinate (integer) -#sout-dvbsub-x=-1 - -# Encoding Y coordinate (integer) -#sout-dvbsub-y=-1 - -[ddummy] # Dummy decoder - -# Save raw codec data (boolean) -#dummy-save-es=0 - -[x264] # H.264/MPEG4 AVC encoder (x264) - -# Maximum GOP size (integer) -#sout-x264-keyint=250 - -# Minimum GOP size (integer) -#sout-x264-min-keyint=25 - -# Use recovery points to close GOPs (boolean) -#sout-x264-opengop=0 - -# Enable compatibility hacks for Blu-ray support (boolean) -#sout-x264-bluray-compat=0 - -# Extra I-frames aggressivity (integer) -#sout-x264-scenecut=40 - -# B-frames between I and P (integer) -#sout-x264-bframes=3 - -# Adaptive B-frame decision (integer) -#sout-x264-b-adapt=1 - -# Influence (bias) B-frames usage (integer) -#sout-x264-b-bias=0 - -# Keep some B-frames as references (string) -#sout-x264-bpyramid=normal - -# CABAC (boolean) -#sout-x264-cabac=1 - -# Number of reference frames (integer) -#sout-x264-ref=3 - -# Skip loop filter (boolean) -#sout-x264-nf=0 - -# Loop filter AlphaC0 and Beta parameters alpha:beta (string) -#sout-x264-deblock=0:0 - -# Strength of psychovisual optimization, default is "1.0:0.0" (string) -#sout-x264-psy-rd=1.0:0.0 - -# Use Psy-optimizations (boolean) -#sout-x264-psy=1 - -# H.264 level (string) -#sout-x264-level=0 - -# H.264 profile (string) -#sout-x264-profile=high - -# Interlaced mode (boolean) -#sout-x264-interlaced=0 - -# Force number of slices per frame (integer) -#sout-x264-slices=0 - -# Limit the size of each slice in bytes (integer) -#sout-x264-slice-max-size=0 - -# Limit the size of each slice in macroblocks (integer) -#sout-x264-slice-max-mbs=0 - -# HRD-timing information (string) -#sout-x264-hrd=none - -# Set QP (integer) -#sout-x264-qp=-1 - -# Quality-based VBR (integer) -#sout-x264-crf=23 - -# Min QP (integer) -#sout-x264-qpmin=10 - -# Max QP (integer) -#sout-x264-qpmax=51 - -# Max QP step (integer) -#sout-x264-qpstep=4 - -# Average bitrate tolerance (float) -#sout-x264-ratetol=1.000000 - -# Max local bitrate (integer) -#sout-x264-vbv-maxrate=0 - -# VBV buffer (integer) -#sout-x264-vbv-bufsize=0 - -# Initial VBV buffer occupancy (float) -#sout-x264-vbv-init=0.900000 - -# QP factor between I and P (float) -#sout-x264-ipratio=1.400000 - -# QP factor between P and B (float) -#sout-x264-pbratio=1.300000 - -# QP difference between chroma and luma (integer) -#sout-x264-chroma-qp-offset=0 - -# Multipass ratecontrol (integer) -#sout-x264-pass=0 - -# QP curve compression (float) -#sout-x264-qcomp=0.600000 - -# Reduce fluctuations in QP (float) -#sout-x264-cplxblur=20.000000 - -# Reduce fluctuations in QP (float) -#sout-x264-qblur=0.500000 - -# How AQ distributes bits (integer) -#sout-x264-aq-mode=1 - -# Strength of AQ (float) -#sout-x264-aq-strength=1.000000 - -# Partitions to consider (string) -#sout-x264-partitions=normal - -# Direct MV prediction mode (string) -#sout-x264-direct=spatial - -# Direct prediction size (integer) -#sout-x264-direct-8x8=1 - -# Weighted prediction for B-frames (boolean) -#sout-x264-weightb=1 - -# Weighted prediction for P-frames (integer) -#sout-x264-weightp=2 - -# Integer pixel motion estimation method (string) -#sout-x264-me=hex - -# Maximum motion vector search range (integer) -#sout-x264-merange=16 - -# Maximum motion vector length (integer) -#sout-x264-mvrange=-1 - -# Minimum buffer space between threads (integer) -#sout-x264-mvrange-thread=-1 - -# Subpixel motion estimation and partition decision quality (integer) -#sout-x264-subme=7 - -# Decide references on a per partition basis (boolean) -#sout-x264-mixed-refs=1 - -# Chroma in motion estimation (boolean) -#sout-x264-chroma-me=1 - -# Adaptive spatial transform size (boolean) -#sout-x264-8x8dct=1 - -# Trellis RD quantization (integer) -#sout-x264-trellis=1 - -# Framecount to use on frametype lookahead (integer) -#sout-x264-lookahead=40 - -# Use Periodic Intra Refresh (boolean) -#sout-x264-intra-refresh=0 - -# Use mb-tree ratecontrol (boolean) -#sout-x264-mbtree=1 - -# Early SKIP detection on P-frames (boolean) -#sout-x264-fast-pskip=1 - -# Coefficient thresholding on P-frames (boolean) -#sout-x264-dct-decimate=1 - -# Noise reduction (integer) -#sout-x264-nr=0 - -# Inter luma quantization deadzone (integer) -#sout-x264-deadzone-inter=21 - -# Intra luma quantization deadzone (integer) -#sout-x264-deadzone-intra=11 - -# Non-deterministic optimizations when threaded (boolean) -#sout-x264-non-deterministic=0 - -# CPU optimizations (boolean) -#sout-x264-asm=1 - -# PSNR computation (boolean) -#sout-x264-psnr=0 - -# SSIM computation (boolean) -#sout-x264-ssim=0 - -# Quiet mode (boolean) -#sout-x264-quiet=0 - -# SPS and PPS id numbers (integer) -#sout-x264-sps-id=0 - -# Access unit delimiters (boolean) -#sout-x264-aud=0 - -# Statistics (boolean) -#sout-x264-verbose=0 - -# Filename for 2 pass stats file (string) -#sout-x264-stats=x264_2pass.log - -# Use preset as default settings. Overridden by user settings. (string) -#sout-x264-preset= - -# Tune the settings for a particular type of source or situation. Overridden by user settings. (string) -#sout-x264-tune= - -[speex] # Speex audio decoder - -# Mode (integer) -#sout-speex-mode=0 - -# Encoding complexity (integer) -#sout-speex-complexity=3 - -# CBR encoding (boolean) -#sout-speex-cbr=0 - -# Encoding quality (float) -#sout-speex-quality=8.000000 - -# Maximal bitrate (integer) -#sout-speex-max-bitrate=0 - -# Voice activity detection (boolean) -#sout-speex-vad=1 - -# Discontinuous Transmission (boolean) -#sout-speex-dtx=0 - -[telx] # Teletext subtitles decoder - -# Override page (integer) -#telx-override-page=-1 - -# Ignore subtitle flag (boolean) -#telx-ignore-subtitle-flag=0 - -# Workaround for France (boolean) -#telx-french-workaround=0 - -[subsdec] # Text subtitles decoder - -# Subtitles justification (integer) -#subsdec-align=0 - -# Subtitles text encoding (string) -#subsdec-encoding= - -# UTF-8 subtitles autodetection (boolean) -#subsdec-autodetect-utf8=1 - -# Formatted Subtitles (boolean) -#subsdec-formatted=1 - -[vorbis] # Vorbis audio decoder - -# Encoding quality (integer) -#sout-vorbis-quality=0 - -# Maximum encoding bitrate (integer) -#sout-vorbis-max-bitrate=0 - -# Minimum encoding bitrate (integer) -#sout-vorbis-min-bitrate=0 - -# CBR encoding (boolean) -#sout-vorbis-cbr=0 - -[schroedinger] # Dirac video decoder using libschroedinger - -# Rate control method (string) -#sout-schro-rate-control= - -# Constant quality factor (float) -#sout-schro-quality=-1.000000 - -# Noise Threshold (float) -#sout-schro-noise-threshold=-1.000000 - -# CBR bitrate (kbps) (integer) -#sout-schro-bitrate=-1 - -# Maximum bitrate (kbps) (integer) -#sout-schro-max-bitrate=-1 - -# Minimum bitrate (kbps) (integer) -#sout-schro-min-bitrate=-1 - -# GOP structure (string) -#sout-schro-gop-structure= - -# GOP length (integer) -#sout-schro-gop-length=-1 - -# Chroma format (string) -#sout-schro-chroma-fmt=420 - -# Picture coding mode (string) -#sout-schro-coding-mode=auto - -# Motion Vector precision (string) -#sout-schro-mv-precision= - -# Size of motion compensation blocks (string) -#sout-schro-motion-block-size= - -# Overlap of motion compensation blocks (string) -#sout-schro-motion-block-overlap= - -# Three component motion estimation (integer) -#sout-schro-me-combined=-1 - -# Enable hierarchical Motion Estimation (integer) -#sout-schro-enable-hierarchical-me=-1 - -# Number of levels of downsampling (integer) -#sout-schro-downsample-levels=-1 - -# Enable Global Motion Estimation (integer) -#sout-schro-enable-global-me=-1 - -# Enable Phase Correlation Estimation (integer) -#sout-schro-enable-phasecorr-me=-1 - -# Intra picture DWT filter (string) -#sout-schro-intra-wavelet= - -# Inter picture DWT filter (string) -#sout-schro-inter-wavelet= - -# Number of DWT iterations (integer) -#sout-schro-transform-depth=-1 - -# Enable multiple quantizers (integer) -#sout-schro-enable-multiquant=-1 - -# Size of code blocks in each subband (string) -#sout-schro-codeblock-size= - -# Prefilter (string) -#sout-schro-filtering= - -# Amount of prefiltering (float) -#sout-schro-filter-value=-1.000000 - -# Enable Scene Change Detection (integer) -#sout-schro-enable-scd=-1 - -# perceptual weighting method (string) -#sout-schro-perceptual-weighting= - -# perceptual distance (float) -#sout-schro-perceptual-distance=-1.000000 - -# Disable arithmetic coding (integer) -#sout-schro-enable-noarith=-1 - -# Horizontal slices per frame (integer) -#sout-schro-horiz-slices=-1 - -# Vertical slices per frame (integer) -#sout-schro-vert-slices=-1 - -# Force Profile (string) -#sout-schro-force-profile= - -[avcodec] # FFmpeg audio/video decoder - -# Direct rendering (boolean) -#ffmpeg-dr=1 - -# Error resilience (integer) -#ffmpeg-error-resilience=1 - -# Workaround bugs (integer) -#ffmpeg-workaround-bugs=1 - -# Hurry up (boolean) -#ffmpeg-hurry-up=1 - -# Skip frame (default=0) (integer) -#ffmpeg-skip-frame=0 - -# Skip idct (default=0) (integer) -#ffmpeg-skip-idct=0 - -# Visualize motion vectors (integer) -#ffmpeg-vismv=0 - -# Low resolution decoding (integer) -#ffmpeg-lowres=0 - -# Allow speed tricks (boolean) -#ffmpeg-fast=0 - -# Skip the loop filter for H.264 decoding (integer) -#ffmpeg-skiploopfilter=0 - -# Debug mask (integer) -#ffmpeg-debug=0 - -# Codec name (string) -#ffmpeg-codec= - -# Hardware decoding (boolean) -#ffmpeg-hw=0 - -# Threads (integer) -#ffmpeg-threads=0 - -# Codec name (string) -#sout-ffmpeg-codec= - -# Quality level (string) -#sout-ffmpeg-hq=simple - -# Ratio of key frames (integer) -#sout-ffmpeg-keyint=0 - -# Ratio of B frames (integer) -#sout-ffmpeg-bframes=0 - -# Hurry up (boolean) -#sout-ffmpeg-hurry-up=0 - -# Interlaced encoding (boolean) -#sout-ffmpeg-interlace=0 - -# Interlaced motion estimation (boolean) -#sout-ffmpeg-interlace-me=1 - -# Video bitrate tolerance (integer) -#sout-ffmpeg-vt=0 - -# Pre-motion estimation (boolean) -#sout-ffmpeg-pre-me=0 - -# Rate control buffer size (integer) -#sout-ffmpeg-rc-buffer-size=1835008 - -# Rate control buffer aggressiveness (float) -#sout-ffmpeg-rc-buffer-aggressivity=1.000000 - -# I quantization factor (float) -#sout-ffmpeg-i-quant-factor=0.000000 - -# Noise reduction (integer) -#sout-ffmpeg-noise-reduction=0 - -# MPEG4 quantization matrix (boolean) -#sout-ffmpeg-mpeg4-matrix=0 - -# Minimum video quantizer scale (integer) -#sout-ffmpeg-qmin=0 - -# Maximum video quantizer scale (integer) -#sout-ffmpeg-qmax=0 - -# Trellis quantization (boolean) -#sout-ffmpeg-trellis=0 - -# Fixed quantizer scale (float) -#sout-ffmpeg-qscale=0.000000 - -# Strict standard compliance (integer) -#sout-ffmpeg-strict=0 - -# Luminance masking (float) -#sout-ffmpeg-lumi-masking=0.000000 - -# Darkness masking (float) -#sout-ffmpeg-dark-masking=0.000000 - -# Motion masking (float) -#sout-ffmpeg-p-masking=0.000000 - -# Border masking (float) -#sout-ffmpeg-border-masking=0.000000 - -# Luminance elimination (integer) -#sout-ffmpeg-luma-elim-threshold=0 - -# Chrominance elimination (integer) -#sout-ffmpeg-chroma-elim-threshold=0 - -# Specify AAC audio profile to use (string) -#sout-ffmpeg-aac-profile=low - -[svcdsub] # Philips OGT (SVCD subtitle) decoder - -[kate] # Kate overlay decoder - -# Formatted Subtitles (boolean) -#kate-formatted=1 - -# Use Tiger for rendering (boolean) -#kate-use-tiger=1 - -# Rendering quality (float) -#kate-tiger-quality=1.000000 - -# Default font description (string) -#kate-tiger-default-font-desc= - -# Default font effect (integer) -#kate-tiger-default-font-effect=0 - -# Default font effect strength (float) -#kate-tiger-default-font-effect-strength=0.500000 - -# Default font color (integer) -#kate-tiger-default-font-color=16777215 - -# Default font alpha (integer) -#kate-tiger-default-font-alpha=255 - -# Default background color (integer) -#kate-tiger-default-background-color=16777215 - -# Default background alpha (integer) -#kate-tiger-default-background-alpha=0 - -[svg] # svg - -# SVG template file (string) -#svg-template-file= - -[freetype] # Freetype2 font renderer - -# Font (string) -#freetype-font=Serif Bold - -# Font size in pixels (integer) -#freetype-fontsize=0 - -# Relative font size (integer) -#freetype-rel-fontsize=16 - -# Text opacity (integer) -#freetype-opacity=255 - -# Text default color (integer) -#freetype-color=16777215 - -# Force bold (boolean) -#freetype-bold=0 - -# Background opacity (integer) -#freetype-background-opacity=0 - -# Background color (integer) -#freetype-background-color=0 - -# Outline opacity (integer) -#freetype-outline-opacity=255 - -# Outline color (integer) -#freetype-outline-color=0 - -# Outline thickness (integer) -#freetype-outline-thickness=4 - -# Shadow opacity (integer) -#freetype-shadow-opacity=128 - -# Shadow color (integer) -#freetype-shadow-color=0 - -# Shadow angle (float) -#freetype-shadow-angle=-45.000000 - -# Shadow distance (float) -#freetype-shadow-distance=0.060000 - -# Use YUVP renderer (boolean) -#freetype-yuvp=0 - -[sap] # Network streams (SAP) - -# SAP multicast address (string) -#sap-addr= - -# SAP timeout (seconds) (integer) -#sap-timeout=1800 - -# Try to parse the announce (boolean) -#sap-parse=1 - -# SAP Strict mode (boolean) -#sap-strict=0 - -[podcast] # Podcasts - -# Podcast URLs list (string) -#podcast-urls= - -[skins2] # Skinnable Interface - -# Skin to use (string) -#skins2-last= - -# Config of last used skin (string) -#skins2-config= - -# Enable transparency effects (boolean) -#skins2-transparency=0 - -# Use a skinned playlist (boolean) -#skinned-playlist=1 - -# Display video in a skinned window if any (boolean) -#skinned-video=1 - -[qt4] # Qt interface - -# Start in minimal view (without menus) (boolean) -#qt-minimal-view=0 - -# Systray icon (boolean) -#qt-system-tray=1 - -# Show notification popup on track change (boolean) -#qt-notification=1 - -# Start VLC with only a systray icon (boolean) -#qt-start-minimized=0 - -# Pause the video playback when minimized (boolean) -#qt-pause-minimized=0 - -# Windows opacity between 0.1 and 1 (float) -#qt-opacity=1.000000 - -# Fullscreen controller opacity between 0.1 and 1 (float) -#qt-fs-opacity=0.800000 - -# Resize interface to the native video size (boolean) -#qt-video-autoresize=1 - -# Show playing item name in window title (boolean) -#qt-name-in-title=1 - -# Show a controller in fullscreen mode (boolean) -#qt-fs-controller=1 - -# Save the recently played items in the menu (boolean) -#qt-recentplay=1 - -# List of words separated by | to filter (string) -#qt-recentplay-filter= - -# Automatically save the volume on exit (boolean) -#qt-autosave-volume=1 - -# Embed the file browser in open dialog (boolean) -#qt-embedded-open=0 - -# Show advanced preferences over simple ones (boolean) -#qt-advanced-pref=0 - -# Show unimportant error and warnings dialogs (boolean) -#qt-error-dialogs=1 - -# Define the colors of the volume slider (string) -#qt-slider-colours=153;210;153;20;210;20;255;199;15;245;39;29 - -# Ask for network policy at start (boolean) -qt-privacy-ask=0 - -# Define which screen fullscreen goes (integer) -#qt-fullscreen-screennumber=-1 - -# Load extensions on startup (boolean) -#qt-autoload-extensions=1 - -# Display background cone or art (boolean) -#qt-bgcone=1 - -# Expanding background cone or art. (boolean) -#qt-bgcone-expands=0 - -# Allow automatic icon changes (boolean) -#qt-icon-change=1 - -[ncurses] # Ncurses interface - -# Filebrowser starting point (string) -#browse-dir= - -[visual] # Visualizer filter - -# Effects list (string) -#effect-list=spectrum - -# Video width (integer) -#effect-width=800 - -# Video height (integer) -#effect-height=500 - -# Show 80 bands instead of 20 (boolean) -#visual-80-bands=1 - -# Draw peaks in the analyzer (boolean) -#visual-peaks=1 - -# Enable original graphic spectrum (boolean) -#spect-show-original=0 - -# Draw the base of the bands (boolean) -#spect-show-base=1 - -# Base pixel radius (integer) -#spect-radius=42 - -# Spectral sections (integer) -#spect-sections=3 - -# V-plane color (integer) -#spect-color=80 - -# Draw bands in the spectrometer (boolean) -#spect-show-bands=1 - -# Show 80 bands instead of 20 (boolean) -#spect-80-bands=1 - -# Number of blank pixels between bands. (integer) -#spect-separ=1 - -# Amplification (integer) -#spect-amp=8 - -# Draw peaks in the analyzer (boolean) -#spect-show-peaks=1 - -# Peak extra width (integer) -#spect-peak-width=61 - -# Peak height (integer) -#spect-peak-height=1 - -[gnutls] # GNU TLS transport layer security - -# TLS cipher priorities (string) -#gnutls-priorities=NORMAL - -[vod_rtsp] # RTSP VoD server - -# MUX for RAW RTSP transport (string) -#rtsp-raw-mux=ts - -# Maximum number of connections (integer) -#rtsp-throttle-users=0 - -# Sets the timeout option in the RTSP session string (integer) -#rtsp-session-timeout=5 - -[logger] # File logging - -# Log filename (string) -#logfile= - -# Log format (string) -#logmode=text - -# Syslog facility (string) -#syslog-facility=user - -# Verbosity (integer) -#log-verbose=-1 - -[audioscrobbler] # Submission of played songs to last.fm - -# Username (string) -#lastfm-username= - -# Password (string) -#lastfm-password= - -# Scrobbler URL (string) -#scrobbler-url=post.audioscrobbler.com - -[cdda] # Audio CD input - -# CDDB Server (string) -#cddb-server=freedb.videolan.org - -# CDDB port (integer) -#cddb-port=80 - -[dtv] # Digital Television and Radio - -# DVB adapter (integer) -#dvb-adapter=0 - -# DVB device (integer) -#dvb-device=0 - -# Do not demultiplex (boolean) -#dvb-budget-mode=0 - -# Frequency (Hz) (integer) -#dvb-frequency=0 - -# Spectrum inversion (integer) -#dvb-inversion=-1 - -# Bandwidth (MHz) (integer) -#dvb-bandwidth=0 - -# Transmission mode (integer) -#dvb-transmission=0 - -# Guard interval (string) -#dvb-guard= - -# High-priority code rate (string) -#dvb-code-rate-hp= - -# Low-priority code rate (string) -#dvb-code-rate-lp= - -# Hierarchy mode (integer) -#dvb-hierarchy=-1 - -# Layer A modulation (string) -#dvb-a-modulation= - -# Layer A code rate (string) -#dvb-a-fec= - -# Layer A segments count (integer) -#dvb-a-count=0 - -# Layer A time interleaving (integer) -#dvb-a-interleaving=0 - -# Layer B modulation (string) -#dvb-b-modulation= - -# Layer B code rate (string) -#dvb-b-fec= - -# Layer B segments count (integer) -#dvb-b-count=0 - -# Layer B time interleaving (integer) -#dvb-b-interleaving=0 - -# Layer C modulation (string) -#dvb-c-modulation= - -# Layer C code rate (string) -#dvb-c-fec= - -# Layer C segments count (integer) -#dvb-c-count=0 - -# Layer C time interleaving (integer) -#dvb-c-interleaving=0 - -# Modulation / Constellation (string) -#dvb-modulation= - -# Symbol rate (bauds) (integer) -#dvb-srate=0 - -# FEC code rate (string) -#dvb-fec= - -# Pilot (integer) -#dvb-pilot=-1 - -# Roll-off factor (integer) -#dvb-rolloff=-1 - -# Transport stream ID (integer) -#dvb-ts-id=0 - -# Polarization (Voltage) (string) -#dvb-polarization= - -# (integer) -#dvb-voltage=13 - -# High LNB voltage (boolean) -#dvb-high-voltage=0 - -# Local oscillator low frequency (kHz) (integer) -#dvb-lnb-low=0 - -# Local oscillator high frequency (kHz) (integer) -#dvb-lnb-high=0 - -# Universal LNB switch frequency (kHz) (integer) -#dvb-lnb-switch=11700000 - -# DiSEqC LNB number (integer) -#dvb-satno=0 - -# Continuous 22kHz tone (integer) -#dvb-tone=-1 - -[access_smb] # SMB input - -# SMB user name (string) -#smb-user= - -# SMB password (string) -#smb-pwd= - -# SMB domain (string) -#smb-domain= - -[filesystem] # File input - -# Subdirectory behavior (string) -#recursive=expand - -# Ignored extensions (string) -#ignore-filetypes=m3u,db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa - -[xcb_screen] # Screen capture (with X11/XCB) - -# Frame rate (float) -#screen-fps=2.000000 - -# Region left column (integer) -#screen-left=0 - -# Region top row (integer) -#screen-top=0 - -# Capture region width (integer) -#screen-width=0 - -# Capture region height (integer) -#screen-height=0 - -# Follow the mouse (boolean) -#screen-follow-mouse=0 - -[access_alsa] # ALSA audio capture input - -# Stereo (boolean) -#alsa-stereo=1 - -# Capture format (default s16l) (string) -#alsa-format=s16l - -# Samplerate (integer) -#alsa-samplerate=48000 - -[linsys_sdi] # SDI Input - -# Link # (integer) -#linsys-sdi-link=0 - -# Video ID (integer) -#linsys-sdi-id-video=0 - -# Aspect ratio (string) -#linsys-sdi-aspect-ratio= - -# Audio configuration (string) -#linsys-sdi-audio=0=1,1 - -# Teletext configuration (string) -#linsys-sdi-telx= - -# Teletext language (string) -#linsys-sdi-telx-lang= - -[access_ftp] # FTP input - -# FTP user name (string) -#ftp-user=anonymous - -# FTP password (string) -#ftp-pwd=anonymous@example.com - -# FTP account (string) -#ftp-account=anonymous - -[access_imem] # Memory input - -# ID (integer) -#imem-id=-1 - -# Group (integer) -#imem-group=0 - -# Category (integer) -#imem-cat=0 - -# Codec (string) -#imem-codec= - -# Language (string) -#imem-language= - -# Sample rate (integer) -#imem-samplerate=0 - -# Channels count (integer) -#imem-channels=0 - -# Width (integer) -#imem-width=0 - -# Height (integer) -#imem-height=0 - -# Display aspect ratio (string) -#imem-dar= - -# Frame rate (string) -#imem-fps= - -# Size (integer) -#imem-size=0 - -[access_oss] # OSS input - -# Stereo (boolean) -#oss-stereo=1 - -# Samplerate (integer) -#oss-samplerate=48000 - -[v4l2] # Video4Linux2 input - -# Device (string) -#v4l2-dev=/dev/video0 - -# Standard (string) -#v4l2-standard= - -# Video input chroma format (string) -#v4l2-chroma= - -# Input (integer) -#v4l2-input=0 - -# Audio input (integer) -#v4l2-audio-input=-1 - -# Width (integer) -#v4l2-width=-1 - -# Height (integer) -#v4l2-height=-1 - -# Picture aspect-ratio n:m (string) -#v4l2-aspect-ratio=4:3 - -# Framerate (float) -#v4l2-fps=0.000000 - -# Use libv4l2 (boolean) -#v4l2-use-libv4l2=0 - -# Tuner id (integer) -#v4l2-tuner=0 - -# Frequency (integer) -#v4l2-tuner-frequency=-1 - -# Audio mode (integer) -#v4l2-tuner-audio-mode=-1 - -# Reset controls (boolean) -#v4l2-controls-reset=0 - -# Brightness (integer) -#v4l2-brightness=-1 - -# Automatic brightness (integer) -#v4l2-brightness-auto=-1 - -# Contrast (integer) -#v4l2-contrast=-1 - -# Saturation (integer) -#v4l2-saturation=-1 - -# Hue (integer) -#v4l2-hue=-1 - -# Automatic hue (integer) -#v4l2-hue-auto=-1 - -# White balance temperature (K) (integer) -#v4l2-white-balance-temperature=-1 - -# Automatic white balance (integer) -#v4l2-auto-white-balance=-1 - -# Red balance (integer) -#v4l2-red-balance=-1 - -# Blue balance (integer) -#v4l2-blue-balance=-1 - -# Gamma (integer) -#v4l2-gamma=-1 - -# Automatic gain (integer) -#v4l2-autogain=-1 - -# Gain (integer) -#v4l2-gain=-1 - -# Sharpness (integer) -#v4l2-sharpness=-1 - -# Chroma gain (integer) -#v4l2-chroma-gain=-1 - -# Automatic chroma gain (integer) -#v4l2-chroma-gain-auto=-1 - -# Power line frequency (integer) -#v4l2-power-line-frequency=-1 - -# Backlight compensation (integer) -#v4l2-backlight-compensation=-1 - -# Band-stop filter (integer) -#v4l2-band-stop-filter=-1 - -# Horizontal flip (boolean) -#v4l2-hflip=0 - -# Vertical flip (boolean) -#v4l2-vflip=0 - -# Rotate (degrees) (integer) -#v4l2-rotate=-1 - -# Color killer (integer) -#v4l2-color-killer=-1 - -# Color effect (integer) -#v4l2-color-effect=-1 - -# Audio volume (integer) -#v4l2-audio-volume=-1 - -# Audio balance (integer) -#v4l2-audio-balance=-1 - -# Mute (boolean) -#v4l2-audio-mute=0 - -# Bass level (integer) -#v4l2-audio-bass=-1 - -# Treble level (integer) -#v4l2-audio-treble=-1 - -# Loudness mode (boolean) -#v4l2-audio-loudness=0 - -# v4l2 driver controls (string) -#v4l2-set-ctrls= - -[rtp] # Real-Time Protocol (RTP) input - -# RTCP (local) port (integer) -#rtcp-port=0 - -# SRTP key (hexadecimal) (string) -#srtp-key= - -# SRTP salt (hexadecimal) (string) -#srtp-salt= - -# Maximum RTP sources (integer) -#rtp-max-src=1 - -# RTP source timeout (sec) (integer) -#rtp-timeout=5 - -# Maximum RTP sequence number dropout (integer) -#rtp-max-dropout=3000 - -# Maximum RTP sequence number misordering (integer) -#rtp-max-misorder=100 - -# RTP payload format assumed for dynamic payloads (string) -#rtp-dynamic-pt= - -[access_vdr] # VDR recordings - -# Chapter offset in ms (integer) -#vdr-chapter-offset=0 - -# Frame rate (float) -#vdr-fps=25.000000 - -[access_http] # HTTP input - -# HTTP proxy (string) -#http-proxy= - -# HTTP proxy password (string) -#http-proxy-pwd= - -# HTTP referer value (string) -#http-referrer= - -# User Agent (string) -#http-user-agent= - -# Auto re-connect (boolean) -#http-reconnect=0 - -# Continuous stream (boolean) -#http-continuous=0 - -# Forward Cookies (boolean) -#http-forward-cookies=1 - -[linsys_hdsdi] # HD-SDI Input - -# Link # (integer) -#linsys-hdsdi-link=0 - -# Video ID (integer) -#linsys-hdsdi-id-video=0 - -# Aspect ratio (string) -#linsys-hdsdi-aspect-ratio= - -# Audio configuration (string) -#linsys-hdsdi-audio=0=1,1 - -[dvdnav] # DVDnav Input - -# DVD angle (integer) -#dvdnav-angle=1 - -# Start directly in menu (boolean) -#dvdnav-menu=1 - -[access_jack] # JACK audio input - -# Pace (boolean) -#jack-input-use-vlc-pace=0 - -# Auto Connection (boolean) -#jack-input-auto-connect=0 - -[pvr] # IVTV MPEG Encoding cards input - -# Device (string) -#pvr-device=/dev/video0 - -# Radio device (string) -#pvr-radio-device=/dev/radio0 - -# Norm (integer) -#pvr-norm=0 - -# Width (integer) -#pvr-width=-1 - -# Height (integer) -#pvr-height=-1 - -# Frequency (integer) -#pvr-frequency=-1 - -# Framerate (integer) -#pvr-framerate=-1 - -# Key interval (integer) -#pvr-keyint=-1 - -# Framerate (integer) -#pvr-bframes=-1 - -# Bitrate (integer) -#pvr-bitrate=-1 - -# Bitrate peak (integer) -#pvr-bitrate-peak=-1 - -# Bitrate mode (integer) -#pvr-bitrate-mode=-1 - -# Audio bitmask (integer) -#pvr-audio-bitmask=-1 - -# Volume (integer) -#pvr-audio-volume=-1 - -# Channel (integer) -#pvr-channel=-1 - -[access_shm] # Shared memory framebuffer - -# Frame rate (float) -#shm-fps=10.000000 - -# Frame buffer width (integer) -#shm-width=800 - -# Frame buffer height (integer) -#shm-height=480 - -# Frame buffer depth (integer) -#shm-depth=32 - -[access_mms] # Microsoft Media Server (MMS) input - -# TCP/UDP timeout (ms) (integer) -#mms-timeout=5000 - -# Force selection of all streams (boolean) -#mms-all=0 - -# Maximum bitrate (integer) -#mms-maxbitrate=0 - -# HTTP proxy (string) -#mmsh-proxy= - -[access_udp] # UDP input - -[dvdread] # DVDRead Input (no menu support) - -# DVD angle (integer) -#dvdread-angle=1 - -[libbluray] # Blu-Ray Disc support (libbluray) - -# Bluray menus (boolean) -#bluray-menu=0 - -[lua] # Lua interpreter - -# Lua interface (string) -#lua-intf=dummy - -# Lua interface configuration (string) -#lua-config= - -# Source directory (string) -#http-src= - -# Directory index (boolean) -#http-index=0 - -# TCP command input (string) -#rc-host= - -# CLI input (string) -#cli-host= - -# Host (string) -#telnet-host=localhost - -# Port (integer) -#telnet-port=4212 - -# Password (string) -#telnet-password=admin - -[main] # main program - -# Enable audio (boolean) -#audio=1 - -# Default audio volume (integer) -volume=263 - -# Audio output volume step (integer) -#volume-step=32 - -# High quality audio resampling (boolean) -#hq-resampling=1 - -# Use S/PDIF when available (boolean) -#spdif=0 - -# Force detection of Dolby Surround (integer) -#force-dolby-surround=0 - -# Audio desynchronization compensation (integer) -#audio-desync=0 - -# Replay gain mode (string) -#audio-replay-gain-mode=none - -# Replay preamp (float) -#audio-replay-gain-preamp=0.000000 - -# Default replay gain (float) -#audio-replay-gain-default=-7.000000 - -# Peak protection (boolean) -#audio-replay-gain-peak-protection=1 - -# Enable time stretching audio (boolean) -#audio-time-stretch=1 - -# Audio output module (string) -#aout= - -# Audio filters (string) -#audio-filter= - -# Audio visualizations (string) -#audio-visual= - -# Enable video (boolean) -#video=1 - -# Grayscale video output (boolean) -#grayscale=0 - -# Fullscreen video output (boolean) -#fullscreen=0 - -# Embedded video (boolean) -#embedded-video=1 - -# (boolean) -#xlib=1 - -# Drop late frames (boolean) -#drop-late-frames=1 - -# Skip frames (boolean) -#skip-frames=1 - -# Quiet synchro (boolean) -#quiet-synchro=0 - -# Key press events (boolean) -#keyboard-events=1 - -# Mouse events (boolean) -#mouse-events=1 - -# Overlay video output (boolean) -#overlay=1 - -# Always on top (boolean) -#video-on-top=0 - -# Enable wallpaper mode (boolean) -#video-wallpaper=0 - -# Disable screensaver (boolean) -#disable-screensaver=1 - -# Show media title on video (boolean) -#video-title-show=1 - -# Show video title for x milliseconds (integer) -#video-title-timeout=5000 - -# Position of video title (integer) -#video-title-position=8 - -# Hide cursor and fullscreen controller after x milliseconds (integer) -#mouse-hide-timeout=1000 - -# Video snapshot directory (or filename) (string) -#snapshot-path= - -# Video snapshot file prefix (string) -#snapshot-prefix=vlcsnap- - -# Video snapshot format (string) -#snapshot-format=png - -# Display video snapshot preview (boolean) -#snapshot-preview=1 - -# Use sequential numbers instead of timestamps (boolean) -#snapshot-sequential=0 - -# Video snapshot width (integer) -#snapshot-width=-1 - -# Video snapshot height (integer) -#snapshot-height=-1 - -# Video width (integer) -#width=-1 - -# Video height (integer) -#height=-1 - -# Video X coordinate (integer) -#video-x=0 - -# Video Y coordinate (integer) -#video-y=0 - -# Video cropping (string) -#crop= - -# Custom crop ratios list (string) -#custom-crop-ratios= - -# Source aspect ratio (string) -#aspect-ratio= - -# Video Auto Scaling (boolean) -#autoscale=1 - -# Video scaling factor (float) -#scale=1.000000 - -# Monitor pixel aspect ratio (string) -#monitor-par= - -# Custom aspect ratios list (string) -#custom-aspect-ratios= - -# Fix HDTV height (boolean) -#hdtv-fix=1 - -# Window decorations (boolean) -#video-deco=1 - -# Video title (string) -#video-title= - -# Video alignment (integer) -#align=0 - -# Zoom video (float) -#zoom=1.000000 - -# Deinterlace (integer) -#deinterlace=0 - -# Deinterlace mode (string) -#deinterlace-mode=blend - -# Video output module (string) -#vout= - -# Video filter module (string) -#video-filter= - -# Video splitter module (string) -#video-splitter= - -# Enable sub-pictures (boolean) -#spu=1 - -# On Screen Display (boolean) -#osd=1 - -# Text rendering module (string) -#text-renderer= - -# Use subtitle file (string) -#sub-file= - -# Autodetect subtitle files (boolean) -#sub-autodetect-file=1 - -# Subtitle autodetection fuzziness (integer) -#sub-autodetect-fuzzy=3 - -# Subtitle autodetection paths (string) -#sub-autodetect-path=./Subtitles, ./subtitles, ./Subs, ./subs - -# Force subtitle position (integer) -#sub-margin=0 - -# Subpictures source module (string) -#sub-source= - -# Subpictures filter module (string) -#sub-filter= - -# Program (integer) -#program=0 - -# Programs (string) -#programs= - -# Audio track (integer) -#audio-track=-1 - -# Subtitles track (integer) -#sub-track=-1 - -# Audio language (string) -#audio-language= - -# Subtitle language (string) -#sub-language= - -# Audio track ID (integer) -#audio-track-id=-1 - -# Subtitles track ID (integer) -#sub-track-id=-1 - -# Preferred video resolution (integer) -#preferred-resolution=-1 - -# Input repetitions (integer) -#input-repeat=0 - -# Start time (float) -#start-time=0.000000 - -# Stop time (float) -#stop-time=0.000000 - -# Run time (float) -#run-time=0.000000 - -# Fast seek (boolean) -#input-fast-seek=0 - -# Playback speed (float) -#rate=1.000000 - -# Input list (string) -#input-list= - -# Input slave (experimental) (string) -#input-slave= - -# Bookmarks list for a stream (string) -#bookmarks= - -# DVD device (string) -#dvd=/dev/dvd - -# VCD device (string) -#vcd=/dev/cdrom - -# Audio CD device (string) -#cd-audio=/dev/cdrom - -# MTU of the network interface (integer) -#mtu=1400 - -# TCP connection timeout (integer) -#ipv4-timeout=5000 - -# HTTP server address (string) -#http-host= - -# HTTP server port (integer) -#http-port=8080 - -# HTTPS server port (integer) -#https-port=8443 - -# RTSP server address (string) -#rtsp-host= - -# RTSP server port (integer) -#rtsp-port=554 - -# HTTP/TLS server certificate (string) -#http-cert= - -# HTTP/TLS server private key (string) -#http-key= - -# HTTP/TLS Certificate Authority (string) -#http-ca= - -# HTTP/TLS Certificate Revocation List (string) -#http-crl= - -# SOCKS server (string) -#socks= - -# SOCKS user name (string) -#socks-user= - -# SOCKS password (string) -#socks-pwd= - -# Title metadata (string) -#meta-title= - -# Author metadata (string) -#meta-author= - -# Artist metadata (string) -#meta-artist= - -# Genre metadata (string) -#meta-genre= - -# Copyright metadata (string) -#meta-copyright= - -# Description metadata (string) -#meta-description= - -# Date metadata (string) -#meta-date= - -# URL metadata (string) -#meta-url= - -# File caching (ms) (integer) -#file-caching=300 - -# Live capture caching (ms) (integer) -#live-caching=300 - -# Disc caching (ms) (integer) -#disc-caching=300 - -# Network caching (ms) (integer) -#network-caching=1000 - -# Clock reference average counter (integer) -#cr-average=40 - -# Clock synchronisation (integer) -#clock-synchro=-1 - -# Clock jitter (integer) -#clock-jitter=5000 - -# Network synchronisation (boolean) -#network-synchronisation=0 - -# Record directory or filename (string) -#input-record-path= - -# Prefer native stream recording (boolean) -#input-record-native=1 - -# Timeshift directory (string) -#input-timeshift-path= - -# Timeshift granularity (integer) -#input-timeshift-granularity=-1 - -# Change title according to current media (string) -#input-title-format=$Z - -# Preferred decoders list (string) -#codec= - -# Preferred encoders list (string) -#encoder= - -# Access module (string) -#access= - -# Demux module (string) -#demux= - -# Stream filter module (string) -#stream-filter= - -# Default stream output chain (string) -#sout= - -# Display while streaming (boolean) -#sout-display=0 - -# Keep stream output open (boolean) -#sout-keep=0 - -# Enable streaming of all ES (boolean) -#sout-all=0 - -# Enable audio stream output (boolean) -#sout-audio=1 - -# Enable video stream output (boolean) -#sout-video=1 - -# Enable SPU stream output (boolean) -#sout-spu=1 - -# Stream output muxer caching (ms) (integer) -#sout-mux-caching=1500 - -# VLM configuration file (string) -#vlm-conf= - -# Mux module (string) -#mux= - -# Access output module (string) -#access_output= - -# Hop limit (TTL) (integer) -#ttl=-1 - -# Multicast output interface (string) -#miface= - -# DiffServ Code Point (integer) -#dscp=0 - -# Preferred packetizer list (string) -#packetizer= - -# SAP announcement interval (integer) -#sap-interval=5 - -# Memory copy module (string) -#memcpy= - -# VoD server module (string) -#vod-server= - -# Use a plugins cache (boolean) -#plugins-cache=1 - -# Data search path (string) -#data-path= - -# Allow real-time priority (boolean) -#rt-priority=0 - -# Adjust VLC priority (integer) -#rt-offset=0 - -# Inhibit the power management daemon during playback (boolean) -#inhibit=1 - -# Allow only one running instance (boolean) -#one-instance=0 - -# One instance when started from file (boolean) -#one-instance-when-started-from-file=1 - -# Enqueue items to playlist when in one instance mode (boolean) -#playlist-enqueue=0 - -# Play files randomly forever (boolean) -#random=0 - -# Repeat all (boolean) -#loop=0 - -# Repeat current item (boolean) -#repeat=0 - -# Play and exit (boolean) -#play-and-exit=0 - -# Play and stop (boolean) -#play-and-stop=0 - -# Play and pause (boolean) -#play-and-pause=0 - -# Auto start (boolean) -#playlist-autostart=1 - -# Use media library (boolean) -#media-library=0 - -# Display playlist tree (boolean) -#playlist-tree=0 - -# Default stream (string) -#open= - -# Automatically preparse files (boolean) -#auto-preparse=1 - -# Album art policy (integer) -#album-art=0 - -# Services discovery modules (string) -#services-discovery= - -# Verbosity (0,1,2) (integer) -#verbose=0 - -# Choose which objects should print debug message (string) -#verbose-objects= - -# Be quiet (boolean) -#quiet=0 - -# Run as daemon process (boolean) -#daemon=0 - -# Write process id to file (string) -#pidfile= - -# Log to file (boolean) -#file-logging=0 - -# Log to syslog (boolean) -#syslog=0 - -# Color messages (boolean) -#color=1 - -# Show advanced options (boolean) -#advanced=0 - -# Interface interaction (boolean) -#interact=1 - -# Locally collect statistics (boolean) -#stats=1 - -# Interface module (string) -#intf= - -# Extra interface modules (string) -#extraintf= - -# Control interfaces (string) -#control= - -# Fullscreen (string) -#global-key-toggle-fullscreen= - -# Fullscreen (string) -#key-toggle-fullscreen=f - -# Leave fullscreen (string) -#global-key-leave-fullscreen= - -# Leave fullscreen (string) -#key-leave-fullscreen=Esc - -# Play/Pause (string) -#global-key-play-pause= - -# Play/Pause (string) -#key-play-pause=Space - -# Pause only (string) -#global-key-pause= - -# Pause only (string) -#key-pause= - -# Play only (string) -#global-key-play= - -# Play only (string) -#key-play= - -# Faster (string) -#global-key-faster= - -# Faster (string) -#key-faster=+ - -# Slower (string) -#global-key-slower= - -# Slower (string) -#key-slower=- - -# Normal rate (string) -#global-key-rate-normal= - -# Normal rate (string) -#key-rate-normal== - -# Faster (fine) (string) -#global-key-rate-faster-fine= - -# Faster (fine) (string) -#key-rate-faster-fine=] - -# Slower (fine) (string) -#global-key-rate-slower-fine= - -# Slower (fine) (string) -#key-rate-slower-fine=[ - -# Next (string) -#global-key-next= - -# Next (string) -#key-next=n - -# Previous (string) -#global-key-prev= - -# Previous (string) -#key-prev=p - -# Stop (string) -#global-key-stop= - -# Stop (string) -#key-stop=s - -# Position (string) -#global-key-position= - -# Position (string) -#key-position=t - -# Very short backwards jump (string) -#global-key-jump-extrashort= - -# Very short backwards jump (string) -#key-jump-extrashort=Shift+Left - -# Very short forward jump (string) -#global-key-jump+extrashort= - -# Very short forward jump (string) -#key-jump+extrashort=Shift+Right - -# Short backwards jump (string) -#global-key-jump-short= - -# Short backwards jump (string) -#key-jump-short=Alt+Left - -# Short forward jump (string) -#global-key-jump+short= - -# Short forward jump (string) -#key-jump+short=Alt+Right - -# Medium backwards jump (string) -#global-key-jump-medium= - -# Medium backwards jump (string) -#key-jump-medium=Ctrl+Left - -# Medium forward jump (string) -#global-key-jump+medium= - -# Medium forward jump (string) -#key-jump+medium=Ctrl+Right - -# Long backwards jump (string) -#global-key-jump-long= - -# Long backwards jump (string) -#key-jump-long=Ctrl+Alt+Left - -# Long forward jump (string) -#global-key-jump+long= - -# Long forward jump (string) -#key-jump+long=Ctrl+Alt+Right - -# Next frame (string) -#global-key-frame-next= - -# Next frame (string) -#key-frame-next=e - -# Activate (string) -#global-key-nav-activate= - -# Activate (string) -#key-nav-activate=Enter - -# Navigate up (string) -#global-key-nav-up= - -# Navigate up (string) -#key-nav-up=Up - -# Navigate down (string) -#global-key-nav-down= - -# Navigate down (string) -#key-nav-down=Down - -# Navigate left (string) -#global-key-nav-left= - -# Navigate left (string) -#key-nav-left=Left - -# Navigate right (string) -#global-key-nav-right= - -# Navigate right (string) -#key-nav-right=Right - -# Go to the DVD menu (string) -#global-key-disc-menu= - -# Go to the DVD menu (string) -#key-disc-menu=Shift+m - -# Select previous DVD title (string) -#global-key-title-prev= - -# Select previous DVD title (string) -#key-title-prev=Shift+o - -# Select next DVD title (string) -#global-key-title-next= - -# Select next DVD title (string) -#key-title-next=Shift+b - -# Select prev DVD chapter (string) -#global-key-chapter-prev= - -# Select prev DVD chapter (string) -#key-chapter-prev=Shift+p - -# Select next DVD chapter (string) -#global-key-chapter-next= - -# Select next DVD chapter (string) -#key-chapter-next=Shift+n - -# Quit (string) -#global-key-quit= - -# Quit (string) -#key-quit=Ctrl+q - -# Volume up (string) -#global-key-vol-up= - -# Volume up (string) -#key-vol-up=Ctrl+Up - -# Volume down (string) -#global-key-vol-down= - -# Volume down (string) -#key-vol-down=Ctrl+Down - -# Mute (string) -#global-key-vol-mute= - -# Mute (string) -#key-vol-mute=m - -# Subtitle delay up (string) -#global-key-subdelay-up= - -# Subtitle delay up (string) -#key-subdelay-up=h - -# Subtitle delay down (string) -#global-key-subdelay-down= - -# Subtitle delay down (string) -#key-subdelay-down=g - -# Subtitle position up (string) -#global-key-subpos-up= - -# Subtitle position up (string) -#key-subpos-up= - -# Subtitle position down (string) -#global-key-subpos-down= - -# Subtitle position down (string) -#key-subpos-down= - -# Audio delay up (string) -#global-key-audiodelay-up= - -# Audio delay up (string) -#key-audiodelay-up=k - -# Audio delay down (string) -#global-key-audiodelay-down= - -# Audio delay down (string) -#key-audiodelay-down=j - -# Cycle audio track (string) -#global-key-audio-track= - -# Cycle audio track (string) -#key-audio-track=b - -# Cycle through audio devices (string) -#global-key-audiodevice-cycle= - -# Cycle through audio devices (string) -#key-audiodevice-cycle=Shift+a - -# Cycle subtitle track (string) -#global-key-subtitle-track= - -# Cycle subtitle track (string) -#key-subtitle-track=v - -# Cycle source aspect ratio (string) -#global-key-aspect-ratio= - -# Cycle source aspect ratio (string) -#key-aspect-ratio=a - -# Cycle video crop (string) -#global-key-crop= - -# Cycle video crop (string) -#key-crop=c - -# Toggle autoscaling (string) -#global-key-toggle-autoscale= - -# Toggle autoscaling (string) -#key-toggle-autoscale=o - -# Increase scale factor (string) -#global-key-incr-scalefactor= - -# Increase scale factor (string) -#key-incr-scalefactor=Alt+o - -# Decrease scale factor (string) -#global-key-decr-scalefactor= - -# Decrease scale factor (string) -#key-decr-scalefactor=Alt+Shift+o - -# Cycle deinterlace modes (string) -#global-key-deinterlace= - -# Cycle deinterlace modes (string) -#key-deinterlace=d - -# Show controller in fullscreen (string) -#global-key-intf-show= - -# Show controller in fullscreen (string) -#key-intf-show=i - -# Boss key (string) -#global-key-intf-boss= - -# Boss key (string) -#key-intf-boss= - -# Take video snapshot (string) -#global-key-snapshot= - -# Take video snapshot (string) -#key-snapshot=Shift+s - -# Record (string) -#global-key-record= - -# Record (string) -#key-record=Shift+r - -# Zoom (string) -#global-key-zoom= - -# Zoom (string) -#key-zoom=z - -# Un-Zoom (string) -#global-key-unzoom= - -# Un-Zoom (string) -#key-unzoom=Shift+z - -# Toggle wallpaper mode in video output (string) -#global-key-wallpaper= - -# Toggle wallpaper mode in video output (string) -#key-wallpaper=w - -# Display OSD menu on top of video output (string) -#global-key-menu-on= - -# Display OSD menu on top of video output (string) -#key-menu-on=Alt+Shift+m - -# Do not display OSD menu on video output (string) -#global-key-menu-off= - -# Do not display OSD menu on video output (string) -#key-menu-off=Ctrl+Alt+m - -# Highlight widget on the right (string) -#global-key-menu-right= - -# Highlight widget on the right (string) -#key-menu-right=Alt+Shift+Right - -# Highlight widget on the left (string) -#global-key-menu-left= - -# Highlight widget on the left (string) -#key-menu-left=Alt+Shift+Left - -# Highlight widget on top (string) -#global-key-menu-up= - -# Highlight widget on top (string) -#key-menu-up=Alt+Shift+Up - -# Highlight widget below (string) -#global-key-menu-down= - -# Highlight widget below (string) -#key-menu-down=Alt+Shift+Down - -# Select current widget (string) -#global-key-menu-select= - -# Select current widget (string) -#key-menu-select=Alt+Shift+Enter - -# Crop one pixel from the top of the video (string) -#global-key-crop-top= - -# Crop one pixel from the top of the video (string) -#key-crop-top=Alt+r - -# Uncrop one pixel from the top of the video (string) -#global-key-uncrop-top= - -# Uncrop one pixel from the top of the video (string) -#key-uncrop-top=Alt+Shift+r - -# Crop one pixel from the left of the video (string) -#global-key-crop-left= - -# Crop one pixel from the left of the video (string) -#key-crop-left=Alt+d - -# Uncrop one pixel from the left of the video (string) -#global-key-uncrop-left= - -# Uncrop one pixel from the left of the video (string) -#key-uncrop-left=Alt+Shift+d - -# Crop one pixel from the bottom of the video (string) -#global-key-crop-bottom= - -# Crop one pixel from the bottom of the video (string) -#key-crop-bottom=Alt+c - -# Uncrop one pixel from the bottom of the video (string) -#global-key-uncrop-bottom= - -# Uncrop one pixel from the bottom of the video (string) -#key-uncrop-bottom=Alt+Shift+c - -# Crop one pixel from the right of the video (string) -#global-key-crop-right= - -# Crop one pixel from the right of the video (string) -#key-crop-right=Alt+f - -# Uncrop one pixel from the right of the video (string) -#global-key-uncrop-right= - -# Uncrop one pixel from the right of the video (string) -#key-uncrop-right=Alt+Shift+f - -# Random (string) -#global-key-random= - -# Random (string) -#key-random=r - -# Normal/Repeat/Loop (string) -#global-key-loop= - -# Normal/Repeat/Loop (string) -#key-loop=l - -# 1:4 Quarter (string) -#global-key-zoom-quarter= - -# 1:4 Quarter (string) -#key-zoom-quarter=Alt+1 - -# 1:2 Half (string) -#global-key-zoom-half= - -# 1:2 Half (string) -#key-zoom-half=Alt+2 - -# 1:1 Original (string) -#global-key-zoom-original= - -# 1:1 Original (string) -#key-zoom-original=Alt+3 - -# 2:1 Double (string) -#global-key-zoom-double= - -# 2:1 Double (string) -#key-zoom-double=Alt+4 - -# Very short jump length (integer) -#extrashort-jump-size=3 - -# Short jump length (integer) -#short-jump-size=10 - -# Medium jump length (integer) -#medium-jump-size=60 - -# Long jump length (integer) -#long-jump-size=300 - -# Set playlist bookmark 1 (string) -#global-key-set-bookmark1= - -# Set playlist bookmark 1 (string) -#key-set-bookmark1=Ctrl+F1 - -# Set playlist bookmark 2 (string) -#global-key-set-bookmark2= - -# Set playlist bookmark 2 (string) -#key-set-bookmark2=Ctrl+F2 - -# Set playlist bookmark 3 (string) -#global-key-set-bookmark3= - -# Set playlist bookmark 3 (string) -#key-set-bookmark3=Ctrl+F3 - -# Set playlist bookmark 4 (string) -#global-key-set-bookmark4= - -# Set playlist bookmark 4 (string) -#key-set-bookmark4=Ctrl+F4 - -# Set playlist bookmark 5 (string) -#global-key-set-bookmark5= - -# Set playlist bookmark 5 (string) -#key-set-bookmark5=Ctrl+F5 - -# Set playlist bookmark 6 (string) -#global-key-set-bookmark6= - -# Set playlist bookmark 6 (string) -#key-set-bookmark6=Ctrl+F6 - -# Set playlist bookmark 7 (string) -#global-key-set-bookmark7= - -# Set playlist bookmark 7 (string) -#key-set-bookmark7=Ctrl+F7 - -# Set playlist bookmark 8 (string) -#global-key-set-bookmark8= - -# Set playlist bookmark 8 (string) -#key-set-bookmark8=Ctrl+F8 - -# Set playlist bookmark 9 (string) -#global-key-set-bookmark9= - -# Set playlist bookmark 9 (string) -#key-set-bookmark9=Ctrl+F9 - -# Set playlist bookmark 10 (string) -#global-key-set-bookmark10= - -# Set playlist bookmark 10 (string) -#key-set-bookmark10=Ctrl+F10 - -# Play playlist bookmark 1 (string) -#global-key-play-bookmark1= - -# Play playlist bookmark 1 (string) -#key-play-bookmark1=F1 - -# Play playlist bookmark 2 (string) -#global-key-play-bookmark2= - -# Play playlist bookmark 2 (string) -#key-play-bookmark2=F2 - -# Play playlist bookmark 3 (string) -#global-key-play-bookmark3= - -# Play playlist bookmark 3 (string) -#key-play-bookmark3=F3 - -# Play playlist bookmark 4 (string) -#global-key-play-bookmark4= - -# Play playlist bookmark 4 (string) -#key-play-bookmark4=F4 - -# Play playlist bookmark 5 (string) -#global-key-play-bookmark5= - -# Play playlist bookmark 5 (string) -#key-play-bookmark5=F5 - -# Play playlist bookmark 6 (string) -#global-key-play-bookmark6= - -# Play playlist bookmark 6 (string) -#key-play-bookmark6=F6 - -# Play playlist bookmark 7 (string) -#global-key-play-bookmark7= - -# Play playlist bookmark 7 (string) -#key-play-bookmark7=F7 - -# Play playlist bookmark 8 (string) -#global-key-play-bookmark8= - -# Play playlist bookmark 8 (string) -#key-play-bookmark8=F8 - -# Play playlist bookmark 9 (string) -#global-key-play-bookmark9= - -# Play playlist bookmark 9 (string) -#key-play-bookmark9=F9 - -# Play playlist bookmark 10 (string) -#global-key-play-bookmark10= - -# Play playlist bookmark 10 (string) -#key-play-bookmark10=F10 - -# Playlist bookmark 1 (string) -#bookmark1= - -# Playlist bookmark 2 (string) -#bookmark2= - -# Playlist bookmark 3 (string) -#bookmark3= - -# Playlist bookmark 4 (string) -#bookmark4= - -# Playlist bookmark 5 (string) -#bookmark5= - -# Playlist bookmark 6 (string) -#bookmark6= - -# Playlist bookmark 7 (string) -#bookmark7= - -# Playlist bookmark 8 (string) -#bookmark8= - -# Playlist bookmark 9 (string) -#bookmark9= - -# Playlist bookmark 10 (string) -#bookmark10= - diff --git a/.git.info.exclude b/.git.info.exclude index a2d075e..d9080bd 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -101,7 +101,7 @@ lock # Ignore these files for no good reason .bogofilter .config/Trolltech.conf -.config/vlc/vlc-qt-interface.conf +.config/vlc .gem .offlineimap .prefix -- cgit v1.1-4-g5e80 From dcd02f4498b97a4a5d4dfce975142d8f98bfd892 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 16 Sep 2012 21:54:14 -0400 Subject: .git.info.exclude: better sollution than the !.*/*/*/* crap --- .git.info.exclude | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.git.info.exclude b/.git.info.exclude index d9080bd..1c3e168 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -1,19 +1,8 @@ # Defualt to ignoring all files -* +/* # Except dotfiles !.* -!.*/* -!.*/*/* -!.*/*/*/* -!.*/*/*/*/* -!.*/*/*/*/*/* -!.*/*/*/*/*/*/* -!.*/*/*/*/*/*/*/* -!.*/*/*/*/*/*/*/*/* -!.*/*/*/*/*/*/*/*/*/* -!.*/*/*/*/*/*/*/*/*/*/* -!.*/*/*/*/*/*/*/*/*/*/*/* # Or Makefile !Makefile -- cgit v1.1-4-g5e80 From ce72763de93a1cd6e607d570b0f64c3afdf8e634 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 19 Sep 2012 09:53:17 -0400 Subject: .profile: use `uname -m` instead of `arch` --- .profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.profile b/.profile index 235d190..c2fbf49 100644 --- a/.profile +++ b/.profile @@ -9,7 +9,7 @@ umask 022 ## Paths ############################################################# # Unix -bins=$(echo $HOME/bin $HOME/.local.`arch`/bin $HOME/.local/bin $HOME/.prefix.`arch`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) +bins=$(echo $HOME/bin $HOME/.local.`uname -m`/bin $HOME/.local/bin $HOME/.prefix.`uname -m`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) for dir in $bins; do if [ -d "$dir" ]; then export PATH="$dir:$PATH" -- cgit v1.1-4-g5e80 From 1557b290b98286d8c44ea066b64cc0910eecc0f7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 24 Sep 2012 13:24:08 -0400 Subject: .profile: only set java.io.tmpdir if $TMPDIR is set --- .profile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.profile b/.profile index c2fbf49..2e2e1d0 100644 --- a/.profile +++ b/.profile @@ -42,7 +42,9 @@ _JAVA_OPTIONS='' _JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on' _JAVA_OPTIONS+=' -Dswing.aatext=true' _JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' -_JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" +if [ -n "$TMPDIR" ]; then + _JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" +fi export _JAVA_OPTIONS # ALSA -- cgit v1.1-4-g5e80 From 34a6c23f99988a75729b04880824b8d79d1391a2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:20:24 -0400 Subject: Use XDG for bash, remove alsa, clean up bash & profile, add CACHEDIR.TAG .profile: fix up --- .bash.d/emacs.sh | 8 --- .bash_aliases | 66 ------------------------- .bash_login | 1 + .bash_logout | 10 +--- .bashrc | 121 +-------------------------------------------- .config/bash/aliases.sh | 59 ++++++++++++++++++++++ .config/bash/login.sh | 9 ++++ .config/bash/logout.sh | 9 ++++ .config/bash/rc.d/emacs.sh | 8 +++ .config/bash/rc.sh | 80 ++++++++++++++++++++++++++++++ .git.info.exclude | 107 --------------------------------------- .git.info.exclude.in | 108 ++++++++++++++++++++++++++++++++++++++++ .login-daemons | 10 ---- .profile | 74 ++++++++++++++------------- Makefile | 9 ++-- 15 files changed, 319 insertions(+), 360 deletions(-) delete mode 100644 .bash.d/emacs.sh delete mode 100644 .bash_aliases create mode 120000 .bash_login mode change 100644 => 120000 .bash_logout mode change 100644 => 120000 .bashrc create mode 100644 .config/bash/aliases.sh create mode 100644 .config/bash/login.sh create mode 100644 .config/bash/logout.sh create mode 100644 .config/bash/rc.d/emacs.sh create mode 100644 .config/bash/rc.sh delete mode 100644 .git.info.exclude create mode 100644 .git.info.exclude.in delete mode 100644 .login-daemons diff --git a/.bash.d/emacs.sh b/.bash.d/emacs.sh deleted file mode 100644 index f484bbb..0000000 --- a/.bash.d/emacs.sh +++ /dev/null @@ -1,8 +0,0 @@ -case "$TERM" in - eterm*) - SELECTED_EDITOR='emacsclient' - EDITOR=$SELECTED_EDITOR - VISUAL=$SELECTED_EDITOR - export SELECTED_EDITOR EDITOR VISUAL - :;; -esac diff --git a/.bash_aliases b/.bash_aliases deleted file mode 100644 index de1a321..0000000 --- a/.bash_aliases +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# The above line probably should never be *used* in this file, but it -# lets text editors know that this is BASH syntax. - -###################################################################### -# Set up colors and settings for ls/dir/vdir # -###################################################################### -if [ -x "`which dircolors`" ]; then - eval "`dircolors -b`" - alias ls='ls -1v --color=auto' - alias dir='dir -v --color=auto' - alias vdir='vdir -v--color=auto' - - for xgrep in ${PATH//:/\/*grep }/*grep; do - if [ -f "$xgrep" ]; then - xgrep=`basename "$xgrep"` - if [ "$xgrep" != pgrep ]; then - alias $xgrep="$xgrep --color=auto" - fi - fi - done -else - alias ls='ls -1v' - alias dir='dir -v' - alias vdir='vdir -v' -fi - -###################################################################### -# Set up the standard aliases for ls # -###################################################################### -alias ll='ls -l' -alias la='ls -a' -alias l='ls -CF' - -###################################################################### -# Some preferences for miscellaneous stuff # -###################################################################### -#alias rm='gvfs-trash' -alias ssh='ssh -XC' -alias sed='sed --follow-symlinks' -alias tree='tree --charset utf8' -alias cd=pushd -alias gitk='gitk --all --date-order' - -###################################################################### -# Remember lat/long for redshift # -###################################################################### -redshift='redshift -l39.9030:85.9979' -alias gtk-redshift="gtk-$redshift" -alias redshift="$redshift" - -###################################################################### -# Some almost-function aliases # -###################################################################### -#alias serva='ssh luke@servb.ath.cx -p3440' -#alias phpdoctor='php /usr/gnu/www/0-other/phpdoctor-head/phpdoc.php' -function xterm-title () { echo "];$@"; } # Oh, wait this one *is* a function -alias lock="clear; away -C 'This terminal is locked'" -alias plock="xterm-title Terminal Locked;lock" - -###################################################################### -# Other # -###################################################################### -case "$TERM" in - eterm*) alias editor='editor -n';; -esac diff --git a/.bash_login b/.bash_login new file mode 120000 index 0000000..31231da --- /dev/null +++ b/.bash_login @@ -0,0 +1 @@ +.config/bash/login.sh \ No newline at end of file diff --git a/.bash_logout b/.bash_logout deleted file mode 100644 index a8b88c1..0000000 --- a/.bash_logout +++ /dev/null @@ -1,9 +0,0 @@ -# ~/.bash_logout: executed by bash(1) when login shell exits. - -# when leaving the console clear the screen to increase privacy - -if [ "$SHLVL" = 1 ]; then - [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q -fi - -make -C "$HOME" diff --git a/.bash_logout b/.bash_logout new file mode 120000 index 0000000..d8117ff --- /dev/null +++ b/.bash_logout @@ -0,0 +1 @@ +.config/bash/logout.sh \ No newline at end of file diff --git a/.bashrc b/.bashrc deleted file mode 100644 index ff11c5b..0000000 --- a/.bashrc +++ /dev/null @@ -1,120 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# I include this file for all interactive invocations of bash(1), whether -# they are login shells or not. - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -# don't overwrite GNU Midnight Commander's setting of `ignorespace'. -export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups -# ... or force ignoredups and ignorespace -export HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# Let ** recursively scan directories -shopt -s globstar - -# Why is this not on by default? -# "We have a cached value, but it isn't valid anymore. Should we trash it?" -shopt -s checkhash - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -case "$TERM" in - xterm) export TERM=xterm-256color;; -esac - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - linux) color_prompt=yes;; - *-*color*) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\n\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\n\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# Include modular config files -if [ -d ~/.bash.d ]; then - for file in ~/.bash.d/*.sh; do - . $file; - done -fi - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion -fi - -if [ -f "$HOME/.login-daemons" ]; then - . "$HOME/.login-daemons" -fi - -if [ -f "${HOME}/.gnupg/agent-info" ]; then - . "${HOME}/.gnupg/agent-info" - export GPG_AGENT_INFO - #export SSH_AUTH_SOCK -fi - -export PERL_LOCAL_LIB_ROOT="/home/luke/perl5"; -export PERL_MB_OPT="--install_base /home/luke/perl5"; -export PERL_MM_OPT="INSTALL_BASE=/home/luke/perl5"; -export PERL5LIB="/home/luke/perl5/lib/perl5/i686-linux-thread-multi:/home/luke/perl5/lib/perl5"; -export PATH="/home/luke/perl5/bin:$PATH"; diff --git a/.bashrc b/.bashrc new file mode 120000 index 0000000..18faac1 --- /dev/null +++ b/.bashrc @@ -0,0 +1 @@ +.config/bash/rc.sh \ No newline at end of file diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh new file mode 100644 index 0000000..8241b95 --- /dev/null +++ b/.config/bash/aliases.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# The above line probably should never be *used* in this file, but it +# lets text editors know that this is BASH syntax. + +###################################################################### +# Set up colors and settings for ls/dir/vdir # +###################################################################### +if [ -x "`which dircolors`" ]; then + eval "`dircolors -b`" + alias ls='ls -1v --color=auto' + alias dir='dir -v --color=auto' + alias vdir='vdir -v--color=auto' + + for xgrep in ${PATH//:/\/*grep }/*grep; do + if [ -f "$xgrep" ]; then + xgrep=`basename "$xgrep"` + if [ "$xgrep" != pgrep ]; then + alias $xgrep="$xgrep --color=auto" + fi + fi + done +else + alias ls='ls -1v' + alias dir='dir -v' + alias vdir='vdir -v' +fi + +###################################################################### +# Set up the standard aliases for ls # +###################################################################### +alias ll='ls -l' +alias la='ls -a' +alias l='ls -CF' + +###################################################################### +# Some preferences for miscellaneous stuff # +###################################################################### +#alias rm='gvfs-trash' +alias ssh='ssh -XC' +alias sed='sed --follow-symlinks' +alias tree='tree --charset utf8' +alias cd=pushd +alias gitk='gitk --all --date-order' + +###################################################################### +# Remember lat/long for redshift # +###################################################################### +redshift='redshift -l39.9030:85.9979' +alias gtk-redshift="gtk-$redshift" +alias redshift="$redshift" +unset redshift + +###################################################################### +# Some almost-function aliases # +###################################################################### +xterm-title() { echo "];$@"; } # Oh, wait this one *is* a function +alias lock="clear; away -C 'This terminal is locked'" +alias plock="xterm-title Terminal Locked;lock" +mvln() { mv $1 $2; ln -s $2 $1; } diff --git a/.config/bash/login.sh b/.config/bash/login.sh new file mode 100644 index 0000000..1269a03 --- /dev/null +++ b/.config/bash/login.sh @@ -0,0 +1,9 @@ +# ~/.bash_login: executed by bash(1) when login shell starts. + +# I think this is sane default behavior + +# Load user settings +. "$HOME/.profile" + +# Load bash settings (automatic for non-login shells) +. "$HOME/.bashrc" diff --git a/.config/bash/logout.sh b/.config/bash/logout.sh new file mode 100644 index 0000000..a8b88c1 --- /dev/null +++ b/.config/bash/logout.sh @@ -0,0 +1,9 @@ +# ~/.bash_logout: executed by bash(1) when login shell exits. + +# when leaving the console clear the screen to increase privacy + +if [ "$SHLVL" = 1 ]; then + [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q +fi + +make -C "$HOME" diff --git a/.config/bash/rc.d/emacs.sh b/.config/bash/rc.d/emacs.sh new file mode 100644 index 0000000..f484bbb --- /dev/null +++ b/.config/bash/rc.d/emacs.sh @@ -0,0 +1,8 @@ +case "$TERM" in + eterm*) + SELECTED_EDITOR='emacsclient' + EDITOR=$SELECTED_EDITOR + VISUAL=$SELECTED_EDITOR + export SELECTED_EDITOR EDITOR VISUAL + :;; +esac diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh new file mode 100644 index 0000000..ed55f75 --- /dev/null +++ b/.config/bash/rc.sh @@ -0,0 +1,80 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# I include this file for all interactive invocations of bash(1), whether +# they are login shells or not. + +# If not running interactively, don't do anything +[ -z "$PS1" ] && return + +# don't put duplicate lines in the history. See bash(1) for more options +export HISTCONTROL=ignoredups +export HISTFILE=${XDG_CACHE_HOME}/bash/history +export HISTTIMEFORMAT='[%Y-%m-%d %H:%M] ' +shopt -s histappend # append to the history file, don't overwrite it + +shopt -s checkwinsize # update the values of LINES and COLUMNS +shopt -s globstar # Let ** recursively scan directories + +# Why is this not on by default? +# "We have a cached value, but it isn't valid anymore. Should we trash it?" +shopt -s checkhash + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x "`which lesspipe 2>/dev/null`" ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +make_prompt() { + local RESET='' + local BOLD='' + local GREEN='' + local BLUE='' + if $1; then + RESET="$(tput sgr0)" + BOLD="$(tput bold)" + GREEN="$(tput setaf 2)" + BLUE="$(tput setaf 4)" + fi + local CHROOT='${debian_chroot:+($debian_chroot)}' + echo "${RESET}${BOLD}${CHROOT}${GREEN}"'\u@\h'"${RESET}:${BOLD}${BLUE}"'\w'"${RESET}" +} + +if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + PS1="$(make_prompt true )"'\n\$ ' +else + PS1="$(make_prompt false)"'\n\$ ' +fi + +# If this is an xterm set the title to user@host:dir +case "$TERM" in + xterm*|rxvt*) + PS1="\[\e]0;$(make_prompt false)\a\]$PS1";; +esac + +unset make_prompt + +# Include modular config files +if [ -d "${XDG_CONFIG_HOME}/rc.d" ]; then + for file in "${XDG_CONFIG_HOME}/rc.d"/*.sh; do + . "$file" + done +fi + +if [ -f ${XDG_CONFIG_HOME}/bash/aliases.sh ]; then + . ${XDG_CONFIG_HOME}/bash/aliases.sh +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if [ -f /etc/bash_completion ]; then + . /etc/bash_completion +fi diff --git a/.git.info.exclude b/.git.info.exclude deleted file mode 100644 index 871ebf6..0000000 --- a/.git.info.exclude +++ /dev/null @@ -1,107 +0,0 @@ -# Defualt to ignoring all files -/* - -# Except dotfiles -!.* - -# Or Makefile -!Makefile - -# Ignore these for privacy -.ssh/* -!.ssh/config -.gnupg/* -!.gnupg/gpg.conf -.netrc - -# Ignore temp/log/history files -*.log -log* - -*.tmp -*.tmp.* -tmp.* -tmp-* -tmp - -*_history -*_hist -history.* -history - -*.lock -.~lock.*# -lock - -*.state -*.cookie -*.bak - -*authority -*cache* - -# Ignore files left by editors -*~ -.#* -\#*# - - -# Ignore these special-purpose cache/temp files -.camel_certs -.compiz/session/* -.config/chromium/Default/History\ Index* -.current.asound -.dbus/session-bus/* -.ddd/sessions -.dvdcss -.esd_auth -.evolution/.* -.gconfd/saved_state -.gnash-media -.gnash/SharedObjects/* -.kde/share/apps/RecentDocuments/* -.kde/socket-* -.kde4/share/apps/RecentDocuments/* -.kde4/share/apps/okular/docdata/* -.kde4/socket-* -.lesshst -.link*/*.his -.local/share/Trash/* -.local/share/gvfs-metadata/* -.local/share/icons/* -.local/share/recently-used.xbel -.pki -.pulse -.pulse-cookie -.recently-used -.recently-used.xbel* -.setroubleshoot -.shotwell/thumbs/* -.sudo_as_admin_successful -.thumbnails/* -.wireshark/recent* -.xsession-errors* - -# Ignore files that are autogenerated -.folders -.nanorc -.config/libretools/blacklist.txt - -# Ignore these files for no good reason -.bogofilter -.config/Trolltech.conf -.config/vlc -.gem -.offlineimap -.prefix -.prefix.* -.terminfo -.wine* - -# Ignore these files that if I tracked them, would be a separate repo -.config/chromium -.config/libreoffice -.config/transmission -.eclipse -.mozilla -.netbeans diff --git a/.git.info.exclude.in b/.git.info.exclude.in new file mode 100644 index 0000000..37c1ee4 --- /dev/null +++ b/.git.info.exclude.in @@ -0,0 +1,108 @@ +# Defualt to ignoring all files +/* + +# Except dotfiles +!.* + +# Or Makefile +!Makefile + +# Ignore these for privacy +.ssh/* +!.ssh/config +.gnupg/* +!.gnupg/gpg.conf +.netrc + +# Ignore temp/log/history files +*.log +log.* + +*.tmp +*.tmp.* +tmp.* +tmp-* +tmp + +*_history +*_hist +history.* +history + +*.lock +.~lock.*# +lock + +*.state +*.cookie +*.bak + +*authority +*cache* + +# Ignore files left by editors +*~ +.#* +\#*# + + +# Ignore these special-purpose cache/temp files +.camel_certs +.compiz/session/* +.config/chromium/Default/History\ Index* +.current.asound +.dbus/session-bus/* +.ddd/sessions +.dvdcss +.esd_auth +.evolution/.* +.gconfd/saved_state +.gnash-media +.gnash/SharedObjects/* +.kde/share/apps/RecentDocuments/* +.kde/socket-* +.kde4/share/apps/RecentDocuments/* +.kde4/share/apps/okular/docdata/* +.kde4/socket-* +.lesshst +.link*/*.his +.local/share/Trash/* +.local/share/gvfs-metadata/* +.local/share/icons/* +.local/share/recently-used.xbel +.pki +.pulse +.pulse-cookie +.recently-used +.recently-used.xbel* +.setroubleshoot +.shotwell/thumbs/* +.sudo_as_admin_successful +.thumbnails/* +.wireshark/recent* +.xsession-errors* + +# Ignore files that are autogenerated +.config/libretools/blacklist.txt +.folders +.git.info.exclude +.nanorc + +# Ignore these files for no good reason +.bogofilter +.config/Trolltech.conf +.config/vlc +.gem +.offlineimap +.prefix +.prefix.* +.terminfo +.wine* + +# Ignore these files that if I tracked them, would be a separate repo +.config/chromium +.config/libreoffice +.config/transmission +.eclipse +.mozilla +.netbeans diff --git a/.login-daemons b/.login-daemons deleted file mode 100644 index bf8cf21..0000000 --- a/.login-daemons +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if [ -x "`which daemon`" ]; then - daemon maildirproc - daemon gpg-agent --daemon --write-env-file "${HOME}/.gnupg/agent-info" - daemon batterymon 20 " - alsactl restore --file $HOME/.full.asound; - espeak 'PLUG ME IN'; - sleep .2;" -fi diff --git a/.profile b/.profile index 2e2e1d0..a6c4d91 100644 --- a/.profile +++ b/.profile @@ -1,4 +1,8 @@ # ~/.profile: executed by the command interpreter for login shells. +# Should be whether logging in graphically or not. +# +# This file should be executable by /bin/sh, but I'm going to assume bash(1) +# # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login # exists. @@ -9,33 +13,44 @@ umask 022 ## Paths ############################################################# # Unix -bins=$(echo $HOME/bin $HOME/.local.`uname -m`/bin $HOME/.local/bin $HOME/.prefix.`uname -m`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) -for dir in $bins; do - if [ -d "$dir" ]; then - export PATH="$dir:$PATH" - fi +bins=($HOME/bin $HOME/.local.`uname -m`/bin $HOME/.local/bin $HOME/.prefix.`uname -m`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin) +for dir in "${bins[@]}"; do + if [ -d "$dir" ]; then + export PATH="$dir:$PATH" + fi done # Ruby for dir in $HOME/.prefix/lib; do - if [ -d "$dir" ]; then - export RUBYLIB="$dir" - fi + if [ -d "$dir" ]; then + export RUBYLIB="$dir" + fi done # Settings ########################################################### # Text editor if [ -f "$HOME/.selected_editor" ]; then - . "$HOME/.selected_editor" - export SELECTED_EDITOR - export ALTERNATE_EDITOR - export EDITOR="${EDITOR:-$SELECTED_EDITOR}" - export VISUAL="${VISUAL:-$SELECTED_EDITOR}" + . "$HOME/.selected_editor" + export SELECTED_EDITOR + export ALTERNATE_EDITOR + export EDITOR="${EDITOR:-$SELECTED_EDITOR}" + export VISUAL="${VISUAL:-$SELECTED_EDITOR}" fi # GPG -export GPGKEY=D4FFBFC9 +if [ -z "$GPGKEY" ] && [ -f "${HOME}/.gnupg/gpg.conf" ]; then + export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` +fi +if [ -z "$(pgrep -u `whoami` gpg-agent)" ]; then + mkdir -p ${XDG_RUNTIME_DIR}/sessions/gpg + gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" +fi +if [ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]; then + . "${XDG_RUNTIME_DIR}/sessions/gpg" + export GPG_AGENT_INFO + #export SSH_AUTH_SOCK +fi # Java _JAVA_OPTIONS='' @@ -43,36 +58,27 @@ _JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on' _JAVA_OPTIONS+=' -Dswing.aatext=true' _JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' if [ -n "$TMPDIR" ]; then - _JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" + _JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" fi export _JAVA_OPTIONS -# ALSA -if [ -x "`which alsactl 2>/dev/null`" ]; then - alsactl restore "$HOME/.current.asound" &> /dev/null || true -fi - # X11 if [ -z "$XAUTHORITY" ]; then - export XAUTHORITY=$HOME/.Xauthority + export XAUTHORITY=$HOME/.Xauthority fi # D-Bus if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `dbus-launch` - export DBUS_SESSION_BUS_ADDRESS - export DBUS_SESSION_BUS_PID -fi + # I want a separate instance for each login + #dbus-launch > "${HOME}/.cache/sessions/dbus" + #. "${HOME}/.cache/sessions/dbus" + eval `dbus-launch` -# Start background programs ########################################## -if [ -f "$HOME/.login-daemons" ]; then - . "$HOME/.login-daemons" + export DBUS_SESSION_BUS_ADDRESS + export DBUS_SESSION_BUS_PID fi -# BASH ############################################################### -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi +# Load any box-specific stuff +if [ -f "$HOME/.profile.local" ]; then + . "$HOME/.profile.local" fi diff --git a/Makefile b/Makefile index 3cecf33..160a64c 100644 --- a/Makefile +++ b/Makefile @@ -4,22 +4,19 @@ NANO_BIN_PREFIX = $(patsubst %/bin/nano,%,$(shell which nano)) NANO_CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:$(NANO_BIN_PREFIX) NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(NANO_CHECK))))) -ALSACTL=$(firstword $(shell . $(HOME)/.profile &>/dev/null; which alsactl) echo) - -targets=.nanorc .folders .crontab.cookie .current.asound +targets=.nanorc .folders .crontab.cookie .git.info.exclude all: $(targets) clean: rm -f $(targets) -%.asound: FORCE - $(ALSACTL) store --file '$@' - .nanorc: .nanorc.in $(NANO_SHARE) cat '$<' > '$@' for file in $(NANO_SHARE)/*.nanorc; do echo "include \"$$file\""; done >> '$@' .folders: Maildir ( echo '..'; find ~/Maildir -maxdepth 2 -type f -name "maildirfolder" -printf '%h\n'|sed -r 's@.*/(.*\.)(.*)@.\1\2@' )|sort>'$@' +.git.info.exclude: .git.info.exclude.in . + ( cat $<; find . -type f -name 'CACHEDIR.TAG' -printf '%h\n'|sed 's@^\./@/@' ) > $@ .crontab.cookie: .crontab .crontab.local -(cat $^; echo) | crontab - 2>/dev/null -- cgit v1.1-4-g5e80 From 318568fb6db4981692d7b2abc5e0a42f0907a2b5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:21:52 -0400 Subject: wmii: use a connected_to_x_server function --- .wmii/include.sh | 5 +++++ .wmii/rbar_battery | 3 +-- .wmii/rbar_clock | 3 +-- .wmii/rbar_cpu | 3 +-- .wmii/rbar_wifi | 3 +-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.wmii/include.sh b/.wmii/include.sh index 36f8f3e..f4b29b3 100644 --- a/.wmii/include.sh +++ b/.wmii/include.sh @@ -68,3 +68,8 @@ Action() { return 1 fi } + +connected_to_x_server() { + xdpyinfo &>/dev/null + return $? +} diff --git a/.wmii/rbar_battery b/.wmii/rbar_battery index 7a7f24f..0e70799 100755 --- a/.wmii/rbar_battery +++ b/.wmii/rbar_battery @@ -3,8 +3,7 @@ priority=$1 -set -e -while true; do +while connected_to_x_server; do acpi -b |a "$WMII_DIR/rbar/${priority}_battery" sleep 1 done diff --git a/.wmii/rbar_clock b/.wmii/rbar_clock index 8e7d2a4..86bf14d 100755 --- a/.wmii/rbar_clock +++ b/.wmii/rbar_clock @@ -3,8 +3,7 @@ priority=$1 -set -e -while true; do +while connected_to_x_server; do date |a "$WMII_DIR/rbar/${priority}_clock" sleep .5 done diff --git a/.wmii/rbar_cpu b/.wmii/rbar_cpu index 7f891da..d3bdd88 100755 --- a/.wmii/rbar_cpu +++ b/.wmii/rbar_cpu @@ -3,8 +3,7 @@ priority=$1 -set -e -while true; do +while connected_to_x_server; do # This doesn't work for me, it shows capacity #echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;') |a "$WMII_DIR/rbar/${priority}_cpu" # This actually displays %idle diff --git a/.wmii/rbar_wifi b/.wmii/rbar_wifi index 608b164..2ea84a3 100755 --- a/.wmii/rbar_wifi +++ b/.wmii/rbar_wifi @@ -3,8 +3,7 @@ priority=$1 -set -e -while true; do +while connected_to_x_server; do echo 'Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality) |a "$WMII_DIR/rbar/${priority}_wifi" sleep 1 done -- cgit v1.1-4-g5e80 From 48c87c85dc219ca3a4ab87a1861dba6d495e5e00 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:23:39 -0400 Subject: maildirproc: add Jade's new email address --- .maildirproc/default.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 71bc00c..c2ad6f2 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -165,6 +165,7 @@ def my_filters(mail): for address in [ "justicejade10@aol.com", "parsonsjade@aol.com", + "parsonstjade@gmail.com", ]: if mail["From"].contains(address): mail.move(".misc.Jade") -- cgit v1.1-4-g5e80 From 65cf2b407744320091f3bd1a1de0dee73992bd8c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:32:35 -0400 Subject: symlink .kde4/share/{apps,config} to .config --- .git.info.exclude.in | 6 +++--- .kde | 1 + .kde4/share/apps | 1 + .kde4/share/config | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) create mode 120000 .kde create mode 120000 .kde4/share/apps create mode 120000 .kde4/share/config diff --git a/.git.info.exclude.in b/.git.info.exclude.in index 37c1ee4..fe97ec8 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -17,6 +17,7 @@ # Ignore temp/log/history files *.log log.* +log *.tmp *.tmp.* @@ -49,7 +50,9 @@ lock # Ignore these special-purpose cache/temp files .camel_certs .compiz/session/* +.config/RecentDocuments/* .config/chromium/Default/History\ Index* +.config/okular/docdata/* .current.asound .dbus/session-bus/* .ddd/sessions @@ -59,10 +62,7 @@ lock .gconfd/saved_state .gnash-media .gnash/SharedObjects/* -.kde/share/apps/RecentDocuments/* .kde/socket-* -.kde4/share/apps/RecentDocuments/* -.kde4/share/apps/okular/docdata/* .kde4/socket-* .lesshst .link*/*.his diff --git a/.kde b/.kde new file mode 120000 index 0000000..e604d30 --- /dev/null +++ b/.kde @@ -0,0 +1 @@ +.kde4 \ No newline at end of file diff --git a/.kde4/share/apps b/.kde4/share/apps new file mode 120000 index 0000000..7f8f949 --- /dev/null +++ b/.kde4/share/apps @@ -0,0 +1 @@ +../../.config \ No newline at end of file diff --git a/.kde4/share/config b/.kde4/share/config new file mode 120000 index 0000000..7f8f949 --- /dev/null +++ b/.kde4/share/config @@ -0,0 +1 @@ +../../.config \ No newline at end of file -- cgit v1.1-4-g5e80 From c13b6347ac065da59e8645479a37005fd3fb412d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:33:02 -0400 Subject: ditch ConsoleKit in .xinitrc --- .xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xinitrc b/.xinitrc index 9c5ce55..bfc352b 100644 --- a/.xinitrc +++ b/.xinitrc @@ -23,4 +23,4 @@ fi # exec startkde # exec startxfce4 # ...or the Window Manager of your choice -exec ck-launch-session wmii +exec wmii -- cgit v1.1-4-g5e80 From e1127837281b134f3b141c2e417c0fb1dc4562ac Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 20:12:20 -0400 Subject: ditch wicd --- .wicd/WHEREAREMYFILES | 1 - 1 file changed, 1 deletion(-) delete mode 120000 .wicd/WHEREAREMYFILES diff --git a/.wicd/WHEREAREMYFILES b/.wicd/WHEREAREMYFILES deleted file mode 120000 index 5e06b02..0000000 --- a/.wicd/WHEREAREMYFILES +++ /dev/null @@ -1 +0,0 @@ -/var/lib/wicd/WHEREAREMYFILES \ No newline at end of file -- cgit v1.1-4-g5e80 From 281adcda20ee3b0d65a416dfb0d6a0d1413dc1be Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 20:13:58 -0400 Subject: move the X11 config files to .config/X11, add a serverrc file remove extra newline from .config/X11/login --- .Xdefaults | 19 +------------------ .config/X11/clientrc | 27 +++++++++++++++++++++++++++ .config/X11/defaults | 18 ++++++++++++++++++ .config/X11/login | 9 +++++++++ .config/X11/modmap | 7 +++++++ .config/X11/serverrc | 6 ++++++ .xinitrc | 27 +-------------------------- .xserverrc | 1 + .xsession | 11 +---------- 9 files changed, 71 insertions(+), 54 deletions(-) mode change 100644 => 120000 .Xdefaults create mode 100644 .config/X11/clientrc create mode 100644 .config/X11/defaults create mode 100644 .config/X11/login create mode 100644 .config/X11/modmap create mode 100644 .config/X11/serverrc mode change 100644 => 120000 .xinitrc create mode 120000 .xserverrc mode change 100644 => 120000 .xsession diff --git a/.Xdefaults b/.Xdefaults deleted file mode 100644 index ceabc5c..0000000 --- a/.Xdefaults +++ /dev/null @@ -1,18 +0,0 @@ -URxvt.background: #000000 -URxvt.foreground: #CCCCCC - -URxvt.scrollstyle: plain -URxvt.scrollBar_floating: true - -URxvt.font: xft:Monospace-8 -URxvt.cursorBlink: true -URxvt.termName: xterm-256color -URxvt.pastableTabs: true - -URxvt.scrollTtyOutput: false -URxvt.scrollTtyKeypress: false -URxvt.scrollWithBuffer: true - -URxvt.perl-ext-common: default,matcher -URxvt.urlLauncher: v-www-browser -URxvt.matcher.button: 1 diff --git a/.Xdefaults b/.Xdefaults new file mode 120000 index 0000000..7588317 --- /dev/null +++ b/.Xdefaults @@ -0,0 +1 @@ +.config/X11/defaults \ No newline at end of file diff --git a/.config/X11/clientrc b/.config/X11/clientrc new file mode 100644 index 0000000..d1e1725 --- /dev/null +++ b/.config/X11/clientrc @@ -0,0 +1,27 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +if [ -d /etc/X11/xinit/xinitrc.d ]; then + echo ' ==> Running scripts in Entering xinitrc.d/*' + for f in /etc/X11/xinit/xinitrc.d/*; do + echo " -> $f" + [ -x "$f" ] && "$f" & + done + unset f + echo ' -> done' +fi + +usermodmap="$XDG_CONFIG_HOME/X11/modmap" +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# exec gnome-session +# exec startkde +# exec startxfce4 +# ...or the Window Manager of your choice +#export WMII_CONFPATH="$XDG_CONFIG_HOME/wmii" +exec wmii diff --git a/.config/X11/defaults b/.config/X11/defaults new file mode 100644 index 0000000..ceabc5c --- /dev/null +++ b/.config/X11/defaults @@ -0,0 +1,18 @@ +URxvt.background: #000000 +URxvt.foreground: #CCCCCC + +URxvt.scrollstyle: plain +URxvt.scrollBar_floating: true + +URxvt.font: xft:Monospace-8 +URxvt.cursorBlink: true +URxvt.termName: xterm-256color +URxvt.pastableTabs: true + +URxvt.scrollTtyOutput: false +URxvt.scrollTtyKeypress: false +URxvt.scrollWithBuffer: true + +URxvt.perl-ext-common: default,matcher +URxvt.urlLauncher: v-www-browser +URxvt.matcher.button: 1 diff --git a/.config/X11/login b/.config/X11/login new file mode 100644 index 0000000..03bad2a --- /dev/null +++ b/.config/X11/login @@ -0,0 +1,9 @@ +#!/bin/sh + +# +# ~/.xsession +# +# Executed by xdm/gdm/kdm at login +# + +/bin/bash --login -i ~/.xinitrc diff --git a/.config/X11/modmap b/.config/X11/modmap new file mode 100644 index 0000000..e4ade24 --- /dev/null +++ b/.config/X11/modmap @@ -0,0 +1,7 @@ +remove lock = Caps_Lock +keysym Caps_Lock = Super_L + +keycode 135 = Super_R + +clear mod4 +add mod4 = Super_L Super_R Hyper_L Hyper_R Menu diff --git a/.config/X11/serverrc b/.config/X11/serverrc new file mode 100644 index 0000000..d6c6ffc --- /dev/null +++ b/.config/X11/serverrc @@ -0,0 +1,6 @@ +#!/bin/bash + +VT=vt07 +#VT=$(tty|sed 's@/dev/tty@vt@') + +exec /usr/bin/X -nolisten tcp "$VT" "$@" diff --git a/.xinitrc b/.xinitrc deleted file mode 100644 index bfc352b..0000000 --- a/.xinitrc +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - echo ' ==> Running scripts in Entering xinitrc.d/*' - for f in /etc/X11/xinit/xinitrc.d/*; do - echo " -> $f" - [ -x "$f" ] && "$f" & - done - unset f - echo ' -> done' -fi - -usermodmap="$HOME/.xmodmap" -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice -exec wmii diff --git a/.xinitrc b/.xinitrc new file mode 120000 index 0000000..c0f7e1c --- /dev/null +++ b/.xinitrc @@ -0,0 +1 @@ +.config/X11/clientrc \ No newline at end of file diff --git a/.xserverrc b/.xserverrc new file mode 120000 index 0000000..f46e3e3 --- /dev/null +++ b/.xserverrc @@ -0,0 +1 @@ +.config/X11/serverrc \ No newline at end of file diff --git a/.xsession b/.xsession deleted file mode 100644 index a16dc0b..0000000 --- a/.xsession +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - diff --git a/.xsession b/.xsession new file mode 120000 index 0000000..ee16887 --- /dev/null +++ b/.xsession @@ -0,0 +1 @@ +.config/X11/login \ No newline at end of file -- cgit v1.1-4-g5e80 From 8f6fe81e1db6e1d95a4eb0ef303491b4aadf44c1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:54:40 -0400 Subject: remove superfluous lines from .git.info.exclude.in --- .git.info.exclude.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/.git.info.exclude.in b/.git.info.exclude.in index fe97ec8..612ecf2 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -53,10 +53,8 @@ lock .config/RecentDocuments/* .config/chromium/Default/History\ Index* .config/okular/docdata/* -.current.asound .dbus/session-bus/* .ddd/sessions -.dvdcss .esd_auth .evolution/.* .gconfd/saved_state -- cgit v1.1-4-g5e80 From 4493d30ac4c747b08b2107a440084245a9157bd4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 12:48:36 -0400 Subject: wmii: use 9mount --- .wmii/include.sh | 2 +- .wmii/wmiirc | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.wmii/include.sh b/.wmii/include.sh index f4b29b3..29d4d67 100644 --- a/.wmii/include.sh +++ b/.wmii/include.sh @@ -4,7 +4,7 @@ if [ -z "$WMII_NAMESPACE" ]; then export WMII_NAMESPACE=`wmiir namespace` fi if [ -z "$WMII_DIR" ]; then - export WMII_DIR=$WMII_NAMESPACE/mnt + export WMII_DIR="$HOME/n/wmii" fi # a -- a work-around for buggy IO append in 9pfuse diff --git a/.wmii/wmiirc b/.wmii/wmiirc index 92adb8b..8d77394 100755 --- a/.wmii/wmiirc +++ b/.wmii/wmiirc @@ -5,9 +5,8 @@ wmiir xwrite /event Start . "$HOME/.wmii/include.sh" echo ' ==> Starting wmiirc' -mount9p=/opt/plan9/bin/9pfuse -mkdir -p $WMII_NAMESPACE/mnt -$mount9p $WMII_NAMESPACE/{wmii,mnt} +mkdir -p "$WMII_DIR" +9mount -i "unix!$WMII_NAMESPACE/wmii" "$WMII_DIR" MODKEY=Mod4 # super UP=p @@ -45,7 +44,7 @@ Event() { echo ' ==> Stopping wmiirc' echo " -> unmounting WMII_DIR=$WMII_DIR..." # might complain about /etc/mtab if the x server has already stopped - fusermount -u "$WMII_DIR" 2>>/dev/null + 9umount "$WMII_DIR" echo " -> rmdir'ing WMII_DIR=$WMII_DIR..." rmdir "$WMII_DIR" exit;; -- cgit v1.1-4-g5e80 From f5f19ca8e8d46ba1087f8531e2309ac392c24112 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 14:33:31 -0400 Subject: wmii: phase out wmiir --- .wmii/include.sh | 37 ++++++++++++------------ .wmii/quit | 2 +- .wmii/rbar_battery | 2 +- .wmii/rbar_clock | 2 +- .wmii/rbar_cpu | 4 +-- .wmii/rbar_wifi | 2 +- .wmii/wmiirc | 84 +++++++++++++++++++++++------------------------------- 7 files changed, 61 insertions(+), 72 deletions(-) diff --git a/.wmii/include.sh b/.wmii/include.sh index 29d4d67..b1ec901 100644 --- a/.wmii/include.sh +++ b/.wmii/include.sh @@ -7,20 +7,22 @@ if [ -z "$WMII_DIR" ]; then export WMII_DIR="$HOME/n/wmii" fi -# a -- a work-around for buggy IO append in 9pfuse -# useing '|a' should be just like using '>>', but will work -# when 9pfuse decides to bug out. -a() { - f="${1/#${WMII_DIR}/}" - if [ "$f" = "$1" ]; then - cat >> "$1" - else - if wmiir ls "$f" &>/dev/null; then - wmiir write "$f" - else - wmiir create "$f" - fi - fi +# Linux's 9p kernel module sometimes omits entries in directory listings +unalias ls 2>/dev/null +ls() { + real_ls="`which ls` -1F" + [ $# = 0 ] && set -- "`pwd`" + case $# in + 1) + f="${1/#${WMII_DIR}/}" + if [ "$f" = "$1" ]; then + $real_ls "$f" + else + wmiir ls "$f" + fi + ;; + *) $real_ls "$f";; + esac } # I like wmiir's setsid better than linux-utils' @@ -37,9 +39,8 @@ path_which() { PATH="$mypath" "$which" -- "$prog" 2>/dev/null } - lstags() { - ls $WMII_DIR/tag | sed '/^sel$/d' + ls $WMII_DIR/tag | sed -e 's@/@@' -e '/^sel$/d' } scansection() { @@ -70,6 +71,6 @@ Action() { } connected_to_x_server() { - xdpyinfo &>/dev/null - return $? + xdpyinfo &>/dev/null + return $? } diff --git a/.wmii/quit b/.wmii/quit index 54f64e7..876a60e 100755 --- a/.wmii/quit +++ b/.wmii/quit @@ -1,3 +1,3 @@ #!/bin/bash . "$HOME/.wmii/include.sh" -echo quit |a $WMII_DIR/ctl +echo quit >> $WMII_DIR/ctl diff --git a/.wmii/rbar_battery b/.wmii/rbar_battery index 0e70799..ae8980a 100755 --- a/.wmii/rbar_battery +++ b/.wmii/rbar_battery @@ -4,6 +4,6 @@ priority=$1 while connected_to_x_server; do - acpi -b |a "$WMII_DIR/rbar/${priority}_battery" + acpi -b >> "$WMII_DIR/rbar/${priority}_battery" sleep 1 done diff --git a/.wmii/rbar_clock b/.wmii/rbar_clock index 86bf14d..18c4493 100755 --- a/.wmii/rbar_clock +++ b/.wmii/rbar_clock @@ -4,6 +4,6 @@ priority=$1 while connected_to_x_server; do - date |a "$WMII_DIR/rbar/${priority}_clock" + date >> "$WMII_DIR/rbar/${priority}_clock" sleep .5 done diff --git a/.wmii/rbar_cpu b/.wmii/rbar_cpu index d3bdd88..22da985 100755 --- a/.wmii/rbar_cpu +++ b/.wmii/rbar_cpu @@ -5,8 +5,8 @@ priority=$1 while connected_to_x_server; do # This doesn't work for me, it shows capacity - #echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;') |a "$WMII_DIR/rbar/${priority}_cpu" + #echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;') >> "$WMII_DIR/rbar/${priority}_cpu" # This actually displays %idle - echo 'CPU: [ '$(tail -n3 ~/tmp/cputime|sed -ur 's/\s\s+/\t/g'|cut -f2,11|sed 's/\t\(.*\)/(\1)/')' ]' |a "$WMII_DIR/rbar/${priority}_cpu" + echo 'CPU: [ '$(tail -n3 ~/tmp/cputime|sed -ur 's/\s\s+/\t/g'|cut -f2,11|sed 's/\t\(.*\)/(\1)/')' ]' >> "$WMII_DIR/rbar/${priority}_cpu" sleep 1 done diff --git a/.wmii/rbar_wifi b/.wmii/rbar_wifi index 2ea84a3..2ada834 100755 --- a/.wmii/rbar_wifi +++ b/.wmii/rbar_wifi @@ -4,6 +4,6 @@ priority=$1 while connected_to_x_server; do - echo 'Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality) |a "$WMII_DIR/rbar/${priority}_wifi" + echo 'Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality) >> "$WMII_DIR/rbar/${priority}_wifi" sleep 1 done diff --git a/.wmii/wmiirc b/.wmii/wmiirc index 8d77394..1e88128 100755 --- a/.wmii/wmiirc +++ b/.wmii/wmiirc @@ -84,9 +84,9 @@ Event() { { case `wmii9menu Delete Fullscreen` in Delete) - echo kill |a $WMII_DIR/client/$client/ctl;; + echo kill >> $WMII_DIR/client/$client/ctl;; Fullscreen) - echo Fullscreen on |a $WMII_DIR/client/$1/ctl;; + echo Fullscreen on >> $WMII_DIR/client/$1/ctl;; esac }& ;; esac;; @@ -101,7 +101,7 @@ Event() { resp=$(wihack -transient $client \ xmessage -nearmouse -buttons Kill,Wait -print "$msg") if [ "$resp" = Kill ]; then - echo slay |a $WMII_DIR/client/$client/ctl + echo slay >> $WMII_DIR/client/$client/ctl fi }& ;; Fullscreen) ## $1=client $2=[on|off] @@ -110,24 +110,24 @@ Event() { ## Tag events CreateTag) ## $1=tag - echo "$WMII_NORMCOLORS" $@ |a $WMII_DIR/lbar/$1;; + echo "$WMII_NORMCOLORS" $@ >> $WMII_DIR/lbar/$1;; DestroyTag) ## $1=tag rm $WMII_DIR/lbar/$1;; FocusTag) ## $1=tag - echo "$WMII_FOCUSCOLORS" $1 |a $WMII_DIR/lbar/$1;; + echo "$WMII_FOCUSCOLORS" $1 >> $WMII_DIR/lbar/$1;; UnfocusTag) ## $1=tag - echo "$WMII_NORMCOLORS" $1 |a $WMII_DIR/lbar/$1;; + echo "$WMII_NORMCOLORS" $1 >> $WMII_DIR/lbar/$1;; UrgentTag) ## $1=tag $2=[Manager|Client] - echo "$WMII_URGENTCOLORS" $1 |a $WMII_DIR/lbar/$1;; + echo "$WMII_URGENTCOLORS" $1 >> $WMII_DIR/lbar/$1;; NotUrgentTag) ## $1=tag $2=[Manager|Client] - echo "$WMII_NORMCOLORS" $1 |a $WMII_DIR/lbar/$1;; + echo "$WMII_NORMCOLORS" $1 >> $WMII_DIR/lbar/$1;; ## LeftBar events (usually tag buttons) LeftBarMouseDown) ## $1=button $2=bar_item ;; LeftBarClick) ## $1=button $2=bar_item shift # ignore the button - echo view "$@" |a $WMII_DIR/ctl;; + echo view "$@" >> $WMII_DIR/ctl;; LeftMouseDND) ## $1=button $2=bar_item Event LeftBarClick "$@";; @@ -152,50 +152,49 @@ Key() { ## Moving around $MODKEY-$LEFT) ## Select the client to the left - echo select left |a $WMII_DIR/tag/sel/ctl;; + echo select left >> $WMII_DIR/tag/sel/ctl;; $MODKEY-$RIGHT) ## Select the client to the right - echo select right |a $WMII_DIR/tag/sel/ctl;; + echo select right >> $WMII_DIR/tag/sel/ctl;; $MODKEY-$UP) ## Select the client above - echo select up |a $WMII_DIR/tag/sel/ctl;; + echo select up >> $WMII_DIR/tag/sel/ctl;; $MODKEY-$DOWN) ## Select the client below - echo select down |a $WMII_DIR/tag/sel/ctl;; + echo select down >> $WMII_DIR/tag/sel/ctl;; $MODKEY-space) ## Toggle between floating and managed layers - echo select toggle |a $WMII_DIR/tag/sel/ctl;; + echo select toggle >> $WMII_DIR/tag/sel/ctl;; ## Moving clients around $MODKEY-Shift-$LEFT) ## Move selected client to the left - wmiir xwrite /tag/sel/ctl send sel left;; + echo send sel left >> $WMII_DIR/tag/sel/ctl;; $MODKEY-Shift-$RIGHT) ## Move selected client to the right - wmiir xwrite /tag/sel/ctl send sel right;; + echo send sel right >> $WMII_DIR/tag/sel/ctl;; $MODKEY-Shift-$UP) ## Move selected client up - wmiir xwrite /tag/sel/ctl send sel up;; + echo send sel up >> $WMII_DIR/tag/sel/ctl;; $MODKEY-Shift-$DOWN) ## Move selected client down - wmiir xwrite /tag/sel/ctl send sel down;; - + echo send sel down >> $WMII_DIR/tag/sel/ctl;; $MODKEY-Shift-space) ## Toggle selected client between floating and managed layers - wmiir xwrite /tag/sel/ctl send sel toggle;; + echo send sel toggle >> $WMII_DIR/tag/sel/ctl;; ## Moving through stacks $MODKEY-Control-$UP) ## Select the stack above - wmiir xwrite /tag/sel/ctl select up stack;; - $MODKEY-Control-$DOWN) # Select the stack below - wmiir xwrite /tag/sel/ctl select down stack;; + echo select up stack >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-Control-$DOWN) ## Select the stack below + echo select down stack >> $WMII_DIR/tag/sel/ctl;; ## Client actions $MODKEY-shift-1) ## Toggle selected client's fullsceen state - wmiir xwrite /client/sel/ctl Fullscreen toggle;; + echo Fullscreen toggle >> $WMII_DIR/client/sel/ctl;; $MODKEY-shift-0) ## Close client - wmiir xwrite /client/sel/ctl kill;; + echo kill >> $WMII_DIR/client/sel/ctl;; ## Changing column modes $MODKEY-d) ## Set column to default mode - wmiir xwrite /tag/sel/ctl colmode sel default-max;; + echo colmode sel default-max >> $WMII_DIR/tag/sel/ctl;; $MODKEY-s) ## Set column to stack mode - wmiir xwrite /tag/sel/ctl colmode sel stack-max;; + echo colmode sel stack-max >> $WMII_DIR/tag/sel/ctl;; $MODKEY-m) ## Set column to max mode - wmiir xwrite /tag/sel/ctl colmode sel stack+max;; + echo colmode sel stack+max >> $WMII_DIR/tag/sel/ctl;; ## Running programs $MODKEY-a) ## Open wmii actions menu @@ -205,44 +204,33 @@ Key() { $MODKEY-Return) ## Launch a terminal setsid x-terminal-emulator & ;; - ## Other - $MODKEY-Control-t) ## Toggle all other key bindings - case $(wmiir read /keys | wc -l | tr -d ' \t\n') in - 0|1) - echo -n "$Keys" | wmiir write /keys - wmiir xwrite /ctl grabmod $MODKEY;; - *) - wmiir xwrite /keys $MODKEY-Control-t - wmiir xwrite /ctl grabmod Mod3;; - esac;; - ## Tag actions $MODKEY-t) ## Change to another tag { tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return - wmiir xwrite /ctl view $tag + echo view $tag >> $WMII_DIR/ctl }& ;; $MODKEY-Shift-t) ## Retag the selected client sel=$(sed 1q $WMII_DIR/client/sel/ctl) { tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return - wmiir xwrite /client/$sel/tags "$tag" + echo "$tag" >> $WMII_DIR/client/$sel/tags }& ;; esac } ## End Key # WM Configuration -echo font xft:Monospace-8 |a $WMII_DIR/ctl -echo focuscolors $WMII_FOCUSCOLORS |a $WMII_DIR/ctl -echo normcolors $WMII_NORMCOLORS |a $WMII_DIR/ctl -echo grabmod $MODKEY |a $WMII_DIR/ctl -echo border 1 |a $WMII_DIR/ctl +echo font xft:Monospace-8 >> $WMII_DIR/ctl +echo focuscolors $WMII_FOCUSCOLORS >> $WMII_DIR/ctl +echo normcolors $WMII_NORMCOLORS >> $WMII_DIR/ctl +echo grabmod $MODKEY >> $WMII_DIR/ctl +echo border 1 >> $WMII_DIR/ctl xsetroot -solid "$WMII_BACKGROUND" & progsfile=$WMII_NAMESPACE/.proglist path_ls $PATH > $progsfile & -eval arg `scansection Key|cut -sf2` |a $WMII_DIR/keys +eval arg `scansection Key|cut -sf2` >> $WMII_DIR/keys # Clear the LBar find $WMII_DIR/lbar -type f -delete @@ -265,6 +253,6 @@ fi trap "Event Quit" EXIT # use wmiir so it doesn't look like an open file -wmiir read /event 2>/dev/null | while read event; do +wmiir read /event | while read event; do Event $event done -- cgit v1.1-4-g5e80 From fdb7a68bec32153e696a440d2e7795c8e4b58e08 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 20:18:49 -0400 Subject: make .wmii/autostart a profile-local --- .wmii/autostart | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 .wmii/autostart diff --git a/.wmii/autostart b/.wmii/autostart deleted file mode 100755 index aae23f4..0000000 --- a/.wmii/autostart +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -daemon lxpanel &> /dev/null -daemon wicd-client -t &> /dev/null -daemon notifyd &> /dev/null -- cgit v1.1-4-g5e80 From 4414160a4cce0080f3f2b33f9e7a7583c77c7062 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 17:36:00 -0400 Subject: wmii: refactor --- .wmii/config.sh | 242 +++++++++++++++++++++++++++++++++++++++++++++++++++ .wmii/ctl-init | 5 ++ .wmii/fixes.sh | 24 ++++++ .wmii/include.sh | 71 ++------------- .wmii/tagrules | 3 + .wmii/util.sh | 121 ++++++++++++++++++++++++++ .wmii/wmiirc | 257 ++----------------------------------------------------- 7 files changed, 408 insertions(+), 315 deletions(-) create mode 100644 .wmii/config.sh create mode 100644 .wmii/ctl-init create mode 100644 .wmii/fixes.sh create mode 100644 .wmii/tagrules create mode 100644 .wmii/util.sh diff --git a/.wmii/config.sh b/.wmii/config.sh new file mode 100644 index 0000000..abe378f --- /dev/null +++ b/.wmii/config.sh @@ -0,0 +1,242 @@ +#!/bin/bash + +MODKEY=Mod4 # "super" +UP=p +DOWN=n +LEFT=b +RIGHT=f + +# Colors tuples: " " +. `conffile theme-solarized-dark` + +Event() { + event=$1; shift; + case "$event" in + ## Mouse event meanings: + ## MouseDown = mouse down + ## Click = mouse up + ## DND = hover, while dragging something (Drag 'n' Drop) + ## The associated mouse button is always "1" + ## + ## Mouse-button IDs: + ## 1 = left + ## 2 = middle + ## 3 = right + + ## Custom (non-WMII-generated) events + WmiircStart) ## No args + echo ' ==> Starting wmiirc' + 9umount "$WMII_DIR" &>/dev/null # just in case + mkdir -p "$WMII_DIR" + 9mount -i "unix!$WMII_NAMESPACE/wmii" "$WMII_DIR" + + # Configure wmii + < "`conffile tagrules`" expand_variables >> $WMII_DIR/tagrules + < "`conffile ctl-init`" expand_variables >> $WMII_DIR/ctl + scansection Key|cut -sf2 >> $WMII_DIR/keys + # Configure X11 + xsetroot -solid "$WMII_BACKGROUND" + + # Generate dynamic files + path_ls $PATH > $progsfile + + # Clear the LBar and RBar + find $WMII_DIR/{l,r}bar -type f -delete + # Populate the LBar by emulating [Create|Focus]Tag events + seltag=`sed 1q $WMII_DIR/tag/sel/ctl` + lstags | while read tag; do + Event CreateTag "$tag" + if [ "$tag" = "$seltag" ]; then + Event FocusTag "$tag" + fi + done + + # Run the autostart action + Action autostart 2>/dev/null & + ;; + WmiircQuit) ## No args + Event Quit;; + ## WMII-meta events + Quit) ## No args + echo ' ==> Stopping wmiirc' + echo " -> unmounting WMII_DIR=$WMII_DIR..." + 9umount "$WMII_DIR" + echo " -> rmdir'ing WMII_DIR=$WMII_DIR..." + rmdir "$WMII_DIR" + exit;; + Warning) ## $@=string + notify-send "wmii warning: $*";; + Key) ## $1=keystroke + Key "$@";; + + ## WMII Window management events + FocusFloating) ## No args + ;; + AreaFocus) ## $1=area + ;; + DestroyArea) ## $1=area + ;; + ColumnFocus) ## $1=column + ;; + CreateColumn) ## $1=column + ;; + + ## Client events + CreateClient) ## $1=client + ;; + DestroyClient) ## $1=client + ;; + Urgent) ## $1=client $2=[Manager|Client] + ;; + NotUrgent) ## $1=client $2=[Manager|Client] + ;; + ClientMouseDown) ## $1=client $2=button + client=$1 + button=$2 + case $button in + 1) ;; + 2) ;; + 3) + { + case `wmii9menu Delete Fullscreen` in + Delete) + echo kill >> $WMII_DIR/client/$client/ctl;; + Fullscreen) + echo Fullscreen on >> $WMII_DIR/client/$1/ctl;; + esac + }& ;; + esac;; + ClientClick) ## $1=client $2=button + ;; + Unresponsive) ## $1=client + client=$1 + client_name=`cat $WMII_DIR/client/$client/label` + msg="The client \`${client_name}' is not responding." + msg+=" What would you like to do?" + { + resp=$(wihack -transient $client \ + xmessage -nearmouse -buttons Kill,Wait -print "$msg") + if [ "$resp" = Kill ]; then + echo slay >> $WMII_DIR/client/$client/ctl + fi + }& ;; + Fullscreen) ## $1=client $2=[on|off] + # TODO: hide any clients with the 'panel' class + ;; + + ## Tag events + CreateTag) ## $1=tag + echo "$WMII_NORMCOLORS" $@ >> $WMII_DIR/lbar/$1;; + DestroyTag) ## $1=tag + rm $WMII_DIR/lbar/$1;; + FocusTag) ## $1=tag + echo "$WMII_FOCUSCOLORS" $1 >> $WMII_DIR/lbar/$1;; + UnfocusTag) ## $1=tag + echo "$WMII_NORMCOLORS" $1 >> $WMII_DIR/lbar/$1;; + UrgentTag) ## $1=tag $2=[Manager|Client] + echo "$WMII_URGENTCOLORS" $1 >> $WMII_DIR/lbar/$1;; + NotUrgentTag) ## $1=tag $2=[Manager|Client] + echo "$WMII_NORMCOLORS" $1 >> $WMII_DIR/lbar/$1;; + + ## LeftBar events (usually tag buttons) + LeftBarMouseDown) ## $1=button $2=bar_item + ;; + LeftBarClick) ## $1=button $2=bar_item + shift # ignore the button + echo view "$@" >> $WMII_DIR/ctl;; + LeftMouseDND) ## $1=button $2=bar_item + Event LeftBarClick "$@";; + + ## RightBar events + RightBarMouseDown) ## $1=button $2=bar_item + ;; + RightBarClick) ## $1=button $2=bar_item + ;; + RightMouseDND) ## $1=button $2=bar_item + Event RightBarClick "$@";; + esac +} ## End Event + +# Key Bindings +Key() { + key=$1 + case "$key" in + ## Moving around + + $MODKEY-$LEFT) ## Select the client to the left + echo select left >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-$RIGHT) ## Select the client to the right + echo select right >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-$UP) ## Select the client above + echo select up >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-$DOWN) ## Select the client below + echo select down >> $WMII_DIR/tag/sel/ctl;; + + $MODKEY-space) ## Toggle between floating and managed layers + echo select toggle >> $WMII_DIR/tag/sel/ctl;; + + ## Moving clients around + + $MODKEY-Shift-$LEFT) ## Move selected client to the left + echo send sel left >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-Shift-$RIGHT) ## Move selected client to the right + echo send sel right >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-Shift-$UP) ## Move selected client up + echo send sel up >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-Shift-$DOWN) ## Move selected client down + echo send sel down >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-Shift-space) ## Toggle selected client between floating and managed layers + echo send sel toggle >> $WMII_DIR/tag/sel/ctl;; + + ## Moving through stacks + $MODKEY-Control-$UP) ## Select the stack above + echo select up stack >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-Control-$DOWN) ## Select the stack below + echo select down stack >> $WMII_DIR/tag/sel/ctl;; + + ## Client actions + $MODKEY-shift-1) ## Toggle selected client's fullsceen state + echo Fullscreen toggle >> $WMII_DIR/client/sel/ctl;; + $MODKEY-shift-0) ## Close client + echo kill >> $WMII_DIR/client/sel/ctl;; + + ## Changing column modes + $MODKEY-d) ## Set column to default mode + echo colmode sel default-max >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-s) ## Set column to stack mode + echo colmode sel stack-max >> $WMII_DIR/tag/sel/ctl;; + $MODKEY-m) ## Set column to max mode + echo colmode sel stack+max >> $WMII_DIR/tag/sel/ctl;; + + ## Running programs + $MODKEY-a) ## Open wmii actions menu + Action $(path_ls $WMII_CONFPATH | wimenu -h "${hist}.actions" -n 5000) & ;; + $MODKEY-x) ## Open program menu + setsid $(wimenu -h "${hist}.progs" -n 5000 <$progsfile) & ;; + $MODKEY-Return) ## Launch a terminal + setsid x-terminal-emulator & ;; + + ## Tag actions + $MODKEY-t) ## Change to another tag + { + tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return + echo view $tag >> $WMII_DIR/ctl + }& ;; + $MODKEY-Shift-t) ## Retag the selected client + sel=$(sed 1q $WMII_DIR/client/sel/ctl) + { + tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return + echo "$tag" >> $WMII_DIR/client/$sel/tags + }& ;; + esac +} ## End Key + +Action() { + prog=`path_which "$WMII_CONFPATH" $1`; shift + if [ -n "$prog" ]; then + "$prog" "$@" + return $? + else + return 1 + fi +} ## End Action diff --git a/.wmii/ctl-init b/.wmii/ctl-init new file mode 100644 index 0000000..026c0d5 --- /dev/null +++ b/.wmii/ctl-init @@ -0,0 +1,5 @@ +font xft:Monospace-8 +focuscolors $WMII_FOCUSCOLORS +normcolors $WMII_NORMCOLORS +grabmod $MODKEY +border 1 diff --git a/.wmii/fixes.sh b/.wmii/fixes.sh new file mode 100644 index 0000000..6e1f38b --- /dev/null +++ b/.wmii/fixes.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# Fix various deficiencies in either the shell or the filesystem + +## +# Usage: ls DIRECTORY +# Linux's 9p kernel module sometimes omits entries in directory listings +## +unalias ls 2>/dev/null +ls() { + real_ls="`which ls` -1F" + [ $# = 0 ] && set -- "`pwd`" + f="${1/#${WMII_DIR}/}" + if [ "$f" = "$1" ]; then + $real_ls "$f" + else + wmiir ls "$f" + fi +} + +## +# Usage: setsid cmd [arguments...] +# I like wmiir's setsid better than linux-utils' +## +setsid() { wmiir setsid "$@"; } diff --git a/.wmii/include.sh b/.wmii/include.sh index b1ec901..43855e6 100644 --- a/.wmii/include.sh +++ b/.wmii/include.sh @@ -1,76 +1,15 @@ #!/bin/bash if [ -z "$WMII_NAMESPACE" ]; then - export WMII_NAMESPACE=`wmiir namespace` + export WMII_NAMESPACE="`wmiir namespace`" fi if [ -z "$WMII_DIR" ]; then export WMII_DIR="$HOME/n/wmii" fi -# Linux's 9p kernel module sometimes omits entries in directory listings -unalias ls 2>/dev/null -ls() { - real_ls="`which ls` -1F" - [ $# = 0 ] && set -- "`pwd`" - case $# in - 1) - f="${1/#${WMII_DIR}/}" - if [ "$f" = "$1" ]; then - $real_ls "$f" - else - wmiir ls "$f" - fi - ;; - *) $real_ls "$f";; - esac -} +. "$HOME/.wmii/util.sh" -# I like wmiir's setsid better than linux-utils' -setsid() { wmiir setsid "$@"; } +hist="`conffile history`" +progsfile=$WMII_NAMESPACE/.proglist -path_ls() { - find -L `echo "$@"|sed 'y/:/ /'` -maxdepth 1 -type f -executable -printf '%f\n' 2>/dev/null| sort -u -} - -path_which() { - mypath=$1 - prog=$2 - which=`which which` - PATH="$mypath" "$which" -- "$prog" 2>/dev/null -} - -lstags() { - ls $WMII_DIR/tag | sed -e 's@/@@' -e '/^sel$/d' -} - -scansection() { - file=`path_which "$WMII_CONFPATH" wmiirc` - sec=$1 - tmp=`mktemp` - if [ -n "$sec" ]; then - < "$file" sed -n "/^\s*$sec\s*()/,/##\s*End $sec/p" | sed '1d;$d'> $tmp - else - < "$file" sed "/\s*}\s*##\s*End\s/d" > $tmp - fi - < $tmp sed -n '/##/p'|sed -r 's/^\s*(.*)\)\s*## ?/\t\1\t/;s/\s*## ?//' - rm $tmp -} - -conffile() { - echo "$HOME/.wmii/$@" -} - -Action() { - prog=`path_which "$WMII_CONFPATH" $1`; shift - if [ -n "$prog" ]; then - "$prog" "$@" - return $? - else - return 1 - fi -} - -connected_to_x_server() { - xdpyinfo &>/dev/null - return $? -} +. "$HOME/.wmii/config.sh" diff --git a/.wmii/tagrules b/.wmii/tagrules new file mode 100644 index 0000000..990151f --- /dev/null +++ b/.wmii/tagrules @@ -0,0 +1,3 @@ +/Emacs|Navigator/ -> +sel +/Eclipse/ -> +sel +/panel/ -> /.*/ diff --git a/.wmii/util.sh b/.wmii/util.sh new file mode 100644 index 0000000..3234783 --- /dev/null +++ b/.wmii/util.sh @@ -0,0 +1,121 @@ +#!/bin/bash + +# I moved "fixes" into a separate file because it isn't so much configuration... +. "$HOME/.wmii/fixes.sh" + +################################################################################ +# Added shell features # +################################################################################ + +## +# Usage: dquote STRING +# Safely double-quotes a string. +# It escapes ways to execute code, but not variables. +## +dquote() { + str=$1 + str="${str//\\/\\\\}" # backslash + str="${str//\"/\\\"}" # dquote + str="${str//\$(/\\\$(}" # $(...) + str="${str//\`/\\\`}" # backtick + printf '"%s"\n' "$str" +} + +## +# Usage: expand_variables +# Expands variables read from /dev/stdin +## +expand_variables() { + while read; do + eval printf "'%s\n'" "$(dquote "$REPLY")" + done +} + +################################################################################ +# PATH manipulation # +################################################################################ + +## +# Usage: path_ls PATH +# List executables in PATH (PATH is delimited by `:') +## +path_ls() { + dirs="`echo "$@"|sed 'y/:/ /'`" + find -L $dirs -maxdepth 1 -type f -executable -printf '%f\n' 2>/dev/null | sort -u +} + +## +# Usage: path_which PATH PROGRAM +# Find the full path of PROGRAM by searching PATH +## +path_which() { + mypath=$1 + prog=$2 + which=`which which` + PATH="$mypath" "$which" -- "$prog" 2>/dev/null +} + +################################################################################ +# wmii convenience functions # +################################################################################ + +## +# Usage: lstags +# Lists wmii tags +## +lstags() { + ls $WMII_DIR/tag | sed -e 's@/@@' -e '/^sel$/d' +} + +################################################################################ +# X11 functions # +################################################################################ + +## +# Usage: connected_to_x_server +# Return status indicates whether there is an X server at $DISPLAY +## +connected_to_x_server() { + xdpyinfo &>/dev/null + return $? +} + +################################################################################ +# My wmii configuration # +################################################################################ + +## +# Usage: scansection [SECTION] +# Reads the doc comments from a section of wmiirc. +# If SECTION is not given, it reads all doc comments. +## +scansection() { + file=`conffile config.sh` + sec=$1 + tmp=`mktemp` + # Isolate the sections we want. + if [ -n "$sec" ]; then + # Find the section + < "$file" sed -n "/^\s*$sec\s*()/,/##\s*End $sec/p" | sed '1d;$d'> $tmp + else + # Remove extra lines that mark the end of a section + < "$file" sed "/\s*}\s*##\s*End\s/d" > $tmp + fi + < $tmp sed -n '/##/p' | while read; do + var="$(echo "$REPLY" | sed -nr 's/^\s*(.*)\)\s*##.*/\1/p')" + comment="$(echo "$REPLY" | sed -r 's/.*## ?//')" + if [ -z "$var" ]; then + printf '%s\n' "$comment" + else + printf '\t%s\t%s\n' "$(echo "$var"|expand_variables)" "$comment" + fi + done + rm $tmp +} + +## +# Usage: conffile FILE +## +conffile() { + echo "$HOME/.wmii/$@" +} diff --git a/.wmii/wmiirc b/.wmii/wmiirc index 1e88128..c513cd1 100755 --- a/.wmii/wmiirc +++ b/.wmii/wmiirc @@ -1,258 +1,17 @@ #!/bin/bash -# Let any running instances of wmiirc know that we're starting -wmiir xwrite /event Start - . "$HOME/.wmii/include.sh" -echo ' ==> Starting wmiirc' -mkdir -p "$WMII_DIR" -9mount -i "unix!$WMII_NAMESPACE/wmii" "$WMII_DIR" - -MODKEY=Mod4 # super -UP=p -DOWN=n -LEFT=b -RIGHT=f - -# Colors tuples: " " -. `conffile theme-solarized-dark` - -# Menu history -hist="`conffile history`" - -# Tagging Rules -echo '/Emacs|Navigator/ -> +sel' >> $WMII_DIR/tagrules -echo '/Eclipse/ -> +sel' >> $WMII_DIR/tagrules -echo '/panel/ -> /.*/' >> $WMII_DIR/tagrules - -Event() { - event=$1; shift; - case "$event" in - ## Mouse event meanings: - ## MouseDown = mouse down - ## Click = mouse up - ## DND = hover, while dragging something (Drag 'n' Drop) - ## The associated mouse button is always "1" - ## - ## Mouse-button IDs: - ## 1 = left - ## 2 = middle - ## 3 = right - - ## WMII-meta events - Quit) ## No args - echo ' ==> Stopping wmiirc' - echo " -> unmounting WMII_DIR=$WMII_DIR..." - # might complain about /etc/mtab if the x server has already stopped - 9umount "$WMII_DIR" - echo " -> rmdir'ing WMII_DIR=$WMII_DIR..." - rmdir "$WMII_DIR" - exit;; - Warning) ## $@=string - notify-send "wmii warning: $*";; - Key) ## $1=keystroke - Key "$@";; - - ## WMII Window management events - FocusFloating) ## No args - ;; - AreaFocus) ## $1=area - ;; - DestroyArea) ## $1=area - ;; - ColumnFocus) ## $1=column - ;; - CreateColumn) ## $1=column - ;; - - ## Client events - CreateClient) ## $1=client - ;; - DestroyClient) ## $1=client - ;; - Urgent) ## $1=client $2=[Manager|Client] - ;; - NotUrgent) ## $1=client $2=[Manager|Client] - ;; - ClientMouseDown) ## $1=client $2=button - client=$1 - button=$2 - case $button in - 1) ;; - 2) ;; - 3) - { - case `wmii9menu Delete Fullscreen` in - Delete) - echo kill >> $WMII_DIR/client/$client/ctl;; - Fullscreen) - echo Fullscreen on >> $WMII_DIR/client/$1/ctl;; - esac - }& ;; - esac;; - ClientClick) ## $1=client $2=button - ;; - Unresponsive) ## $1=client - client=$1 - client_name=`cat $WMII_DIR/client/$client/label` - msg="The client \`${client_name}' is not responding." - msg+=" What would you like to do?" - { - resp=$(wihack -transient $client \ - xmessage -nearmouse -buttons Kill,Wait -print "$msg") - if [ "$resp" = Kill ]; then - echo slay >> $WMII_DIR/client/$client/ctl - fi - }& ;; - Fullscreen) ## $1=client $2=[on|off] - # TODO: hide any clients with the 'panel' class - ;; - - ## Tag events - CreateTag) ## $1=tag - echo "$WMII_NORMCOLORS" $@ >> $WMII_DIR/lbar/$1;; - DestroyTag) ## $1=tag - rm $WMII_DIR/lbar/$1;; - FocusTag) ## $1=tag - echo "$WMII_FOCUSCOLORS" $1 >> $WMII_DIR/lbar/$1;; - UnfocusTag) ## $1=tag - echo "$WMII_NORMCOLORS" $1 >> $WMII_DIR/lbar/$1;; - UrgentTag) ## $1=tag $2=[Manager|Client] - echo "$WMII_URGENTCOLORS" $1 >> $WMII_DIR/lbar/$1;; - NotUrgentTag) ## $1=tag $2=[Manager|Client] - echo "$WMII_NORMCOLORS" $1 >> $WMII_DIR/lbar/$1;; - - ## LeftBar events (usually tag buttons) - LeftBarMouseDown) ## $1=button $2=bar_item - ;; - LeftBarClick) ## $1=button $2=bar_item - shift # ignore the button - echo view "$@" >> $WMII_DIR/ctl;; - LeftMouseDND) ## $1=button $2=bar_item - Event LeftBarClick "$@";; - - ## RightBar events - RightBarMouseDown) ## $1=button $2=bar_item - ;; - RightBarClick) ## $1=button $2=bar_item - ;; - RightMouseDND) ## $1=button $2=bar_item - Event RightBarClick "$@";; - - ## Custom (non-WMII-generated) events - Start) ## No args - Event Quit;; # get out of the way for a new event loop - esac -} ## End Event - -# Key Bindings -Key() { - key=$1 - case "$key" in - ## Moving around - - $MODKEY-$LEFT) ## Select the client to the left - echo select left >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-$RIGHT) ## Select the client to the right - echo select right >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-$UP) ## Select the client above - echo select up >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-$DOWN) ## Select the client below - echo select down >> $WMII_DIR/tag/sel/ctl;; - - $MODKEY-space) ## Toggle between floating and managed layers - echo select toggle >> $WMII_DIR/tag/sel/ctl;; - - ## Moving clients around - - $MODKEY-Shift-$LEFT) ## Move selected client to the left - echo send sel left >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-Shift-$RIGHT) ## Move selected client to the right - echo send sel right >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-Shift-$UP) ## Move selected client up - echo send sel up >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-Shift-$DOWN) ## Move selected client down - echo send sel down >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-Shift-space) ## Toggle selected client between floating and managed layers - echo send sel toggle >> $WMII_DIR/tag/sel/ctl;; - - ## Moving through stacks - $MODKEY-Control-$UP) ## Select the stack above - echo select up stack >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-Control-$DOWN) ## Select the stack below - echo select down stack >> $WMII_DIR/tag/sel/ctl;; - - ## Client actions - $MODKEY-shift-1) ## Toggle selected client's fullsceen state - echo Fullscreen toggle >> $WMII_DIR/client/sel/ctl;; - $MODKEY-shift-0) ## Close client - echo kill >> $WMII_DIR/client/sel/ctl;; - - ## Changing column modes - $MODKEY-d) ## Set column to default mode - echo colmode sel default-max >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-s) ## Set column to stack mode - echo colmode sel stack-max >> $WMII_DIR/tag/sel/ctl;; - $MODKEY-m) ## Set column to max mode - echo colmode sel stack+max >> $WMII_DIR/tag/sel/ctl;; - - ## Running programs - $MODKEY-a) ## Open wmii actions menu - Action $(path_ls $WMII_CONFPATH | wimenu -h "${hist}.actions" -n 5000) & ;; - $MODKEY-x) ## Open program menu - setsid $(wimenu -h "${hist}.progs" -n 5000 <$progsfile) & ;; - $MODKEY-Return) ## Launch a terminal - setsid x-terminal-emulator & ;; - - ## Tag actions - $MODKEY-t) ## Change to another tag - { - tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return - echo view $tag >> $WMII_DIR/ctl - }& ;; - $MODKEY-Shift-t) ## Retag the selected client - sel=$(sed 1q $WMII_DIR/client/sel/ctl) - { - tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return - echo "$tag" >> $WMII_DIR/client/$sel/tags - }& ;; - esac -} ## End Key - -# WM Configuration -echo font xft:Monospace-8 >> $WMII_DIR/ctl -echo focuscolors $WMII_FOCUSCOLORS >> $WMII_DIR/ctl -echo normcolors $WMII_NORMCOLORS >> $WMII_DIR/ctl -echo grabmod $MODKEY >> $WMII_DIR/ctl -echo border 1 >> $WMII_DIR/ctl -xsetroot -solid "$WMII_BACKGROUND" & - -progsfile=$WMII_NAMESPACE/.proglist -path_ls $PATH > $progsfile & - -eval arg `scansection Key|cut -sf2` >> $WMII_DIR/keys - -# Clear the LBar -find $WMII_DIR/lbar -type f -delete - -# Emulate [Create|Focus]Tag events -seltag=`sed 1q $WMII_DIR/tag/sel/ctl` -lstags | while read tag; do - Event CreateTag "$tag" - if [ "$tag" = "$seltag" ]; then - Event FocusTag "$tag" - fi -done - -Action autostart 2>/dev/null & +# Let any running instances of wmiirc know that we're starting +PIDFILE=$WMII_NAMESPACE/.wmii.pid +echo $$ > $PIDFILE -if [ -f "`conffile wmiirc_local`" ]; then - . "`conffile wmiirc_local`" -fi +Event WmiircStart trap "Event Quit" EXIT # use wmiir so it doesn't look like an open file -wmiir read /event | while read event; do - Event $event +wmiir read /event 2>/dev/null | while read event; do + [[ $$ = $(cat $PIDFILE) ]] && Event $event done + +Event WmiircQuit -- cgit v1.1-4-g5e80 From 8996d931f15ae50bbae47bbafbd950fc420d2428 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 17:38:06 -0400 Subject: wmii: add help-events and help-keys actions --- .wmii/help-events | 3 +++ .wmii/help-keys | 3 +++ 2 files changed, 6 insertions(+) create mode 100755 .wmii/help-events create mode 100755 .wmii/help-keys diff --git a/.wmii/help-events b/.wmii/help-events new file mode 100755 index 0000000..25b7d41 --- /dev/null +++ b/.wmii/help-events @@ -0,0 +1,3 @@ +#!/bin/bash +. "$HOME/.wmii/include.sh" +scansection Event | xmessage -file - diff --git a/.wmii/help-keys b/.wmii/help-keys new file mode 100755 index 0000000..c6e7038 --- /dev/null +++ b/.wmii/help-keys @@ -0,0 +1,3 @@ +#!/bin/bash +. "$HOME/.wmii/include.sh" +scansection Key | xmessage -file - -- cgit v1.1-4-g5e80 From 198455ac623054f46b4da3fec040fb7cb0494ce1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 18:58:09 -0400 Subject: wmii: clean up a vew variables --- .wmii/config.sh | 13 ++++++------- .wmii/include.sh | 4 ---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.wmii/config.sh b/.wmii/config.sh index abe378f..58217fa 100644 --- a/.wmii/config.sh +++ b/.wmii/config.sh @@ -6,6 +6,8 @@ DOWN=n LEFT=b RIGHT=f +HIST="`conffile history`" + # Colors tuples: " " . `conffile theme-solarized-dark` @@ -37,9 +39,6 @@ Event() { # Configure X11 xsetroot -solid "$WMII_BACKGROUND" - # Generate dynamic files - path_ls $PATH > $progsfile - # Clear the LBar and RBar find $WMII_DIR/{l,r}bar -type f -delete # Populate the LBar by emulating [Create|Focus]Tag events @@ -210,22 +209,22 @@ Key() { ## Running programs $MODKEY-a) ## Open wmii actions menu - Action $(path_ls $WMII_CONFPATH | wimenu -h "${hist}.actions" -n 5000) & ;; + Action $(path_ls $WMII_CONFPATH | wimenu -h "${HIST}.actions" -n 5000) & ;; $MODKEY-x) ## Open program menu - setsid $(wimenu -h "${hist}.progs" -n 5000 <$progsfile) & ;; + setsid $(path_ls $PATH | wimenu -h "${HIST}.progs" -n 5000) & ;; $MODKEY-Return) ## Launch a terminal setsid x-terminal-emulator & ;; ## Tag actions $MODKEY-t) ## Change to another tag { - tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return + tag=$(lstags | wimenu -h "${HIST}.tags" -n 50) || return echo view $tag >> $WMII_DIR/ctl }& ;; $MODKEY-Shift-t) ## Retag the selected client sel=$(sed 1q $WMII_DIR/client/sel/ctl) { - tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return + tag=$(lstags | wimenu -h "${HIST}.tags" -n 50) || return echo "$tag" >> $WMII_DIR/client/$sel/tags }& ;; esac diff --git a/.wmii/include.sh b/.wmii/include.sh index 43855e6..d4e58c3 100644 --- a/.wmii/include.sh +++ b/.wmii/include.sh @@ -8,8 +8,4 @@ if [ -z "$WMII_DIR" ]; then fi . "$HOME/.wmii/util.sh" - -hist="`conffile history`" -progsfile=$WMII_NAMESPACE/.proglist - . "$HOME/.wmii/config.sh" -- cgit v1.1-4-g5e80 From b18a02654e2c8b4a91f7c97352b75464e24c6edb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 18:59:31 -0400 Subject: wmii: redo the mount/unmount and quit code --- .wmii/config.sh | 28 ++++++++++++++++++---------- .wmii/util.sh | 7 +++++++ .wmii/wmiirc | 9 ++------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.wmii/config.sh b/.wmii/config.sh index 58217fa..4c2da38 100644 --- a/.wmii/config.sh +++ b/.wmii/config.sh @@ -28,9 +28,8 @@ Event() { ## Custom (non-WMII-generated) events WmiircStart) ## No args echo ' ==> Starting wmiirc' - 9umount "$WMII_DIR" &>/dev/null # just in case - mkdir -p "$WMII_DIR" - 9mount -i "unix!$WMII_NAMESPACE/wmii" "$WMII_DIR" + is_mounted $WMII_DIR && Event WmiircUnmount + Event WmiircMount # Configure wmii < "`conffile tagrules`" expand_variables >> $WMII_DIR/tagrules @@ -54,15 +53,24 @@ Event() { Action autostart 2>/dev/null & ;; WmiircQuit) ## No args - Event Quit;; - ## WMII-meta events - Quit) ## No args echo ' ==> Stopping wmiirc' - echo " -> unmounting WMII_DIR=$WMII_DIR..." - 9umount "$WMII_DIR" - echo " -> rmdir'ing WMII_DIR=$WMII_DIR..." - rmdir "$WMII_DIR" exit;; + WmiircMount) ## No args + echo " -> Creating mountpoint WMII_DIR=$WMII_DIR..." + mkdir -p "$WMII_DIR" + echo " -> Mounting WMII_DIR=$WMII_DIR..." + 9mount -i "unix!$WMII_NAMESPACE/wmii" "$WMII_DIR";; + WmiircUnmount) ## No args + echo " -> Unmounting WMII_DIR=$WMII_DIR..." + 9umount "$WMII_DIR" + echo " -> Removing mountpoint WMII_DIR=$WMII_DIR..." + rmdir "$WMII_DIR";; + ## WMII-meta events + Quit) ## No args + echo ' ==> wmii quit: unmounting' + trap - EXIT + Event WmiircUnmount + Event WmiircQuit;; Warning) ## $@=string notify-send "wmii warning: $*";; Key) ## $1=keystroke diff --git a/.wmii/util.sh b/.wmii/util.sh index 3234783..43d7d4a 100644 --- a/.wmii/util.sh +++ b/.wmii/util.sh @@ -31,6 +31,13 @@ expand_variables() { done } +is_mounted() { + dir="$(readlink -m $1)" + mntpnt="$(cut -d' ' -f2 /proc/mounts|grep -- "$dir")" + [[ $dir = "$mntpnt" ]] + return $? +} + ################################################################################ # PATH manipulation # ################################################################################ diff --git a/.wmii/wmiirc b/.wmii/wmiirc index c513cd1..1f1ea18 100755 --- a/.wmii/wmiirc +++ b/.wmii/wmiirc @@ -1,17 +1,12 @@ #!/bin/bash . "$HOME/.wmii/include.sh" -# Let any running instances of wmiirc know that we're starting -PIDFILE=$WMII_NAMESPACE/.wmii.pid -echo $$ > $PIDFILE +wmiir xwrite /event WmiircQuit # close any existing wmiirc's Event WmiircStart trap "Event Quit" EXIT -# use wmiir so it doesn't look like an open file wmiir read /event 2>/dev/null | while read event; do - [[ $$ = $(cat $PIDFILE) ]] && Event $event + Event $event done - -Event WmiircQuit -- cgit v1.1-4-g5e80 From 3515a46d330af1d09bf1e0b963c13a86c2dbe8a8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 18:59:51 -0400 Subject: wmii: touch up --- .wmii/config.sh | 2 +- .wmii/fixes.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.wmii/config.sh b/.wmii/config.sh index 4c2da38..1dac0ad 100644 --- a/.wmii/config.sh +++ b/.wmii/config.sh @@ -34,7 +34,7 @@ Event() { # Configure wmii < "`conffile tagrules`" expand_variables >> $WMII_DIR/tagrules < "`conffile ctl-init`" expand_variables >> $WMII_DIR/ctl - scansection Key|cut -sf2 >> $WMII_DIR/keys + scansection Key | cut -sf2 >> $WMII_DIR/keys # Configure X11 xsetroot -solid "$WMII_BACKGROUND" diff --git a/.wmii/fixes.sh b/.wmii/fixes.sh index 6e1f38b..aa09157 100644 --- a/.wmii/fixes.sh +++ b/.wmii/fixes.sh @@ -5,7 +5,7 @@ # Usage: ls DIRECTORY # Linux's 9p kernel module sometimes omits entries in directory listings ## -unalias ls 2>/dev/null +unalias ls &>/dev/null ls() { real_ls="`which ls` -1F" [ $# = 0 ] && set -- "`pwd`" -- cgit v1.1-4-g5e80