diff --git a/configs/i3/config b/configs/i3/config index ef83364..3932923 100644 --- a/configs/i3/config +++ b/configs/i3/config @@ -47,7 +47,7 @@ bindsym Print exec gscreenshot # redshift {{{ # -bindsym $mod+Mod4+1 exec redshift -x && redshift -O 1250 +bindsym $mod+Mod4+1 exec redshift -x && redshift -O 1000 bindsym $mod+Mod4+2 exec redshift -x && redshift -O 2000 bindsym $mod+Mod4+3 exec redshift -x && redshift -O 3000 bindsym $mod+Mod4+4 exec redshift -x && redshift -O 4000 @@ -198,7 +198,8 @@ set $ws4 "4 " workspace $ws4 output $samsung bindsym $mod+F4 workspace $ws4; exec $def_term -set $ws5 "5 " +# set $ws5 "5 " +set $ws5 "5 🎥" workspace $ws5 output $samsung bindsym $mod+F5 workspace $ws5; exec $browser bindsym Mod4+g workspace $ws5; layout stacking; exec steam @@ -209,20 +210,24 @@ assign [class="Slack"] $ws6 bindsym Mod4+d workspace $ws6; exec discord bindsym Mod4+k workspace $ws6; exec slack -set $ws7 "7 " +# set $ws7 "7 " +set $ws7 "7 📤" workspace $ws7 output $samsung bindsym $mod+F7 workspace $ws7; exec $def_term -set $ws8 "8 " +# set $ws8 "8 " +set $ws8 "8 📊" # assign [class="jetbrains-"] $ws8 workspace $ws8 output $samsung bindsym $mod+F8 workspace $ws8; exec urxvt -e htop -s PERCENT_MEM -set $ws9 "9 " +# set $ws9 "9 " +set $ws9 "9 🔧" workspace $ws9 output $samsung bindsym $mod+F9 workspace $ws9; exec $def_term -set $ws10 "10 " +# set $ws10 "10 " +set $ws10 "10 🎵" assign [class="spotify"] $ws10 workspace $ws10 output $samsung set $hp 2 @@ -344,7 +349,9 @@ bindsym control+shift+0 gaps inner all set 0;gaps outer all set 0 # status bar {{{ # # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) -set $sb_font Hack NF Bold +set $sb_font DejaVuSansMono Nerd Font Mono Bold +# set $sb_font Hack NF Bold +# set $sb_font EmojiOne set $black #000000 set $white #ffffff @@ -356,6 +363,7 @@ set $inactive_ws_bg #444c52 # set $inactive_ws_text #bcccd7 # set $inactive_ws_text #838e96 set $inactive_ws_text #cbe4ff +# set $inactive_ws_text $bg # set $inactive_ws_trans c8 # set $inactive_ws_trans 96 @@ -394,7 +402,8 @@ bar { inactive_workspace $inactive_ws_bg $inactive_ws_bg$inactive_ws_trans $inactive_ws_text } tray_output none - status_command i3blocks -c ~/.config/i3blocks/i3blocks.conf + # status_command i3blocks -c ~/.config/i3blocks/i3blocks.conf + status_command 2>/tmp/i3blocks.err i3blocks -vvv -c ~/.config/i3blocks/i3blocks.conf | tee /tmp/i3blocks.out output $benq wheel_up_cmd nop wheel_down_cmd nop diff --git a/configs/i3blocks-scripts/name b/configs/i3blocks-scripts/name index 96dad5b..176a414 100755 --- a/configs/i3blocks-scripts/name +++ b/configs/i3blocks-scripts/name @@ -1 +1,7 @@ +#!/bin/bash + +. "/home/kevin/.cache/wal/colors.sh" + echo "Kevin" +# echo "Kevin" +# echo "Kevin" diff --git a/configs/i3blocks-scripts/time b/configs/i3blocks-scripts/time new file mode 100755 index 0000000..089e568 --- /dev/null +++ b/configs/i3blocks-scripts/time @@ -0,0 +1,7 @@ +#!/bin/bash + +. "/home/kevin/.cache/wal/colors.sh" +printf "$(date '+%H:%M.%a-%m-%d')\n\n%s" "$color2" +# printf "%s" "$color2" +# printf "" + diff --git a/configs/i3blocks/i3blocks.conf b/configs/i3blocks/i3blocks.conf index 9215754..62bdb74 100644 --- a/configs/i3blocks/i3blocks.conf +++ b/configs/i3blocks/i3blocks.conf @@ -1,32 +1,6 @@ -# properties {{{ # -# i3blocks config file -# -# Please see man i3blocks for a complete reference! -# The man page is also hosted at http://vivien.github.io/i3blocks -# -# List of valid properties: -# -# align -# color -# command -# full_text -# instance -# interval -# label -# min_width -# name -# separator -# separator_block_width -# short_text -# signal -# urgent -# }}} properties # - -# Global properties {{{ # # The top properties below are applied to every block, but can be overridden. # Each block command defaults to the script name to avoid boilerplate. align=center -# command=/usr/share/i3blocks/$BLOCK_NAME command=~/linux-config/configs/i3blocks-scripts/$BLOCK_NAME separator=true separator_block_width=25 @@ -34,11 +8,14 @@ markup=pango # color=#d1e7ff # color=#acc0cd color=#cbe4ff -# }}} Global properties # + +# color=$foreground +# color="${foreground}" +# color="$(echo $foreground)" [time] -label= -command=date '+%H:%M.%a-%m-%d' +label=🕓 +# command=date '+%H:%M.%a-%m-%d' interval=30 # color=#acc0cd @@ -55,19 +32,20 @@ interval=30 # [cpu_usage -w 50 -c 80] [cpu_usage] -label= +label= # color=#990000 interval=5 [memory] -label= +label= # color=#3da061 interval=5 [name] -label= +label=🎅 # color=#ba50a9 # color=#1e5b99 +# color="$foreground" interval=6000 # unused blocks {{{ # @@ -163,3 +141,28 @@ interval=6000 #interval=once #signal=11 # }}} unused blocks # + +# list of properties {{{ # +# i3blocks config file +# +# Please see man i3blocks for a complete reference! +# The man page is also hosted at http://vivien.github.io/i3blocks +# +# List of valid properties: +# +# align +# color +# command +# full_text +# instance +# interval +# label +# min_width +# name +# separator +# separator_block_width +# short_text +# signal +# urgent +# }}} properties # + diff --git a/configs/neofetch/config.conf b/configs/neofetch/config.conf index 4e34093..50e7723 100644 --- a/configs/neofetch/config.conf +++ b/configs/neofetch/config.conf @@ -21,9 +21,9 @@ print_info() { info "Packages" packages info "WM" wm info "WM Theme" wm_theme - # info "Font" font - # info "Theme" theme - # info "Icons" icons + info "Font" font + info "Theme" theme + info "Icons" icons info "CPU" cpu info "CPU Usage" cpu_usage info "GPU" gpu @@ -31,13 +31,13 @@ print_info() { info "Memory" memory info "Disk" disk info "Resolution" resolution - info "Song" song - # info "Install Date" install_date # }}} enabled # # others {{{ # + # info "Song" song + # info "Install Date" install_date # info "Host" model # info "Uptime" uptime # info "DE" de diff --git a/configs/sam-i3blocks/sam-i3blocks.conf b/configs/sam-i3blocks/sam-i3blocks.conf index 3b7a1ec..cdf13c2 100644 --- a/configs/sam-i3blocks/sam-i3blocks.conf +++ b/configs/sam-i3blocks/sam-i3blocks.conf @@ -2,7 +2,6 @@ # The top properties below are applied to every block, but can be overridden. # Each block command defaults to the script name to avoid boilerplate. align=center -command=/usr/share/i3blocks/$BLOCK_NAME separator=true separator_block_width=25 markup=pango @@ -11,7 +10,8 @@ color=#cbe4ff [spotify] command=python ~/linux-config/configs/i3blocks-scripts/spotify.py -label= +# label= +label=🎧 # green # color=#198c19 # aqua @@ -19,6 +19,7 @@ label= interval=10 [time] -command=date '+%H:%M' +label=🕓 +command=echo "$(date '+%H:%M')" interval=30 # color=#acc0cd diff --git a/dotfiles/.Xresources b/dotfiles/.Xresources index 1de7364..381b757 100644 --- a/dotfiles/.Xresources +++ b/dotfiles/.Xresources @@ -1,5 +1,5 @@ -! URxvt.font: xft:DejaVu Sans Mono:size=14 -URxvt.font: xft:Hack Nerd Font:size=14 +URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=14 +! URxvt.font: xft:Hack Nerd Font:size=14 ! URxvt.font: xft:Hack NF:size=18 ! URxvt.font: xft:Hack:size=18 diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 4c378a4..c468f35 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -273,7 +273,9 @@ autocmd Filetype tex inoremap lr \Leftrightarrow autocmd Filetype tex inoremap n \neq autocmd Filetype tex inoremap N \mathbb{N} autocmd Filetype tex inoremap q \qquad -autocmd Filetype tex inoremap r \Rightarrow +autocmd Filetype tex inoremap r \rightarrow +autocmd Filetype tex inoremap R \Rightarrow +autocmd Filetype tex inoremap s \subset autocmd Filetype tex inoremap st such that autocmd Filetype tex inoremap S \Sigma autocmd Filetype tex inoremap t \times diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc index 9686dd6..f459dfd 100644 --- a/dotfiles/.zshrc +++ b/dotfiles/.zshrc @@ -1,6 +1,6 @@ -ZSH_THEME="bira" +# ZSH_THEME="bira" # ZSH_THEME="miloshadzic" -# ZSH_THEME="agnoster" +ZSH_THEME="agnoster" # default {{{ # @@ -153,6 +153,8 @@ add-zsh-hook precmd reload_aliases # }}} autoreload zsh aliases # [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh +# export pywal colors +source ~/.cache/wal/colors.sh # autoload -U add-zsh-hook add-zsh-hook -Uz chpwd (){ ls -a; } diff --git a/scripts/change-sink b/scripts/change-sink index 0311ef4..06b5f77 100755 --- a/scripts/change-sink +++ b/scripts/change-sink @@ -2,7 +2,7 @@ #Device name variable if [ "$1" = "dac" ]; then - devicename="alsa_output.usb-FiiO_DigiHug_USB_Audio-01.analog-stereo" + devicename="alsa_output.usb-1852_DigiHug_USB_Audio-01.analog-stereo" elif [ "$1" = "line-out" ]; then devicename="alsa_output.pci-0000_00_14.2.analog-stereo" fi diff --git a/setup.sh b/setup.sh index f4659a2..31c2166 100755 --- a/setup.sh +++ b/setup.sh @@ -28,15 +28,12 @@ link_to_lc "files" "$HOME" "$lc_dir/dotfiles" link_to_lc "dirs" "$HOME/.config" "$lc_dir/configs" link_to_lc "dirs" "$HOME/.themes" "$lc_dir/gtk/themes" -# setup nvim config {{{ # - +# setup nvim config # nvim_file="/home/kevin/lc-test/init.vim" nvim_file="$HOME/.config/nvim/init.vim" rm "$nvim_file" ln -s "$HOME/.nvim" "$nvim_file" && echo "Setup Neovim config." -# }}} setup nvim config # - # testing {{{ # # link_to_lc "files" "/home/kevin/lc-test" "$lc_dir/dotfiles" diff --git a/txt/key_dirs.txt b/txt/key_dirs.txt index b786bc4..ecca95c 100644 --- a/txt/key_dirs.txt +++ b/txt/key_dirs.txt @@ -30,7 +30,7 @@ wo /home/kevin/Documents/workout-logs/11 sc /home/kevin/school st /home/kevin/school/sta 2 /home/kevin/school/236 -a3 /home/kevin/school/latex-notes/236/a3 +a3 /home/kevin/school/latex-notes/343/a3 3 /home/kevin/school/343 # }}} sch * diff --git a/txt/pacman-pkgs/aur-pkgs.txt b/txt/pacman-pkgs/aur-pkgs.txt index 6bbcf81..4273f13 100644 --- a/txt/pacman-pkgs/aur-pkgs.txt +++ b/txt/pacman-pkgs/aur-pkgs.txt @@ -1,7 +1,25 @@ -discord -texlive-localmanager-git -gscreenshot -rxvt-unicode-pixbuf -Hack NF -the_silver_searcher -trizen +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/nzxt-pkgs.txt b/txt/pacman-pkgs/nzxt-pkgs.txt index 7191c5c..f236bca 100644 --- a/txt/pacman-pkgs/nzxt-pkgs.txt +++ b/txt/pacman-pkgs/nzxt-pkgs.txt @@ -43,7 +43,7 @@ gscreenshot gzip htop-vim-git i3-gaps -i3blocks +i3blocks-git i3status imwheel inetutils @@ -61,6 +61,7 @@ logrotate lolcat lsof lvm2 +lxappearance make man-db man-pages @@ -114,8 +115,10 @@ texlive-local-pgfplots texlive-local-tkz-base texlive-local-tkz-euclide texlive-localmanager-git +the_silver_searcher trizen ttf-dejavu +ttf-emojione udisks2 unzip usbutils