diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d90ba90..8fc18e8 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -48,7 +48,7 @@ o.foldenable = false o.grepprg = "rg --color=never" o.guicursor = "a:blinkon0,i:ver25-iCursor" o.ignorecase = true -o.laststatus = 3 +-- o.laststatus = 2 o.cmdheight = 0 o.linebreak = true o.mouse = "a" diff --git a/.config/nvim/lua/config/cokeline.lua b/.config/nvim/lua/config/cokeline.lua new file mode 100644 index 0000000..826e472 --- /dev/null +++ b/.config/nvim/lua/config/cokeline.lua @@ -0,0 +1,95 @@ +return function() + local get_hex = require("cokeline/utils").get_hex + local C = { + active = { + fg = "#d8dee9", + bg = "#434c5e", + }, + inactive = { + fg = "#d8dee9", + bg = "#2e3440", + }, + bg = "#2e3440", + fg = "#d8dee9", + } + require("cokeline").setup({ + show_if_buffers_are_at_least = 2, + buffers = { + -- filter_valid = function(buffer) -> true | false, + -- filter_visible = function(buffer) -> true | false, + -- focus_on_delete = 'prev' | 'next', + -- new_buffers_position = 'last' | 'next' | 'directory' | 'number', + -- delete_on_right_click = true | false, + }, + -- rendering = { + -- max_buffer_width = 999, + -- }, + + default_hl = { + fg = function(buf) + return buf.is_focused and C.active.fg or C.inactive.fg + end, + bg = function(buf) + return buf.is_focused and C.active.bg or C.inactive.bg + end, + style = "NONE", + }, + + components = { + { + text = "", + fg = function(buf) + return buf.is_focused and C.active.bg or C.inactive.bg + end, + bg = C.bg, + }, + { + text = function(buf) + return " " .. buf.devicon.icon + end, + fg = function(buf) + return buf.devicon.color + end, + }, + { + text = function(buf) + return buf.filename .. " " + end, + style = function(buf) + return buf.is_focused and "italic" or "none" + end, + }, + { + text = "", + delete_buffer_on_left_click = true, + }, + { + text = " ", + }, + + { + text = "", + fg = function(buf) + return buf.is_focused and C.active.bg or C.inactive.bg + end, + bg = C.bg, + }, + { + text = " ", + bg = C.bg, + }, + }, + + sidebar = { + filetype = "neo-tree", + components = { + { + text = " NeoTree", + fg = get_hex("NeoTreeNormal", "fg"), + bg = get_hex("NeoTeeNormal", "bg"), + style = "bold", + }, + }, + }, + }) +end diff --git a/.config/nvim/lua/config/color.lua b/.config/nvim/lua/config/color.lua index cbea8b8..d588f58 100644 --- a/.config/nvim/lua/config/color.lua +++ b/.config/nvim/lua/config/color.lua @@ -26,13 +26,8 @@ return function() vim.cmd.colorscheme("nord") - -- require("catppuccin").setup({ - -- custom_highlights = function(c) - -- return { - -- ["@"] - -- } - -- end, - -- }) + + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) -- General visibility vim.api.nvim_set_hl(0, "Comment", { fg = "#616e88", italic = 1 }) @@ -51,5 +46,12 @@ return function() -- Neotree vim.api.nvim_set_hl(0, "NeoTreeCursorLine", { bg = "#3B4252" }) vim.api.nvim_set_hl(0, "NeoTreeNormal", { bg = "#282E39" }) + vim.api.nvim_set_hl(0, "NeoTreeNormalNC", { bg = "#282E39" }) vim.api.nvim_set_hl(0, "NeoTreeWinSeparator", { fg = "#2E3440", bg = "#2E3440" }) + + -- Trouble + vim.api.nvim_set_hl(0, "TroubleNormal", { bg = "#282E39" }) + + -- Cokeline + vim.api.nvim_set_hl(0, "TabLine", { bg = "#2E3440" }) end diff --git a/.config/nvim/lua/config/lsp.lua b/.config/nvim/lua/config/lsp.lua index e578037..7c50141 100644 --- a/.config/nvim/lua/config/lsp.lua +++ b/.config/nvim/lua/config/lsp.lua @@ -69,6 +69,7 @@ return function() lsp.terraformls.setup(config()) lsp.tsserver.setup(config()) lsp.vls.setup(config({ format = true })) + lsp.zls.setup(config()) lsp.lua_ls.setup({ on_attach = on_attach(), capabilities = capabilities, diff --git a/.config/nvim/plugin/10-main.lua b/.config/nvim/plugin/10-main.lua index 8cc0e78..a3cd16f 100644 --- a/.config/nvim/plugin/10-main.lua +++ b/.config/nvim/plugin/10-main.lua @@ -39,7 +39,7 @@ require("packer").startup({ use({ "lewis6991/impatient.nvim" }) -- pretty menus - use({ "stevearc/dressing.nvim" }) + -- use({ "stevearc/dressing.nvim" }) -- Keymaps use({ @@ -94,15 +94,21 @@ require("packer").startup({ -- colorscheme use({ "nordtheme/vim", as = "nord", config = require("config.color") }) - -- use({ "catppuccin/nvim", as = "catppuccin", config = require("config.color") }) + -- use({ "shaunsingh/nord.nvim", as = "nord", config = require("config.color") }) -- "tab" line with buffers + -- use({ + -- "akinsho/bufferline.nvim", + -- tag = "*", + -- requires = { "kyazdani42/nvim-web-devicons" }, + -- -- opt = true, + -- config = require("config.bufferline"), + -- }) use({ - "akinsho/bufferline.nvim", - tag = "*", - requires = { "kyazdani42/nvim-web-devicons" }, - -- opt = true, - config = require("config.bufferline"), + "willothy/nvim-cokeline", + requires = "kyazdani42/nvim-web-devicons", + config = require("config.cokeline"), + after = "nord", }) -- syntax highlighting, etc diff --git a/.config/spicetify/config-xpui.ini b/.config/spicetify/config-xpui.ini index fba5f0b..2ceaadf 100644 --- a/.config/spicetify/config-xpui.ini +++ b/.config/spicetify/config-xpui.ini @@ -27,5 +27,5 @@ remove_rtl_rule = 1 ; DO NOT CHANGE! [Backup] -version = -with = +version = 1.2.9.743.g85d9593d +with = 2.17.1 diff --git a/.config/tmux/settings.conf b/.config/tmux/settings.conf index a2ec0ca..b04cbbd 100644 --- a/.config/tmux/settings.conf +++ b/.config/tmux/settings.conf @@ -42,6 +42,11 @@ set -g mode-style "fg=white,bg=brightblack" set -g message-style "fg=white,bg=brightblack" set -g message-command-style "fg=white,bg=brightblack" -# Bordres -set -g pane-active-border-style bg=default,fg="#b48ead" -set -g pane-border-style fg="#a3be8c" + +# Pane colors +set -g window-style bg="#2a2e38" +set -g window-active-style bg="#2e3440" + +# Borders +set -g pane-active-border-style bg=default,fg="#393c42" +set -g pane-border-style fg="#393c42",bg=default diff --git a/.config/tmux/status.conf b/.config/tmux/status.conf index 4f446ae..23213a8 100644 --- a/.config/tmux/status.conf +++ b/.config/tmux/status.conf @@ -30,3 +30,8 @@ set -g status-left "" set -g status-right "#[fg=#434c5e bg=default]" set -ag status-right "#[fg=color4 bg=#434c5e]  #[fg=default] #H " set -ag status-right "#[fg=#434c5e bg=default]" + +# Hide the status if only one window +# if -F "#{==:#{session_windows},1}" "set -g status off" "set -g status on" +# set-hook -g window-linked 'if -F "#{==:#{session_windows},1}" "set -g status off" "set -g status on"' +# set-hook -g window-unlinked 'if -F "#{==:#{session_windows},1}" "set -g status off" "set -g status on"' diff --git a/.config/vifm/colors/Default.vifm b/.config/vifm/colors/Default.vifm index 1647f96..5b9dac9 100644 --- a/.config/vifm/colors/Default.vifm +++ b/.config/vifm/colors/Default.vifm @@ -1,87 +1,28 @@ -" You can edit this file by hand. -" The " character at the beginning of a line comments out the line. -" Blank lines are ignored. - -" The Default color scheme is used for any directory that does not have -" a specified scheme and for parts of user interface like menus. A -" color scheme set for a base directory will also -" be used for the sub directories. - -" The standard ncurses colors are: -" Default = -1 = None, can be used for transparency or default color -" Black = 0 -" Red = 1 -" Green = 2 -" Yellow = 3 -" Blue = 4 -" Magenta = 5 -" Cyan = 6 -" White = 7 - -" Light versions of colors are also available (they set bold -" attribute in terminals with less than 16 colors): -" LightBlack -" LightRed -" LightGreen -" LightYellow -" LightBlue -" LightMagenta -" LightCyan -" LightWhite - -" Available attributes (some of them can be combined): -" bold -" underline -" reverse or inverse -" standout -" italic (on unsupported systems becomes reverse) -" combine -" none - -" Vifm supports 256 colors you can use color numbers 0-255 -" (requires properly set up terminal: set your TERM environment variable -" (directly or using resources) to some color terminal name (e.g. -" xterm-256color) from /usr/lib/terminfo/; you can check current number -" of colors in your terminal with tput colors command) - -" highlight group cterm=attrs ctermfg=foreground_color ctermbg=background_color +" nord color scheme approximation for vifm +" Reset all styles first highlight clear -highlight Win cterm=none ctermfg=white ctermbg=black -highlight Directory cterm=bold ctermfg=cyan ctermbg=default -highlight Link cterm=bold ctermfg=yellow ctermbg=default -highlight BrokenLink cterm=bold ctermfg=red ctermbg=default -highlight HardLink cterm=none ctermfg=yellow ctermbg=default -highlight Socket cterm=bold ctermfg=magenta ctermbg=default -highlight Device cterm=bold ctermfg=red ctermbg=default -highlight Fifo cterm=bold ctermfg=cyan ctermbg=default -highlight Executable cterm=bold ctermfg=green ctermbg=default -highlight Selected cterm=bold ctermfg=magenta ctermbg=default -highlight CurrLine cterm=bold,reverse ctermfg=default ctermbg=default -highlight TopLine cterm=none ctermfg=black ctermbg=white -highlight TopLineSel cterm=bold ctermfg=black ctermbg=default -highlight StatusLine cterm=bold ctermfg=black ctermbg=white -highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black -highlight CmdLine cterm=none ctermfg=white ctermbg=black -highlight ErrorMsg cterm=none ctermfg=red ctermbg=black -highlight Border cterm=none ctermfg=black ctermbg=white -highlight OtherLine ctermfg=default ctermbg=default -highlight JobLine cterm=bold,reverse ctermfg=black ctermbg=white -highlight SuggestBox cterm=bold ctermfg=default ctermbg=default -highlight CmpMismatch cterm=bold ctermfg=white ctermbg=red -highlight AuxWin ctermfg=default ctermbg=default -highlight TabLine cterm=none ctermfg=white ctermbg=black -highlight TabLineSel cterm=bold,reverse ctermfg=default ctermbg=default -highlight User1 ctermfg=default ctermbg=default -highlight User2 ctermfg=default ctermbg=default -highlight User3 ctermfg=default ctermbg=default -highlight User4 ctermfg=default ctermbg=default -highlight User5 ctermfg=default ctermbg=default -highlight User6 ctermfg=default ctermbg=default -highlight User7 ctermfg=default ctermbg=default -highlight User8 ctermfg=default ctermbg=default -highlight User9 ctermfg=default ctermbg=default -highlight OtherWin ctermfg=default ctermbg=default -highlight LineNr ctermfg=default ctermbg=default -highlight OddLine ctermfg=default ctermbg=default +highlight Border cterm=none ctermfg=default ctermbg=default +highlight TopLine cterm=none ctermfg=110 ctermbg=236 +highlight TopLineSel cterm=bold ctermfg=110 ctermbg=237 + +highlight Win cterm=none ctermfg=7 ctermbg=default +highlight OtherWin cterm=none ctermfg=7 ctermbg=default +highlight CurrLine cterm=bold,inverse ctermfg=default ctermbg=default +highlight OtherLine cterm=bold ctermfg=default ctermbg=235 +highlight Selected cterm=none ctermfg=7 ctermbg=237 + +highlight JobLine cterm=bold ctermfg=116 ctermbg=238 +highlight StatusLine cterm=bold ctermfg=110 ctermbg=237 +highlight ErrorMsg cterm=bold ctermfg=167 ctermbg=default +highlight WildMenu cterm=bold,inverse ctermfg=110 ctermbg=236 +highlight CmdLine cterm=none ctermfg=7 ctermbg=default + +highlight Executable cterm=bold ctermfg=003 ctermbg=default +highlight Directory cterm=bold ctermfg=110 ctermbg=default +highlight Link cterm=none ctermfg=005 ctermbg=default +highlight BrokenLink cterm=bold ctermfg=007 ctermbg=167 +highlight Device cterm=none,standout ctermfg=110 ctermbg=default +highlight Fifo cterm=none ctermfg=172 ctermbg=default +highlight Socket cterm=bold ctermfg=223 ctermbg=default diff --git a/.config/vifm/scripts/README b/.config/vifm/scripts/README new file mode 100644 index 0000000..7694952 --- /dev/null +++ b/.config/vifm/scripts/README @@ -0,0 +1,6 @@ +This directory is dedicated for user-supplied scripts/executables. +vifm modifies its PATH environment variable to let user run those +scripts without specifying full path. All subdirectories are added +as well. File in a subdirectory overrules file with the same name +in parent directories. Restart might be needed to recognize files +in newly created or renamed subdirectories. \ No newline at end of file diff --git a/.config/vifm/vifminfo.json b/.config/vifm/vifminfo.json index f33c557..0567cee 100644 --- a/.config/vifm/vifminfo.json +++ b/.config/vifm/vifminfo.json @@ -1 +1 @@ -{"gtabs":[{"panes":[{"ptabs":[{"history":[{"dir":"/Users/nathan","file":"Dropbox","relpos":5,"ts":1654489671},{"dir":"/Users/nathan/Dropbox","file":"..","relpos":0,"ts":1654489671},{"dir":"/Users/nathan","file":"Dropbox","relpos":5,"ts":1654489671},{"dir":"/Users","file":"nathan","relpos":2,"ts":1654489671},{"dir":"/Users/nathan","file":"Dropbox","relpos":5,"ts":1654489671}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/Users/nathan","sorting":[2],"preview":false}]},{"ptabs":[{"history":[{"dir":"/Users/nathan","file":"..","relpos":0,"ts":1654489671}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/Users/nathan","sorting":[2],"preview":false}]}],"active-pane":0,"preview":false,"splitter":{"pos":-1,"ratio":0.5,"orientation":"v","expanded":false}}],"marks":{"H":{"dir":"/Users/nathan/","file":"..","ts":1654489646},"b":{"dir":"/Users/nathan/bin/","file":"..","ts":1654489646},"h":{"dir":"/Users/nathan/","file":"..","ts":1654489646},"z":{"dir":"/Users/nathan/.config/vifm","file":"..","ts":1654489646}},"bmarks":{},"cmd-hist":[{"text":"q","ts":1654489671}],"regs":{},"dir-stack":[],"use-term-multiplexer":false} \ No newline at end of file +{"gtabs":[{"panes":[{"ptabs":[{"history":[{"dir":"/Users/nathan","file":"Dropbox","relpos":5,"ts":1654489671},{"dir":"/Users/nathan/Dropbox","file":"..","relpos":0,"ts":1654489671},{"dir":"/Users/nathan","file":"Dropbox","relpos":5,"ts":1654489671},{"dir":"/Users","file":"nathan","relpos":2,"ts":1654489671},{"dir":"/Users/nathan","file":"Music","relpos":9,"ts":1654489671},{"dir":"/Users/nathan/src/nydoitt/aci-automation/validation/rules","file":"201_references.py","relpos":3,"ts":1681489263}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/Users/nathan/src/nydoitt/aci-automation/validation/rules","sorting":[2],"preview":false}]},{"ptabs":[{"history":[{"dir":"/Users/nathan","file":"..","relpos":0,"ts":1654489671}],"filters":{"invert":true,"dot":true,"manual":"","auto":""},"last-location":"/Users/nathan","sorting":[2],"preview":false}]}],"active-pane":0,"preview":false,"splitter":{"pos":-1,"ratio":0.5,"orientation":"v","expanded":false}}],"trash":[{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_202_fabric_leaf_switch_policy_group_references.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/202_fabric_leaf_switch_policy_group_references.py"},{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_203_fabric_spine_switch_policy_group_references.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/203_fabric_spine_switch_policy_group_references.py"},{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_204_access_leaf_interface_policy_group_references.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/204_access_leaf_interface_policy_group_references.py"},{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_205_access_spine_interface_policy_group_references.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/205_access_spine_interface_policy_group_references.py"},{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_301_infra_vlan_aaep.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/301_infra_vlan_aaep.py"},{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_302_dns_policy_profile.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/302_dns_policy_profile.py"},{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_303_pod_policy.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/303_pod_policy.py"},{"trashed":"/Users/nathan/.local/share/vifm/Trash/000_304_date_time_policy.py","original":"/Users/nathan/src/nydoitt/aci-automation/validation/rules/304_date_time_policy.py"}],"marks":{"H":{"dir":"/Users/nathan/","file":"..","ts":1654489646},"b":{"dir":"/Users/nathan/bin/","file":"..","ts":1654489646},"h":{"dir":"/Users/nathan/","file":"..","ts":1654489646},"z":{"dir":"/Users/nathan/.config/vifm","file":"..","ts":1654489646}},"bmarks":{},"cmd-hist":[{"text":"help config","ts":1681489072},{"text":"colorscheme Default","ts":1681489228},{"text":"q","ts":1681489228}],"regs":{"\"":["/Users/nathan/.local/share/vifm/Trash/000_202_fabric_leaf_switch_policy_group_references.py","/Users/nathan/.local/share/vifm/Trash/000_203_fabric_spine_switch_policy_group_references.py","/Users/nathan/.local/share/vifm/Trash/000_204_access_leaf_interface_policy_group_references.py","/Users/nathan/.local/share/vifm/Trash/000_205_access_spine_interface_policy_group_references.py","/Users/nathan/.local/share/vifm/Trash/000_301_infra_vlan_aaep.py","/Users/nathan/.local/share/vifm/Trash/000_302_dns_policy_profile.py","/Users/nathan/.local/share/vifm/Trash/000_303_pod_policy.py","/Users/nathan/.local/share/vifm/Trash/000_304_date_time_policy.py"]},"dir-stack":[],"use-term-multiplexer":true} \ No newline at end of file diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 27b6253..b473d36 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -1,10 +1,5 @@ set vicmd=nvim -" This makes vifm perform file operations on its own instead of relying on -" standard utilities like `cp`. While using `cp` and alike is a more universal -" solution, it's also much slower when processing large amounts of files and -" doesn't support progress measuring. - screen! set syscalls set trash @@ -14,7 +9,7 @@ set sortnumbers set undolevels=100 set vimhelp set norunexec -colorscheme Default-256 Default +colorscheme Default set timefmt=%m/%d\ %H:%M set wildmenu set wildstyle=popup diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index 30c2359..94244bc 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -36,7 +36,85 @@ local ctrl_a = { key = "a", mods = "CTRL" } -- cross-tool window mgmt local ctrl_w = { key = "w", mods = "CTRL" } +local C = { + active = { + fg = "#d8dee9", + bg = "#434c5e", + }, + inactive = { + fg = "#d8dee9", + bg = "#2e3440", + }, + bg = "#2a2e38", + -- bg = "#000000", + fg = "#d8dee9", +} +-- local sep = { +-- left = "", +-- right = "", +-- } + +-- tab, tabs, panes, config, hover, max_width +-- w.on("format-tab-title", function(tab, _, _, _, _, max_width) +-- local title = string.gmatch(tab.active_pane.title, "([^/]+)$")() +-- local width = max_width - 9 +-- if #title > width then +-- title = string.sub(title, #title - width, #title) +-- end +-- if tab.is_active then +-- return { +-- { Foreground = { Color = "#8fbcbb" } }, +-- { Text = "  " }, +-- { Foreground = { Color = C.active.fg } }, +-- { Text = " " .. title .. " " }, +-- } +-- else +-- return { +-- { Foreground = { Color = C.inactive.fg } }, +-- { Text = "  " }, +-- { Text = " " .. title .. " " }, +-- } +-- end +-- -- if tab.is_active then +-- -- return { +-- -- { Background = { Color = C.bg } }, +-- -- { Text = " " }, +-- -- { Background = { Color = C.bg } }, +-- -- { Foreground = { Color = C.active.bg } }, +-- -- { Text = sep.left }, +-- -- { Background = { Color = C.active.bg } }, +-- -- { Foreground = { Color = "#8fbcbb" } }, +-- -- { Text = "  " }, +-- -- { Foreground = { Color = C.active.fg } }, +-- -- { Text = " " .. title .. " " }, +-- -- { Background = { Color = C.bg } }, +-- -- { Foreground = { Color = C.active.bg } }, +-- -- { Text = sep.right }, +-- -- { Background = { Color = C.bg } }, +-- -- { Text = " " }, +-- -- } +-- -- else +-- -- return { +-- -- { Background = { Color = C.bg } }, +-- -- { Text = " " }, +-- -- { Background = { Color = C.bg } }, +-- -- { Foreground = { Color = C.inactive.bg } }, +-- -- { Text = sep.left }, +-- -- { Background = { Color = C.inactive.bg } }, +-- -- { Foreground = { Color = C.inactive.fg } }, +-- -- { Text = "  " }, +-- -- { Text = " " .. title .. " " }, +-- -- { Background = { Color = C.bg } }, +-- -- { Foreground = { Color = C.inactive.bg } }, +-- -- { Text = sep.right }, +-- -- { Background = { Color = C.bg } }, +-- -- { Text = " " }, +-- -- } +-- -- end +-- end) + return { + -- window_background_image = "/Users/nathan/Pictures/dancer.jpeg", -- Font font = w.font("RobotoMono Nerd Font", { weight = "Medium" }), font_size = 15.0, @@ -48,33 +126,34 @@ return { window_decorations = "RESIZE", disable_default_key_bindings = true, native_macos_fullscreen_mode = true, - -- debug_key_events = true, - -- window_padding = { - -- left = 8, - -- right = 8, - -- top = 8, - -- bottom = 8, - -- }, enable_tab_bar = false, - use_fancy_tab_bar = true, - show_tabs_in_tab_bar = false, + use_fancy_tab_bar = false, + show_tabs_in_tab_bar = true, show_new_tab_button_in_tab_bar = false, + tab_max_width = 32, + default_prog = { "zsh", "-c", "tmux" }, + window_padding = { + left = 8, + right = 8, + top = 8, + bottom = 8, + }, window_frame = { - -- active_titlebar_bg = "#191c23", - -- inactive_titlebar_bg = "#191c23", - active_titlebar_bg = "#000000", - inactive_titlebar_bg = "#000000", + active_titlebar_bg = C.bg, + inactive_titlebar_bg = C.bg, + font = w.font({ family = "Roboto Mono", weight = "Bold" }), + font_size = 14.0, }, - tab_max_width = 8, colors = { tab_bar = { + background = C.bg, active_tab = { - bg_color = "#2e3440", - fg_color = "#d8dee9", + bg_color = C.active.bg, + fg_color = C.active.fg, }, inactive_tab = { - bg_color = "#222730", - fg_color = "#616e88", + bg_color = C.inactive.bg, + fg_color = C.inactive.fg, }, }, }, diff --git a/.zshenv b/.zshenv index f85f8e4..0caf669 100644 --- a/.zshenv +++ b/.zshenv @@ -15,6 +15,7 @@ export PATH=/opt/homebrew/opt/openssl@3/bin:$PATH export PATH=/opt/homebrew/bin:$PATH export PATH=$PATH:$HOME/.spicetify export PATH=$PATH:$HOME/.dotnet/tools +export PATH=$PATH:$HOME/.pub-cache/bin export GPG_TTY=$(tty) @@ -34,3 +35,4 @@ export FZF_DEFAULT_OPTS=$FZF_DEFAULT_OPTS' --color=info:#eacb8a,prompt:#bf6069,pointer:#b48dac --color=marker:#a3be8b,spinner:#b48dac,header:#a3be8b' # TERM="alacritty-direct" +