summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doom/.config/doom/themes/noctalia-theme.el108
-rw-r--r--foot/.config/foot/themes/noctalia42
-rw-r--r--ghostty/.config/ghostty/themes/noctalia44
-rw-r--r--niri/.config/niri/noctalia.kdl22
-rw-r--r--nvim/.config/nvim/lazy-lock.json1
-rw-r--r--starship/.config/starship.toml60
l---------tmux/.config/tmux/tmux.conf1
-rw-r--r--tmux/.tmux.conf51
8 files changed, 190 insertions, 139 deletions
diff --git a/doom/.config/doom/themes/noctalia-theme.el b/doom/.config/doom/themes/noctalia-theme.el
index ed309c1..4f6b512 100644
--- a/doom/.config/doom/themes/noctalia-theme.el
+++ b/doom/.config/doom/themes/noctalia-theme.el
@@ -21,75 +21,75 @@
(deftheme noctalia "Theme using Template variables with quality of life improvements.")
;; Define all the color variables (replaced by template processor)
-(let* ((bg "#13140f")
- (err "#ffb4ab")
- (err-container "#93000a")
- (on-background "#e4e3db")
- (on-err "#690005")
- (on-err-container "#ffdad6")
- (on-primary "#243603")
+(let* ((bg "#fbfaf1")
+ (err "#ba1a1a")
+ (err-container "#ffdad6")
+ (on-background "#1b1c17")
+ (on-err "#ffffff")
+ (on-err-container "#93000a")
+ (on-primary "#ffffff")
(on-primary-container "#fffff4")
- (on-secondary "#2b331c")
- (on-secondary-container "#afb999")
- (on-surface "#e4e3db")
- (on-surface-variant "#c5c8b9")
- (on-tertiary "#003826")
+ (on-secondary "#ffffff")
+ (on-secondary-container "#5e684d")
+ (on-surface "#1b1c17")
+ (on-surface-variant "#45483d")
+ (on-tertiary "#ffffff")
(on-tertiary-container "#ffffff")
- (outline-color "#8f9284")
- (outline-variant "#45483d")
- (primary "#b7cf8b")
+ (outline-color "#75786b")
+ (outline-variant "#c5c8b9")
+ (primary "#4f642c")
(primary-container "#677d42")
- (secondary "#c1cbaa")
- (secondary-container "#414a31")
+ (secondary "#586247")
+ (secondary-container "#dde7c5")
(shadow "#000000")
- (surface "#13140f")
- (surface-container "#1f201b")
- (surface-container-high "#292a25")
- (surface-container-highest "#343530")
- (surface-container-low "#1b1c17")
- (surface-container-lowest "#0d0f0a")
- (surface-variant "#45483d")
- (tertiary "#92d4b5")
+ (surface "#fbfaf1")
+ (surface-container "#efeee6")
+ (surface-container-high "#e9e8e0")
+ (surface-container-highest "#e4e3db")
+ (surface-container-low "#f5f4ec")
+ (surface-container-lowest "#ffffff")
+ (surface-variant "#e1e4d4")
+ (tertiary "#26694f")
(tertiary-container "#418267")
;; Map success colors to tertiary (as used in other templates)
- (success "#92d4b5")
- (on-success "#003826")
+ (success "#26694f")
+ (on-success "#ffffff")
(success-container "#418267")
(on-success-container "#ffffff")
;; Map fixed colors to regular colors
- (primary-fixed "#b7cf8b")
+ (primary-fixed "#4f642c")
(primary-fixed-dim "#677d42")
- (secondary-fixed "#c1cbaa")
- (secondary-fixed-dim "#414a31")
- (tertiary-fixed "#92d4b5")
+ (secondary-fixed "#586247")
+ (secondary-fixed-dim "#dde7c5")
+ (tertiary-fixed "#26694f")
(tertiary-fixed-dim "#418267")
- (on-primary-fixed "#243603")
+ (on-primary-fixed "#ffffff")
(on-primary-fixed-variant "#fffff4")
- (on-secondary-fixed "#2b331c")
- (on-secondary-fixed-variant "#afb999")
- (on-tertiary-fixed "#003826")
+ (on-secondary-fixed "#ffffff")
+ (on-secondary-fixed-variant "#5e684d")
+ (on-tertiary-fixed "#ffffff")
(on-tertiary-fixed-variant "#ffffff")
;; Map inverse colors to surface variants
- (inverse-on-surface "#e4e3db")
- (inverse-primary "#b7cf8b")
- (inverse-surface "#13140f")
+ (inverse-on-surface "#1b1c17")
+ (inverse-primary "#4f642c")
+ (inverse-surface "#fbfaf1")
;; ANSI terminal colors
- (term0 "#45483d")
- (term1 "#ffb4ab")
- (term2 "#b7cf8b")
- (term3 "#c1cbaa")
- (term4 "#92d4b5")
- (term5 "#b7cf8b")
- (term6 "#c1cbaa")
- (term7 "#e4e3db")
- (term8 "#8f9284")
- (term9 "#ffb4ab")
- (term10 "#b7cf8b")
- (term11 "#c1cbaa")
- (term12 "#92d4b5")
- (term13 "#b7cf8b")
- (term14 "#c1cbaa")
- (term15 "#e4e3db"))
+ (term0 "#e1e4d4")
+ (term1 "#ba1a1a")
+ (term2 "#4f642c")
+ (term3 "#586247")
+ (term4 "#26694f")
+ (term5 "#667a3a")
+ (term6 "#6e7759")
+ (term7 "#1b1c17")
+ (term8 "#75786b")
+ (term9 "#ba1a1a")
+ (term10 "#4f642c")
+ (term11 "#586247")
+ (term12 "#26694f")
+ (term13 "#667a3a")
+ (term14 "#6e7759")
+ (term15 "#1b1c17"))
(custom-theme-set-faces
'noctalia
diff --git a/foot/.config/foot/themes/noctalia b/foot/.config/foot/themes/noctalia
index 8917d70..e4d9608 100644
--- a/foot/.config/foot/themes/noctalia
+++ b/foot/.config/foot/themes/noctalia
@@ -1,22 +1,22 @@
[colors-dark]
-foreground=e4e3db
-background=13140f
-regular0=45483d
-regular1=ffb4ab
-regular2=b7cf8b
-regular3=c1cbaa
-regular4=92d4b5
-regular5=b7cf8b
-regular6=c1cbaa
-regular7=e4e3db
-bright0=8f9284
-bright1=ffb4ab
-bright2=b7cf8b
-bright3=c1cbaa
-bright4=92d4b5
-bright5=b7cf8b
-bright6=c1cbaa
-bright7=e4e3db
-selection-foreground=c5c8b9
-selection-background=45483d
-cursor=13140f e4e3db
+foreground=1b1c17
+background=fbfaf1
+regular0=e1e4d4
+regular1=ba1a1a
+regular2=4f642c
+regular3=586247
+regular4=26694f
+regular5=667a3a
+regular6=6e7759
+regular7=1b1c17
+bright0=75786b
+bright1=ba1a1a
+bright2=4f642c
+bright3=586247
+bright4=26694f
+bright5=667a3a
+bright6=6e7759
+bright7=1b1c17
+selection-foreground=45483d
+selection-background=e1e4d4
+cursor=fbfaf1 1b1c17
diff --git a/ghostty/.config/ghostty/themes/noctalia b/ghostty/.config/ghostty/themes/noctalia
index 4979304..78e1c33 100644
--- a/ghostty/.config/ghostty/themes/noctalia
+++ b/ghostty/.config/ghostty/themes/noctalia
@@ -1,22 +1,22 @@
-palette = 0=#45483d
-palette = 1=#ffb4ab
-palette = 2=#b7cf8b
-palette = 3=#c1cbaa
-palette = 4=#92d4b5
-palette = 5=#b7cf8b
-palette = 6=#c1cbaa
-palette = 7=#e4e3db
-palette = 8=#8f9284
-palette = 9=#ffb4ab
-palette = 10=#b7cf8b
-palette = 11=#c1cbaa
-palette = 12=#92d4b5
-palette = 13=#b7cf8b
-palette = 14=#c1cbaa
-palette = 15=#e4e3db
-background = #13140f
-foreground = #e4e3db
-cursor-color = #e4e3db
-cursor-text = #13140f
-selection-background = #45483d
-selection-foreground = #c5c8b9
+palette = 0=#e1e4d4
+palette = 1=#ba1a1a
+palette = 2=#4f642c
+palette = 3=#586247
+palette = 4=#26694f
+palette = 5=#667a3a
+palette = 6=#6e7759
+palette = 7=#1b1c17
+palette = 8=#75786b
+palette = 9=#ba1a1a
+palette = 10=#4f642c
+palette = 11=#586247
+palette = 12=#26694f
+palette = 13=#667a3a
+palette = 14=#6e7759
+palette = 15=#1b1c17
+background = #fbfaf1
+foreground = #1b1c17
+cursor-color = #1b1c17
+cursor-text = #fbfaf1
+selection-background = #e1e4d4
+selection-foreground = #45483d
diff --git a/niri/.config/niri/noctalia.kdl b/niri/.config/niri/noctalia.kdl
index f818300..29c9247 100644
--- a/niri/.config/niri/noctalia.kdl
+++ b/niri/.config/niri/noctalia.kdl
@@ -1,15 +1,15 @@
layout {
focus-ring {
- active-color "#b7cf8b"
- inactive-color "#13140f"
- urgent-color "#ffb4ab"
+ active-color "#4f642c"
+ inactive-color "#fbfaf1"
+ urgent-color "#ba1a1a"
}
border {
- active-color "#b7cf8b"
- inactive-color "#13140f"
- urgent-color "#ffb4ab"
+ active-color "#4f642c"
+ inactive-color "#fbfaf1"
+ urgent-color "#ba1a1a"
}
shadow {
@@ -17,19 +17,19 @@ layout {
}
tab-indicator {
- active-color "#b7cf8b"
+ active-color "#4f642c"
inactive-color "#677d42"
- urgent-color "#ffb4ab"
+ urgent-color "#ba1a1a"
}
insert-hint {
- color "#b7cf8b80"
+ color "#4f642c80"
}
}
recent-windows {
highlight {
- active-color "#b7cf8b"
- urgent-color "#ffb4ab"
+ active-color "#4f642c"
+ urgent-color "#ba1a1a"
}
}
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 87c956e..e93480e 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,5 +1,6 @@
{
"LazyVim": { "branch": "main", "commit": "459a4c3b1059671e766a46c7cc223827dc67e3d0" },
+ "base16-nvim": { "branch": "master", "commit": "cf82c4be16334c7cdf9883296eacfba50ff93b26" },
"blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"catppuccin": { "branch": "main", "commit": "79e2049a0fdf7ec840f8463fe1d962c94493196b" },
diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml
index 7906683..ab1d1a7 100644
--- a/starship/.config/starship.toml
+++ b/starship/.config/starship.toml
@@ -52,40 +52,40 @@ deleted = ""
[palettes.noctalia]
# Standard colors
-blue = "#92d4b5"
-red = "#ffb4ab"
-green = "#b7cf8b"
-yellow = "#c1cbaa"
-cyan = "#c1cbaa"
-magenta = "#b7cf8b"
-white = "#e4e3db"
-black = "#45483d"
+blue = "#26694f"
+red = "#ba1a1a"
+green = "#4f642c"
+yellow = "#586247"
+cyan = "#6e7759"
+magenta = "#667a3a"
+white = "#1b1c17"
+black = "#e1e4d4"
# Extended palette (Catppuccin-compatible names)
-rosewater = "#c1cbaa"
-flamingo = "#ffb4ab"
-pink = "#b7cf8b"
-mauve = "#b7cf8b"
-maroon = "#ffb4ab"
-peach = "#c1cbaa"
-teal = "#c1cbaa"
-sky = "#c1cbaa"
-sapphire = "#92d4b5"
-lavender = "#b7cf8b"
+rosewater = "#586247"
+flamingo = "#ba1a1a"
+pink = "#667a3a"
+mauve = "#667a3a"
+maroon = "#ba1a1a"
+peach = "#586247"
+teal = "#6e7759"
+sky = "#6e7759"
+sapphire = "#26694f"
+lavender = "#667a3a"
# Text shades
-text = "#e4e3db"
-subtext1 = "#e4e3db"
-subtext0 = "#8f9284"
+text = "#1b1c17"
+subtext1 = "#1b1c17"
+subtext0 = "#75786b"
# Surface shades
-overlay2 = "#8f9284"
-overlay1 = "#8f9284"
-overlay0 = "#45483d"
-surface2 = "#45483d"
-surface1 = "#45483d"
-surface0 = "#13140f"
-base = "#13140f"
-mantle = "#13140f"
-crust = "#13140f"
+overlay2 = "#75786b"
+overlay1 = "#75786b"
+overlay0 = "#e1e4d4"
+surface2 = "#e1e4d4"
+surface1 = "#e1e4d4"
+surface0 = "#fbfaf1"
+base = "#fbfaf1"
+mantle = "#fbfaf1"
+crust = "#fbfaf1"
# <<< NOCTALIA STARSHIP PALETTE <<<
diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf
deleted file mode 120000
index 15e3bad..0000000
--- a/tmux/.config/tmux/tmux.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../dotfiles/tmux/.config/tmux/tmux.conf \ No newline at end of file
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
new file mode 100644
index 0000000..c68b67e
--- /dev/null
+++ b/tmux/.tmux.conf
@@ -0,0 +1,51 @@
+unbind '"'
+bind - split-window -v -c "#{pane_current_path}"
+
+# Reload config
+unbind r
+bind r source-file $HOME/.config/tmux/tmux.conf
+
+# Alt+hjkl to switch panes without prefix
+bind -n M-h select-pane -L
+bind -n M-j select-pane -D
+bind -n M-k select-pane -U
+bind -n M-l select-pane -R
+
+# Alt+number to select window
+bind -n M-1 select-window -t 1
+bind -n M-2 select-window -t 2
+bind -n M-3 select-window -t 3
+bind -n M-4 select-window -t 4
+bind -n M-5 select-window -t 5
+bind -n M-6 select-window -t 6
+bind -n M-7 select-window -t 7
+bind -n M-8 select-window -t 8
+bind -n M-9 select-window -t 9
+# Statusline - current window
+set -g window-status-current-format "#[fg=${thm_blue},bg=${thm_bg}] #I: #[fg=${thm_magenta},bg=${thm_bg}](✓) #[fg=${thm_cyan},bg=${thm_bg}]#(echo '#{pane_current_path}' | rev | cut -d'/' -f-2 | rev) #[fg=${thm_magenta},bg=${thm_bg}]"
+
+# Statusline - other windows
+set -g window-status-format "#[fg=${thm_blue},bg=${thm_bg}] #I: #[fg=${thm_fg},bg=${thm_bg}]#W"
+
+# Statusline - right side
+set -g status-right "#[fg=${thm_blue},bg=${thm_bg},nobold,nounderscore,noitalics]#[fg=${thm_bg},bg=${thm_blue},nobold,nounderscore,noitalics] #[fg=${thm_fg},bg=${thm_gray}] #W #{?client_prefix,#[fg=${thm_magenta}],#[fg=${thm_cyan}]}#[bg=${thm_gray}]#{?client_prefix,#[bg=${thm_magenta}],#[bg=${thm_cyan}]}#[fg=${thm_bg}] #[fg=${thm_fg},bg=${thm_gray}] #S "
+
+# Statusline - left side (empty)
+set -g status-left ""
+
+# Modes
+set -g clock-mode-colour "${thm_blue}"
+set -g mode-style "fg=${thm_blue} bg=${thm_black4} bold"
+# Change from 0 based to 1 based because keyboard layout
+set -g base-index 1
+set -g pane-base-index 1
+set-window-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# Vim-like copy/paste
+set-window-option -g mode-keys vi
+bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
+bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
+unbind -T copy-mode-vi MouseDragEnd1Pane
+