diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua index 908f302..3249fb0 100644 --- a/nvim/.config/nvim/lua/plugins/colorscheme.lua +++ b/nvim/.config/nvim/lua/plugins/colorscheme.lua @@ -1,5 +1,5 @@ -vim.pack.add({ "https://github.com/ellisonleao/gruvbox.nvim" }) +vim.pack.add({ "https://github.com/EdenEast/nightfox.nvim" }) local cs = require("config.colorscheme") -cs.set_colorschemes("gruvbox", "gruvbox") +cs.set_colorschemes("terafox", "dayfox") cs.update_colorscheme() diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index d9dad72..a141e80 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -16,15 +16,15 @@ "rev": "fcea7ff883235d9024dc41e638f164a450c14ca2", "src": "https://github.com/folke/flash.nvim" }, - "gruvbox.nvim": { - "rev": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437", - "src": "https://github.com/ellisonleao/gruvbox.nvim" - }, "multicursor.nvim": { "rev": "993c6eda70077c5619388900dcffefff73b40c96", "src": "https://github.com/jake-stewart/multicursor.nvim", "version": "'1.0'" }, + "nightfox.nvim": { + "rev": "ba47d4b4c5ec308718641ba7402c143836f35aa9", + "src": "https://github.com/EdenEast/nightfox.nvim" + }, "nvim-surround": { "rev": "1098d7b3c34adcfa7feb3289ee434529abd4afd1", "src": "https://github.com/kylechui/nvim-surround", diff --git a/xsession/.Xresources b/xsession/.Xresources index cc0fd00..e89b925 100644 --- a/xsession/.Xresources +++ b/xsession/.Xresources @@ -58,50 +58,51 @@ XTerm.vt100.color15: #ECEFF4 st.font: FiraCode Nerd Font:size=10 -! gruvebox colors from https://github.com/morhetz/gruvbox-contrib/tree/master/deepin-terminal +! terrafox colors from https://github.com/edeneast/nightfox.nvim/raw/main/extra/terafox/alacritty.toml +! dayfox colors from https://github.com/edeneast/nightfox.nvim/raw/main/extra/dayfox/alacritty.toml #ifdef THEME_DARK st.lightmode: 0 -st.background: #282828 -st.foreground: #d5c4a1 -st.cursorColor: #bf8040 -st.reverse-cursor: #1f212e -st.color0: #282828 -st.color1: #cc241d -st.color2: #98971a -st.color3: #d79921 -st.color4: #458588 -st.color5: #b16286 -st.color6: #689d6a -st.color7: #a89984 -st.color8: #928374 -st.color9: #fb4934 -st.color10: #b8bb26 -st.color11: #fabd2f -st.color12: #83a598 -st.color13: #d3869b -st.color14: #8ec07c -st.color15: #ebdbb2 +st.background: #152528 +st.foreground: #e6eaea +st.cursorColor: #cbd9d8 +st.reverse-cursor: #e6eaea +st.color0: #2f3239 +st.color1: #e85c51 +st.color2: #7aa4a1 +st.color3: #fda47f +st.color4: #5a93aa +st.color5: #ad5c7c +st.color6: #a1cdd8 +st.color7: #ebebeb +st.color8: #4e5157 +st.color9: #eb746b +st.color10: #8eb2af +st.color11: #fdb292 +st.color12: #73a3b7 +st.color13: #b97490 +st.color14: #afd4de +st.color15: #eeeeee #else st.lightmode: 1 -st.background: #fbf1c7 -st.foreground: #3c3836 -st.cursorColor: #bf8040 -st.reverse-cursor: #1f212e -st.color0: #282828 -st.color1: #cc241d -st.color2: #98971a -st.color3: #d79921 -st.color4: #458588 -st.color5: #b16286 -st.color6: #689d6a -st.color7: #7c6f64 -st.color8: #928374 -st.color9: #9d0006 -st.color10: #79740e -st.color11: #b57614 -st.color12: #076678 -st.color13: #8f3f71 -st.color14: #427b58 -st.color15: #3c3836 +st.background: #f6f2ee +st.foreground: #3d2b5a +st.cursorColor: #643f61 +st.reverse-cursor: #3d2b5a +st.color0: #352c24 +st.color1: #a5222f +st.color2: #396847 +st.color3: #ac5402 +st.color4: #2848a9 +st.color5: #6e33ce +st.color6: #287980 +st.color7: #f2e9e1 +st.color8: #534c45 +st.color9: #b3434e +st.color10: #577f63 +st.color11: #b86e28 +st.color12: #4863b6 +st.color13: #8452d5 +st.color14: #488d93 +st.color15: #f4ece6 #endif