diff --git a/bash/.bash_profile b/bash/.bash_profile index d920cfe..9e325e5 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1,15 +1,6 @@ -<<<<<<< HEAD -======= -# # ~/.bash_profile # # Get the aliases and functions [ -f $HOME/.bashrc ] && . $HOME/.bashrc [[ -f ~/.bashrc ]] && . ~/.bashrc -export XDG_CONFIG_HOME="$HOME/.config" -#export DISPLAY=:0 -export BROWSER=firefox -export EDITOR=vim -export TERM=screen-256color ->>>>>>> 05f5a5326ea758311bda4cc4225cd0ce265b8ec0 diff --git a/mpd/mpd.conf b/mpd/mpd.conf index a0548ec..b22f35a 100644 --- a/mpd/mpd.conf +++ b/mpd/mpd.conf @@ -1,6 +1,6 @@ db_file "~/.config/mpd/database" log_file "~/.config/mpd/log" -music_directory "~/Music" +music_directory "/mnt/media/music" playlist_directory "~/.config/mpd/playlists" pid_file "~/.config/mpd/pid" state_file "~/.config/mpd/state" @@ -15,7 +15,7 @@ max_output_buffer_size "16384" audio_output { type "alsa" name "alsa for audio soundcard" - mixer_type "software" + # mixer_type "software" } audio_output { @@ -24,3 +24,17 @@ name "toggle_visualizer" path "/tmp/mpd.fifo" format "44100:16:2" } + +audio_output { + type "pulse" + name "PulseAudio Output" + #server "localhost" # optional + #sink "alsa_output" # optional +} + +audio_output { + type "alsa" + name "MPD" + device "pulse" + mixer_control "Master" +} diff --git a/newsboat/config b/newsboat/config index 36e126d..8fa3c35 100644 --- a/newsboat/config +++ b/newsboat/config @@ -30,7 +30,7 @@ color listfocus_unread yellow default bold color info red black bold color article cyan default -browser linkhandler +# browser linkhandler macro , open-in-browser macro t set browser "tsp youtube-dl --add-metadata -ic"; open-in-browser ; set browser linkhandler macro a set browser "tsp youtube-dl --add-metadata -xic -f bestaudio/best"; open-in-browser ; set browser linkhandler diff --git a/ranger/rc.conf b/ranger/rc.conf new file mode 100644 index 0000000..ca99503 --- /dev/null +++ b/ranger/rc.conf @@ -0,0 +1 @@ +map bw shell wal -i %s diff --git a/ranger/rifle.conf b/ranger/rifle.conf new file mode 100644 index 0000000..a388b59 --- /dev/null +++ b/ranger/rifle.conf @@ -0,0 +1,264 @@ +# vim: ft=cfg +# +# This is the configuration file of "rifle", ranger's file executor/opener. +# Each line consists of conditions and a command. For each line the conditions +# are checked and if they are met, the respective command is run. +# +# Syntax: +# , , ... = command +# +# The command can contain these environment variables: +# $1-$9 | The n-th selected file +# $@ | All selected files +# +# If you use the special command "ask", rifle will ask you what program to run. +# +# Prefixing a condition with "!" will negate its result. +# These conditions are currently supported: +# match | The regexp matches $1 +# ext | The regexp matches the extension of $1 +# mime | The regexp matches the mime type of $1 +# name | The regexp matches the basename of $1 +# path | The regexp matches the absolute path of $1 +# has | The program is installed (i.e. located in $PATH) +# env | The environment variable "variable" is non-empty +# file | $1 is a file +# directory | $1 is a directory +# number | change the number of this command to n +# terminal | stdin, stderr and stdout are connected to a terminal +# X | $DISPLAY is not empty (i.e. Xorg runs) +# +# There are also pseudo-conditions which have a "side effect": +# flag | Change how the program is run. See below. +# label