From 87c990bf2a298ec471399052f0589e58d84863ae Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 18 Sep 2025 13:11:54 +0200 Subject: [PATCH] uses modus themes where possible --- modules/lazygit/default.nix | 10 +-- modules/nvim/config/lazy-lock.json | 22 +++-- modules/nvim/config/lua/plugins/snacks.lua | 5 +- modules/nvim/config/lua/plugins/theme.lua | 94 +++++++++------------- modules/wezterm/config/appearance.lua | 17 +--- modules/wezterm/config/tab_bar.lua | 40 ++++++--- 6 files changed, 85 insertions(+), 103 deletions(-) diff --git a/modules/lazygit/default.nix b/modules/lazygit/default.nix index 99a7f44..5deab6a 100644 --- a/modules/lazygit/default.nix +++ b/modules/lazygit/default.nix @@ -7,15 +7,7 @@ gui = { nerdFontsVersion = "3"; theme = { - selectedLineBgColor = [ "#332d41" ]; - searchingActiveBorderColor = [ "#31748f" "bold" ]; - optionsTextColor = [ "#ebbcba" ]; - inactiveBorderColor = [ "#6e6a86" ]; - defaultFgColor = [ "#e0def4" ]; - cherryPickedCommitFgColor = [ "#ebbcba" ]; - cherryPickedCommitBgColor = [ "#e0def4" ]; - activeBorderColor = [ "#31748f" "bold" ]; - unstagedChangesColor = [ "#eb6f92" ]; + lightTheme = false; }; }; }; diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json index 81c96e2..c871fc5 100644 --- a/modules/nvim/config/lazy-lock.json +++ b/modules/nvim/config/lazy-lock.json @@ -1,30 +1,28 @@ { "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "codecompanion.nvim": { "branch": "main", "commit": "019be206a96cf6de12ea71f02a9e1b847a2debbb" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "codecompanion.nvim": { "branch": "main", "commit": "8d55059b63bcf53e8b4d3d0885c37b2282d6fa2d" }, "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, - "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "flash.nvim": { "branch": "main", "commit": "b68bda044d68e4026c4e1ec6df3c5afd7eb8e341" }, "follow-md-links.nvim": { "branch": "main", "commit": "728d96d268eef9666f0ee77a083e7e2f0b44f607" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, - "grug-far.nvim": { "branch": "main", "commit": "c5b629399c0f2e436c00df381e44852a13b7313a" }, + "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" }, + "grug-far.nvim": { "branch": "main", "commit": "50d9ee2b5a19634670441948e7e4afaa042f1059" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "mini.diff": { "branch": "main", "commit": "7077b636d642fcd5cd48554e187a251883239660" }, "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" }, "mini.pairs": { "branch": "main", "commit": "3738ea30ff33e0cbf2983dc67319a5468d25b0a9" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" }, - "none-ls.nvim": { "branch": "main", "commit": "df778107fd2f0503f5606363ce13437132056d54" }, + "modus-themes.nvim": { "branch": "master", "commit": "61b8c10ec636f42baf6c845edb14b9ae2723711f" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "95994ad668786cd75d0ee6d0b7178bce7c3ca146" }, - "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, - "schemastore.nvim": { "branch": "main", "commit": "fb58187b76d8e086f08686b872b50f52eac57818" }, - "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "render-markdown.nvim": { "branch": "main", "commit": "67f2c7c8850bb11eefa6b22054a6f4cef1146de2" }, + "schemastore.nvim": { "branch": "main", "commit": "8ebf58bd467f353d18cfa71776b33b28a68130de" }, + "snacks.nvim": { "branch": "main", "commit": "d67a47739dfc652cfcf66c59e929c704a854b37a" }, "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" }, diff --git a/modules/nvim/config/lua/plugins/snacks.lua b/modules/nvim/config/lua/plugins/snacks.lua index 00476ab..ff6e7cc 100644 --- a/modules/nvim/config/lua/plugins/snacks.lua +++ b/modules/nvim/config/lua/plugins/snacks.lua @@ -19,7 +19,10 @@ return { enabled = true, what = "commit", }, - indent = { enabled = true }, + indent = { + enabled = true, + char = "┆", + }, input = { enabled = true }, lazygit = { enabled = true, diff --git a/modules/nvim/config/lua/plugins/theme.lua b/modules/nvim/config/lua/plugins/theme.lua index 5729886..58b6b39 100644 --- a/modules/nvim/config/lua/plugins/theme.lua +++ b/modules/nvim/config/lua/plugins/theme.lua @@ -1,58 +1,44 @@ return { - { - "rose-pine/neovim", - name = "rose-pine", - config = function() - require("rose-pine").setup({ - variant = "auto", -- auto, main, moon, or dawn - dark_variant = "main", -- main, moon, or dawn - dim_inactive_windows = false, - extend_background_behind_borders = true, - - enable = { - terminal = true, - migrations = true, - }, - - styles = { - bold = true, - italic = false, - transparency = true, - }, - - groups = { - border = "muted", - link = "iris", - panel = "surface", - - error = "love", - hint = "iris", - info = "foam", - note = "pine", - todo = "rose", - warn = "gold", - - git_add = "foam", - git_change = "rose", - git_delete = "love", - git_dirty = "rose", - git_ignore = "muted", - git_merge = "iris", - git_rename = "pine", - git_stage = "iris", - git_text = "rose", - git_untracked = "subtle", - - h1 = "iris", - h2 = "foam", - h3 = "rose", - h4 = "gold", - h5 = "pine", - h6 = "foam", - }, - }) - - vim.cmd("colorscheme rose-pine") + "miikanissi/modus-themes.nvim", + priority = 1000, + opts = { + style = "modus_vivendi", + variant = "tinted", + transparent = true, + sign_column_background = false, + line_nr_column_background = false, + on_highlights = function(highlight, color) + highlight.TabLine = { fg = color.fg_dim, bg = color.bg_dim } + highlight.TabLineFill = { fg = color.fg_dim, bg = color.bg_main } + highlight.BufferInactiveMod = { fg = color.fg_dim, bg = color.bg_main } + highlight.BufferInactive = { fg = color.fg_dim, bg = color.bg_main } + highlight.BufferInactiveSign = { fg = color.fg_alt, bg = color.bg_main } + highlight.BufferInactiveSignRight = { fg = color.fg_alt, bg = color.bg_main } + highlight.BufferInactiveTarget = { fg = color.yellow_faint, bg = color.bg_main } + highlight.BufferActiveMod = { fg = color.fg_dim, bg = color.bg_main } + highlight.BufferActive = { fg = color.fg_dim, bg = color.bg_main } + highlight.BufferActiveSign = { fg = color.fg_alt, bg = color.bg_dim } + highlight.BufferActiveSignRight = { fg = color.fg_alt, bg = color.bg_dim } + highlight.BufferActiveTarget = { fg = color.yellow_faint, bg = color.bg_dim } + highlight.BufferCurrentMod = { fg = color.fg_alt, bg = color.bg_dim } + highlight.BufferCurrentBtn = { fg = color.fg_main, bg = color.bg_dim } + highlight.BufferCurrent = { fg = color.fg_main, bg = color.bg_dim } + highlight.BufferCurrentSign = { fg = color.fg_alt, bg = color.bg_dim } + highlight.BufferCurrentSignRight = { fg = color.fg_alt, bg = color.bg_dim } + highlight.BufferCurrentTarget = { fg = color.yellow_faint, bg = color.bg_dim } + highlight.WhichKeyFloat = { fg = "NONE", bg = "NONE" } + highlight.NormalFloat = { fg = "NONE", bg = "NONE" } + highlight.SnacksIndent = { fg = color.bg_dim } + highlight.FlashMatch = { fg = color.fg_main, bg = color.bg_cyan_subtle } + highlight.FlashLabel = { fg = color.fg_main, bg = color.bg_magenta_intense } + highlight.SnacksIndentScope = { fg = color.fg_dim } + highlight.CursorLine = { bg = color.tinted_bg_cyan_nuanced } + highlight.Visual = { bg = color.bg_magenta_subtle } + highlight.IncSearch = { fg = color.cyan, bg = color.bg_cyan_nuanced } + highlight["@comment"] = { fg = color.fg_dim } end, }, + init = function() + vim.cmd([[colorscheme modus]]) + end, } diff --git a/modules/wezterm/config/appearance.lua b/modules/wezterm/config/appearance.lua index 4442ff9..965bc89 100644 --- a/modules/wezterm/config/appearance.lua +++ b/modules/wezterm/config/appearance.lua @@ -1,23 +1,10 @@ local wezterm = require("wezterm") -local theme = wezterm.plugin.require("https://github.com/neapsix/wezterm").main local helpers = require("helpers") local M = {} -local scheme = wezterm.get_builtin_color_schemes()["rose-pine"] - -scheme.selection_fg = "white" -scheme.selection_bg = "teal" -scheme.copy_mode_active_highlight_bg = { AnsiColor = "Teal" } -scheme.copy_mode_active_highlight_fg = { AnsiColor = "White" } -scheme.copy_mode_inactive_highlight_bg = { AnsiColor = "Silver" } -scheme.copy_mode_inactive_highlight_fg = { AnsiColor = "Black" } - function M.apply_to_config(config) - config.color_schemes = { - ["rose-pine"] = scheme, - } - config.color_scheme = "rose-pine" + config.color_scheme = "Modus-Vivendi-Tinted" config.font = wezterm.font("VictorMono Nerd Font", { weight = "DemiBold", stretch = "Normal", style = "Normal" }) config.font_size = 18.5 config.window_decorations = "RESIZE" @@ -25,8 +12,6 @@ function M.apply_to_config(config) config.window_background_opacity = 0.97 config.macos_window_background_blur = 30 config.command_palette_font_size = 19 - config.command_palette_fg_color = theme.colors().foreground - config.command_palette_bg_color = theme.colors().tab_bar.active_tab.bg_color end return M diff --git a/modules/wezterm/config/tab_bar.lua b/modules/wezterm/config/tab_bar.lua index d2d7f70..0b7816e 100644 --- a/modules/wezterm/config/tab_bar.lua +++ b/modules/wezterm/config/tab_bar.lua @@ -1,20 +1,17 @@ local wezterm = require("wezterm") -local theme = wezterm.plugin.require("https://github.com/neapsix/wezterm").main local helpers = require("helpers") local M = {} local function get_elements(for_window) return { - { Background = { Color = theme.colors().tab_bar.background } }, - { Foreground = { Color = theme.colors().tab_bar.inactive_tab.fg_color } }, + { Background = { Color = "#0d0e1c" } }, { Text = "h:" .. wezterm.hostname() .. " " }, - { Text = "upgrades:" .. helpers.get_outdated_packages() .. " " }, - { Text = "bat:" .. helpers.get_primary_battery_state() .. " " }, - { Background = { Color = theme.colors().tab_bar.active_tab.bg_color } }, - { Foreground = { Color = theme.colors().tab_bar.active_tab.fg_color } }, + { Text = "u:" .. helpers.get_outdated_packages() .. " " }, + { Text = "b:" .. helpers.get_primary_battery_state() .. " " }, + { Background = { Color = "#1d2235" } }, { Text = " " .. helpers.get_zoomed_status(for_window) .. " " }, - { Text = "session >> " .. for_window:active_workspace() .. " " }, + { Text = "s:" .. for_window:active_workspace() .. " " }, } end @@ -28,13 +25,34 @@ function M.apply_to_config(config) config.tab_bar_at_bottom = false config.window_frame = { - inactive_titlebar_bg = theme.colors().tab_bar.background, - active_titlebar_bg = theme.colors().tab_bar.background, + inactive_titlebar_bg = "#0d0e1c", + active_titlebar_bg = "#0d0e1c", font = wezterm.font({ family = "Victor Mono", weight = "Bold" }), } config.colors = { - tab_bar = theme.colors().tab_bar, + tab_bar = { + active_tab = { + bg_color = "#0d0e1c", + fg_color = "#ffffff", + }, + inactive_tab = { + bg_color = "#0d0e1c", + fg_color = "#989898", + }, + inactive_tab_hover = { + fg_color = "#ffffff", + bg_color = "#0d0e1c", + }, + new_tab = { + bg_color = "#0d0e1c", + fg_color = "#989898", + }, + new_tab_hover = { + bg_color = "#0d0e1c", + fg_color = "#ffffff", + }, + }, } end