More changes.

This commit is contained in:
2014-08-19 13:49:19 +02:00
parent 46c9c6de47
commit 00c8fe6f61
10 changed files with 114 additions and 114 deletions

View File

@@ -17,7 +17,6 @@
rb = "rebase" rb = "rebase"
df = "diff" df = "diff"
last = "log -1 HEAD" last = "log -1 HEAD"
logl = log --graph --decorate --pretty=oneline --abbrev-commit --all logl = log --graph --decorate --pretty=oneline --abbrev-commit --all
@@ -37,3 +36,7 @@
tool = vimdiff tool = vimdiff
[gc] [gc]
auto = 0 auto = 0
[advice]
pushNonFastForward = false
statusHints = false
commitBeforeMerge = false

View File

@@ -15,7 +15,7 @@ bindsym XF86AudioNext exec --no-startup-id mpc next
# font for window titles. ISO 10646 = Unicode # font for window titles. ISO 10646 = Unicode
font pango:DejaVu Sans Mono 11 font pango:DejaVu Sans Mono 11
bindsym $mod+o exec --no-startup-id "bash -c '~/development/projects/xautorandr/xautorandr.sh ; kill -SIGUSR2 $(cat $HOME/.var/run/wallchanger.pid)'" bindsym $mod+o exec --no-startup-id "bash -c '~/development/projects/xautorandr/xautorandr ; kill -SIGUSR2 $(cat $HOME/.var/run/wallchanger.pid)'"
bindsym $mod+p exec --no-startup-id "bash -c 'kill -SIGUSR1 $(cat $HOME/.var/run/wallchanger.pid)'" bindsym $mod+p exec --no-startup-id "bash -c 'kill -SIGUSR1 $(cat $HOME/.var/run/wallchanger.pid)'"

View File

@@ -69,6 +69,10 @@ case "$signal" in
log "[I] Shutting down." log "[I] Shutting down."
systemctl poweroff systemctl poweroff
;; ;;
screen-off)
log "[I] Turning screen off."
xset dpms force off
;;
*) *)
echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}" echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}"
log "[E] Signal \"$signal\" unknown. Aborting." log "[E] Signal \"$signal\" unknown. Aborting."

View File

