Merge branch 'master' into arch-laptop

merging vim binds

config/.Xresources

@@ -1,5 +1,5 @@
 ! High DPI Settings for Window Managers
-!Xft.dpi: 192
+Xft.dpi: 192
 ! #define background_opacity 80
 #include ".theme.xresources"
 ! .alpha: 0.2

config/.bash_profile

@@ -1,11 +1,16 @@
-export PATH="${PATH}:$HOME/.scripts"
 source ~/.profile
-source ~/.bashrc
-
 
 # Added by Toolbox App
 export PATH="$PATH:/home/mikec/.local/share/JetBrains/Toolbox/scripts"
 
+export PATH="${PATH}:$HOME/.scripts:$HOME/maple2022/bin:$HOME/intelFPGA_lite/18.1/quartus/bin:$HOME/intelFPGA_lite/18.1/modelsim_ase/bin"
+export _JAVA_AWT_WM_NONREPARENTING=1
+export XDG_CURRENT_DESKTOP=sway
+source ~/.bashrc
+export QSYS_ROOTDIR="/home/mikec/intelFPGA_lite/18.1/quartus/sopc_builder/bin"
+export VERSION_CONTROL="never"
+
+# exec hilbish -S -l
 
 
 # BEGIN opam configuration

config/.config/bspwm/bspwmrc

@@ -20,13 +20,12 @@ picom &
 #nm-applet &
 
 ## Configure Monitors/Workspaces
-bspc monitor DisplayPort-1 -d 1 2 3 4 5 6 7 8 9
-bspc monitor DisplayPort-0 -d 1 2 3 4 5 6 7 8 9
+bspc monitor eDP-1 -d 1 2 3 4 5 6 7 8 9
 
 ## Theming
 bspc config border_width        1
 bspc config window_gap          10
-bspc config top_padding         20
+bspc config top_padding         36
 bspc config left_padding        0
 bspc config right_padding       0
 bspc config bottom_padding      0

config/.config/picom/picom.conf

@@ -101,7 +101,7 @@ fade-in-step = 0.03;
 fade-out-step = 0.03;
 
 # The time between steps in fade step, in milliseconds. (> 0, defaults to 10)
-fade-delta = 5.0;
+fade-delta = 4.0;
 
 # Specify a list of conditions of windows that should not be faded.
 # fade-exclude = []

config/.config/polybar/config.ini

@@ -39,12 +39,12 @@ background = ${xrdb:background}
 foreground = ${xrdb:foreground}
 override-redirect = true
 wm-restack = bspwm
-font-0 = Olympe Mono Hacked:style=Regular:pixelsize=11;2
-font-1 = CaskaydiaCove Nerd Font:style=Regular:pixelsize=11:2
-font-2 = NotoColorEmoji:pixelsize=16
-font-3 = Font Awesome 6 Brands:style=Regular:size=13;2
-font-4 = Font Awesome 6 Free Solid:style=Regular:size=9;2
-height = 20
+font-0 = Olympe Mono Hacked:style=Regular:pixelsize=20;2
+font-1 = CaskaydiaCove Nerd Font:style=Regular:pixelsize=20:2
+font-2 = NotoColorEmoji:pixelsize=20
+font-3 = Font Awesome 6 Brands:style=Regular:size=20;2
+font-4 = Font Awesome 6 Free Solid:style=Regular:size=20;2
+height = 36
 line-size = 2
 modules-left = bspwm
 modules-right = music memory filesystem xkeyboard network redshift pulseaudio backlight tray battery datetime

config/.config/sxhkd/sxhkdrc

@@ -75,11 +75,11 @@ XF86AudioNext
 XF86AudioPrev
     playerctl previous
 # Brightness Up
-XF86_MonBrightnessUp
+XF86MonBrightnessUp
     brightnessctl set 1%+
 # Brightness Down
-XF86_MonBrightnessDown
-    brightnessctl set 1%+
+XF86MonBrightnessDown
+    brightnessctl set 1%-
 
 ## BSPWM Controls ##
  

config/.doom.d/config.el

@@ -19,8 +19,8 @@
 ;;
 ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
 ;; font string. You generally only need these two:
-(setq doom-font (font-spec :family "Olympe Mono Hacked" :size 16)
-      doom-variable-pitch-font (font-spec :family "Cantarell" :size 16 :weight 'bold))
+(setq doom-font (font-spec :family "Olympe Mono Hacked" :size 28 )
+      doom-variable-pitch-font (font-spec :family "Cantarell" :size 28 :weight 'bold))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the

config/.profile

@@ -3,7 +3,10 @@ if [ "$XDG_SESSION_DESKTOP" = "sway" ] ; then
     export _JAVA_AWT_WM_NONREPARENTING=1
     export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/
 fi
-
+export PATH="${PATH}:$HOME/.scripts:$HOME/.emacs.d/bin:$HOME/.local/share/gem/ruby/3.0.0/bin"
+source ~/.bashrc
+export QSYS_ROOTDIR="/home/mikec/intelFPGA_lite/18.1/quartus/sopc_builder/bin"
+export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest/core.jar"
 
 # Added by Toolbox App
 export PATH="$PATH:/home/mikec/.local/share/JetBrains/Toolbox/scripts"

config/.scripts/bar.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 DATE=$(date +'%Y-%m-%d %I:%M:%S %p')
-# BAT=$(cat /sys/class/power_supply/BAT1/capacity)
+BAT=$(cat /sys/class/power_supply/BAT1/capacity)
 VOL=$(pactl get-sink-volume @DEFAULT_SINK@ | tr "," "\n" | grep \% | sed s/Volume\:// | sed 's/\%.*$//' | sed 's/^.*\///' | head -n1 | sed s/\ *//)
 VOL="${VOL}%"
 MUTED=$(pactl get-sink-mute @DEFAULT_SINK@ | cut -d\  -f2)
-# BRIGHT=$(brightnessctl | tr "\n" " " | cut -d\  -f9 | tr -d "()%")
+BRIGHT=$(brightnessctl | tr "\n" " " | cut -d\  -f9 | tr -d "()%")
 MEM=$(free -h | sed 's/[  ]\+/:/g' | cut -d\: -f4 | tr "\n" ":" | cut -d\: -f2)
 USER=$(id -u -n)
 HOST=$(cat /proc/sys/kernel/hostname)

config/.scripts/mutt_oauth2.py

@@ -45,7 +45,7 @@ import readline
 # encryption and decryption pipes you prefer. They should read from standard
 # input and write to standard output. The example values here invoke GPG,
 # although won't work until an appropriate identity appears in the first line.
-ENCRYPTION_PIPE = ['gpg', '--encrypt', '--recipient', 'mikecchalupiak@outlook.com']
+ENCRYPTION_PIPE = ['gpg', '--encrypt', '--recipient', 'mchalupiak']
 DECRYPTION_PIPE = ['gpg', '--decrypt']
 
 registrations = {

config/.xprofile

@@ -1,9 +1,10 @@
 export PATH="${PATH}:$HOME/.scripts:~/.local/share/gem/ruby/3.0.0/bin"
-#export GDK_SCALE=2
-#export GDK_DPI_SCALE=0.5
+export GDK_SCALE=2
+export GDK_DPI_SCALE=0.5
 export XCURSOR_SIZE=32
 export SUDO_ASKPASS=ksshaskpass
 #sxhkd -c $HOME/.config/berry/sxhkdrc &
+xrandr --output eDP-1 --scale 1.25x1.25
+# autorandr -c
 # xrandr --output DisplayPort-0 --rate 165
-autorandr -c
 $HOME/.fehbg