Skip to content

Commit c220c3b

Browse files
svnltosvnlto
committed
feat: improve UI consistency and add tmux-gh integration
- Update Oh My Posh colors to proper Catppuccin Mocha palette - Remove nix-shell and direnv indicators from prompt for cleaner UI - Add FZF Catppuccin Mocha theme to session variables - Unify git sign symbols in scrollbar (use │ for all states) - Reduce status column spacing for tighter layout - Add tmux-gh plugin for GitHub integration in tmux status bar - Enable auto-reload for files changed externally (works in tmux with LSP)
1 parent 57c38ae commit c220c3b

File tree

7 files changed

+49
-50
lines changed

7 files changed

+49
-50
lines changed

‎common/claude-code/settings.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"$schema": "https://json.schemastore.org/claude-code-settings.json",
3-
"includeCoAuthoredBy": false,
4-
"model": "sonnet",
5-
"enableAllProjectMcpServers": true,
6-
"enabledMcpjsonServers": [
7-
"code-reasoning",
8-
"sequential-thinking",
9-
"context7"
10-
],
11-
"statusLine": {
12-
"type": "command",
13-
"command": "npx -y ccusage@latest statusline --visual-burn-rate emoji",
14-
"padding": 0
15-
},
16-
"feedbackSurveyState": {
17-
"lastShownTime": 1754125509075
18-
}
2+
"$schema": "https://json.schemastore.org/claude-code-settings.json",
3+
"includeCoAuthoredBy": false,
4+
"enableAllProjectMcpServers": true,
5+
"enabledMcpjsonServers": [
6+
"code-reasoning",
7+
"sequential-thinking",
8+
"context7"
9+
],
10+
"model": "claude-sonnet-4-5-20250929",
11+
"statusLine": {
12+
"type": "command",
13+
"command": "npx -y ccusage@latest statusline --visual-burn-rate emoji",
14+
"padding": 0
15+
},
16+
"feedbackSurveyState": {
17+
"lastShownTime": 1754125509075
18+
}
1919
}

‎common/neovim/lua/config/autocmds.lua‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,13 @@ vim.api.nvim_create_autocmd("FileType", {
5757
vim.opt_local.spell = false
5858
end,
5959
})
60+
61+
-- Auto-reload files when changed outside Neovim (works in tmux)
62+
vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
63+
group = augroup("checktime"),
64+
callback = function()
65+
if vim.o.buftype ~= "nofile" then
66+
vim.cmd("checktime")
67+
end
68+
end,
69+
})

‎common/neovim/lua/config/options.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,17 @@ opt.swapfile = false
2929
opt.colorcolumn = "80"
3030

3131
opt.signcolumn = "yes"
32-
opt.statuscolumn = "%s%=%{&ft=='NvimTree'?'':v:relnum?v:relnum:v:lnum} "
32+
opt.statuscolumn = "%s%{&ft=='NvimTree'?'':v:relnum?v:relnum:v:lnum} "
3333
opt.ttyfast = true
3434
opt.lazyredraw = false
3535

3636
opt.shortmess:append("I")
3737
opt.spell = false
38+
opt.autoread = true
3839

3940
-- Cursor configuration - pink blinking cursor
4041
opt.guicursor = {
4142
"n-v-c:block-Cursor/lCursor-blinkwait1000-blinkon500-blinkoff500",
4243
"i-ci:ver25-Cursor/lCursor-blinkwait1000-blinkon500-blinkoff500",
4344
"r-cr:hor20-Cursor/lCursor-blinkwait1000-blinkon500-blinkoff500",
4445
}
45-
46-
-- Cursor color is set in colorscheme.lua after theme loads

