diff --git a/bin/bin/syncmusic.sh b/bin/bin/syncmusic.sh index 4bcf9fb..b581d9d 100755 --- a/bin/bin/syncmusic.sh +++ b/bin/bin/syncmusic.sh @@ -1,4 +1,4 @@ #!/bin/sh -rsync -az --delete --progress alrayyes@eniac:/mnt/storage/headphones/ ~/music/headphones +rsync -az --delete --progress alrayyes@eniac:/mnt/storage/music/ ~/music/headphones rsync -az --delete --progress --inplace --size-only ~/music/headphones/ ~/stackdav/music diff --git a/git/.gitignore_global b/git/.gitignore_global index eecc7ed..6910c7f 100644 --- a/git/.gitignore_global +++ b/git/.gitignore_global @@ -107,3 +107,7 @@ fabric.properties # *.ipr # End of https://www.gitignore.io/api/webstorm + +# php-cs-fixer +php-cs-fixer +.php_cs.cache diff --git a/i3/.config/i3/config b/i3/.config/i3/config index b0ead6d..4f0fb26 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -249,7 +249,6 @@ exec_always --no-startup-id ~/bin/start-conky.sh exec --no-startup-id nm-applet exec --no-startup-id firejail dropbox start -exec --no-startup-id compton -f exec --no-startup-id redshift-gtk exec --no-startup-id xautolock -time 10 -locker "i3lock-fancy" exec --no-startup-id /usr/lib/deja-dup/deja-dup/deja-dup-monitor diff --git a/oh-my-zsh/.oh-my-zsh b/oh-my-zsh/.oh-my-zsh index d2725d4..5667161 160000 --- a/oh-my-zsh/.oh-my-zsh +++ b/oh-my-zsh/.oh-my-zsh @@ -1 +1 @@ -Subproject commit d2725d44fce59ea7060b4d712c5739512a56882d +Subproject commit 5667161d49b9ddc4ea8de7a379d50fc2cb7ffb50 diff --git a/urxvt/.Xdefaults b/urxvt/.Xdefaults new file mode 100644 index 0000000..8bd4c9e --- /dev/null +++ b/urxvt/.Xdefaults @@ -0,0 +1,97 @@ +!------------------------------------------------------------------------------- +! Xft settings +!------------------------------------------------------------------------------- + +Xft.dpi: 220 +Xft.antialias: false +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight + +!------------------------------------------------------------------------------- +! URxvt settings +! Colours lifted from Solarized (http://ethanschoonover.com/solarized) +! More info at: +! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod +!------------------------------------------------------------------------------- + +URxvt.depth: 32 +URxvt.geometry: 90x30 +URxvt.transparent: true +URxvt.fading: 0 +! URxvt.urgentOnBell: true +! URxvt.visualBell: true +URxvt.loginShell: true +URxvt.saveLines: 50 +URxvt.internalBorder: 3 +URxvt.lineSpace: 0 + +! Fonts +URxvt.allow_bold: false +/* URxvt.font: -*-terminus-medium-r-normal-*-12-120-72-72-c-60-iso8859-1 */ +URxvt*font: xft:PragmataPro:size=10 +URxvt*boldFont: xft:PragmataPro:size=10 + +! Fix font space +URxvt*letterSpace: -1 + +! Scrollbar +URxvt.scrollStyle: rxvt +URxvt.scrollBar: false + +! Perl extensions +URxvt.perl-ext-common: default,matcher +URxvt.matcher.button: 1 +URxvt.urlLauncher: firefox + +! Cursor +URxvt.cursorBlink: true +URxvt.cursorColor: #657b83 +URxvt.cursorUnderline: false + +! Pointer +URxvt.pointerBlank: true + +!!Source http://github.com/altercation/solarized + +#*background: #002b36 +*shading: 20 + +*foreground: #657b83 +!!*fading: 40 +*fadeColor: #002b36 +*cursorColor: #93a1a1 +*pointerColorBackground: #586e75 +*pointerColorForeground: #93a1a1 + +!! black dark/light +*color0: #073642 +*color8: #002b36 + +!! red dark/light +*color1: #dc322f +*color9: #cb4b16 + +!! green dark/light +*color2: #859900 +*color10: #586e75 + +!! yellow dark/light +*color3: #b58900 +*color11: #657b83 + +!! blue dark/light +*color4: #268bd2 +*color12: #839496 + +!! magenta dark/light +*color5: #d33682 +*color13: #6c71c4 + +!! cyan dark/light +*color6: #2aa198 +*color14: #93a1a1 + +!! white dark/light +*color7: #eee8d5 +*color15: #fdf6e3