@@ -6,7 +6,8 @@ options=(
"suspend" "suspend"
"hibernate" "hibernate"
"reboot" "reboot"
"shutdown") "shutdown"
"screen-off")
i=1 i=1
output=$( output=$(

View File

@@ -267,9 +267,9 @@ follow_inside_symlinks "yes"
audio_output { audio_output {
type "httpd" type "httpd"
name "mpd http stream" name "mpd http stream"
encoder "vorbis" # optional, vorbis or lame encoder "lame" # optional, vorbis or lame
port "8000" port "8000"
# bind_to_address "0.0.0.0" # optional, IPv4 or IPv6 # bind_to_address "localhost" # optional, IPv4 or IPv6
quality "5.0" # do not define if bitrate is defined quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined # bitrate "128" # do not define if quality is defined
format "44100:16:1" format "44100:16:1"
@@ -280,7 +280,7 @@ audio_output {
# #
audio_output { audio_output {
type "pulse" type "pulse"
name "mpd" name "mpd pulse"
## server "remote_server" # optional ## server "remote_server" # optional
## sink "remote_server_sink" # optional ## sink "remote_server_sink" # optional
} }
@@ -288,7 +288,7 @@ audio_output {
# This is necessary for visualization in ncmpcpp # This is necessary for visualization in ncmpcpp
audio_output { audio_output {
type "fifo" type "fifo"
name "mpd_fifo" name "mpd fifo"
path "/tmp/mpd.fifo" path "/tmp/mpd.fifo"
format "44100:16:2" format "44100:16:2"
} }

View File

@@ -32,9 +32,9 @@ mpd_port = "6600"
# #
mpd_music_dir = "~/music/library" mpd_music_dir = "~/music/library"
# #
#mpd_connection_timeout = "5" mpd_connection_timeout = "5"
# #
#mpd_crossfade_time = "5" mpd_crossfade_time = "5"
# #
#(polling/notifications) #(polling/notifications)
mpd_communication_mode = "notifications" mpd_communication_mode = "notifications"
@@ -59,7 +59,7 @@ mpd_communication_mode = "notifications"
## If you set format to 44100:16:2, make it 'yes'. ## If you set format to 44100:16:2, make it 'yes'.
## ##
# #
visualizer_in_stereo = "no" visualizer_in_stereo = "yes"
# #
visualizer_fifo_path = "/tmp/mpd.fifo" visualizer_fifo_path = "/tmp/mpd.fifo"
# #
@@ -90,7 +90,7 @@ visualizer_sync_interval = "30"
# #
visualizer_type = "spectrum" (spectrum/wave) visualizer_type = "spectrum" (spectrum/wave)
# #
visualizer_look = "◆" visualizer_look = "◆#"
# #
##### system encoding ##### ##### system encoding #####
## ##
@@ -113,11 +113,11 @@ visualizer_look = "◆│"
# #
## delay after playlist highlighting will be disabled (0 = don't disable) ## delay after playlist highlighting will be disabled (0 = don't disable)
# #
#playlist_disable_highlight_delay = "5" playlist_disable_highlight_delay = "5"
# #
## defines how long various messages are supposed to be visible ## defines how long various messages are supposed to be visible
# #
#message_delay_time = "4" message_delay_time = "4"
# #
##### song format ##### ##### song format #####
## ##
@@ -173,11 +173,11 @@ visualizer_look = "◆│"
# #
song_list_format = "{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}" song_list_format = "{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}"
# #
#song_status_format = "{{%a{ \"%b\"{ (%y)}} - }{%t}}|{%f}" song_status_format = "{{%a{ \"%b\"{ (%y)}} - }{%t}}|{%f}"
# #
#song_library_format = "{%n - }{%t}|{%f}" song_library_format = "{%n - }{%t}|{%f}"
# #
#tag_editor_album_format = "{(%y) }%b" tag_editor_album_format = "{(%y) }%b"
# #
## ##
## Note: Below variables are for alternative version of user's interface. ## Note: Below variables are for alternative version of user's interface.
@@ -196,28 +196,28 @@ song_list_format = "{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}"
## with reversed colors. ## with reversed colors.
## ##
# #
#alternative_header_first_line_format = "$b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b" alternative_header_first_line_format = "$b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b"
# #
#alternative_header_second_line_format = "{{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}" alternative_header_second_line_format = "{{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}"
# #
## ##
## Note: Below variables also supports ## Note: Below variables also supports
## text attributes listed above. ## text attributes listed above.
## ##
# #
#now_playing_prefix = "$b" now_playing_prefix = "$b"
# #
#now_playing_suffix = "$/b" now_playing_suffix = "$/b"
# #
#browser_playlist_prefix = "$2playlist$9 " browser_playlist_prefix = "$2playlist$9 "
# #
#selected_item_prefix = "$6" selected_item_prefix = "$6"
# #
#selected_item_suffix = "$9" selected_item_suffix = "$9"
# #
## colors are not supported for below variable ## colors are not supported for below variable
# #
#song_window_title_format = "{%a - }{%t}|{%f}" song_window_title_format = "{%a - }{%t}|{%f}"
# #
##### columns settings ##### ##### columns settings #####
## ##
@@ -255,7 +255,7 @@ song_list_format = "{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}"
## not available. ## not available.
## ##
# #
#song_columns_list_format = "(7f)[green]{l} (25)[cyan]{a} (40)[]{t|f} (30)[red]{b}" song_columns_list_format = "(7f)[green]{l} (25)[cyan]{a} (40)[]{t|f} (30)[red]{b}"
# #
##### various settings ##### ##### various settings #####
# #
@@ -268,69 +268,69 @@ song_list_format = "{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}"
## ##
#execute_on_song_change = "" #execute_on_song_change = ""
# #
#playlist_show_remaining_time = "no" playlist_show_remaining_time = "no"
# #
#playlist_shorten_total_times = "no" playlist_shorten_total_times = "no"
# #
#playlist_separate_albums = "no" playlist_separate_albums = "no"
# #
#playlist_display_mode = "classic" (classic/columns) playlist_display_mode = "columns" (classic/columns)
# #
#browser_display_mode = "classic" (classic/columns) browser_display_mode = "columns" (classic/columns)
# #
#search_engine_display_mode = "classic" (classic/columns) search_engine_display_mode = "columns" (classic/columns)
# #
#playlist_editor_display_mode = "classic" (classic/columns) playlist_editor_display_mode = "columns" (classic/columns)
# #
#discard_colors_if_item_is_selected = "yes" discard_colors_if_item_is_selected = "yes"
# #
#incremental_seeking = "yes" incremental_seeking = "yes"
# #
#seek_time = "1" seek_time = "1"
# #
#autocenter_mode = "no" autocenter_mode = "no"
# #
#centered_cursor = "no" centered_cursor = "no"
# #
## ##
## Note: You can specify third character which will ## Note: You can specify third character which will
## be used to build 'empty' part of progressbar. ## be used to build 'empty' part of progressbar.
## ##
progressbar_look = "==" progressbar_look = "=|"
# #
#default_place_to_search_in = "database" (database/playlist) #default_place_to_search_in = "database" (database/playlist)
# #
#user_interface = "classic" (classic/alternative) user_interface = "alternative" (classic/alternative)
# #
#media_library_left_column = "a" (possible values: a,y,g,c,p, legend above) media_library_left_column = "a" (possible values: a,y,g,c,p, legend above)
# #
#default_find_mode = "wrapped" (wrapped/normal) default_find_mode = "wrapped" (wrapped/normal)
# #
#default_space_mode = "add" (add/select) default_space_mode = "add" (add/select)
# #
#default_tag_editor_left_col = "albums" (albums/dirs) default_tag_editor_left_col = "albums" (albums/dirs)
# #
#default_tag_editor_pattern = "%n - %t" default_tag_editor_pattern = "%n - %t"
# #
#header_visibility = "yes" header_visibility = "yes"
# #
#statusbar_visibility = "yes" statusbar_visibility = "yes"
# #
#titles_visibility = "yes" titles_visibility = "yes"
# #
#header_text_scrolling = "yes" header_text_scrolling = "yes"
# #
#fancy_scrolling = "yes" fancy_scrolling = "yes"
# #
#cyclic_scrolling = "no" cyclic_scrolling = "no"
# #
#lines_scrolled = "2" lines_scrolled = "2"
# #
#follow_now_playing_lyrics = "no" follow_now_playing_lyrics = "no"
# #
#fetch_lyrics_for_current_song_in_background = "no" fetch_lyrics_for_current_song_in_background = "no"
# #
#store_lyrics_in_song_dir = "no" store_lyrics_in_song_dir = "no"
# #
## ##
## Note: If you set this variable, ncmpcpp will try to ## Note: If you set this variable, ncmpcpp will try to
@@ -385,46 +385,46 @@ progressbar_look = "=="
## Note: You can define startup screen for ncmpcpp ## Note: You can define startup screen for ncmpcpp
## by choosing screen number from the list above. ## by choosing screen number from the list above.
## ##
#startup_screen = "2" startup_screen = "2"
# #
#jump_to_now_playing_song_at_start = "yes" jump_to_now_playing_song_at_start = "yes"
# #
#ask_before_clearing_main_playlist = "no" ask_before_clearing_main_playlist = "no"
# #
#clock_display_seconds = "no" clock_display_seconds = "no"
# #
#display_volume_level = "yes" display_volume_level = "yes"
# #
#display_bitrate = "no" display_bitrate = "no"
# #
#display_remaining_time = "no" display_remaining_time = "no"
# #
#regular_expressions = "basic" (basic/extended) regular_expressions = "basic" (basic/extended)
# #
## ##
## Note: If below is enabled, ncmpcpp will ignore leading ## Note: If below is enabled, ncmpcpp will ignore leading
## "The" word while sorting items in browser, tags in ## "The" word while sorting items in browser, tags in
## media library, etc. ## media library, etc.
## ##
#ignore_leading_the = "no" ignore_leading_the = "yes"
# #
#block_search_constraints_change_if_items_found = "yes" #block_search_constraints_change_if_items_found = "yes"
# #
#mouse_support = "yes" mouse_support = "yes"
# #
#mouse_list_scroll_whole_page = "yes" mouse_list_scroll_whole_page = "yes"
# #
#empty_tag_marker = "<empty>" empty_tag_marker = "<empty>"
# #
#tag_editor_extended_numeration = "no" tag_editor_extended_numeration = "no"
# #
#media_library_display_date = "yes" media_library_display_date = "yes"
# #
#media_library_display_empty_tag = "yes" media_library_display_empty_tag = "yes"
# #
#media_library_disable_two_column_mode = "no" media_library_disable_two_column_mode = "no"
# #
#enable_window_title = "yes" enable_window_title = "yes"
# #
## ##
## Note: You can choose default search mode for search ## Note: You can choose default search mode for search
@@ -438,7 +438,7 @@ progressbar_look = "=="
## in database and local one for searching in current playlist) ## in database and local one for searching in current playlist)
## ##
# #
#search_engine_default_search_mode = "1" search_engine_default_search_mode = "1"
# #
## ##
## Note: Below variables can allow you to physically ## Note: Below variables can allow you to physically
@@ -446,9 +446,9 @@ progressbar_look = "=="
## ncmpcpp's browser screen. ## ncmpcpp's browser screen.
## ##
# #
#allow_physical_files_deletion = "no" allow_physical_files_deletion = "no"
# #
#allow_physical_directories_deletion = "no" allow_physical_directories_deletion = "no"
# #
#external_editor = "" #external_editor = ""
# #
@@ -456,37 +456,37 @@ progressbar_look = "=="
# #
##### colors definitions ##### ##### colors definitions #####
# #
#colors_enabled = "yes" colors_enabled = "yes"
# #
#empty_tag_color = "cyan" empty_tag_color = "cyan"
# #
#header_window_color = "default" header_window_color = "default"
# #
#volume_color = "default" volume_color = "default"
# #
#state_line_color = "default" state_line_color = "default"
# #
#state_flags_color = "default" state_flags_color = "default"
# #
#main_window_color = "yellow" main_window_color = "yellow"
# #
#color1 = "white" color1 = "white"
# #
#color2 = "green" color2 = "green"
# #
#main_window_highlight_color = "yellow" main_window_highlight_color = "yellow"
# #
#progressbar_color = "default" progressbar_color = "default"
# #
#statusbar_color = "default" statusbar_color = "default"
# #
#alternative_ui_separator_color = "black" alternative_ui_separator_color = "black"
# #
#active_column_color = "red" active_column_color = "red"
# #
#visualizer_color = "yellow" visualizer_color = "yellow"
# #
#window_border_color = "green" window_border_color = "green"
# #
#active_window_border = "red" active_window_border = "red"
# #

View File

@@ -1,6 +1,7 @@
chromium-libpdf chromium-libpdf
chromium-pepper-flash chromium-pepper-flash
cower cower
dmenu2
dropbox dropbox
fontconfig-infinality-git fontconfig-infinality-git
freetype2-infinality-git freetype2-infinality-git

View File

@@ -1,12 +1,11 @@
abs
acpi acpi
alsa-utils alsa-utils
atool atool
atop atop
baobab
blender blender
btrfs-progs btrfs-progs
bzr bzr
cdparanoia
chromium chromium
chrony chrony
clementine clementine
@@ -15,14 +14,16 @@ codespell
conky conky
cowsay cowsay
cronie cronie
d-feet
dd_rescue dd_rescue
deluge deluge
d-feet
dialog dialog
dnsutils dnsutils
dosfstools dosfstools
dzen2
efibootmgr efibootmgr
encfs encfs
envoy
expac expac
feh feh
filezilla filezilla
@@ -38,15 +39,14 @@ gparted
gptfdisk gptfdisk
grub grub
gsmartcontrol gsmartcontrol
gvfs
gvim gvim
hardinfo hardinfo
hedgewars hedgewars
highlight highlight
htop htop
i3-wm
i3lock i3lock
i3status i3status
i3-wm
icedtea-web-java7 icedtea-web-java7
ifplugd ifplugd
iftop iftop
@@ -68,15 +68,11 @@ libreoffice-gnome
libreoffice-impress libreoffice-impress
libreoffice-math libreoffice-math
libreoffice-postgresql-connector libreoffice-postgresql-connector
libreoffice-sdk-doc
libreoffice-writer libreoffice-writer
libtool-multilib
libva-intel-driver libva-intel-driver
linux-headers linux-headers
lsb-release lsb-release
lxappearance lxappearance
mono
mono-basic
mousepad mousepad
mpc mpc
mpd mpd
@@ -120,7 +116,6 @@ smplayer
sshfs sshfs
steam steam
subversion subversion
syslinux
thunar thunar
thunar-archive-plugin thunar-archive-plugin
thunar-media-tags-plugin thunar-media-tags-plugin
@@ -132,7 +127,6 @@ tree
ttf-dejavu ttf-dejavu
ttf-ubuntu-font-family ttf-ubuntu-font-family
tumbler tumbler
unclutter
units units
unrar unrar
virtualbox virtualbox
@@ -142,20 +136,18 @@ vlc
vnstat vnstat
wget wget
wine wine
wine_gecko
wine-mono wine-mono
wine_gecko
winetricks winetricks
wireshark-gtk wireshark-gtk
wpa_actiond wpa_actiond
wpa_supplicant wpa_supplicant
xarchiver
xbindkeys xbindkeys
xclip xclip
xcursor-vanilla-dmz xcursor-vanilla-dmz
xf86-input-synaptics xf86-input-synaptics
xf86-video-intel xf86-video-intel
xfce4-panel xfce4-panel
xlockmore
xorg-server xorg-server
xorg-sessreg xorg-sessreg
xorg-utils xorg-utils

View File

@@ -50,7 +50,7 @@ keyboard_repeat_delay=150
keyboard_repeat_speed=30 keyboard_repeat_speed=30
# path and options for the wallpaper changer script # path and options for the wallpaper changer script
path_wallchanger="$HOME/.i3/scripts/wallchanger.sh" path_wallchanger="$HOME/development/projects/wallchanger/wallchanger"
wallchanger_pidfile="$RUNDIR/wallchanger.pid" wallchanger_pidfile="$RUNDIR/wallchanger.pid"
wallpaper_directory="$HOME/pictures/wallpaper/misc" wallpaper_directory="$HOME/pictures/wallpaper/misc"
wallpaper_logfile="$LOGDIR/wallpaper.log" wallpaper_logfile="$LOGDIR/wallpaper.log"

View File

@@ -142,9 +142,9 @@ cd() {
mount() { mount() {
if [[ $# == 0 ]] ; then if [[ $# == 0 ]] ; then
/usr/bin/env mount | column -t command mount | column -t
else else
/usr/bin/env mount $* command mount "$@"
fi fi
} }
@@ -208,17 +208,12 @@ fnottype() {
find . -maxdepth 1 ! -type $1 find . -maxdepth 1 ! -type $1
} }
# simple calculator
c () {
echo "$*" | bc -l
}
http() { http() {
curl http://httpcode.info/$1 curl http://httpcode.info/$1
} }
bak() { bak() {
[[ -e "$1" ]] && cp -ai "$1" "$1.$(date +%FT%T).bak" [[ -e "$1" ]] && cp -av "$1" "$1.bak"
} }
fstab() { fstab() {
@@ -229,3 +224,7 @@ fstab() {
rmext() { rmext() {
[[ -e "$1" ]] && mv -i "$1" "${1%.*}" [[ -e "$1" ]] && mv -i "$1" "${1%.*}"
} }
serve() {
python3 -m http.server 8800
}