From fc65ba409d05899d4918c709cbc63f63171a9317 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Wed, 20 Jul 2016 14:38:45 +0200 Subject: [PATCH] added directories, todoman and mpd --- cal/.config/todoman/todoman.conf | 2 ++ dirs.sh | 6 ++++ music/.config/mpd/mpd.conf | 41 +++++++++++++++++++++++++ music/.local/bin/ncmpcpp | 3 ++ music/.ncmpcpp/bindings | 22 ++++++++++++++ music/.ncmpcpp/config | 51 ++++++++++++++++++++++++++++++++ music/.ncmpcpp/cover.sh | 8 +++++ pkgs.sh | 33 +++++++++++++++++++++ shell/.bashrc | 2 +- x/.config/i3/config | 11 +++---- x/.config/i3status/config | 21 +------------ 11 files changed, 172 insertions(+), 28 deletions(-) create mode 100644 cal/.config/todoman/todoman.conf create mode 100644 dirs.sh create mode 100644 music/.config/mpd/mpd.conf create mode 100755 music/.local/bin/ncmpcpp create mode 100644 music/.ncmpcpp/bindings create mode 100644 music/.ncmpcpp/config create mode 100755 music/.ncmpcpp/cover.sh create mode 100644 pkgs.sh diff --git a/cal/.config/todoman/todoman.conf b/cal/.config/todoman/todoman.conf new file mode 100644 index 0000000..ee89e59 --- /dev/null +++ b/cal/.config/todoman/todoman.conf @@ -0,0 +1,2 @@ +[main] +path = ~/.vdirsyncer/cal/default diff --git a/dirs.sh b/dirs.sh new file mode 100644 index 0000000..0541a6c --- /dev/null +++ b/dirs.sh @@ -0,0 +1,6 @@ +mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman} +mkdir -pv ~/.mutt +mkdir -pv ~/.gnupg +mkdir -pv ~/.vim/{autoload,bundle} +mkdir -pv ~/.{local/bin,config/{i3,i3status}} +mkdir -pv ~/.{ncmpcpp,config/mpd} diff --git a/music/.config/mpd/mpd.conf b/music/.config/mpd/mpd.conf new file mode 100644 index 0000000..5532ffb --- /dev/null +++ b/music/.config/mpd/mpd.conf @@ -0,0 +1,41 @@ +db_file "~/.config/mpd/database" +log_file "~/.config/mpd/log" + +# Optional +music_directory "/mnt/data/music" +playlist_directory "~/.config/mpd/playlists" +pid_file "~/.config/mpd/pid" +state_file "~/.config/mpd/state" +sticker_file "~/.config/mpd/sticker.sql" + +user "mrl" +group "mrl" +bind_to_address "any" + +auto_update "yes" +follow_outside_symlinks "yes" +follow_inside_symlinks "yes" + +input { + plugin "curl" +# proxy "proxy.isp.com:8080" +# proxy_user "user" +# proxy_password "password" +} + +audio_output { + type "pulse" + name "My Pulse Output" +# server "remote_server" # optional +# sink "remote_server_sink" # optional +} + +audio_output { + type "fifo" + name "Visualizer feed" + path "/dev/shm/mpd.fifo" + format "44100:16:2" +} + +filesystem_charset "UTF-8" +id3v1_encoding "UTF-8" diff --git a/music/.local/bin/ncmpcpp b/music/.local/bin/ncmpcpp new file mode 100755 index 0000000..352eee5 --- /dev/null +++ b/music/.local/bin/ncmpcpp @@ -0,0 +1,3 @@ +#!/bin/bash +/usr/bin/ncmpcpp "$@" +printf "\e]20;;100x100+1000+1000\a" diff --git a/music/.ncmpcpp/bindings b/music/.ncmpcpp/bindings new file mode 100644 index 0000000..5512564 --- /dev/null +++ b/music/.ncmpcpp/bindings @@ -0,0 +1,22 @@ +def_key "j" + scroll_down +def_key "k" + scroll_up +def_key "J" + select_item + scroll_down +def_key "K" + select_item + scroll_up +def_key "l" + next_column +def_key "l" + slave_screen +def_key "h" + previous_column +def_key "h" + master_screen +def_key "ctrl-j" + page_down +def_key "ctrl-k" + page_up diff --git a/music/.ncmpcpp/config b/music/.ncmpcpp/config new file mode 100644 index 0000000..736e26d --- /dev/null +++ b/music/.ncmpcpp/config @@ -0,0 +1,51 @@ +mpd_music_dir = /mnt/data/music + +visualizer_fifo_path = /dev/shm/mpd.fifo +visualizer_output_name = Visualizer feed +visualizer_in_stereo = yes +visualizer_type = spectrum +visualizer_look = .* +# ●▮ + +browser_sort_mode = name +browser_sort_format = {%A - }{%t}|{%f} {(%l)} + +execute_on_song_change = "~/.ncmpcpp/cover.sh" + +playlist_show_remaining_time = yes +playlist_shorten_total_times = yes +playlist_separate_albums = yes + +browser_display_mode = columns +search_engine_display_mode = columns +playlist_editor_display_mode = columns + +autocenter_mode = yes +centered_cursor = yes + +default_place_to_search_in = database +user_interface = alternative + +media_library_primary_tag = album_artist +cyclic_scrolling = yes + +allow_for_physical_item_deletion = no + +startup_screen = "playlist" +startup_slave_screen = "media_library" + +locked_screen_width_part = 50 +ask_for_locked_screen_width_part = no + +clock_display_seconds = yes +display_volume_level = yes +display_bitrate = yes +display_remaining_time = yes + +ignore_leading_the = yes +media_library_sort_by_mtime = no + +enable_window_title = yes + +external_editor = vim +use_console_editor = yes diff --git a/music/.ncmpcpp/cover.sh b/music/.ncmpcpp/cover.sh new file mode 100755 index 0000000..6d56ac9 --- /dev/null +++ b/music/.ncmpcpp/cover.sh @@ -0,0 +1,8 @@ +#!/bin/bash +shopt -s nullglob + +file="$(mpc --format /mnt/data/music/%file% current)" +printf "\e]20;;100x100+1000+1000\a" +for c in "${file%/*}/cover."*; do + printf "\e]20;$c;30x30+1+94:op=keep-aspect\a" +done diff --git a/pkgs.sh b/pkgs.sh new file mode 100644 index 0000000..66fb78a --- /dev/null +++ b/pkgs.sh @@ -0,0 +1,33 @@ +sudo apt-get install \ + bash-completion \ + build-essential \ + dunst \ + flashplugin-nonfree \ + git \ + gv \ + i3-wm \ + i3status \ + iotop \ + man-db \ + mpd \ + msmtp \ + mutt \ + ncmpcpp \ + notmuch \ + notmuch-mutt \ + offlineimap \ + pass \ + pavucontrol \ + pinentry-qt \ + psmisc \ + puddletag \ + pulseaudio \ + python3-virtualenv \ + stow \ + suckless-tools \ + unzip \ + vim \ + virtualbox \ + w3m \ + x11-xserver-utils \ + xinit diff --git a/shell/.bashrc b/shell/.bashrc index de7e106..c7b2658 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -16,7 +16,7 @@ export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass export NOTMUCH_CONFIG=~/.mutt/notmuch-config export CLEAN_HOME=/opt/clean -export PATH=$PATH:~/.local/bin:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin +export PATH=~/.local/bin:$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin alias ls='ls --color=auto' alias grep='grep --color=auto' diff --git a/x/.config/i3/config b/x/.config/i3/config index f8534f5..ba92828 100644 --- a/x/.config/i3/config +++ b/x/.config/i3/config @@ -14,20 +14,19 @@ set $font DejaVu Sans Mono set $fontsize 12 # lock the screen after 10 minutes -exec xautolock -locker ~/.local/bin/lock.sh &\ - display -window root /tmp/bg.png &\ +exec display -window root /tmp/bg.png &\ dunst &\ - /usr/sbin/wpa_gui -t &\ urxvtd -q -o -f &\ + mpd &\ xrdb -merge ~/.Xresources &\ setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle +# Toggle playback +bindsym Pause exec mpc toggle # Printscreen current window bindsym Shift+Print exec ~/.local/bin/scr window # Printscreen bindsym Print exec ~/.local/bin/scr -# lock the screen -bindsym $mod+l exec xautolock -locknow # put a password in the clipboard bindsym $mod+y exec /usr/share/doc/pass/examples/dmenu/passmenu bindsym $mod+b exec ~/.local/bin/network @@ -146,6 +145,4 @@ bar { status_command i3status modifier $mod font pango:$font $fontsize - mode hide - bindsym button1 exec killall -USR1 i3status } diff --git a/x/.config/i3status/config b/x/.config/i3status/config index fa2e5f2..d3b3458 100644 --- a/x/.config/i3status/config +++ b/x/.config/i3status/config @@ -3,36 +3,17 @@ general { interval = 5 } -order += "wireless wlp2s0" -order += "ethernet enp3s0f1" +order += "ethernet enp5s0" order += "volume master" order += "disk /" -order += "wireless wlp1s0" -order += "battery 0" order += "tztime local" -battery 0 { - format = "%status %percentage %remaining" - integer_battery_capacity = true - format_down = "No battery" - status_chr = "⚇ CHR" - status_bat = "⚡ BAT" - status_full = "☻ FULL" - path = "/sys/class/power_supply/BAT%d/uevent" - low_threshold = 10 -} - volume master { format = "♪: %volume" format_muted = "♪: muted (%volume)" device = "hw:1" } -wireless wlp2s0 { - format_up = "W: %essid %ip" - format_down ="W: down" -} - ethernet enp3s0f1 { format_up = "E: %ip" format_down ="E: down" -- 2.20.1