summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ghostty/.local/share/ghostty/themes/melange_dark.txt21
-rw-r--r--ghostty/.local/share/ghostty/themes/melange_light.txt21
-rw-r--r--ghostty/Library/Application Support/com.mitchellh.ghostty/config2
-rw-r--r--neovim/.config/nvim/lua/config/colourscheme.lua2
-rw-r--r--neovim/.config/nvim/lua/config/lazy.lua2
-rw-r--r--neovim/.config/nvim/lua/config/lualine.lua15
-rw-r--r--neovim/.config/nvim/lua/plugins/lualine.lua10
7 files changed, 63 insertions, 10 deletions
diff --git a/ghostty/.local/share/ghostty/themes/melange_dark.txt b/ghostty/.local/share/ghostty/themes/melange_dark.txt
new file mode 100644
index 0000000..dffef20
--- /dev/null
+++ b/ghostty/.local/share/ghostty/themes/melange_dark.txt
@@ -0,0 +1,21 @@
+background = #292522
+foreground = #ECE1D7
+cursor-color = #ECE1D7
+selection-background = #403A36
+selection-foreground = #ECE1D7
+palette = 0=#34302C
+palette = 1=#BD8183
+palette = 2=#78997A
+palette = 3=#E49B5D
+palette = 4=#7F91B2
+palette = 5=#B380B0
+palette = 6=#7B9695
+palette = 7=#C1A78E
+palette = 8=#867462
+palette = 9=#D47766
+palette = 10=#85B695
+palette = 11=#EBC06D
+palette = 12=#A3A9CE
+palette = 13=#CF9BC2
+palette = 14=#89B3B6
+palette = 15=#ECE1D7
diff --git a/ghostty/.local/share/ghostty/themes/melange_light.txt b/ghostty/.local/share/ghostty/themes/melange_light.txt
new file mode 100644
index 0000000..2b2baff
--- /dev/null
+++ b/ghostty/.local/share/ghostty/themes/melange_light.txt
@@ -0,0 +1,21 @@
+background = #F1F1F1
+foreground = #54433A
+cursor-color = #54433A
+selection-background = #D9D3CE
+selection-foreground = #54433A
+palette = 0=#E9E1DB
+palette = 1=#C77B8B
+palette = 2=#6E9B72
+palette = 3=#BC5C00
+palette = 4=#7892BD
+palette = 5=#BE79BB
+palette = 6=#739797
+palette = 7=#7D6658
+palette = 8=#A98A78
+palette = 9=#BF0021
+palette = 10=#3A684A
+palette = 11=#A06D00
+palette = 12=#465AA4
+palette = 13=#904180
+palette = 14=#3D6568
+palette = 15=#54433A
diff --git a/ghostty/Library/Application Support/com.mitchellh.ghostty/config b/ghostty/Library/Application Support/com.mitchellh.ghostty/config
index aca8126..a39835f 100644
--- a/ghostty/Library/Application Support/com.mitchellh.ghostty/config
+++ b/ghostty/Library/Application Support/com.mitchellh.ghostty/config
@@ -42,7 +42,7 @@ font-size = 13
# # which is explained in the docs for that config option.
# # Just for example:
# resize-overlay-duration = 4s 200ms
-theme = light:Apple System Colors Light,dark:Apple System Colors
+theme = light:melange_light,dark:melange_dark
macos-titlebar-style = native
shell-integration-features = title,sudo,cursor
font-thicken = true
diff --git a/neovim/.config/nvim/lua/config/colourscheme.lua b/neovim/.config/nvim/lua/config/colourscheme.lua
index 78e71a5..109c49e 100644
--- a/neovim/.config/nvim/lua/config/colourscheme.lua
+++ b/neovim/.config/nvim/lua/config/colourscheme.lua
@@ -1,4 +1,4 @@
-local colorscheme = "xcodehc"
+local colorscheme = "melange"
vim.o.background = "light"
local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
if not ok then
diff --git a/neovim/.config/nvim/lua/config/lazy.lua b/neovim/.config/nvim/lua/config/lazy.lua
index f9671dc..c453a45 100644
--- a/neovim/.config/nvim/lua/config/lazy.lua
+++ b/neovim/.config/nvim/lua/config/lazy.lua
@@ -30,7 +30,7 @@ require("lazy").setup({
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
- install = { colorscheme = { "xcodehc" }, missing = true },
+ install = { colorscheme = { "melange" }, missing = true },
-- automatically check for plugin updates
checker = { enabled = true, notify = false },
})
diff --git a/neovim/.config/nvim/lua/config/lualine.lua b/neovim/.config/nvim/lua/config/lualine.lua
index 8bb6559..a95cd73 100644
--- a/neovim/.config/nvim/lua/config/lualine.lua
+++ b/neovim/.config/nvim/lua/config/lualine.lua
@@ -39,13 +39,14 @@ local config = {
-- Disable sections and component separators
component_separators = '',
section_separators = '',
- theme = {
- -- We are going to use lualine_c an lualine_x as left and
- -- right section. Both are highlighted by c theme . So we
- -- are just setting default looks o statusline
- normal = { c = { fg = colors.fg, bg = colors.bg } },
- inactive = { c = { fg = colors.fg, bg = colors.bg } },
- },
+ --theme = {
+ ---- We are going to use lualine_c an lualine_x as left and
+ ---- right section. Both are highlighted by c theme . So we
+ ---- are just setting default looks o statusline
+ --normal = { c = { fg = colors.fg, bg = colors.bg } },
+ --inactive = { c = { fg = colors.fg, bg = colors.bg } },
+ --},
+ theme = 'melange',
},
sections = {
-- these are to remove the defaults
diff --git a/neovim/.config/nvim/lua/plugins/lualine.lua b/neovim/.config/nvim/lua/plugins/lualine.lua
index e4326cf..dfd03d4 100644
--- a/neovim/.config/nvim/lua/plugins/lualine.lua
+++ b/neovim/.config/nvim/lua/plugins/lualine.lua
@@ -15,11 +15,21 @@ return {
},
},
{
+ 'rebelot/kanagawa.nvim',
+ priority = 1000,
+ lazy = false,
+ },
+ {
'neanias/everforest-nvim',
priority = 1000,
lazy = false,
},
{
+ 'savq/melange-nvim',
+ priority = 1000,
+ lazy = false,
+ },
+ {
'navarasu/onedark.nvim',
lazy = false,
priority = 1000,