Update configs to work with my laptop

bombadil.toml

@@ -35,7 +35,7 @@ ranger = { source = "ranger", target = ".config/ranger" }
 rofi = { source = "rofi", target = ".config/rofi" }
 roficafmenu = { source = "rofi-cafmenu", target = ".config/rofi-cafmenu" }
 screenlayout = { source = "screenlayout", target = ".config/screenlayout" }
-vim = { source = "vim", target = ".config/vim" }
+vim = { source = "vim/vimrc", target = ".config/vim/vimrc" }
 X11 = { source = "X11", target = ".config/X11" }
 zsh = { source = "zsh", target = ".config/zsh" }
 

home/editorconfig

@@ -3,17 +3,22 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
-charset = utf-8
 trim_trailing_whitespace = true
+charset = utf-8
+indent_style = tab
 indent_size = 4
 
 [*.py]
 indent_style = tab
 
-[*.rs]
+[*.{rs,rst,hs}]
 indent_style = space
 
 [*.sql]
 indent_style = space
 indent_size = 8
 
+[*.{bashrc,sh,zsh,zshrc}]
+indent_style = space
+indent_size = 2
+

i3/config

@@ -188,17 +188,11 @@ for_window [all] border none
 hide_edge_borders both
 
 # other commands
-exec_always --no-startup-id picom -b
+exec --no-startup-id picom -b
-exec_always --no-startup-id /home/mbradley/.config/i3/feh.sh
 exec --no-startup-id redshift-gtk -l 44.631:-77.955
 
-exec_always --no-startup-id polybar-msg cmd quit
-exec_always --no-startup-id polybar -r main
-exec_always --no-startup-id polybar -r other
-exec_always --no-startup-id polybar -r last
 exec --no-startup-id /usr/bin/dunst
-
-exec --no-startup-id /home/mbradley/.config/i3/startup.sh
-
 exec --no-startup-id /usr/bin/birdtray
 
+exec --no-startup-id ~/.config/i3/startup.sh
+

i3/startup.sh

@@ -8,14 +8,18 @@ function cmd() {
 }
 
 # /home/mbradley/scripts/mouse_sens.sh
+./feh.sh
+~/.config/polybar/launch.sh
 
-i3-msg 'workspace 3; append_layout /home/mbradley/.config/i3/startup.json'
+if [ "$(uname -n)" == "chonk" ]; then
-sleep 0.1
+  i3-msg 'workspace 3; append_layout /home/mbradley/.config/i3/startup.json'
+  sleep 0.1
 
-cmd clear
+  cmd clear
-cmd c
+  cmd c
-sleep 0.5
+  sleep 0.5
-cmd btop
+  cmd btop
 
-i3-msg 'workspace 1'
+  i3-msg 'workspace 1'
+fi
 

kitty/kitty/theme.conf

@@ -1,21 +0,0 @@
-background #090200
-foreground #a4a1a1
-cursor #a4a1a1
-selection_background #494542
-color0 #090200
-color8 #5b5754
-color1 #da2c20
-color9 #e8bacf
-color2 #00a152
-color10 #3a3332
-color3 #fcec02
-color11 #494542
-color4 #00a0e4
-color12 #7f7c7b
-color5 #a06994
-color13 #d6d4d3
-color6 #b5e4f4
-color14 #ccab53
-color7 #a4a1a1
-color15 #f7f7f7
-selection_foreground #090200

kitty/theme.conf

@@ -1 +0,0 @@
-gh/kitty-themes/themes/3024_Night.conf

kitty/theme.conf

@@ -0,0 +1,21 @@
+background #090200
+foreground #a4a1a1
+cursor #a4a1a1
+selection_background #494542
+color0 #090200
+color8 #5b5754
+color1 #da2c20
+color9 #e8bacf
+color2 #00a152
+color10 #3a3332
+color3 #fcec02
+color11 #494542
+color4 #00a0e4
+color12 #7f7c7b
+color5 #a06994
+color13 #d6d4d3
+color6 #b5e4f4
+color14 #ccab53
+color7 #a4a1a1
+color15 #f7f7f7
+selection_foreground #090200

polybar/config.ini

@@ -69,27 +69,24 @@ enable-ipc = true
 ; override-redirect = true
 
 
-[bar/main]
+[bar/main_desktop]
 inherit = bar/base
 monitor = DisplayPort-1
 
 modules-left = xworkspaces xwindow
-; modules-right = pulseaudio date menu-power
 modules-right = pulseaudio dunst
 
 
-[bar/other]
+[bar/side_desktop]
 inherit = bar/base
 monitor = DisplayPort-0
 monitor-fallback = DisplayPort-1
 
-; modules-left = xworkspaces dunst xwindow
 modules-left = xworkspaces system-usb-udev
-; modules-right = xbacklight filesystem hdd-filesystem memory cpu eth date menu-power
 modules-right = memory cpu eth date menu-power
 
 
-[bar/last]
+[bar/top_desktop]
 inherit = bar/base
 monitor = HDMI-A-0
 monitor-fallback = DisplayPort-1
@@ -98,6 +95,21 @@ modules-left = xworkspaces tray
 modules-right = xbacklight change-background wlan filesystem hdd-filesystem pulseaudio date
 
 
+[bar/main_laptop]
+inherit = bar/base
+
+height = 22pt
+
+border-size = 2.5pt
+border-bottom-size = -1pt
+
+monitor = DP-2
+
+modules-left = xworkspaces xwindow
+modules-center = tray
+modules-right = pulseaudio backlight battery memory cpu wlan date menu-power
+
+
 [module/menu-apps]
 type = custom/menu
 
