From 74f672b39beb7c27ad2d4d7dfc6253449694f8d1 Mon Sep 17 00:00:00 2001 From: Shubham Saini Date: Sun, 16 Feb 2020 13:49:33 +0530 Subject: shifted to void --- README.md | 13 -- alacritty/.config/alacritty/alacritty.yml | 2 +- arch.png | Bin 754559 -> 0 bytes bin/.local/bin/fetch | 91 ++++++----- bin/.local/bin/lock | 6 + bin/.local/bin/unblock | 2 +- bspwm/.config/bspwm/bspwmrc | 9 +- compton/.config/compton.conf | 228 +++------------------------ nvim/.config/nvim/init.vim | 38 ++--- nvim/.config/nvim/plugged/deol.nvim | 1 + nvim/.config/nvim/plugged/deoplete-clangx | 1 + nvim/.config/nvim/plugged/deoplete-jedi | 1 + nvim/.config/nvim/plugged/deoplete-zsh | 1 + nvim/.config/nvim/plugged/deoplete.nvim | 1 + nvim/.config/nvim/plugged/goyo.vim | 1 + nvim/.config/nvim/plugged/nerdtree | 1 + nvim/.config/nvim/plugged/rainbow | 1 + nvim/.config/nvim/plugged/tabular | 1 + nvim/.config/nvim/plugged/vim-airline | 1 + nvim/.config/nvim/plugged/vim-airline-themes | 1 + nvim/.config/nvim/plugged/vim-css-color | 1 + nvim/.config/nvim/plugged/vim-eunuch | 1 + nvim/.config/nvim/plugged/vim-gitgutter | 1 + nvim/.config/nvim/plugged/vim-markdown | 1 + polybar/.config/polybar/config | 8 +- sxhkd/.config/sxhkd/sxhkdrc | 4 +- x/.Xresources | 68 +++----- x/.xinitrc | 24 +-- zsh/.zshrc | 14 +- 29 files changed, 155 insertions(+), 367 deletions(-) delete mode 100644 README.md delete mode 100644 arch.png create mode 100755 bin/.local/bin/lock create mode 160000 nvim/.config/nvim/plugged/deol.nvim create mode 160000 nvim/.config/nvim/plugged/deoplete-clangx create mode 160000 nvim/.config/nvim/plugged/deoplete-jedi create mode 160000 nvim/.config/nvim/plugged/deoplete-zsh create mode 160000 nvim/.config/nvim/plugged/deoplete.nvim create mode 160000 nvim/.config/nvim/plugged/goyo.vim create mode 160000 nvim/.config/nvim/plugged/nerdtree create mode 160000 nvim/.config/nvim/plugged/rainbow create mode 160000 nvim/.config/nvim/plugged/tabular create mode 160000 nvim/.config/nvim/plugged/vim-airline create mode 160000 nvim/.config/nvim/plugged/vim-airline-themes create mode 160000 nvim/.config/nvim/plugged/vim-css-color create mode 160000 nvim/.config/nvim/plugged/vim-eunuch create mode 160000 nvim/.config/nvim/plugged/vim-gitgutter create mode 160000 nvim/.config/nvim/plugged/vim-markdown diff --git a/README.md b/README.md deleted file mode 100644 index 04999ab..0000000 --- a/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# dot-files -Dot files for my setup (bspwm, rofi, compton, neovim, i3blocks, polybar, lockscreen, i3[not using anymore]) - -![alt text](arch.png) - -# To replicate -```shell -$ git clone https://github.com/anon6405/dotfiles.git -$ sudo pacman -S stow (use your choice of package manager) -$ cd dotfiles -$ stow * -``` -That's all diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 21ee0f5..c0f41f2 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -36,7 +36,7 @@ font: # - (macOS) Menlo # - (Linux) monospace # - (Windows) Consolas - family: 'Hermit' + family: 'Fantasque Sans Mono' # The `style` can be specified to pick a specific face. style: Regular diff --git a/arch.png b/arch.png deleted file mode 100644 index c7f54c2..0000000 Binary files a/arch.png and /dev/null differ diff --git a/bin/.local/bin/fetch b/bin/.local/bin/fetch index 609850c..05cb71e 100755 --- a/bin/.local/bin/fetch +++ b/bin/.local/bin/fetch @@ -1,63 +1,76 @@ #!/bin/sh # -# ufetch-arch - tiny system info for arch +# ufetch-void - tiny system info for void ## INFO # user is already defined host="$(hostname)" -os='Arch Linux' +os='Void Linux' kernel="$(uname -sr)" uptime="$(uptime -p | sed 's/up //')" -packages="$(pacman -Q | wc -l)" -shell="$(basename ${SHELL})" - -if [ -z "${WM}" ]; then - if [ "${XDG_CURRENT_DESKTOP}" ]; then - envtype='DE' - WM="${XDG_CURRENT_DESKTOP}" - elif [ "${DESKTOP_SESSION}" ]; then - envtype='DE' - WM="${DESKTOP_SESSION}" - else - envtype='WM' - WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)" - fi +packages="$(xbps-query -l | wc -l)" +shell="$(basename "$SHELL")" + +## UI DETECTION + +if [ -n "${DE}" ]; then + ui="${DE}" + uitype='DE' +elif [ -n "${WM}" ]; then + ui="${WM}" + uitype='WM' +elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then + ui="${XDG_CURRENT_DESKTOP}" + uitype='DE' +elif [ -n "${DESKTOP_SESSION}" ]; then + ui="${DESKTOP_SESSION}" + uitype='DE' +elif [ -f "${HOME}/.xinitrc" ]; then + ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)" + uitype='WM' +elif [ -f "${HOME}/.xsession" ]; then + ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)" + uitype='WM' else - envtype='WM' + ui='unknown' + uitype='UI' fi ## DEFINE COLORS # probably don't change these -bold="$(tput bold)" -black="$(tput setaf 0)" -red="$(tput setaf 1)" -green="$(tput setaf 2)" -yellow="$(tput setaf 3)" -blue="$(tput setaf 4)" -magenta="$(tput setaf 5)" -cyan="$(tput setaf 6)" -white="$(tput setaf 7)" -reset="$(tput sgr0)" +if [ -x "$(command -v tput)" ]; then + bold="$(tput bold)" + black="$(tput setaf 0)" + red="$(tput setaf 1)" + green="$(tput setaf 2)" + yellow="$(tput setaf 3)" + blue="$(tput setaf 4)" + magenta="$(tput setaf 5)" + cyan="$(tput setaf 6)" + white="$(tput setaf 7)" + reset="$(tput sgr0)" +fi # you can change these -lc="${reset}${bold}${cyan}" # labels -nc="${reset}${bold}${cyan}" # user and hostname -ic="${reset}${bold}${white}" # info -c0="${reset}${bold}${cyan}" # first color -c1="${reset}${cyan}" # second color +lc="${reset}${bold}${green}" # labels +nc="${reset}${bold}${green}" # user and hostname +ic="${reset}" # info +c0="${reset}${bold}${green}" # first color +c1="${reset}${green}" # second color ## OUTPUT cat < +format-discharging = format-full = format-charging =  ramp-capacity-0 =  diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index 7e91465..c333197 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -30,7 +30,7 @@ super + Escape super + shift + w firefox control + alt + l - light-locker-command -l + ~/.local/bin/lock super + shift + f pcmanfm Print @@ -163,4 +163,4 @@ XF86Audio{Play,Next,Prev} #light XF86MonBrightness{Down,Up} - xbacklight {-dec 3,-inc 3} + light {-U 3,-A 3} diff --git a/x/.Xresources b/x/.Xresources index 569a360..54e7237 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -35,56 +35,25 @@ URxvt*fading: 0 URxvt*tintColor: #ffffff URxvt*shading: 0 URxvt*inheritPixmap: False -!Tomorrow -#define t_background #ffffff -#define t_current_line #efefef -#define t_selection #d6d6d6 -#define t_foreground #4d4d4c -#define t_comment #8e908c -#define t_red #c82829 -#define t_orange #f5871f -#define t_yellow #eab700 -#define t_green #718c00 -#define t_aqua #3e999f -#define t_blue #4271ae -#define t_purple #8959a8 - -*.foreground: t_foreground -*.background: t_background -*.cursorColor: #aeafad - -! Black / Grey -*.color0: #000000 -*.color8: #666666 - -! Red / Bright Red -*.color1: t_red -*.color9: #FF3334 - -! Green + Bright Green -*.color2: t_green -*.color10: #9ec400 - -! Yellow (Orange) + Bright Yellow (Yellow) -*.color3: t_orange -*.color11: t_yellow - -! Blue + Bright Blue -*.color4: t_blue -*.color12: t_blue - -! Magenta (Purple) + Bright Magenta -*.color5: t_purple -*.color13: #b777e0 - -! Cyan (Aqua) + Bright Cyan -*.color6: t_aqua -*.color14: #54ced6 - -! Light Grey (Selection) + White (Current Line) -*.color7: t_selection -*.color15: t_current_line +*.foreground: #F8F8F2 +*.background: #121212 +*.color0: #000000 +*.color8: #4D4D4D +*.color1: #FF5555 +*.color9: #FF6E67 +*.color2: #50FA7B +*.color10: #5AF78E +*.color3: #F1FA8C +*.color11: #F4F99D +*.color4: #BD93F9 +*.color12: #CAA9FA +*.color5: #FF79C6 +*.color13: #FF92D0 +*.color6: #8BE9FD +*.color14: #9AEDFE +*.color7: #BFBFBF +*.color15: #E6E6E6 ! Perls URxvt.perl-ext-common : default,matcher,keyboard-select,url-select,resize-font @@ -98,4 +67,3 @@ URxvt.url-select.launcher : firefox URxvt.url-select.autocopy : true URxvt.url-select.underline : true URxvt.url-select.button: 1 - diff --git a/x/.xinitrc b/x/.xinitrc index 8626b1b..b32d4c8 100644 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -40,25 +40,5 @@ if [ -n "$DISPLAY" ]; then xset b off fi -# load additional configs -if [ "$2" = "nvidia" ]; then - XINIT_D="/etc/X11/nvidia/xinit/xinitrc.d" -else - XINIT_D="/etc/X11/xinit/xinitrc.d" -fi - -if [ -d "$XINIT_D" ]; then - for f in "$XINIT_D/?*.sh" ; do - [ -x "$f" ] && . "$f" - done - unset f -fi -unset XINIT_D - -# additional nvidia specific settings -if [ "$2" = "nvidia" ]; then - xrandr --setprovideroutputsource modesetting NVIDIA-0 - xrandr --auto -fi - -exec bspwm +xsetroot -cursor_name left_ptr +exec dbus-launch --sh-syntax --exit-with-x11 bspwm diff --git a/zsh/.zshrc b/zsh/.zshrc index a062cf7..d64be24 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -13,7 +13,7 @@ export XDG_CURRENT_DESKTOP=bspwm # 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="jaischeema" +ZSH_THEME="theunraveler" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -73,7 +73,7 @@ ZSH_THEME="jaischeema" # 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 sudo archlinux extract python common-aliases autojump fzf) +plugins=(git sudo extract python common-aliases autojump) source $ZSH/oh-my-zsh.sh @@ -106,15 +106,17 @@ alias key="vim $HOME/.config/sxhkd/sxhkdrc" alias wm="vim ~/.config/bspwm/bspwmrc" alias f="ranger" alias bb="cat /proc/acpi/bbswitch" -alias nu="nmcli connection up " -alias nt="nmtui-connect" -alias nd="nmcli connection down " +alias nu="sudo nmcli connection up " +alias nt="sudo nmtui-connect" +alias nd="sudo nmcli connection down " +alias xi="sudo xbps-install -S " +alias xu="sudo xbps-install -Syu" +alias xr="sudo xbps-remove -R " alias pg="ping google.com" alias weather="curl wttr.in" alias py="/bin/python" alias py2="/bin/python2" alias pubip="curl ipinfo.io/ip" -alias mirror="sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" alias k="pkill " alias m="cmus" alias vimrc="vim $HOME/.config/nvim/init.vim" -- cgit v1.2.3