From e3688f7e2a71a34ad23ef7a57f14648d4b8e4163 Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Mon, 3 Dec 2018 03:34:29 -0500 Subject: [PATCH] Update --- aliases/zsh_aliases | 3 ++- configs/i3/config | 33 ++++++++++++++++++++++++--------- configs/neofetch/config.conf | 8 ++++---- dotfiles/Xresources | 4 +++- dotfiles/zshrc | 11 ++++++++--- key_dirs.txt | 1 - 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index ad02f08..ad30d87 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -54,7 +54,7 @@ function mkex() { chmod 777 $1 ; } # directory-related {{{ # alias l='ls -a' -alias ll='ls -alF' +alias ll='ls -alFh' function f() { cd $1 && pwd > ~/.last_dir && ls -a ; } # restore last dir if [ -f ~/.last_dir ] @@ -111,6 +111,7 @@ alias vlh="alsamixer -c 2" function apti() { sudo apt install $1 ; } function aptr() { sudo apt remove $1 ; } function pac() { sudo pacman -S $1 ; } +function pcr() { sudo pacman -Rs $1 ; } alias aptu="sudo apt upgrade" # }}} system # diff --git a/configs/i3/config b/configs/i3/config index 3aa31f0..8784c4d 100644 --- a/configs/i3/config +++ b/configs/i3/config @@ -6,10 +6,10 @@ set $swex "sudo ~/Downloads/swex.appimage" exec redshift -O 2000 # random bg # exec wal -i "$HOME/Pictures/Backgrounds/dim" -exec wal -i "~/Pictures/van.png" exec imwheel exec xmodmap ~/.Xmodmap exec xrdb ~/.Xresources +exec wal -i "$HOME/Pictures/van.png" exec --no-startup-id start-pulseaudio-x11 exec --no-startup-id i3-msg 'workspace $ws2; exec $def_term' exec --no-startup-id i3-msg 'workspace $ws3; exec $browser' @@ -44,17 +44,32 @@ bindsym Print exec ksnapshot # }}} app shortcuts # # redshift {{{ # -bindsym $mod+Mod4+1 exec redshift -O 1000 -bindsym $mod+Mod4+2 exec redshift -O 1250 -bindsym $mod+Mod4+3 exec redshift -O 1500 -bindsym $mod+Mod4+4 exec redshift -O 2000 -bindsym $mod+Mod4+5 exec redshift -O 2500 -bindsym $mod+Mod4+6 exec redshift -O 3000 -bindsym $mod+Mod4+7 exec redshift -O 4000 -bindsym $mod+Mod4+8 exec redshift -O 5000 +bindsym $mod+Mod4+1 exec redshift -x && redshift -O 1000 +bindsym $mod+Mod4+2 exec redshift -x && redshift -O 1250 +bindsym $mod+Mod4+3 exec redshift -x && redshift -O 1500 +bindsym $mod+Mod4+4 exec redshift -x && redshift -O 2000 +bindsym $mod+Mod4+5 exec redshift -x && redshift -O 2500 +bindsym $mod+Mod4+6 exec redshift -x && redshift -O 3000 +bindsym $mod+Mod4+7 exec redshift -x && redshift -O 4000 +bindsym $mod+Mod4+8 exec redshift -x && redshift -O 5000 bindsym $mod+Mod4+grave exec redshift -x # }}} redshift # +# backlight {{{ # + +bindsym Shift+F1 exec xbacklight -set 10 +bindsym Shift+F2 exec xbacklight -set 20 +bindsym Shift+F3 exec xbacklight -set 30 +bindsym Shift+F4 exec xbacklight -set 40 +bindsym Shift+F5 exec xbacklight -set 50 +bindsym Shift+F6 exec xbacklight -set 60 +bindsym Shift+F7 exec xbacklight -set 70 +bindsym Shift+F8 exec xbacklight -set 80 +bindsym Shift+F9 exec xbacklight -set 90 +bindsym Shift+F0 exec xbacklight -set 100 + +# }}} backlight # + # menu {{{ # # start dmenu (a program launcher) bindsym Mod4+Return exec dmenu_run diff --git a/configs/neofetch/config.conf b/configs/neofetch/config.conf index 1600734..4dec094 100644 --- a/configs/neofetch/config.conf +++ b/configs/neofetch/config.conf @@ -10,10 +10,10 @@ print_info() { info "OS" distro info "Terminal" term + info "Terminal Font" term_font info "Shell" shell - info "Font" font + # info "Font" font info "Packages" packages - info "Terminal Font" term_font info "WM" wm info "WM Theme" wm_theme # info "Theme" theme @@ -22,6 +22,7 @@ print_info() { # info "CPU Usage" cpu_usage # info "GPU" gpu info "Memory" memory + info "Disk" disk # info "Resolution" resolution # info "Uptime" uptime info "Install Date" install_date @@ -32,7 +33,6 @@ print_info() { # info "Kernel" kernel # info "DE" de # info "GPU Driver" gpu_driver # Linux only - # info "Disk" disk # info "Battery" battery # info "Local IP" local_ip # info "Public IP" public_ip @@ -322,7 +322,7 @@ public_ip_host="http://ident.me" # disk_show=('/'): # 'Disk (/): 74G / 118G (66%)' # -disk_show=('/') +disk_show=('/' '/dev/sda3') # Disk subtitle. # What to append to the Disk subtitle. diff --git a/dotfiles/Xresources b/dotfiles/Xresources index bb4568a..1813976 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -1,4 +1,6 @@ -URxvt.font: xft:Hack Nerd Font:size=17 +URxvt.font: xft:Hack Nerd Font:size=18 +! URxvt.font: xft:Hack NF:size=18 +! URxvt.font: xft:Hack:size=18 URxvt*inheritPixmap: true ! URxvt*transparent: false diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 4c3ce67..cdfe42c 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -10,7 +10,8 @@ # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="muse" +# ZSH_THEME="muse" +ZSH_THEME="miloshadzic" # Set list of themes to load # Setting this variable when ZSH_THEME=random @@ -39,10 +40,10 @@ ZSH_THEME="muse" # DISABLE_AUTO_TITLE="true" # Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" +ENABLE_CORRECTION="true" # Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" +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 @@ -100,6 +101,10 @@ export LC_MESSAGES="C" # }}} default # +if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then + exec startx +fi + # pywal export PATH="${PATH}:${HOME}/.local/bin/" (cat ~/.cache/wal/sequences &) diff --git a/key_dirs.txt b/key_dirs.txt index 103db26..75737c3 100644 --- a/key_dirs.txt +++ b/key_dirs.txt @@ -13,7 +13,6 @@ ro / cd ~/coding jnd ~/Documents/journal -lh ~/Music/spotify-history snp ~/.vim/plugged/vim-snippets/UltiSnips sv ~/coding/spotify-lib-vis/src swa ~/.local/share/nvim/swap