diff --git a/.Xdefaults b/.Xdefaults index 7705911..1b9f12d 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -1,33 +1,33 @@ -! -*- mode: conf-xdefaults; mode: rainbow -*- +! -*- mode: conf-xdefaults; eval: (rainbow-mode 1); eval: (git-auto-commit-mode 1) -*- ! - color scheme -*.background: #000000 -*.foreground: #15abc3 +urxvt.background: #000000 +urxvt.foreground: #15abc3 ! black -*.color0: #000000 -*.color8: #0d0b0c +urxvt.color0: #000000 +urxvt.color8: #0d0b0c ! red -*.color1: #800000 -*.color9: #c89490 +urxvt.color1: #800000 +urxvt.color9: #c89490 ! green -*.color2: #00815b -*.color10: #05e4a5 +urxvt.color2: #00815b +urxvt.color10: #05e4a5 ! yellow -*.color3: #c3ab15 -*.color11: #e0c624 +urxvt.color3: #c3ab15 +urxvt.color11: #e0c624 ! blue -*.color4: #035390 -*.color12: #029cdc +urxvt.color4: #035390 +urxvt.color12: #029cdc ! purple -*.color5: #585ca8 -*.color13: #9b859d +urxvt.color5: #585ca8 +urxvt.color13: #9b859d ! cyan -*.color6: #15abc3 -*.color14: #24c6e0 +urxvt.color6: #15abc3 +urxvt.color14: #24c6e0 ! white -*.color7: #808080 -*.color15: #ececec +urxvt.color7: #808080 +urxvt.color15: #ececec -*.internalBorder: 0 +urxvt.internalBorder: 0 ! General urxvt*loginShell: true diff --git a/.beetsconfig b/.beetsconfig new file mode 100644 index 0000000..fbce744 --- /dev/null +++ b/.beetsconfig @@ -0,0 +1,8 @@ +[beets] +library: ~/.local/share/beets/library.blb +directory: /mnt/music/mp3/ + +[paths] +default: $albumartist/$year - $album/$track - $title +singleton: Non-Album/$artist - $title +comp: Compilations/$year - $album/$track - $artist - $title diff --git a/.config/.gitignore b/.config/.gitignore index 111aa05..c65bc94 100644 --- a/.config/.gitignore +++ b/.config/.gitignore @@ -1,4 +1,4 @@ -.libreoffice/ +*libreoffice/ Empathy/ GnuDiary/ Trolltech.conf diff --git a/.config/fish/.gitignore b/.config/fish/.gitignore new file mode 100644 index 0000000..606b774 --- /dev/null +++ b/.config/fish/.gitignore @@ -0,0 +1 @@ +fishd.cloud diff --git a/.gitignore b/.gitignore index f52128a..a840b29 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,11 @@ xhtml-loader.rnc .emacs.d/ .cuyo .lgames +.bash* +.beetsmusic.blb +.beetsstate +.msmtprc +.newsrc* +.profile +.xsession_errors +Mail/ diff --git a/.moc/.gitignore b/.moc/.gitignore new file mode 100644 index 0000000..1210ad5 --- /dev/null +++ b/.moc/.gitignore @@ -0,0 +1,5 @@ +cache/ +equalizer +last_directory +softmixer +tags_cache diff --git a/.moc/config b/.moc/config new file mode 100644 index 0000000..b805b8f --- /dev/null +++ b/.moc/config @@ -0,0 +1 @@ +Theme = custom diff --git a/.moc/themes/custom b/.moc/themes/custom new file mode 100644 index 0000000..f9eef4d --- /dev/null +++ b/.moc/themes/custom @@ -0,0 +1,118 @@ +# Example color theme for MOC. +# You can use a theme by copying it to ~/.moc/themes directory and using +# Theme config option or -T command line option. +# +# Fill free to make your own themes and send me them. It will be included in +# official MOC releases or on the MOC web site. +# +# The format of this file is: +# Lines beginning with # are comments. +# Blank lines are ignored. +# Every other line is expected to be in format: +# +# ELEMENT = FOREGROUND_COLOR BACKGROUND_COLOR [ATTRIBUTE[,ATTRIBUTE,..]] +# +# or +# +# colordef COLOR = RED GREEEN BLUE +# +# Where names are case insensitive. +# +# ELEMENT is an element of MOC interface. This can be: +# background - default background for regions when nothing is displayed +# frame - frames for windows +# window_title - the title of the window (eg name of the current +# directory) +# directory - a directory in the menu +# selected_directory - a directory that is selected using arrows +# playlist - playlist file +# selected_playlist - see selected directory +# file - an ordinary file in the menu (mp3, ogg, ...) +# selected_file - see selected directory +# marked_file - a file that is currently beeing played +# marked_selected_file - a file that is currently beeing played and is also +# selected using arrows +# info - information shown at the right side of files +# status - the status line with a message +# title - the title of the file that is currently beeing played +# state - the state: play, stop, or paus (>, [], ||) +# current_time - current time of playing +# time_left - the time left to the end of playing the current file +# total_time - the length of the currently played file +# time_total_frames - the brackets outside the total time of a file ([10:13]) +# sound_parameters - the frequency and bitrate numbers +# legend - "KHz" and "Kbps" +# disabled - disabled element ([STEREO]) +# enabled - enabled element +# empty_mixer_bar - "empty" part of the volume bar +# filled_mixer_bar - "filled" part of the volume bar +# empty_time_bar - "empty" part of the time bar +# filled_time_bar - "filled" part of the time bar +# entry - place wher user can type a search query or a file name +# entry_title - the title of an entry +# error - error message +# message - information message +# plist_time - total time of displayed items +# +# FOREGOUND_VOLOR and BACKGROUND_COLOR can have one of the following values: +# black, red, green, yellow, blue, magenta, cyan, white, default (can be +# transparent), grey (not standard, but works) +# +# Optional ATTRIBUTE parameters can be (from ncurses manual): +# normal - default (no highlight) +# standout - best highlighting mode of the terminal +# underline - underlining +# reverse - reverse video +# blink - blinking +# dim - half bright +# bold - extra bright or bold +# protect - protected mode +# +# You can specify a list of attributes separated by commas: attr1,attr2,attr3. +# Don't use spaces anywhere in such a list. +# +# With colordef you can chend the definition of a color. It works only if +# your termina supports it, if not those lines will be silently ignored. +# COLOR must be a valid color name and the RED GREEN and BLUE are numbers +# from 0 to 1000. Example: +# +# colordef red = 1000 0 0 +# +# HINT: you have only 8 colors, but combined with attributes bold and/or +# reversed you actually get more colors. +# +# If you don't specify some elements, the default values will be used. +# +# Here follows the default configuration: +background = default default +frame = default default +window_title = default default +directory = default default bold +selected_directory = default black bold +playlist = default default bold +selected_playlist = default black bold +file = default default +selected_file = default black +marked_file = green default bold +marked_selected_file = green black bold +info = blue default bold +status = default default +title = default default bold +state = default default bold +current_time = default default bold +time_left = default default bold +total_time = default default bold +time_total_frames = default default +sound_parameters = default default bold +legend = default default +disabled = blue default bold +enabled = default default bold +empty_mixer_bar = default default +filled_mixer_bar = black cyan +empty_time_bar = default default +filled_time_bar = black cyan +entry = default default +entry_title = black cyan +error = red default bold +message = green default bold +plist_time = default default diff --git a/.xbindkeysrc.scm b/.xbindkeysrc.scm index 9e17422..d1c9479 100644 --- a/.xbindkeysrc.scm +++ b/.xbindkeysrc.scm @@ -1,8 +1,8 @@ -;; -*- eval: (git-auto-commit-mode 1) -*- +;;;_ Import (use-modules (ice-9 popen) (ice-9 rdelim)) -;;; Variables +;;;_ Variables (define modkey 'mod4) (define dmenu-font "-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*") @@ -22,7 +22,7 @@ (define previous-tag '()) (define current-tag "default") -;;; Macros +;;;_ Macros (define-macro (cmd command) `(lambda () (run-command ,command) @@ -36,7 +36,7 @@ (xbindkey-function `(,modkey g) reset-main-binding) (grab-all-keys))) -;;; Functions +;;;_ Functions (define (reset-main-binding) "reset first binding" (close-gui-window) @@ -66,19 +66,34 @@ (close-port file) tag)) -(define (switch-tags) - "Switch to another tag" - (let* ((tags (get-tags)) - (tag (choose-tag "Switch to tag" tags))) +(define (switch-to-tag tag) + (let ((tags (get-tags))) (if (string? tag) (begin (if (not (member tag tags)) (system (string-append "herbstclient add " tag))) (set! previous-tag current-tag) (set! current-tag tag) - (run-command (string-append "herbstclient use " tag)))) + (run-command (string-append "herbstclient use " tag)))))) + +(define (switch-tags) + "Switch to another tag" + (let* ((tags (get-tags)) + (tag (choose-tag "Switch to tag" tags))) + (switch-to-tag tag) (reset-main-binding))) +(define (switch-and-run) + "Ask for a command to run, switch to a tag with that name and run +the command." + (let* ((file (open-input-pipe + (string-append "dmenu_pick -p 'Run:' " dmenu-args))) + (prog (read-line file))) + (close-port file) + (switch-to-tag prog) + (run-command prog)) + (reset-main-binding)) + (define (kill-tag) "Kill a selected tag" (let* ((tags (get-tags)) @@ -123,7 +138,7 @@ (close-pipe dzen-pipe) (set! dzen-pipe '()))) -;;; Maps +;;;_ Maps (define (main-binding) "First binding" (xbindkey `(,modkey shift "1") (string-append "dmenu_run -p 'Run:' " dmenu-args)) @@ -142,6 +157,10 @@ (xbindkey '(XF86AudioPrev) "mpc prev") (xbindkey '(XF86AudioNext) "mpc next") (xbindkey '(XF86Tools) "ncmpcpp") + (xbindkey `(,modkey b) "herbstclient focus left") + (xbindkey `(,modkey n) "herbstclient focus down") + (xbindkey `(,modkey p) "herbstclient focus up") + (xbindkey `(,modkey f) "herbstclient focus right") (xbindkey-function `(,modkey g) reset-main-binding)) (create-map X-function-map @@ -158,7 +177,8 @@ (xbindkey-function '(shift f) (cmd "herbstclient fullscreen toggle")) (xbindkey-function '(p) (cmd "herbstclient pseudotile toggle")) (xbindkey-function '(r) resize-map) - (xbindkey-function '(m) move-to-tag)) + (xbindkey-function '(m) move-to-tag) + (xbindkey-function `(,modkey f) switch-and-run)) (create-map W-function-map (gui-print "S-w") @@ -186,5 +206,10 @@ (xbindkey `(,modkey f) "herbstclient resize right +0.05") (xbindkey-function '(Return) reset-main-binding)) -;;; Main +;;;_ Main (main-binding) + +;;;_ Local Variables +;; Local Variables: +;; eval: (git-auto-commit-mode 1) +;; End: diff --git a/.xinitrc b/.xinitrc index 0d1c74e..e637ab5 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,30 +1,26 @@ -# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*- - -# -----[ Set background ]--------------------------------------------- -hsetroot -center ~/pictures/wallpapers/3600x1080/wallpaper-1460625.jpg - -# -----[ Modify keys ]------------------------------------------------ +#_ Modify keys xmodmap ~/.Xmodmap - -# -----[ Start some programs ]---------------------------------------- -conky +#_ Start some programs numlockx & -emacs --daemon -xbindkeys - -# mpdscribble +emacs --daemon & +xbindkeys & +#_. mpdscribble pidof mpdscribble >& /dev/null if [ $? -ne 0 ] then mpdscribble & fi - +#_. mpdnotify mpc idleloop player | { while read; do notify-send "`mpc current`"; done } & - -# -----[ Start notifier ]--------------------------------------------- +#_ Start notifier /usr/bin/dunst \ -fn "-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*" \ -nb "#000000" -nf "#15abc3" & - -# -----[ Start session ]---------------------------------------------- +#_ Start session exec ck-launch-session /usr/bin/herbstluftwm 2>&1 > ~/.xsession_errors +#_ Local Variables +# Local Variables: +# mode: shell-script +# eval: (git-auto-commit-mode 1) +# eval: (allout-mode 1) +# End: