chore(arch): start installing rices

.chezmoidata/packages.yaml

@@ -10,7 +10,7 @@ packages:
       - "plex"
       - "spotify"
       - "visual-studio-code"
-      - "ghostty"
+      - "iterm2"
       - "vlc"
     brews:
       - "git"
@@ -33,8 +33,8 @@ packages:
       - "base-devel"
       - "eza"
       - "firefox"
+      - "flatpak"
       - "git"
-      - "ghostty"
       - "httpie"
       - "hyfetch"
       - "lazygit"
@@ -50,6 +50,8 @@ packages:
       - "localsend-bin"
       - "spotify"
       - "visual-studio-code-bin"
+    flatpak:
+      - "org.prismlauncher.PrismLauncher"
   vscode:
     - "aaron-bond.better-comments"
     - "bbenoist.nix"

.chezmoiscripts/run_onchange_arch-install-packages.sh.tmpl

@@ -1,4 +1,4 @@
-{{ if (eq .chezmoi.os "linux") -}}
+{{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.idLike "arch")) -}}
 #!/bin/bash
 
 _install_pacman_packages() {
@@ -14,9 +14,21 @@ _install_yay() {
   yay -Y --gendb
 }
 
-_install_pacman_packages() {
-  pacman -S --needed {{ .packages.arch.aur | join " " }}
+_install_aur_packages() {
+  yay -S --needed {{ .packages.arch.aur | join " " }}
 }
 
+_install_flatpak_packages() {
+  flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+  {{ range .packages.arch.flatpak -}}
+  flatpak install {{ . | quote }}
+  {{ end }}
+}
+
+_install_pacman_packages
+_install_yay
+_install_aur_packages
+_install_flatpak_packages
 
 {{ end -}}

.chezmoiscripts/run_onchange_arch-install-rice.sh.tmpl

@@ -0,0 +1,23 @@
+{{ if (and (eq .chezmoi.os "linux") (eq .chezmoi.osRelease.idLike "arch")) -}}
+#!/bin/bash
+
+_apply_grub_theme() {
+    TMPDIR=$(mktemp -d)
+
+    git clone https://github.com/catppuccin/grub.git $TMPDIR
+    cd $TMPDIR/grub
+
+    sudo cp -r src/catppuccin-macchiato-grub-theme /usr/share/grub/themes/
+
+    sudo sed -i \
+    -e 's|^[[:space:]]*#\?[[:space:]]*GRUB_THEME=.*|GRUB_THEME="/usr/share/grub/themes/catppuccin-macchiato-grub-theme/theme.txt"|' \
+    -e '$a GRUB_THEME="/usr/share/grub/themes/catppuccin-macchiato-grub-theme/theme.txt"' \
+    /etc/default/grub
+
+    sudo grub-mkconfig -o /boot/grub/grub.cfg
+}
+
+_apply_grub_theme
+
+
+{{ end -}}

.chezmoiscripts/run_onchange_macos_setup.sh.tmpl

@@ -49,7 +49,7 @@ sudo nvram StartupMute=%00 # Disable startup BONGGGGGGGGGGG
 
 mkdir -p $HOME/walls
 
-url="https://i.badstagram.gay/u/M3SabQ.jpg"
+url="https://i.badstagram.gay/u/g5uhTJ.png"
 wallPath="$HOME/walls/$(basename $url)"
 wget $url -O $wallPath
 

private_dot_config/ghostty/config

@@ -1,20 +0,0 @@
-theme	                  		= Catppuccin Macchiato
-
-font-family	            		= Hack Nerd Font Regular
-font-family-bold	      		= Hack Nerd Font Regular
-font-family-italic	    		= Hack Nerd Font Italic
-font-family-bold-italic			= Hack Nerd Font Bold Italic
-font-size		            	= 14
-
-env			                = TERM=xterm-256color
-
-keybind                 		= ctrl+N=new_window
-keybind			            	= ctrl+shift+V=paste_from_clipboard
-keybind                 		= alt+W=new_split:up
-keybind                 		= alt+A=new_split:right
-keybind                 		= alt+S=new_split:down
-keybind                 		= alt+D=new_split:left
-keybind                 		= ctrl+alt+W=goto_split:up
-keybind                 		= ctrl+alt+A=goto_split:right
-keybind                 		= ctrl+alt+S=goto_split:down
-keybind                 		= ctrl+alt+D=goto_split:left

private_dot_config/sketchybar/executable_sketchybarrc

@@ -13,10 +13,10 @@ bar=(
 	padding_right=0 
 	padding_left=3 
 	corner_radius="$CORNER_RADIUS" 
-	y_offset=0
+	y_offset=1 
 	margin=5 
 	blur_radius=20 
-	notch_width=195
+	notch_width=200 
 )
 
 defaults=(

private_dot_config/sketchybar/items/network.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-COLOR="$PINK"
-
-props=(
-	update_freq=60 
-	icon.color="$COLOR" 
-	icon.padding_left=10 
-	label.padding_right=10 
-	label.color="$COLOR" 
-	background.height=26 
-	background.corner_radius="$CORNER_RADIUS" 
-	background.padding_right=5 
-	background.border_width="$BORDER_WIDTH" 
-	background.border_color="$COLOR" 
-	background.color="$BAR_COLOR" 
-	background.drawing=on 
-	script="$PLUGIN_DIR/network.sh"
-)
-
-sketchybar --add item network left \
-	--set network \
-	"${props[@]}"
-
-
-sketchybar --add item separator left \
-	--set separator icon= \
-	icon.font="$FONT:Regular:16.0" \
-	background.padding_left=15 \
-	background.padding_right=15 \
-	label.drawing=off \
-	associated_display=active \
-	icon.color="$YELLOW"

private_dot_config/sketchybar/items/spotify.sh

@@ -5,8 +5,8 @@ MUSIC_EVENT="com.spotify.client.PlaybackStateChanged"
 COLOR="$GREEN"
 
 props=(
-	scroll_texts="on" 
-	icon="󰎆"
+	scroll_texts=on 
+	icon=󰎆 
 	icon.color="$COLOR" 
 	icon.padding_left=10 
 	background.color="$BAR_COLOR" 
@@ -26,4 +26,4 @@ sketchybar --add event music_change $MUSIC_EVENT \
 --add item music q \
 	--subscribe music music_change \
 	--set music ${bracket_defaults[@]} \
-	"${props[@]}"
+	"${props[@]}"

private_dot_config/sketchybar/plugins/executable_network.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-USERNAME=$(networksetup -listpreferredwirelessnetworks en0 | sed -n '2p' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
-
-sketchybar --set "$NAME" icon="" label="$USERNAME"

private_dot_config/sketchybar/plugins/executable_spotify.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+#!/usr/bin/env bash
+
 update() {
   PLAYING=1
-  
   if [ "$(echo "$INFO" | jq -r '.["Player State"]')" = "Playing" ]; then
     PLAYING=0
     TRACK="$(echo "$INFO" | jq -r .Name | cut -c1-40)"
@@ -21,11 +22,6 @@ update() {
   else
     args+=(--set music icon=􀊆)
   fi
-
-  if [[ $INFO == "" ]]; then
-    args+=(--set music drawing=off)
-  fi
-
   sketchybar -m "${args[@]}"
 }