diff --git a/README.md b/README.md index 06c9238..ea4e4f5 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,30 @@ # Kevin's Linux Setup -![desktop-screenshot-2](https://i.imgur.com/DivyfTu.png) - -![desktop-screenshot](https://i.imgur.com/lkicLP5.png) -*Screenshots from my desktop config.* +![desktop-screenshot](https://i.imgur.com/Fpsr8Fc.png) +*Screenshot from my dual-monitor setup.* This repository contains the dotfiles to increase my workflow efficiency. They are also for my Linux [rice](https://www.reddit.com/r/unixporn/comments/3iy3wd/stupid_question_what_is_ricing/cukxwog/). - -## Basic Info -* **OS**: [Arch Linux](https://www.archlinux.org/) ([packages](https://github.com/Kevin-Mok/linux-config/blob/master/txt/pacman-pkgs/auto-pacman-pkgs.txt)) + +## Main Programs +* **OS**: [Arch Linux](https://www.archlinux.org/) ([packages](txt/nzxt-pkgs.txt)) * 15s boot time, 25s restart time on an SSD. :smiley: * **Terminal**: [rxvt-unicode-pixbuf](https://www.wikiwand.com/en/Rxvt) * **Shell**: [Zsh](http://zsh.sourceforge.net/) + [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) -* **Window Manager**: [i3wm](https://i3wm.org/) + [i3-gaps](https://github.com/Airblader/i3) -* **Editor**: [Neovim](https://github.com/neovim/neovim) ([plugins](https://github.com/Kevin-Mok/linux-config/blob/master/dotfiles/vimrc#L51)) +* **Window Manager**: [i3-gaps](https://github.com/Airblader/i3) +* **Editor**: [Neovim](https://github.com/neovim/neovim) ([plugins](dotfiles/vimrc#L51)) * **File Manager**: [ranger](https://ranger.github.io/) ## Setup -I wrote [a script](https://github.com/Kevin-Mok/linux-config/blob/master/setup.sh) to +I wrote [a script](setup.sh) to symbolically link the files/directories in the repository to the locations they should be in the system. - - -## Old Screenshots -### 3/7 -* [laptop](https://i.imgur.com/UpdX90A.png) - -### 3/5 -* [dual-monitor desktop](https://i.imgur.com/mbu9aYf.png) -* [laptop](https://i.imgur.com/hrSnXmV.png) - - diff --git a/aliases/zsh_aliases b/aliases/zsh_aliases index 2b4c953..69017bc 100644 --- a/aliases/zsh_aliases +++ b/aliases/zsh_aliases @@ -74,12 +74,16 @@ shrm() { # directory-related {{{ # alias l='ls -a' alias ll='ls -alFh' +alias smv="sudo mv" alias f="cd" +alias fz="fzf" +alias fnd="find . -type f -name" f `cat /home/kevin/.oh-my-zsh/cache/last-working-dir` # alias w="cd $(cat /home/kevin/.oh-my-zsh/cache/last-working-dir)" alias rmr="rm -rf" alias mdp="mkdir -p" +alias rsy="rsync -Pr" alias "f."="f .." alias "f.."="f ..." @@ -99,7 +103,7 @@ alias s="systemctl suspend" alias sd="sudo shutdown 0" alias reb="sudo shutdown -r 0" alias lo="i3-msg exit" -alias x="xmodmap ~/.Xmodmap" +alias x="xmodmap ~/.Xmodmap && xset r rate 200 60" # }}} power options # @@ -189,6 +193,7 @@ function auc() { xdotool click --repeat 1000000 --delay $1 1 ; } alias swex="sudo nohup ~/Downloads/swex.appimage $silent" alias vbn="cvlc --loop --alsa-gain 1 ~/Music/brown-noise.mp3" +alias cv="cava" alias rmsw="rm .sw*" function rs(){ redshift -P -O $(echo "scale=2;$1*1000" | bc) ; } diff --git a/configs/i3/config b/configs/i3/config index 91aa02e..b9680d7 100644 --- a/configs/i3/config +++ b/configs/i3/config @@ -44,7 +44,7 @@ bindsym control+$mod+s exec systemctl suspend bindsym Mod4+t exec st # bindsym Mod4+x exec $swex # bindsym Mod4+x exec xmodmap ~/.Xmodmap -bindsym Print exec gscreenshot +# bindsym Print exec gscreenshot # }}} app shortcuts # # redshift {{{ # @@ -183,7 +183,7 @@ bindsym Mod4+Return exec dmenu_run -nb "$fg" -nf "$bg" -sb "$bg" -sf "$fg" # workspace {{{ # # ws names {{{ # set $samsung "DVI-I-1" -set $benq "HDMI-1" +set $benq "HDMI-0" set $ws1 "1 " workspace $ws1 output $benq @@ -204,8 +204,9 @@ bindsym $mod+F4 workspace $ws4; exec $def_term set $ws5 "5 " # set $ws5 "5 🎥" workspace $ws5 output $samsung +assign [class="Steam"] $ws5 bindsym $mod+F5 workspace $ws5; exec $browser -bindsym Mod4+g workspace $ws5; layout stacking; exec steam +bindsym Mod4+g workspace $ws5; layout stacking; exec urxvt -e steam set $ws6 "6 " workspace $ws6 output $samsung @@ -234,7 +235,8 @@ set $ws10 "10 " assign [class="spotify"] $ws10 workspace $ws10 output $samsung set $hp 2 -bindsym Mod4+v workspace $ws10; exec urxvt -e alsamixer -c 0 +# bindsym Mod4+v workspace $ws10; exec urxvt -e alsamixer -c 0 +bindsym Mod4+v workspace $ws10; exec urxvt -e cava bindsym Mod4+h workspace $ws10; exec urxvt -e alsamixer -c $hp bindsym Mod4+s workspace $ws10; exec spotify diff --git a/configs/i3blocks-scripts/spotify b/configs/i3blocks-scripts/spotify index 42884f3..cc8918f 100755 --- a/configs/i3blocks-scripts/spotify +++ b/configs/i3blocks-scripts/spotify @@ -1,4 +1,4 @@ #!/bin/bash . "/home/kevin/.cache/wal/colors.sh" -printf "$(spotify-now -i '%artist - %title' -p '' -e '')\n\n%s\n" "$color7" +printf "$(spotify-now -i '%artist - %title' -p '' -e '')\n$(spotify-now -i '%title' -p '' -e '')\n%s\n" "$color7" diff --git a/configs/i3blocks-scripts/volume b/configs/i3blocks-scripts/volume index f6f84a1..7a61490 100755 --- a/configs/i3blocks-scripts/volume +++ b/configs/i3blocks-scripts/volume @@ -17,8 +17,6 @@ AUDIO_LOW_SYMBOL=${AUDIO_LOW_SYMBOL:-''} AUDIO_MUTED_SYMBOL=${AUDIO_MUTED_SYMBOL:-''} -AUDIO_DELTA=${AUDIO_DELTA:-5} - . "/home/kevin/.cache/wal/colors.sh" # DEFAULT_COLOR=${DEFAULT_COLOR:-"#ffffff"} DEFAULT_COLOR="$color7" @@ -34,6 +32,8 @@ SCONTROL=${SCONTROL:-""} # }}} default vars # +AUDIO_DELTA=${AUDIO_DELTA:-5} + # LONG_FORMAT=${LONG_FORMAT:-'${SYMB} ${VOL}% [${INDEX}:${NAME}]'} LONG_FORMAT=${SHORT_FORMAT:-'${SINK_SYMB} ${VOL}%'} # SHORT_FORMAT=${SHORT_FORMAT:-'${SYMB} ${VOL}%[${INDEX}]'} @@ -145,7 +145,7 @@ function print_format { SINK_SYMB="" ;; *"hdmi"*) - SINK_SYMB="" + SINK_SYMB="" ;; *"pci"*) SINK_SYMB="" diff --git a/configs/sam-i3blocks/sam-i3blocks.conf b/configs/sam-i3blocks/sam-i3blocks.conf index b4b930e..2f84568 100644 --- a/configs/sam-i3blocks/sam-i3blocks.conf +++ b/configs/sam-i3blocks/sam-i3blocks.conf @@ -23,6 +23,7 @@ interval=10 [volume] interval=once signal=1 +interval=10 [time_short] # label=🕓 diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index dbed8af..80f29ab 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -220,6 +220,7 @@ nnoremap nw :set nowrap " check if in neovim nnoremap nv :echo has('nvim') " Plug commands +nnoremap p "*p nnoremap pli :PlugInstall nnoremap plc :PlugClean nnoremap plu :PlugUpdate diff --git a/dotfiles/.xinitrc b/dotfiles/.xinitrc index e7bc145..0856852 100644 --- a/dotfiles/.xinitrc +++ b/dotfiles/.xinitrc @@ -1,3 +1,4 @@ +numlockx xrandr --setprovideroutputsource modesetting NVIDIA-0 [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources xrandr --auto diff --git a/scripts/backup.sh b/scripts/backup.sh index 46160a4..9968c8f 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -3,13 +3,13 @@ # Backup destination case $1 in nzxt ) - backup_dest="/run/media/kevin/nzxt-backup/" + backup_dest="/run/media/kevin/backup-hd/nzxt" ;; x1 ) backup_dest="/run/media/kevin/laptop-backup" ;; esac -exclude_dirs_list="/home/kevin/linux-config/txt/exlude-dirs-backup.txt" +exclude_dirs_list="/home/kevin/linux-config/txt/exclude-dirs-backup.txt" # Labels for backup name distro="arch" diff --git a/txt/exlude-dirs-backup.txt b/txt/exclude-dirs-backup.txt similarity index 100% rename from txt/exlude-dirs-backup.txt rename to txt/exclude-dirs-backup.txt diff --git a/txt/key_dirs.txt b/txt/key_dirs.txt index 064ee86..5b6f882 100644 --- a/txt/key_dirs.txt +++ b/txt/key_dirs.txt @@ -1,7 +1,7 @@ # sys {{{ * bg /home/kevin/Pictures/Backgrounds -co /home/kevin/.config +cf /home/kevin/.config lc /home/kevin/linux-config/ d /home/kevin/Downloads D /home/kevin/Documents @@ -10,6 +10,7 @@ lc /home/kevin/linux-config/ m /run/media/kevin o / p /home/kevin/.password-store +P /home/kevin/Pictures # }}} sys * @@ -24,6 +25,7 @@ sr /home/kevin/linux-config/scripts snp /home/kevin/.vim/plugged/vim-snippets/UltiSnips sv /home/kevin/coding/spotify-lib-vis/src swa /home/kevin/.local/share/nvim/swap +tt /home/kevin/linux-config/txt wo /home/kevin/Documents/workout-logs/11 # }}} cdn * @@ -31,7 +33,6 @@ wo /home/kevin/Documents/workout-logs/11 # sch {{{ * sc /home/kevin/school -st /home/kevin/school/sta 2 /home/kevin/school/236 lt /home/kevin/school/latex-notes diff --git a/txt/key_files.txt b/txt/key_files.txt index b0b1e25..17e3a14 100644 --- a/txt/key_files.txt +++ b/txt/key_files.txt @@ -18,6 +18,7 @@ z /home/kevin/linux-config/aliases/zsh_aliases # cdn {{{ * hlg /home/kevin/coding/spotify-lib-vis/src/api/management/commands/update-history.log +id /home/kevin/coding/project-ideas/ideas.md jn /home/kevin/Documents/journal/todo/12.md jt /home/kevin/Documents/journal/todo/todo.md lh /home/kevin/Documents/listening-history/polarbier.csv diff --git a/txt/pacman-pkgs/nzxt-pkgs.txt b/txt/nzxt-pkgs.txt similarity index 96% rename from txt/pacman-pkgs/nzxt-pkgs.txt rename to txt/nzxt-pkgs.txt index fe3c568..3fe46a0 100644 --- a/txt/pacman-pkgs/nzxt-pkgs.txt +++ b/txt/nzxt-pkgs.txt @@ -29,6 +29,7 @@ evince evolution fakeroot feh +ffcast file filesystem findutils @@ -71,6 +72,7 @@ make man-db man-pages mdadm +mpv nano neofetch neomutt @@ -78,6 +80,7 @@ neovim netctl noto-fonts ntfs-3g +numlockx nvidia openssh pacman @@ -112,6 +115,7 @@ spotify spotify-now-git st steam +steamos-xpad-dkms sudo sysfsutils sysstat @@ -137,12 +141,15 @@ transmission-gtk trizen ttf-dejavu ttf-emojione +ttf-ubuntu-font-family udisks2 unzip usbutils util-linux vi +vlc w3m +wego which wireless_tools wpa_actiond @@ -160,7 +167,6 @@ xf86-video-ati xf86-video-dummy xf86-video-fbdev xf86-video-intel -xf86-video-nouveau xf86-video-openchrome xf86-video-qxl xf86-video-vesa @@ -201,6 +207,7 @@ xorg-xvinfo xorg-xwd xorg-xwininfo xorg-xwud +youtube-viewer zathura zathura-pdf-poppler zbar diff --git a/txt/pacman-pkgs/aur-pkgs.txt b/txt/pacman-pkgs/aur-pkgs.txt deleted file mode 100644 index 4273f13..0000000 --- a/txt/pacman-pkgs/aur-pkgs.txt +++ /dev/null @@ -1,25 +0,0 @@ -chromium-widevine 1:4.10.1196.0-2 -discord 0.0.5-5 -gscreenshot 2.10.0-2 -htop-vim-git 1075.b7b4200-1 -i3blocks-git 1.4.r116.g7bcb556-1 -libc++ 7.0.0-1 -libc++abi 7.0.0-1 -perl-term-shellui 0.92-4 -pipes.sh 1.3.0-1 -qdirstat 1.5-2 -rxvt-unicode-pixbuf 9.22-2 -spotify 1.0.92.390-1 -st 0.8.1-1 -systemd-numlockontty 0.1-11 -texlive-local-algorithmicx 15878-1 -texlive-local-algorithms 42428-1 -texlive-local-enumitem 49282-1 -texlive-local-hyperref 49299-1 -texlive-local-numprint 27498-1 -texlive-local-pgfplots 47373-1 -texlive-local-tkz-base 48710-1 -texlive-local-tkz-euclide 22830-1 -texlive-localmanager-git 0.7.r1.gdaa34cf-1 -trizen 1:1.55-1 -ttf-emojione 4.0.1-3 diff --git a/txt/pacman-pkgs/pacman-pkgs.txt b/txt/pacman-pkgs/pacman-pkgs.txt deleted file mode 100644 index 545a9b0..0000000 --- a/txt/pacman-pkgs/pacman-pkgs.txt +++ /dev/null @@ -1,74 +0,0 @@ -alsa-utils -automake -bc -broadcom-wl -chromium -chromium-widevine -cloc -cmake -cmatrix -colordiff -compton -dhcpcd -dialog -diffutils -dmenu -evince -fakeroot -feh -findutils -fzf -git -grep -grub -htop-vim-git -i3-gaps -i3blocks -i3status -imwheel -less -linux -linux-firmware -linux-headers -lolcat -lsof -lxappearance -make -neofetch -neovim -netctl -noto-fonts -ntfs-3g -pacman -pdfgrep -perl -pipes.sh -pulseaudio -python-dbus -python-pip -python-pywal -python-setuptools -qdirstat -ranger -redshift -rxvt-unicode-pixbuf -sed -shellcheck -spotify -st -sudo -systemd-numlockontty -tar -texinfo -texlive-core -trizen -ttf-dejavu -udisks2 -unzip -vi -w3m -wireless_tools -wpa_supplicant -xclip -zathura -zsh