From 7f5159c60be1ffa61d9c9a5c65d6ede19a73517e Mon Sep 17 00:00:00 2001 From: Tom van der Lee Date: Thu, 24 Sep 2026 13:46:34 +0000 Subject: Setup monokai pro --- ghostty/.config/ghostty/config.ghostty | 45 +++++++++++++------------ neovim/.config/nvim/README.md | 2 +- neovim/.config/nvim/lazy-lock.json | 14 ++++---- neovim/.config/nvim/lua/config/lazy.lua | 2 +- neovim/.config/nvim/lua/plugins/colorscheme.lua | 13 ++----- neovim/.config/nvim/lua/plugins/statusline.lua | 2 +- tmux/.tmux.conf | 24 ++++++------- 7 files changed, 48 insertions(+), 54 deletions(-) diff --git a/ghostty/.config/ghostty/config.ghostty b/ghostty/.config/ghostty/config.ghostty index 257a8af..260fa16 100644 --- a/ghostty/.config/ghostty/config.ghostty +++ b/ghostty/.config/ghostty/config.ghostty @@ -1,30 +1,31 @@ keybind = ctrl+,=unbind window-decoration = true font-size = 11 +font-family = "JetBrainsMono NL Nerd Font Mono" -# Colors matching the neovim janah colorscheme (mhinz/vim-janah) -background = #262626 -foreground = #dadada -cursor-color = #ff00af +# Colors matching the neovim monokai-pro colorscheme (loctvl842/monokai-pro.nvim, "pro" filter) +background = #19181a +foreground = #fcfcfa +cursor-color = #c1c0c0 cursor-style = block cursor-style-blink = false shell-integration-features = no-cursor -selection-background = #005f87 -selection-foreground = #c0c0c0 +selection-background = #403e41 +selection-foreground = #fcfcfa -palette = 0=#262626 -palette = 1=#df5f5f -palette = 2=#afdf87 -palette = 3=#ffdfaf -palette = 4=#87afdf -palette = 5=#df005f -palette = 6=#87dfdf -palette = 7=#dadada -palette = 8=#585858 -palette = 9=#ff5f5f -palette = 10=#87ff5f -palette = 11=#ffff5f -palette = 12=#5fdfff -palette = 13=#ff00af -palette = 14=#87dfaf -palette = 15=#eeeeee +palette = 0=#19181a +palette = 1=#ff6188 +palette = 2=#a9dc76 +palette = 3=#ffd866 +palette = 4=#fc9867 +palette = 5=#ab9df2 +palette = 6=#78dce8 +palette = 7=#fcfcfa +palette = 8=#727072 +palette = 9=#ff6188 +palette = 10=#a9dc76 +palette = 11=#ffd866 +palette = 12=#fc9867 +palette = 13=#ab9df2 +palette = 14=#78dce8 +palette = 15=#fcfcfa diff --git a/neovim/.config/nvim/README.md b/neovim/.config/nvim/README.md index 0e50788..7a54caa 100644 --- a/neovim/.config/nvim/README.md +++ b/neovim/.config/nvim/README.md @@ -35,7 +35,7 @@ such tables) and it's included on next launch. | File | Plugin(s) | Purpose | |---|---|---| -| `colorscheme.lua` | vim-janah | Color scheme, falls back to `desert` if it fails to load | +| `colorscheme.lua` | monokai-pro.nvim | Color scheme, falls back to `desert` if it fails to load | | `statusline.lua` | lualine.nvim | Status line | | `filetree.lua` | neo-tree.nvim | File explorer sidebar with git-status colors (`e` to toggle) | | `fuzzyfinder.lua` | telescope.nvim, telescope-ui-select.nvim | Fuzzy file finder (``), live grep (`fg`), buffers (`fb`); also overrides `vim.ui.select` globally so overseer's/dap's pickers are Telescope windows | diff --git a/neovim/.config/nvim/lazy-lock.json b/neovim/.config/nvim/lazy-lock.json index 6717045..37f86ac 100644 --- a/neovim/.config/nvim/lazy-lock.json +++ b/neovim/.config/nvim/lazy-lock.json @@ -3,13 +3,14 @@ "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "claude-code.nvim": { "branch": "main", "commit": "55c0cb59828fbc3bec744288286a46f5d5750b83" }, "friendly-snippets": { "branch": "main", "commit": "b4d01b0fdf3c9a549961c2f9ffe8dc09be166219" }, - "gitsigns.nvim": { "branch": "main", "commit": "f2421c550618d257048afa650413d9e542ddbe67" }, + "gitsigns.nvim": { "branch": "main", "commit": "070a5d7b985546cc57e1fc61e5bc507fecac6045" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "77e06f7d2fc127e6ef0a720b59acbc50757cff19" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "137bd0feba2c1885545b6934d36f5e5aa6adb486" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, + "monokai-pro.nvim": { "branch": "master", "commit": "a68e38b8e55d69a215d0f02598900a79c356da9d" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "1a14083046d96e88e361d1da00761c40d45012f3" }, "nui.nvim": { "branch": "main", "commit": "10fc361835c856ba4233ef5ea135b919bf3dce97" }, "nvim-autopairs": { "branch": "master", "commit": "430522f95fe4fb7c511ec64f8c1a90cc6a66c05c" }, @@ -17,11 +18,11 @@ "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" }, "nvim-dap-ui": { "branch": "master", "commit": "cc9dd33aade7f20bae414d0cba163bc60d4d4b43" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac9d2f7c4757db6320cab6697fe73e5e8adb2457" }, + "nvim-lspconfig": { "branch": "master", "commit": "046b1a797af1effe8e0474b9af9657a3761ec58a" }, "nvim-nio": { "branch": "master", "commit": "edcc181a875301dd21840189aa2f2f9ad69fc172" }, - "nvim-treesitter": { "branch": "main", "commit": "9a168f6357ed21c3a636e1727bc7d382abc451b8" }, + "nvim-treesitter": { "branch": "main", "commit": "f603a2f4da48728f80257fb5fbb90145fd1dc173" }, "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" }, - "nvim-web-devicons": { "branch": "master", "commit": "5f032a85be210cd1c6ac98861eb3b187ff3bd5eb" }, + "nvim-web-devicons": { "branch": "master", "commit": "58447c1fca354bbf184425e4a8d01deecbd6f3c4" }, "overseer.nvim": { "branch": "master", "commit": "a93d9f6d6defdac4bcd6d2c8ba988650e42e0a0e" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "quick-scope": { "branch": "master", "commit": "6cee1d9e0b9ac0fbffeb538d4a5ba9f5628fabbc" }, @@ -30,6 +31,5 @@ "telescope.nvim": { "branch": "master", "commit": "40aedd8a68c78a656a10a8d62d80c54af59420fb" }, "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, - "vim-janah": { "branch": "master", "commit": "3b8ae976987b6ade2abeac25f0208e8bc90d7138" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/neovim/.config/nvim/lua/config/lazy.lua b/neovim/.config/nvim/lua/config/lazy.lua index 5a645c1..59c672e 100644 --- a/neovim/.config/nvim/lua/config/lazy.lua +++ b/neovim/.config/nvim/lua/config/lazy.lua @@ -12,6 +12,6 @@ end vim.opt.rtp:prepend(lazypath) require("lazy").setup("plugins", { - install = { colorscheme = { "janah", "desert" } }, + install = { colorscheme = { "monokai-pro", "desert" } }, checker = { enabled = false }, }) diff --git a/neovim/.config/nvim/lua/plugins/colorscheme.lua b/neovim/.config/nvim/lua/plugins/colorscheme.lua index 0349cf9..6892cba 100644 --- a/neovim/.config/nvim/lua/plugins/colorscheme.lua +++ b/neovim/.config/nvim/lua/plugins/colorscheme.lua @@ -1,19 +1,12 @@ return { - "mhinz/vim-janah", + "loctvl842/monokai-pro.nvim", lazy = false, priority = 1000, config = function() - local ok = pcall(vim.cmd.colorscheme, "janah") + require("monokai-pro").setup() + local ok = pcall(vim.cmd.colorscheme, "monokai-pro") if not ok then vim.cmd.colorscheme("desert") - return end - - -- vim-janah predates floating windows and never defines NormalFloat/ - -- FloatBorder, so they fall back to Neovim's near-black default and any - -- floating UI (:Mason, :Lazy, which-key's popup, ...) renders as a - -- mismatched black box. Match them to janah's own Normal/Comment colors. - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "#262626", fg = "#dadada" }) - vim.api.nvim_set_hl(0, "FloatBorder", { bg = "#262626", fg = "#585858" }) end, } diff --git a/neovim/.config/nvim/lua/plugins/statusline.lua b/neovim/.config/nvim/lua/plugins/statusline.lua index 6cb2412..0096c0f 100644 --- a/neovim/.config/nvim/lua/plugins/statusline.lua +++ b/neovim/.config/nvim/lua/plugins/statusline.lua @@ -4,7 +4,7 @@ return { opts = { refresh = { statusline = 1000 }, sections = { - lualine_a = { "mode", { function() return os.date("%H:%M") end } }, + lualine_z = { "location", { function() return os.date("%H:%M") end } }, }, }, } diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index f6079f7..d4db1f9 100755 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -9,30 +9,30 @@ bind R source-file ~/.tmux.conf \; display-message "Config reloaded..." set -s escape-time 0 -# Statusline, colored to match the neovim janah colorscheme +# Statusline, colored to match the neovim monokai-pro colorscheme set -g status on set -g status-interval 5 set -g status-justify left set -g status-position bottom -set -g status-style "bg=#262626,fg=#dadada" +set -g status-style "bg=#19181a,fg=#fcfcfa" set -g status-left-length 40 -set -g status-left "#[fg=#262626,bg=#afdf87,bold] #S #[fg=#afdf87,bg=#262626,nobold]" +set -g status-left "#[fg=#19181a,bg=#a9dc76,bold] #S #[fg=#a9dc76,bg=#19181a,nobold]" set -g status-right-length 60 -set -g status-right "#[fg=#3a3a3a,bg=#262626]#[fg=#dadada,bg=#3a3a3a] #h #[fg=#87dfdf,bg=#3a3a3a]#[fg=#262626,bg=#87dfdf,bold] %H:%M " +set -g status-right "#[fg=#403e41,bg=#19181a]#[fg=#fcfcfa,bg=#403e41] #h #[fg=#78dce8,bg=#403e41]#[fg=#19181a,bg=#78dce8,bold] %H:%M " set -g window-status-format " #I:#W " -set -g window-status-style "fg=#808080,bg=#262626" +set -g window-status-style "fg=#939293,bg=#19181a" -set -g window-status-current-format "#[fg=#262626,bg=#87afdf]#[fg=#262626,bg=#87afdf,bold] #I:#W #[fg=#87afdf,bg=#262626,nobold]" -set -g window-status-current-style "fg=#262626,bg=#87afdf,bold" +set -g window-status-current-format "#[fg=#19181a,bg=#ab9df2]#[fg=#19181a,bg=#ab9df2,bold] #I:#W #[fg=#ab9df2,bg=#19181a,nobold]" +set -g window-status-current-style "fg=#19181a,bg=#ab9df2,bold" set -g window-status-separator "" -set -g window-status-activity-style "fg=#ffdfaf,bg=#262626" +set -g window-status-activity-style "fg=#ffd866,bg=#19181a" -set -g pane-border-style "fg=#3a3a3a" -set -g pane-active-border-style "fg=#df005f" +set -g pane-border-style "fg=#403e41" +set -g pane-active-border-style "fg=#ff6188" -set -g message-style "fg=#eeeeee,bg=#df005f,bold" -set -g message-command-style "fg=#eeeeee,bg=#df005f,bold" +set -g message-style "fg=#fcfcfa,bg=#ff6188,bold" +set -g message-command-style "fg=#fcfcfa,bg=#ff6188,bold" -- cgit v1.3