@@ -149,14 +161,16 @@ expand-right = false
 
 menu-0-0 = %{F#007FFF}
 menu-0-0-exec = i3lock-fancy-multimonitor -b=0x3
-#menu-0-1 = %{F#00FF7F}鈴
+menu-0-1 = %{F#00FF7F}鈴
-#menu-0-1-exec = systemctl suspend
+menu-0-1-exec = i3lock-fancy-multimonitor -b=0x3; systemctl suspend
 #menu-0-2 = %{F#7FFF00}
 #menu-0-2-exec = systemctl hibernate
-menu-0-1 = %{F#FF7F00}ﰇ
+menu-0-2 = %{F#FF7F00}ﰇ
-menu-0-1-exec = reboot
+menu-0-2-exec = reboot
-menu-0-2 = %{F#F00}
+menu-0-3 = %{F#F00}
-menu-0-2-exec = shutdown now
+menu-0-3-exec = shutdown now
+#menu-0-3 = %{F#00A2ED}
+#menu-0-3-exec = grub-reboot "$(rg -i windows /boot/grub/grub.cfg|head -n 1|cut -d "'" -f 2)" && reboot
 
 label-open = %{F#F0C674}
 label-close = %{F#F0C674}×
@@ -191,12 +205,12 @@ type = internal/xwindow
 label = %title:0:164:...%
 
 
-[module/xbacklight]
+#[module/xbacklight]
-type = internal/xbacklight
+#type = internal/xbacklight
 #output = HDMI-A-0
 #output = DisplayPort-1
 #output = DisplayPort-0
-label = %{colors.primary}BKL%{F-} %percentage%%
+#label = %{colors.primary}BKL%{F-} %percentage%%
 
 
 [module/change-background]
@@ -394,11 +408,11 @@ screenchange-reload = true
 pseudo-transparency = true
 
 
-#[module/backlight]
+[module/backlight]
-#type = internal/backlight
+type = internal/backlight
-#card = nv_backlight
+card = nv_backlight
-#use-actual-brightness = true
+use-actual-brightness = true
-#enable-scroll = true
+enable-scroll = true
 
 [module/mpd]
 type = internal/mpd

polybar/launch.sh

@@ -2,8 +2,15 @@
 
 # Terminate already running bar instances
 killall -q polybar
-# If all your bars have ipc enabled, you can also use 
+# If all your bars have ipc enabled, you can also use
 # polybar-msg cmd quit
 
-# Launch Polybar, using default config location ~/.config/polybar/config.ini
+if [ "$(uname -n)" == "chonk" ]; then
-polybar mybar 2>&1 | tee -a /tmp/polybar.log & disown
+  # Launch Polybar, using default config location ~/.config/polybar/config.ini
+  polybar main_desktop 2>&1 | tee -a /tmp/polybar-m.log & disown
+  polybar side_desktop 2>&1 | tee -a /tmp/polybar-s.log & disown
+  polybar top_desktop 2>&1 | tee -a /tmp/polybar-t.log & disown
+else
+  polybar main_laptop 2>&1 | tee -a /tmp/polybar.log & disown
+fi
+

screenlayout/monitor.sh

@@ -1,2 +1,7 @@
 #!/bin/sh
-xrandr --output DisplayPort-0 --mode 1920x1080 --pos 1920x1404 --rotate normal --rate 165 --output DisplayPort-1 --mode 1920x1080 --pos 0x1404 --rotate normal --rate 165 --primary --output HDMI-A-0 --pos 0x0 --rotate normal --rate 60 --scale 1.3x1.3 --panning 2496x1404
+if [ "$(uname -n)" == "chonk" ]; then
+  xrandr --output DisplayPort-0 --mode 1920x1080 --pos 1920x1404 --rotate normal --rate 165 --output DisplayPort-1 --mode 1920x1080 --pos 0x1404 --rotate normal --rate 165 --primary --output HDMI-A-0 --pos 0x0 --rotate normal --rate 60 --scale 1.3x1.3 --panning 2496x1404
+else
+  # hpomen
+  xrandr --output DP-0 --off --output DP-1 --off --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate normal --rate 144 --output DP-2 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-3 --primary --mode 1920x1080 --pos 0x0 --rotate normal --rate 165 --output DP-4 --off
+fi

screenlayout/monitor.sh.normal

@@ -1,2 +0,0 @@
-#!/bin/sh
-xrandr --output DisplayPort-0 --mode 1920x1080 --pos 1920x0 --rotate normal --rate 165 --output DisplayPort-1 --mode 1920x1080 --pos 0x0 --rotate normal --rate 165 --primary

vim/viminfo

@@ -1,37 +0,0 @@
-# This viminfo file was generated by Vim 9.0.
-# You may edit it if you're careful!
-
-# Viminfo version
-|1,4
-
-# Value of 'encoding' when this file was written
-*encoding=utf-8
-
-
-# hlsearch on (H) or off (h):
-~h
-# Command Line History (newest to oldest):
-
-# Search String History (newest to oldest):
-
-# Expression History (newest to oldest):
-
-# Input Line History (newest to oldest):
-
-# Debug Line History (newest to oldest):
-
-# Registers:
-
-# File marks:
-'0  1  0  ~/school/3/COMP3000/t1/csimpleshell.c
-|4,48,1,0,1674084872,"~/school/3/COMP3000/t1/csimpleshell.c"
-
-# Jumplist (newest first):
--'  1  0  ~/school/3/COMP3000/t1/csimpleshell.c
-|4,39,1,0,1674084872,"~/school/3/COMP3000/t1/csimpleshell.c"
-
-# History of marks within files (newest to oldest):
-
-> ~/school/3/COMP3000/t1/csimpleshell.c
-	*	1674084863	0
-	"	1	0

vim/vimrc

@@ -15,3 +15,10 @@ set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
 
 if !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif
 
+set number
+set nocompatible
+filetype on
+syntax on
+set cursorline
+set cursorcolumn
+set tabstop=4

zsh/.zshrc

@@ -18,6 +18,7 @@ export VIMINIT='let $MYVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/vimrc" : "$X
 alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
 export W3M_DIR="$XDG_DATA_HOME/w3m"
 export NUGET_PACKAGES="$XDG_CACHE_HOME/NuGetPackages"
+export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
 
 export PATH="$PATH:/home/mbradley/.local/share/JetBrains/Toolbox/scripts:/home/mbradley/scripts"