Merge branch 'master' into arch-laptop

config/.bashrc

@@ -162,10 +162,10 @@ tinty_source_shell_theme() {
   unset subcommand
 }
 
-if [ -n "$(command -v 'tinty')" ]; then
-    tinty_source_shell_theme "init"
-    alias theme='tinty_source_shell_theme apply "$(tinty list | fzf --cycle)" && xrdb ~/.Xresources'
-fi
+# if [ -n "$(command -v 'tinty')" ]; then
+#     tinty_source_shell_theme "init"
+#     alias theme='tinty_source_shell_theme apply "$(tinty list | fzf --cycle)" && xrdb ~/.Xresources'
+# fi
 
 if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then
     alias kak='tmux new-session kak > /dev/null'

config/.config/ghostty/config

@@ -0,0 +1,5 @@
+font-family = ""
+font-family = "Olympe Mono Hacked"
+font-family = "CaskaydiaCove Nerd Font"
+# theme = light:rose-pine-dawn,dark:rose-pine
+theme = light:xcodelight,dark:xcodedark

config/.config/nvim/after/plugin/colors.lua

@@ -1,6 +1,6 @@
 function colors(color, theme)
     color = os.getenv("BASE16_THEME")
-    alt_color = 'everforest' or color
+    alt_color = 'xcode' or color
     -- Available values:   `'hard'`, `'medium'`, `'soft'`
     vim.g.gruvbox_material_background = 'medium'
     -- Available values:   `'material'`, `'mix'`, `'original'`
@@ -26,4 +26,4 @@ function colors(color, theme)
     end
 end
 
-colors()
+colors(nil, true)