Merge branch 'master' of git:hub/dotfiles

.config/ghostty/linux/config

@@ -1,3 +1,3 @@
 font-size = 10
 window-decoration = none
-theme = "rose-pine-moon"
+theme = "tokyonight-moon"

.config/ghostty/macos/config

@@ -1,3 +1,3 @@
 font-size = 12
-theme = "rose pine moon"
+theme = "tokyonight-moon"
 macos-titlebar-style = tabs

.config/ghostty/themes/tokyonight-moon

@@ -0,0 +1,23 @@
+background = #222436
+foreground = #c8d3f5
+selection-background = #2d3f76
+selection-foreground = #c8d3f5
+cursor-color = #c8d3f5
+cursor-text = #222436
+palette = 0=#1b1d2b
+palette = 1=#ff757f
+palette = 2=#c3e88d
+palette = 3=#ffc777
+palette = 4=#82aaff
+palette = 5=#c099ff
+palette = 6=#86e1fc
+palette = 7=#828bb8
+palette = 8=#444a73
+palette = 9=#ff757f
+palette = 10=#c3e88d
+palette = 11=#ffc777
+palette = 12=#82aaff
+palette = 13=#c099ff
+palette = 14=#86e1fc
+palette = 15=#c8d3f5
+

.config/nvim/init.lua

@@ -1,3 +1,4 @@
+vim.opt.termguicolors = true
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
 	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", "https://github.com/folke/lazy.nvim.git", lazypath })
@@ -6,6 +7,11 @@ vim.opt.rtp:prepend(lazypath)
 require("lazy").setup({
 	spec = {
 		{ "rose-pine/neovim", name = "rose-pine" },
+		{ "folke/tokyonight.nvim", lazy = false,
+			priority = 1000,
+			opts = {},
+		},
+		{ "norcalli/nvim-colorizer.lua" },
 		{ "mbbill/undotree" },
 		{ "echasnovski/mini.pairs", version = '*' },
 		{ "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } },
@@ -26,6 +32,7 @@ require("lazy").setup({
 	}
 })
 
+require ('colorizer').setup()
 require('mini.pairs').setup()
 require("fzf-lua").setup({
 	"border-fused",
@@ -59,7 +66,6 @@ require("fzf-lua").setup({
 })
 
 vim.g.mapleader = " "
-vim.opt.termguicolors = true
 vim.opt.number = true
 vim.opt.relativenumber = true
 vim.opt.wrap = false
@@ -72,13 +78,14 @@ vim.opt.completeopt = { "menuone", "noselect", "popup" }
 vim.g.netrw_browse_split = 0
 vim.g.netrw_banner = 0
 vim.g.netrw_winsize = 25
-vim.cmd.colorscheme("rose-pine-moon")
+vim.cmd.colorscheme("tokyonight-moon")
 vim.lsp.enable({ "lua_ls", "clangd" })
 vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
 vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
 vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" })
 vim.api.nvim_set_hl(0, "StatusLineTerm", { bg = "none" })
 vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "none" })
+vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" })
 
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")

.config/tmux/tmux.conf

@@ -7,11 +7,11 @@ set-option -g default-terminal "tmux-256color"
 set-option -as terminal-features ',xterm-ghostty:RGB'
 set-option -g default-shell $SHELL
 
-set -g status-style 'fg=#ea9a97 bg=default'
+set -g status-style 'fg=#ff757f bg=default'
 set -g status-left-length 100
 set -g status-right-length 20
-set -g status-left "#[fg=#6e6a86, bold] #S #[fg=#6e6a86,nobold]- "
-set -g status-right "#[fg=#ea9a97] %m-%d-%Y #[fg=#6e6a86] %H:%M"
+set -g status-left "#[fg=#828bb8, bold] #S #[fg=#828bb8,nobold]- "
+set -g status-right "#[fg=#ff757f] %m-%d-%Y #[fg=#828bb8] %H:%M"
 
 set -g base-index 1
 set -g pane-base-index 1