vdotfiles

Cem's Dotfiles for Void Linux
git clone git://git.ckyln.com/vdotfiles.git
Log | Files | Refs | Submodules | README | LICENSE

commit c7552910fe20366b62ff87569a919db501855b98
parent 4bf17ea7a98dc5d20169db9df180783fb2e42e47
Author: Cem Keylan <cem@ckyln.com>
Date:   Fri, 21 Jun 2019 09:41:16 +0300

Switched to zsh

Diffstat:
A.aliases | 16++++++++++++++++
M.bashrc | 29++++++-----------------------
M.config/i3/config | 22+++++++++++-----------
M.config/polybar/config | 2+-
A.zshrc | 116+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mbin/nightmodetoggle | 4----
Mbin/polyrestart | 17+++++++++++++----
Mbin/wallset | 1-
8 files changed, 163 insertions(+), 44 deletions(-)

diff --git a/.aliases b/.aliases @@ -0,0 +1,16 @@ +alias cp="cp -i" # confirm before overwriting something +alias df='df -h' # human-readable sizes +alias free='free -m' # show sizes in MB +alias np='nano -w PKGBUILD' +alias more=less +alias ncmpcpp="ncmpcpp --port 6601" +alias c="clear" +alias l="ls" +alias rm='rm -v' +alias ccat="highlight" +alias mutt="neomutt" +alias cfb="vim $HOME/.bashrc" +alias sb="source $HOME/.bashrc" +alias dot="cd $HOME/dotfiles" +alias vim="nvim" # Lol I forget typing nvim + diff --git a/.bashrc b/.bashrc @@ -133,22 +133,6 @@ fi unset use_color safe_term match_lhs sh -alias cp="cp -i" # confirm before overwriting something -alias df='df -h' # human-readable sizes -alias free='free -m' # show sizes in MB -alias np='nano -w PKGBUILD' -alias more=less -alias ncmpcpp="ncmpcpp --port 6601" -alias c="clear" -alias l="ls" -alias rm='rm -v' -alias ccat="highlight" -alias mutt="neomutt" -alias cfb="vim $HOME/.bashrc" -alias sb="source $HOME/.bashrc" -alias dot="cd $HOME/dotfiles" -alias vim="nvim" # Lol I forget typing nvim - xhost +local:root > /dev/null 2>&1 complete -cf sudo @@ -165,8 +149,8 @@ shopt -s expand_aliases # Enable history appending instead of overwriting. #139609 shopt -s histappend -HISTSIZE=-1 -HISTFILESIZE=-1 +HISTSIZE=912391291249 +HISTFILESIZE=912391291249 # # # ex - archive extractor # # usage: ex <file> @@ -193,13 +177,9 @@ ex () fi } -# better yaourt colors -export YAOURT_COLORS="nb=1:pkg=1:ver=1;32:lver=1;45:installed=1;42:grp=1;34:od=1;41;5:votes=1;44:dsc=0:other=1;35" -export PATH=$HOME/.gem/ruby/2.6.0/bin/:$PATH - # Default Applications and Configuration Directory export EDITOR="/usr/bin/nvim" -export TERMINAL="terminator" +export TERMINAL="st" export BROWSER="qutebrowser" export XDG_CONFIG_HOME=$HOME/.config @@ -210,3 +190,6 @@ export PATH=/usr/local/bin/:$PATH export PATH=$HOME/.vim/bundle/vim-live-latex-preview/bin/:$PATH set -o vi export VIMUP=TRUE + +# Load aliases +source $HOME/.aliases diff --git a/.config/i3/config b/.config/i3/config @@ -50,11 +50,11 @@ bindsym $mod+j focus down bindsym $mod+k focus up bindsym $mod+l focus right -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right +## alternatively, you can use the cursor keys: +#bindsym $mod+Left focus left +#bindsym $mod+Down focus down +#bindsym $mod+Up focus up +#bindsym $mod+Right focus right # move focused window bindsym $mod+Shift+h move left @@ -62,11 +62,11 @@ bindsym $mod+Shift+j move down bindsym $mod+Shift+k move up bindsym $mod+Shift+l move right -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right +## alternatively, you can use the cursor keys: +#bindsym $mod+Shift+Left move left +#bindsym $mod+Shift+Down move down +#bindsym $mod+Shift+Up move up +#bindsym $mod+Shift+Right move right # split in horizontal orientation bindsym $mod+b split h @@ -216,7 +216,7 @@ bindsym $mod+n exec $fm bindsym $mod+o exec $brow # Launch Terminal -bindsym $mod+Return exec st +bindsym $mod+Return exec --no-startup-id st # Launch Console Music Player bindsym $mod+m exec --no-startup-id $music diff --git a/.config/polybar/config b/.config/polybar/config @@ -411,7 +411,7 @@ label-muted =  label-muted-foreground = ${root.primary} [module/backlight] -type = internal/backlight +type = internal/xbacklight card = intel_backlight format = <ramp> <label> diff --git a/.zshrc b/.zshrc @@ -0,0 +1,116 @@ +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH + +# Path to your oh-my-zsh installation. +export ZSH="/home/cem/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes +ZSH_THEME="dieter" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to automatically update without prompting. +# DISABLE_UPDATE_PROMPT="true" + +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS=true + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in ~/.oh-my-zsh/plugins/* +# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# Default Applications and Configuration Directory +export EDITOR="/usr/bin/nvim" +export TERMINAL="st" +export BROWSER="qutebrowser" +export XDG_CONFIG_HOME=$HOME/.config + +# Personal Scripts +export PATH=$HOME/bin/:$PATH +export PATH=$HOME/.scripts/:$PATH +export PATH=/usr/local/bin/:$PATH +export PATH=$HOME/.vim/bundle/vim-live-latex-preview/bin/:$PATH +set -o vi +export VIMUP=TRUE + +# Load aliases +source $HOME/.aliases diff --git a/bin/nightmodetoggle b/bin/nightmodetoggle @@ -42,8 +42,6 @@ then if [ $(tail -n -1 $HOME/.night) = "NIGHT=1" ] then feh --bg-fill --randomize $HOME/Pictures/Wallpapers/Night/* - pidof betterlockscreen | xargs -r kill - cat $HOME/.fehbg | awk '{print $3}' | xargs -r betterlockscreen -u >/dev/null 2>&1 & case $(ps aux | grep -i polybar) in *night*) exit @@ -54,8 +52,6 @@ then esac else feh --bg-fill --randomize $HOME/Pictures/Wallpapers/Morning/* - pidof betterlockscreen | xargs -r kill - cat $HOME/.fehbg | awk '{print $3}' | xargs -r betterlockscreen -u >/dev/null 2>&1 & case $(ps aux | grep -i polybar | head -n +1 -) in *"polybar -q top") exit diff --git a/bin/polyrestart b/bin/polyrestart @@ -1,22 +1,31 @@ #!/bin/sh case $(ps aux) in + *polybar/config*) + case "$(ps aux)" in + *polybar\ -q*) + killall polybar + ;; + *) + ;; + esac + ;; *polybar*) - kill $(pidof polybar) + killall polybar ;; *) ;; esac -sleep 1 +sleep 0.5 case $1 in morning) polybar -q top >/dev/null 2>&1 & - sleep 1 + sleep 0.5 polybar -q bottom >/dev/null 2>&1 & ;; night) polybar -q topnight >/dev/null 2>&1 & - sleep 1 + sleep 0.5 polybar -q bottomnight >/dev/null 2>&1 & ;; *) diff --git a/bin/wallset b/bin/wallset @@ -13,6 +13,5 @@ then exit else feh --bg-fill $HOME/Pictures/Wallpapers/$nightmode/$selection - cat $HOME/.fehbg | awk '{print $3}' | xargs -r betterlockscreen -u >/dev/null 2>&1 & notify-send 'New wallpaper' 'Your wallpaper has been changed !' fi