various updates

config.sh

@@ -3,11 +3,14 @@ ETH_DEV="enp0s31f6"
 
 MAIN_NET=$WIFI_DEV
 BATTERIES=(BAT0 BAT1)
-MAIN_FONT="Source Code Pro 8"
+zMAIN_FONT="Source Code Pro 8"
 SCREEN_LAYOUT="xrandr --output eDP-1 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --off --output DP-2-1 --off --output DP-2-2 --off --output DP-2-3 --off"
-SCREEN_LAYOUT_DOCKED="xrandr --output eDP-1 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --off --output DP-2-1 --mode 1920x1080 --pos 1920x0 --rotate normal --output DP-2-2 --mode 1280x1024 --pos 3840x0 --rotate normal --output DP-2-3 --off"
+SCREEN_LAYOUT_DOCKED="xrandr --output eDP-1 --off --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --off --output DP-2-1 --primary --mode 2560x1440 --pos 1920x0 --rotate normal --output DP-2-2 --mode 1920x1200 --pos 4480x0 --rotate normal --output DP-2-3 --mode 1920x1080 --pos 0x0 --rotate normal"
-MONITORS=(eDP-1 DP-2-2 DP-2-1)
+#SCREEN_LAYOUT_DOCKED="xrandr --output eDP-1 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1 --off --output HDMI-1 --off --output DP-2 --off --output HDMI-2 --mode 1920x1080 --pos 1920x0 --rotate normal"
-MAIN_MONITOR=eDP-1
+MONITORS=(DP-2-1 DP-2-3 DP-2-2)
+#MONITORS=(eDP-1 HDMI-2)
+MAIN_MONITOR=DP-2-1
+#MAIN_MONITOR=eDP-1
 SIDE_MONITORS=($(xrandr | rg -i "\sconnected" | rg -v eDP | cut -d" " -f1 | grep -v $MAIN_MONITOR))
 BAR_POS="top"
 LAPTOP=1

dots/alacritty/alacritty.yml.template

@@ -107,7 +107,7 @@ bell:
   duration: 0
 
 # Background opacity
-background_opacity: 1.0
+window_opacity: 1.0
 
 # Key bindings
 #

dots/bspwm/bspwmrc.template

@@ -16,9 +16,10 @@ bspc rule -a Firefox desktop='2'
 bspc rule -a Emacs desktop='1' state=tiled
 bspc rule -a Evince desktop='4'
 bspc rule -a mplayer2 state=floating
-bspc rule -a TelegramDesktop desktop='0'
+bspc rule -a TelegramDesktop desktop='10'
-bspc rule -a Thunderbird desktop='0'
+bspc rule -a Thunderbird desktop='10'
-bspc rule -a Skype desktop='0'
+bspc rule -a Skype desktop='10'
+bspc rule -a Element desktop='10'
 bspc rule -a Anki desktop='^5'
 bspc rule -a zoom desktop='^7'
 bspc rule -a .obs-wrapped desktop='8'

dots/bspwm/monitor_laptop.sh

@@ -7,12 +7,12 @@ source ~/dotfiles/config.sh
 # Exit immediately if X isn't running.
 pgrep X > /dev/null || exit 0
 
-all_workspaces="1 2 3 4 5 6 7 8 9 0"
+all_workspaces="1 2 3 4 5 6 7 8 9 10"
 declare -A workspaces
 
-workspaces[0]="1 5 8"
+#workspaces[0]="1 5 8"
-workspaces[1]="3 9 0"
+workspaces[0]="2 4 7 6"
-workspaces[2]="2 4 7 6"
+workspaces[1]="3 9 10"
 
 move_to_monitor() {
     for D in $1; do
@@ -20,7 +20,7 @@ move_to_monitor() {
     done
 }
 
-bspc query -D --names | rg 1 || bspc monitor $MAIN_MONITOR -d $all_workspaces
+echo bspc query -D --names | rg 1 || bspc monitor $MAIN_MONITOR -d $all_workspaces
 if [[ $SIDE_MONITORS != "" ]]; then
     echo "DOCKED"
     eval $SCREEN_LAYOUT_DOCKED

dots/emacs/roam-literature-template.org

@@ -1,3 +1,4 @@
+#+filetags: :Literature:
 
 
 * Notes

dots/fish/config.fish

@@ -3,6 +3,9 @@ set -gx PATH $HOME/.scripts $PATH
 set -gx PATH $HOME/.roswell/bin $PATH
 set -gx PATH /usr/lib/ccache/bin/ $PATH
 set -g theme_display_date no
+set -g theme_color_scheme solarized-light
+set -g theme_project_dir_length 1
+set -g theme_display_git no
 set -g fish_key_bindings fish_default_key_bindings
 set -g FZF_PREVIEW_FILE_CMD "bat --color=always"
 set -g FZF_CD_CMD "fd --type d . \$dir"

dots/home/.direnvrc

@@ -1,5 +1 @@
-source $HOME/.nix-direnv/direnvrc
+source /run/current-system/sw/share/nix-direnv/direnvrc
-
-if [ -f /run/current-system/sw/share/nix-direnv/direnvrc ]; then
-  source /run/current-system/sw/share/nix-direnv/direnvrc
-fi

dots/home/.emacs

@@ -11,5 +11,5 @@
         (eval-print-last-sexp)))
     (load bootstrap-file nil 'nomessage))
 (straight-use-package 'use-package)
-;(straight-use-package 'org)
+(straight-use-package 'org)
 (org-babel-load-file "~/.emacs.d/emacs.org")

dots/sxhkd/sxhkdrc

@@ -118,7 +118,7 @@ super + {_,shift +}c
 
 # focus or send to the given desktop
 super + {_,shift +}{1-9,0}
-        bspc {desktop -f,node -d} {1,2,3,4,5,6,7,8,9,0} --follow
+        bspc {desktop -f,node -d} {1-9,10} --follow
 
 # move desktop to next monitor
 super + alt + m

dots/xournal/config

@@ -7,11 +7,11 @@
 # the display resolution, in pixels per inch
 display_dpi=96.00
 # the initial zoom level, in percent
-initial_zoom=201.93
+initial_zoom=269.67
 # maximize the window at startup (true/false)
 window_maximize=false
 # start in full screen mode (true/false)
-window_fullscreen=false
+window_fullscreen=true
 # the window width in pixels (when not maximized)
 window_width=1920
 # the window height in pixels

install.sh

@@ -64,10 +64,10 @@ function main {
     # Install Stuff
     autolink
 
-    if ! [ -z "$SCREEN_LAYOUT" ]; then
+    # if ! [ -z "$SCREEN_LAYOUT" ]; then
-	printHeading "Setting up Screens"
+    #     printHeading "Setting up Screens"
-	$($SCREEN_LAYOUT)
+    #     $($SCREEN_LAYOUT)
-    fi
+    # fi
     
     # Reload
     printHeading "Reloading"