diff options
| -rw-r--r-- | .zsh_aliases | 5 | ||||
| -rwxr-xr-x | bin/backlight-ctl | 11 | ||||
| -rwxr-xr-x | bin/battery-low-check | 5 | ||||
| -rwxr-xr-x | bin/project-open | 27 | ||||
| -rwxr-xr-x | bin/volume-ctl | 12 | ||||
| -rw-r--r-- | dunst/dunstrc | 2 | ||||
| -rwxr-xr-x | install | 76 | ||||
| -rw-r--r-- | slock/config.def.h | 12 | ||||
| -rw-r--r-- | xmonad.hs | 16 |
9 files changed, 120 insertions, 46 deletions
diff --git a/.zsh_aliases b/.zsh_aliases index aec94e1..d01bd09 100644 --- a/.zsh_aliases +++ b/.zsh_aliases @@ -111,6 +111,11 @@ alias openpdf='zathura `ls -1 *.pdf | dmenu` &' alias cagob='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo build' alias cagor='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo run' +# wifi +wificonnect() { + nmcli device wifi connect $1 password $2 +} + # alias mutt='neomutt' alias ytdl='youtube-dl' diff --git a/bin/backlight-ctl b/bin/backlight-ctl new file mode 100755 index 0000000..7153276 --- /dev/null +++ b/bin/backlight-ctl @@ -0,0 +1,11 @@ +#!/bin/sh + +[ "$#" -ne 1 ] && exit 1; + +case "$1" in + "up") xbacklight -inc 5 ;; + "down") xbacklight -dec 5 ;; + *) exit 1 ;; +esac + +notify-send "backlight $(xbacklight | cut -d '.' -f 1)" diff --git a/bin/battery-low-check b/bin/battery-low-check new file mode 100755 index 0000000..dbbdc6b --- /dev/null +++ b/bin/battery-low-check @@ -0,0 +1,5 @@ +#!/bin/sh + +capacity=$(cat /sys/class/power_supply/BAT0/capacity) + +[ "$capacity" -lt 10 ] && notify-send -u critical "Battery low $capacity%" diff --git a/bin/project-open b/bin/project-open index a4bf523..0dd5d31 100755 --- a/bin/project-open +++ b/bin/project-open @@ -10,22 +10,33 @@ dest=$( [ -z "$dest" ] && exit 1 -if cd "$HOME/git/$dest" 2> /dev/null +dest_path="$HOME/git/$dest" + +if cd "$dest_path" 2> /dev/null then - touch "$HOME/git/$dest" + touch "$dest_path" st else while [ -z "$choice" ] do - choice=$(printf 'yes\nno\n' | dmenu -p "Create a repository at ~/git/$dest?") + choice=$(printf 'create\nclone\ncancel' | dmenu -p "New repository at ~/git/$dest?") done case "$choice" in - "no") exit ;; - "yes") mkdir -p "$HOME/git/$dest" ;; - *) exit 1 ;; + "create") + mkdir -p "$dest_path" + cd "$dest_path" || exit 1 + git init + ;; + "clone") + url="$(echo '' | dmenu -p "Entry repository url: ")" + notify-send "Cloning $url to $dest_path" + git clone --recursive "$url" "$dest_path" || + (notify-send -u critical "Clone failed"; exit 1) + cd "$dest_path" || exit 1 + ;; + "cancel") exit ;; + *) exit 1 ;; esac - cd "$HOME/git/$dest" || exit 1 - git init st fi diff --git a/bin/volume-ctl b/bin/volume-ctl new file mode 100755 index 0000000..7e3ec83 --- /dev/null +++ b/bin/volume-ctl @@ -0,0 +1,12 @@ +#!/bin/sh + +[ "$#" -ne 1 ] && exit 1; + +case "$1" in + "up") pulseaudio-ctl up ;; + "down") pulseaudio-ctl down ;; + "mute") pulseaudio-ctl mute ;; + *) exit 1 ;; +esac + +notify-send "volume $(pulseaudio-ctl full-status | cut -d ' ' -f 1)" diff --git a/dunst/dunstrc b/dunst/dunstrc index 12198ed..a9eba7f 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -292,7 +292,7 @@ background = "#900000" foreground = "#ffffff" frame_color = "#ff0000" - timeout = 0 + timeout = 15 # Icon for notifications with critical urgency, uncomment to enable #icon = /path/to/icon @@ -2,30 +2,30 @@ create_dotfile_link() { - ln -svf $DOTDIR/$1 $HOME/$2 + ln -svf "$DOTDIR/$1" "$HOME/$2" } create_dotfile_link_same() { - create_dotfile_link $1 $1 + create_dotfile_link "$1" "$1" } -########################### -# dotfiles install script # -########################### +############################################################################### +# link dotfiles +############################################################################### # dotfiles directory -[ -z $DOTDIR ] && export DOTDIR=`pwd` +[ -z "$DOTDIR" ] && DOTDIR=$(pwd) && export DOTDIR # Creating links create_dotfile_link_same .zshrc create_dotfile_link_same .bashrc create_dotfile_link_same .vimrc create_dotfile_link_same .pluggins.vim -[ ! -d $HOME/.vim/plugin ] && mkdir -p $HOME/.vim/plugin +mkdir -p "$HOME/.vim/plugin" create_dotfile_link grep.vim .vim/plugin/grep.vim -[ ! -d $HOME/.xmonad ] && mkdir $HOME/.xmonad +mkdir -p "$HOME/.xmonad" create_dotfile_link xmonad.hs .xmonad/xmonad.hs create_dotfile_link_same .gdbinit @@ -36,35 +36,53 @@ create_dotfile_link_same .mailcap create_dotfile_link_same .xinitrc create_dotfile_link_same .zprofile -[ ! -d $HOME/.config ] && mkdir $HOME/.config +mkdir -p "$HOME/.config" create_dotfile_link redshift.conf .config/redshift.conf -################ -# dependencies # -################ +mkdir -p "$HOME/.config/dunst" +create_dotfile_link dunst/dunstrc .config/dunst/dunstrc -[ $# -ge 1 ] || [ "$1" = "--ln" ] && exit 0 +mkdir -p "$HOME/.newsboat" +create_dotfile_link_same .newsboat/config + +# create_dotfile_link_same slock/config.def.h + +ln -sv "$DOTDIR/bin" "$HOME/bin" + +############################################################################### +# dependencies +############################################################################### + +[ "$#" -ne 1 ] || [ ! "$1" = "-a" ] && exit 0 echo "Installing Dependencies" +############################################################################### # vim Plug -PLUGFILE=$HOME/.vim/autoload/plug.vim +PLUGFILE="$HOME/.vim/autoload/plug.vim" PLUGURL='https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' -[ ! -f $PLUGFILE ] && echo "Downloading plug.vim" && \ - curl -fLo $PLUGFILE --create-dirs $PLUGURL +[ ! -f "$PLUGFILE" ] && echo "Downloading plug.vim" && \ + curl -fLo "$PLUGFILE" --create-dirs "$PLUGURL" echo "Installing plug.vim Pluggins" vim -c "PlugInstall" -c "qa" +############################################################################### # zsh pluggins -[ ! -d $HOME/.zsh ] && make $HOME/.zsh -# pure theme -[ ! -d $HOME/.zsh/pure ] && echo "Installing zsh pure theme" && \ - git clone https://github.com/sindresorhus/pure \ - $HOME/.zsh/pure -# syntax hightlighting -[ ! -d $HOME/.zsh/zsh-syntax-highlighting ] && echo "Installing zsh syntax highlighting plugin" && \ - git clone https://github.com/zsh-users/zsh-syntax-highlighting \ - $HOME/.zsh/zsh-syntax-highlighting -# you should use -[ ! -d $HOME/.zsh/zsh-you-should-use ] && echo "Installing zsh you should use plugin" && \ - git clone https://github.com/MichaelAquilina/zsh-you-should-use \ - $HOME/.zsh/zsh-you-should-use + +update_plugin() +{ + url="$1" + dest_path="$2" + if [ ! -d "$dest_path" ] + then + echo "Installing $dest_path" + git clone "$url" "$dest_path" + else + echo "Updating $dest_path" + git -C "$dest_path" pull + fi +} + +mkdir -p "$HOME/.zsh" +update_plugin 'https://github.com/sindresorhus/pure' "$HOME/.zsh/pure" +update_plugin 'https://github.com/zsh-users/zsh-syntax-highlighting' "$HOME/.zsh/zsh-syntax-highlighting" +update_plugin 'https://github.com/MichaelAquilina/zsh-you-should-use' "$HOME/.zsh/zsh-you-should-use" diff --git a/slock/config.def.h b/slock/config.def.h new file mode 100644 index 0000000..a21b349 --- /dev/null +++ b/slock/config.def.h @@ -0,0 +1,12 @@ +/* user and group to drop privileges to */ +static const char *user = "charles"; +static const char *group = "wheel"; + +static const char *colorname[NUMCOLS] = { + [INIT] = "#003355", /* after initialization */ + [INPUT] = "#005577", /* during input */ + [FAILED] = "#CC3333", /* wrong password */ +}; + +/* treat a cleared input like a wrong password (color) */ +static const int failonclear = 1; @@ -18,7 +18,7 @@ main = xmonad $ desktopConfig , focusedBorderColor = "#bbc5ff" , terminal = "st" , layoutHook = myLayouts - , manageHook = myManageHook + , manageHook = myManageHook , modMask = mod4Mask -- mod key to super , borderWidth = 1 , focusFollowsMouse = False -- don't change window based on mouse position (need to click) @@ -33,14 +33,14 @@ myLayouts = tiledBigMaster -- bigger master for code and smaller slave fo myManageHook = insertPosition End Newer -- insert new window at the end of the current layout -myKeys = [ ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up") -- volume up - , ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down") -- volume down - , ("<XF86AudioMute>", spawn "pulseaudio-ctl mute") -- volume mute - , ("<XF86MonBrightnessUp>", spawn "light -A 5") -- backlight up - , ("<XF86MonBrightnessDown>", spawn "light -U 5") -- backlight down - , ("<XF86ScreenSaver>", spawn "slock") -- lock screen +myKeys = [ ("<XF86AudioRaiseVolume>", spawn "~/bin/volume-ctl up") + , ("<XF86AudioLowerVolume>", spawn "~/bin/volume-ctl down") + , ("<XF86AudioMute>", spawn "~/bin/volume-ctl mute") + , ("<XF86MonBrightnessUp>", spawn "~/bin/backlight-ctl up") + , ("<XF86MonBrightnessDown>", spawn "~/bin/backlight-ctl down") + , ("<XF86ScreenSaver>", spawn "slock") - , ("M-o", spawn "~/git/dotfiles/bin/project-open") -- TODO could could be generalized + , ("M-o", spawn "~/bin/project-open") , ("M-S-o", spawn "cd ~/test && st") , ("M-d", spawn "cd ~/Downloads && st") , ("M-m", spawn "st -e mocp") |