diff --git a/.wezterm.lua b/.wezterm.lua index 32192e6..4e1619d 100644 --- a/.wezterm.lua +++ b/.wezterm.lua @@ -47,10 +47,10 @@ end function scheme_for_appearance(appearance, overrides) if appearance:find("Dark") then on_dark_mode(overrides) - return "rose-pine-moon" + return "catppuccin-mocha" else on_light_mode(overrides) - return "rose-pine-dawn" + return "catppuccin-latte" end end @@ -64,7 +64,7 @@ wezterm.on("window-config-reloaded", function(window, pane) end end) -config.font = wezterm.font("Fira Code") +config.font = wezterm.font("CommitMono") config.font_size = 14 config.enable_tab_bar = false diff --git a/nvim/init.lua b/nvim/init.lua index d698aae..66950c1 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -105,12 +105,12 @@ function setup_plugins() require("auto-dark-mode").setup({ set_dark_mode = function() vim.opt.background = "dark" - vim.cmd("colorscheme rose-pine-moon") + vim.cmd("colorscheme catppuccin-mocha") end, set_light_mode = function() vim.opt.background = "light" - vim.cmd("colorscheme rose-pine-dawn") + vim.cmd("colorscheme catppuccin-latte") end, }) @@ -463,7 +463,7 @@ function config_vim() vim.opt.listchars = {} vim.opt.termguicolors = true - vim.o.guifont = "FiraCode Nerd Font:h14" + vim.o.guifont = "CommitMono Nerd Font:h14" vim.g.neovide_floating_shadow = false vim.g.neovide_position_animation_length = 0 @@ -528,7 +528,6 @@ end PLUGINS = { { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, - { "rose-pine/neovim", name = "rose-pine" }, { "shortcuts/no-neck-pain.nvim" }, { "nvim-tree/nvim-web-devicons" }, { "nvim-tree/nvim-tree.lua" }, diff --git a/sketchybar/plugins/theme.sh b/sketchybar/plugins/theme.sh index a61b81c..ff34206 100755 --- a/sketchybar/plugins/theme.sh +++ b/sketchybar/plugins/theme.sh @@ -3,10 +3,10 @@ query=$(defaults read -g AppleInterfaceStyle | xargs) if [ "$query" = "Dark" ]; then - sketchybar --bar color=0xff232136 \ - --set '/.*/' icon.color=0xffe0def4 label.color=0xffe0def4 + sketchybar --bar color=0xff313244 \ + --set '/.*/' icon.color=0xffcdd6f4 label.color=0xffcdd6f4 else - sketchybar --bar color=0xfffaf4ed \ - --set '/.*/' icon.color=0xff575279 label.color=0xff575279 + sketchybar --bar color=0xffeff1f5 \ + --set '/.*/' icon.color=0xff4c4f69 label.color=0xff4c4f69 fi