From d760033f89f7284473895b207e1e36b2f934e8b8 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 21 Nov 2014 22:08:00 -0500 Subject: [PATCH 1/1] new installation setup --- bspwm/.config/bspwm/bspwmrc | 5 +-- bspwm/{.config/panel => .local/bin}/panel | 10 ++--- bspwm/{.config/panel => .local/bin}/panel_bar | 0 .../panel => .local/bin}/panel_colors | 0 sxhkd/.config/sxhkd/sxhkdrc | 40 +++++++++---------- x/.xinitrc | 11 ++--- zsh/.zprofile | 2 +- zsh/.zshrc | 23 +++++++++++ zsh/.zshrc.local | 22 ---------- 9 files changed, 57 insertions(+), 56 deletions(-) rename bspwm/{.config/panel => .local/bin}/panel (84%) rename bspwm/{.config/panel => .local/bin}/panel_bar (100%) rename bspwm/{.config/panel => .local/bin}/panel_colors (100%) mode change 100644 => 100755 x/.xinitrc create mode 100644 zsh/.zshrc delete mode 100644 zsh/.zshrc.local diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index d9d4507..0530d8f 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -3,15 +3,14 @@ bspc config border_width 5 bspc config window_gap 10 -bspc config top_padding 27 +bspc config top_padding 20 bspc config split_ratio 0.5 bspc config borderless_monocle true bspc config gapless_monocle true bspc config focus_by_distance true -# bspc monitor -d I II III IV V VI VII VIII IX X -bspc monitor -d I II III IV V +bspc monitor -d I II III IV V VI VII VIII IX X bspc rule -a Firefox desktop=^2 focus=on bspc rule -a Thunderbird desktop=^3 focus=on diff --git a/bspwm/.config/panel/panel b/bspwm/.local/bin/panel similarity index 84% rename from bspwm/.config/panel/panel rename to bspwm/.local/bin/panel index 2f78550..a981f43 100755 --- a/bspwm/.config/panel/panel +++ b/bspwm/.local/bin/panel @@ -15,12 +15,12 @@ bspc control --subscribe > "$PANEL_FIFO" & #xtitle -sf 'T%s' > "$PANEL_FIFO" & #clock -sf 'S%a %H:%M' > "$PANEL_FIFO" & -pamixer --get-volume > /tmp/volinfo -if $(pamixer --get-mute) ; then +#pamixer --get-volume > /tmp/volinfo +#if $(pamixer --get-mute) ; then echo ⮝ > /tmp/spkicon -else - echo ⮟ > /tmp/spkicon -fi +#else +# echo ⮟ > /tmp/spkicon +#fi conky > "$PANEL_FIFO" & . panel_colors diff --git a/bspwm/.config/panel/panel_bar b/bspwm/.local/bin/panel_bar similarity index 100% rename from bspwm/.config/panel/panel_bar rename to bspwm/.local/bin/panel_bar diff --git a/bspwm/.config/panel/panel_colors b/bspwm/.local/bin/panel_colors similarity index 100% rename from bspwm/.config/panel/panel_colors rename to bspwm/.local/bin/panel_colors diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index 42606ef..7d39527 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -84,7 +84,7 @@ super + Return urxvt super + space - dmenu_run -fn "Source Code Pro for Powerline:bold:pixelsize=10" -h 28 -nb \#2f2b30 -nf \#fefdfb -sb \#cf0f38 -sf \#fefdfb + dmenu_run -fn "-*-termsyn-medium-r-normal-*-13-*-*-*-c-*-*-1" -h 20 -nb \#2f2b30 -nf \#fefdfb -sb \#cf0f38 -sf \#fefdfb super + x slimlock @@ -105,14 +105,14 @@ XF86KbdBrightnessDown XF86KbdBrightnessUp kbdlight up -XF86AudioRaiseVolume - pulseaudio-ctl up +#XF86AudioRaiseVolume +# pulseaudio-ctl up -XF86AudioLowerVolume - pulseaudio-ctl down +#XF86AudioLowerVolume +# pulseaudio-ctl down -XF86AudioMute - pulseaudio-ctl mute +#XF86AudioMute +# pulseaudio-ctl mute XF86AudioPlay mpc toggle @@ -123,18 +123,18 @@ XF86AudioPrev XF86AudioNext mpc next -#XF86AudioRaiseVolume -# pamixer --increase 5;\ -# pamixer --get-volume > /tmp/volinfo +XF86AudioRaiseVolume + pamixer --increase 5;\ + pamixer --get-volume > /tmp/volinfo -#XF86AudioLowerVolume -# pamixer --decrease 5;\ -# pamixer --get-volume > /tmp/volinfo +XF86AudioLowerVolume + pamixer --decrease 5;\ + pamixer --get-volume > /tmp/volinfo -#XF86AudioMute -# pamixer --toggle-mute;\ -# if $(pamixer --get-mute) ; then;\ -# echo ⮝ > /tmp/spkicon;\ -# else;\ -# echo ⮟ > /tmp/spkicon;\ -# fi +XF86AudioMute + pamixer --toggle-mute;\ + if $(pamixer --get-mute) ; then;\ + echo ⮝ > /tmp/spkicon;\ + else;\ + echo ⮟ > /tmp/spkicon;\ + fi diff --git a/x/.xinitrc b/x/.xinitrc old mode 100644 new mode 100755 index fcf9099..f0f1b81 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -16,14 +16,14 @@ export _JAVA_AWT_WM_NONREPARENTING=1 xrdb -merge ~/.Xresources xsetroot -cursor_name left_ptr & # set the cursor icon -#feh --bg-scale ~/Pictures/the-witcher-3-wild-hunt-10.jpg +feh --bg-scale ~/pics/fall.jpg xset +fp /usr/share/fonts/local xset +fp ~/.fonts xset fp rehash xset b off -xrdb -merge ~/.theme/base16-thewildhunt.dark.xresources +#xrdb -merge ~/.theme/base16-thewildhunt.dark.xresources compton & -#xbacklight -set `xbacklight -get` +xbacklight -set 50 synclient TapButton2=3 synclient TapButton3=2 synclient HorizTwoFingerScroll=1 @@ -37,9 +37,10 @@ xset dpms 0 0 300 # exec gnome-session # exec startkde -exec startxfce4 +#exec startxfce4 # ...or the Window Manager of your choice sxhkd & source ~/.profile -#exec bspwm +panel & +exec bspwm diff --git a/zsh/.zprofile b/zsh/.zprofile index 65f92a6..f64674a 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -1,4 +1,4 @@ -# [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx +[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 100644 index 0000000..ec92298 --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1,23 @@ +# Base16 Shell +#BASE16_SCHEME="thewildhunt" +#BASE16_SHELL="$HOME/.theme/base16-$BASE16_SCHEME.dark.sh" +#[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL + +PATH="$HOME/.local/bin:$PATH" +#PATH="`ruby -e 'print Gem.user_dir'`/bin:$PATH" +PATH="/opt/android-sdk/platform-tools:$PATH" +#source ~/.profile + +# take +function take() { + mkdir -p $1 + cd $1 +} + +function y() { + cd ~/music + youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 $1 +} + +#eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) ; export GPG_AGENT_INFO SSH_AUTH_SOCK + diff --git a/zsh/.zshrc.local b/zsh/.zshrc.local deleted file mode 100644 index 11ce4cc..0000000 --- a/zsh/.zshrc.local +++ /dev/null @@ -1,22 +0,0 @@ -# Base16 Shell -BASE16_SCHEME="thewildhunt" -BASE16_SHELL="$HOME/.theme/base16-$BASE16_SCHEME.dark.sh" -[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL - -PATH="$HOME/.local/bin:$PATH" -PATH="`ruby -e 'print Gem.user_dir'`/bin:$PATH" -PATH="/opt/android-sdk/platform-tools:$PATH" - -# take -function take() { - mkdir -p $1 - cd $1 -} - -function y() { - cd ~/music - youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 $1 -} - -eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) ; export GPG_AGENT_INFO SSH_AUTH_SOCK - -- 2.20.1