From 6388164b373026b457e32eecd9c25e2b7351581a Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Thu, 2 Jan 2025 18:00:17 -0800 Subject: [PATCH] theming --- .config/alacritty/dawnfox.toml | 79 +++++++++++++++++++++++++++++++ .config/alacritty/light.toml | 7 ++- .config/nvim/lazy-lock.json | 35 +++++++------- .config/nvim/lua/plugins/init.lua | 1 + .config/nvim/lua/theme.lua | 13 ++--- .emacs.d/settings.org | 39 ++++++++------- .ssh/config | 1 + .tmux.conf | 3 +- scripts/theme/hooks/alacritty.sh | 2 +- scripts/theme/hooks/discord.sh | 5 +- scripts/theme/hooks/spicetify.sh | 6 +-- scripts/theme/hooks/tmux.sh | 9 ++-- src/pikaur | 2 +- 13 files changed, 147 insertions(+), 55 deletions(-) create mode 100644 .config/alacritty/dawnfox.toml diff --git a/.config/alacritty/dawnfox.toml b/.config/alacritty/dawnfox.toml new file mode 100644 index 0000000..7c142ac --- /dev/null +++ b/.config/alacritty/dawnfox.toml @@ -0,0 +1,79 @@ +# Nightfox Alacritty Colors +## name: dawnfox +## upstream: https://github.com/edeneast/nightfox.nvim/raw/main/extra/dawnfox/alacritty.toml + +[colors.primary] +background = "#faf4ed" +foreground = "#575279" +dim_foreground = "#4c4769" +bright_foreground = "#625c87" + +[colors.cursor] +text = "#575279" +cursor = "#625c87" + +[colors.vi_mode_cursor] +text = "#575279" +cursor = "#56949f" + +[colors.search.matches] +foreground = "#575279" +background = "#b8cece" + +[colors.search.focused_match] +foreground = "#575279" +background = "#618774" + +[colors.footer_bar] +foreground = "#575279" +background = "#ebdfe4" + +[colors.hints.start] +foreground = "#575279" +background = "#d7827e" + +[colors.hints.end] +foreground = "#575279" +background = "#ebdfe4" + +[colors.selection] +text = "#575279" +background = "#d0d8d8" + +[colors.normal] +black = "#575279" +red = "#b4637a" +green = "#618774" +yellow = "#ea9d34" +blue = "#286983" +magenta = "#907aa9" +cyan = "#56949f" +white = "#e5e9f0" + +[colors.bright] +black = "#5f5695" +red = "#c26d85" +green = "#629f81" +yellow = "#eea846" +blue = "#2d81a3" +magenta = "#9a80b9" +cyan = "#5ca7b4" +white = "#e6ebf3" + +[colors.dim] +black = "#504c6b" +red = "#a5576d" +green = "#597668" +yellow = "#dd9024" +blue = "#295e73" +magenta = "#816b9a" +cyan = "#50848c" +white = "#c8cfde" + +[[colors.indexed_colors]] +index = 16 +color = "#d7827e" + +[[colors.indexed_colors]] +index = 17 +color = "#d685af" diff --git a/.config/alacritty/light.toml b/.config/alacritty/light.toml index 61b8d1e..9c0a3aa 100644 --- a/.config/alacritty/light.toml +++ b/.config/alacritty/light.toml @@ -1,4 +1,7 @@ general.import = [ - "~/.config/alacritty/catppucin-latte.toml", - "~/.config/alacritty/config.toml" +# "~/.config/alacritty/catppucin-latte.toml", +# "~/.config/alacritty/gruvbox-medium-light.toml", + "~/.config/alacritty/dawnfox.toml", ] + + diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 873f251..8f95425 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,28 +1,29 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" }, - "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, - "catppuccin": { "branch": "main", "commit": "65bf0b16f57a3db70d6a93ac68882dd9a31d0565" }, + "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, + "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" }, + "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "4dd429fe3f47077f4e50cdaf03f7877ce9b213e0" }, - "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" }, - "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" }, - "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.statusline": { "branch": "main", "commit": "813854243156472c9d0bc9c64ea0af159b9b37ca" }, - "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, - "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" }, - "nvim-tree.lua": { "branch": "master", "commit": "82ab19ebf79c1839d7351f2fed213d1af13a598e" }, - "nvim-treesitter": { "branch": "master", "commit": "38c12cb9ac8e1c547a8472c87df9e9d7c8b1af0d" }, - "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, + "nightfox": { "branch": "main", "commit": "595ffb8f291fc4a9bef3201a28b7c0379a41cdee" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, + "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, + "nvim-treesitter": { "branch": "master", "commit": "34d78baa86a37e86fe64b642860144c28ab9f0c8" }, + "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" } + "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" } } diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua index 8174e4e..333957c 100644 --- a/.config/nvim/lua/plugins/init.lua +++ b/.config/nvim/lua/plugins/init.lua @@ -3,6 +3,7 @@ local plugins = { { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, { "mhartington/oceanic-next", name = "oceanic-next", priority = 1000 }, + { "EdenEast/nightfox.nvim", name = "nightfox", priority = 100 }, -- file tree { diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua index 4cdcdc2..59a5dfd 100644 --- a/.config/nvim/lua/theme.lua +++ b/.config/nvim/lua/theme.lua @@ -8,13 +8,14 @@ function Set_theme_at(path) f:close() vim.schedule(function() vim.cmd("colorscheme OceanicNext") --- if (theme == "light") then --- vim.api.nvim_set_option("background", "light") + if (theme == "light") then + vim.api.nvim_set_option("background", "light") -- vim.cmd("colorscheme catppuccin-latte") --- else --- vim.api.nvim_set_option("background", "dark") --- vim.cmd("colorscheme catppuccin-mocha") --- end + vim.cmd("colorscheme dayfox") + else + vim.api.nvim_set_option("background", "dark") + vim.cmd("colorscheme OceanicNext") + end end) end diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org index fec19ca..1e8fa86 100644 --- a/.emacs.d/settings.org +++ b/.emacs.d/settings.org @@ -199,24 +199,27 @@ : t #+BEGIN_SRC emacs-lisp - ;; (use-package catppuccin-theme - ;; :ensure t) - ;; (require 'filenotify) - ;; - ;; (setq *theme-file* "~/theme") - ;; (defun set-system-theme () - ;; (let ((theme - ;; (with-temp-buffer - ;; (insert-file-contents *theme-file*) - ;; (buffer-string))) - ;; (current-flavor catppuccin-flavor)) - ;; (setq catppuccin-flavor (if (string-prefix-p "dark" theme) 'mocha 'latte)) - ;; (if (not (eq catppuccin-flavor current-flavor)) - ;; (catppuccin-reload)))) - ;; - ;; (set-system-theme) - ;; (file-notify-add-watch *theme-file* '(change) - ;; #'(lambda (event) (set-system-theme))) + (use-package catppuccin-theme + :ensure t) + (require 'filenotify) + + (setq *theme-file* "~/theme") + (defun dark-mode () + (load-theme 'doom-oceanic-next t)) + (defun light-mode () +;; (load-theme 'doom-gruvbox-light t)) + (load-theme 'doom-flatwhite t)) +;; (load-theme 'doom-feather-light t)) + (defun set-system-theme () + (let ((theme + (with-temp-buffer + (insert-file-contents *theme-file*) + (buffer-string)))) + (if (string-prefix-p "dark" theme) (dark-mode) (light-mode)))) + + (set-system-theme) + (file-notify-add-watch *theme-file* '(change) + #'(lambda (event) (set-system-theme))) #+END_SRC ** Doom-modeline #+BEGIN_SRC emacs-lisp diff --git a/.ssh/config b/.ssh/config index 8e2eca3..9ef6d25 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,4 +1,5 @@ Host git.simponic.xyz + User git Port 222 Hostname nijika.sys.internal.simponic.xyz diff --git a/.tmux.conf b/.tmux.conf index 082f22a..34ec0b6 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -5,7 +5,8 @@ bind r source-file ~/.tmux.conf set -g prefix C-s set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'catppuccin/tmux' +#set -g @plugin 'catppuccin/tmux' +set -g @plugin 'iggredible/tmux-colorful' bind-key h select-pane -L bind-key j select-pane -D bind-key k select-pane -U diff --git a/scripts/theme/hooks/alacritty.sh b/scripts/theme/hooks/alacritty.sh index e7d123c..0c544d9 100755 --- a/scripts/theme/hooks/alacritty.sh +++ b/scripts/theme/hooks/alacritty.sh @@ -3,6 +3,6 @@ OLD_THEME=$1 NEW_THEME=$2 -echo "import = [ +echo "general.import = [ \"~/.config/alacritty/$NEW_THEME.toml\", ]" > ~/.config/alacritty/theme.toml diff --git a/scripts/theme/hooks/discord.sh b/scripts/theme/hooks/discord.sh index a975f95..e12de9c 100755 --- a/scripts/theme/hooks/discord.sh +++ b/scripts/theme/hooks/discord.sh @@ -4,7 +4,8 @@ OLD_THEME=$1 NEW_THEME=$2 if [ $NEW_THEME = "dark" ]; then - echo '@import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css");' > "$HOME/Library/Application Support/BetterDiscord/data/stable/custom.css" +# echo '@import url("https://betterdiscord.app/Download?id=507");' > "$HOME/Library/Application Support/BetterDiscord/data/stable/custom.css" + echo '@import url("https://betterdiscord.app/Download?id=177");' > "$HOME/Library/Application Support/BetterDiscord/data/stable/custom.css" else - echo '@import url("https://catppuccin.github.io/discord/dist/catppuccin-latte.theme.css");' > "$HOME/Library/Application Support/BetterDiscord/data/stable/custom.css" + echo '@import url("https://betterdiscord.app/Download?id=177");' > "$HOME/Library/Application Support/BetterDiscord/data/stable/custom.css" fi diff --git a/scripts/theme/hooks/spicetify.sh b/scripts/theme/hooks/spicetify.sh index bdc00f9..5650aad 100755 --- a/scripts/theme/hooks/spicetify.sh +++ b/scripts/theme/hooks/spicetify.sh @@ -3,12 +3,12 @@ NEW_THEME=$2 -# spicetify config current_theme Ziro +spicetify config current_theme StarryNight if [ $NEW_THEME = "dark" ]; then - spicetify config color_scheme purple-dark + spicetify config color_scheme Base else - spicetify config color_scheme purple-light + spicetify config color_scheme Cotton-candy fi spicetify apply diff --git a/scripts/theme/hooks/tmux.sh b/scripts/theme/hooks/tmux.sh index 92edc2b..e6ce93a 100755 --- a/scripts/theme/hooks/tmux.sh +++ b/scripts/theme/hooks/tmux.sh @@ -3,13 +3,14 @@ OLD_THEME=$1 NEW_THEME=$2 -function catflavor() { - flavor="mocha" +function coolors() { + flavor="212922-294936-3e6259-5b8266-aef6c7" if [ $1 = "light" ]; then - flavor="latte" +# flavor="393d3f-d5bbb1-9cc4b2-c98ca7-e76d83" + flavor = "74d3ae-678d58-a6c48a-f6e7cb-dd9787" fi echo $flavor } -echo "set -g @catppuccin_flavor $(catflavor $NEW_THEME)" > ~/.tmux/colors +echo "set -g @tmux_colorful_color_scheme 'https://coolors.co/$(coolors $NEW_THEME)'" > ~/.tmux/colors tmux source-file ~/.tmux.conf diff --git a/src/pikaur b/src/pikaur index 1821e8d..9fc4024 160000 --- a/src/pikaur +++ b/src/pikaur @@ -1 +1 @@ -Subproject commit 1821e8d5289c2875d8af7654604251e717357242 +Subproject commit 9fc402499bd5d768141585e271c899c5fd3c3a77