‎common/neovim/lua/plugins/scrollbar.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ return {
7373
highlight = "DiagnosticVirtualTextHint",
7474
},
7575
GitAdd = {
76-
text = "|",
76+
text = "│",
7777
priority = 7,
7878
gui = nil,
7979
color = nil,
@@ -82,7 +82,7 @@ return {
8282
highlight = "GitSignsAdd",
8383
},
8484
GitChange = {
85-
text = "|",
85+
text = "│",
8686
priority = 7,
8787
gui = nil,
8888
color = nil,
@@ -91,7 +91,7 @@ return {
9191
highlight = "GitSignsChange",
9292
},
9393
GitDelete = {
94-
text = "▁",
94+
text = "│",
9595
priority = 7,
9696
gui = nil,
9797
color = nil,

‎common/tmux/default.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
set -g @catppuccin_window_status_style "basic"
149149
150150
# Configure Catppuccin status modules
151-
set -g @catppuccin_status_modules_right "date_time"
151+
set -g @catppuccin_status_modules_right "gh date_time"
152152
set -g @catppuccin_status_modules_left ""
153153
set -g @catppuccin_date_time_text "%Y-%m-%d %H:%M"
154154
@@ -169,6 +169,7 @@
169169
set -g @plugin 'catppuccin/tmux#v2.1.3'
170170
set -g @plugin 'tmux-plugins/tmux-resurrect'
171171
set -g @plugin 'tmux-plugins/tmux-continuum'
172+
set -g @plugin 'tardunge/tmux-gh'
172173
173174
# tmux-resurrect settings
174175
set -g @resurrect-strategy-vim 'session'

‎common/zsh/default.omp.json‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
33
"palette": {
4-
"blue": "#8AADF4",
4+
"blue": "#89B4FA",
55
"closer": "p:os",
6-
"lavender": "#B7BDF8",
7-
"orange": "#f78f40",
8-
"os": "#ACB0BE",
9-
"pink": "#F5BDE6",
10-
"purple": "#C6A0F6",
11-
"text": "#494D64",
12-
"wight": "#FFFFFF",
13-
"nix": "#7EBAE4",
14-
"direnv": "#FFA500"
6+
"lavender": "#B4BEFE",
7+
"orange": "#FAB387",
8+
"os": "#9399B2",
9+
"pink": "#F5C2E7",
10+
"purple": "#CBA6F7",
11+
"text": "#45475A",
12+
"white": "#CDD6F4"
1513
},
1614
"transient_prompt": {
1715
"template": "{{ .UserName }}@{{ .HostName }} > ",
@@ -74,24 +72,12 @@
7472
"type": "git",
7573
"style": "plain",
7674
"background_templates": [
77-
"{{ if or (.Working.Changed) (.Staging.Changed) }}#FFEB3B{{ end }}",
78-
"{{ if and (gt .Ahead 0) (gt .Behind 0) }}#FFCC80{{ end }}",
79-
"{{ if gt .Ahead 0 }}#B388FF{{ end }}",
80-
"{{ if gt .Behind 0 }}#B388FB{{ end }}"
75+
"{{ if or (.Working.Changed) (.Staging.Changed) }}#F9E2AF{{ end }}",
76+
"{{ if and (gt .Ahead 0) (gt .Behind 0) }}#FAB387{{ end }}",
77+
"{{ if gt .Ahead 0 }}#CBA6F7{{ end }}",
78+
"{{ if gt .Behind 0 }}#B4BEFE{{ end }}"
8179
]
8280
},
83-
{
84-
"type": "nix-shell",
85-
"style": "plain",
86-
"foreground": "p:nix",
87-
"template": " \uf313 {{ .Type }}"
88-
},
89-
{
90-
"type": "text",
91-
"style": "plain",
92-
"foreground": "p:direnv",
93-
"template": "{{ if .Env.DIRENV_DIR }} \uf07c direnv{{ end }}"
94-
},
9581
{
9682
"properties": {
9783
"cache_duration": "none"

‎common/zsh/shared.nix‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ rec {
9191
NPM_CONFIG_PREFIX = "$HOME/.npm-global"; # NPM global packages location
9292
LANG = "en_GB.UTF-8"; # Locale settings
9393
LC_ALL = "en_GB.UTF-8";
94+
# FZF Catppuccin Mocha theme
95+
FZF_DEFAULT_OPTS =
96+
"--color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 --color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC --color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 --color=selected-bg:#45475A --color=border:#6C7086,label:#CDD6F4";
9497
};
9598

9699
# Common session paths

0 commit comments

Comments
 (0)