commit 65a81a3bf35c1f2b0a34074d8275bec7f89a7ac4 parent 362eb20d8cbaecb92759a422ae28324aa50da727 Author: mtmn <miro@haravara.org> Date: Mon, 1 Jun 2026 17:08:46 +0200 chore: change theme to doric-mermaid Diffstat:
16 files changed, 198 insertions(+), 153 deletions(-)
diff --git a/hosts/void/overlays/config/magdalena/config.json.nix b/hosts/void/overlays/config/magdalena/config.json.nix Binary files differ. diff --git a/hosts/void/overlays/config/river/init b/hosts/void/overlays/config/river/init @@ -7,7 +7,7 @@ alt="Mod4" term="foot" wobsock="$XDG_RUNTIME_DIR/wob.sock" -dmenu_args="-vi -fn 'Ttyp0 OTB:size=10' -l 10 -h 20 -nb '#181818' -nf '#e7e7e7' -sb '#505050' -sf '#e7e7e7' -nhb '#181818' -nhf '#a0c0d0'" +dmenu_args="-vi -fn 'Ttyp0 OTB:size=10' -l 10 -h 20 -nb '#2a2f48' -nf '#dde0f8' -sb '#424381' -sf '#dde0f8' -nhb '#2a2f48' -nhf '#a0c0d0'" rivertile -view-padding 0 -outer-padding 0 -main-ratio 0.50 & diff --git a/modules/mixins/dotfiles/config/aerc/stylesets/mine b/modules/mixins/dotfiles/config/aerc/stylesets/mine @@ -1,48 +1,48 @@ *.default=true *.normal=true -*.fg = #e7e7e7 -*.selected.bg = #505050 -*.selected.fg = #e7e7e7 -title.bg=#505050 -title.fg=#e7e7e7 +*.fg = #dde0f8 +*.selected.bg = #424381 +*.selected.fg = #dde0f8 +title.bg=#424381 +title.fg=#dde0f8 title.bold=true header.bold=true header.fg=#a0c0d0 -header.bg=#181818 -border.bg=#2f2f2f -border.fg=#2f2f2f -tab.selected.fg=#e7e7e7 -tab.selected.bg=#505050 +header.bg=#2a2f48 +border.bg=#2a2f48 +border.fg=#2a2f48 +tab.selected.fg=#dde0f8 +tab.selected.bg=#424381 tab.selected.bold=true -dirlist*.selected.bg=#505050 -dirlist*.selected.fg=#e7e7e7 +dirlist*.selected.bg=#424381 +dirlist*.selected.fg=#dde0f8 dirlist*.selected.bold=false *error.bold=true *error.fg=#eca28f *warning.fg=#c0b080 -*success.fg=#b9d0aa -statusline_*.bg=#2f2f2f -statusline_*.fg=#e7e7e7 +*success.fg=#a0d0ba +statusline_*.bg=#2a2f48 +statusline_*.fg=#dde0f8 statusline_error.fg=#eca28f msglist_unread.fg=#e9acbf msglist_unread.bold=true -msglist_read.fg=#707070 -msglist_deleted.fg=#2f2f2f -msglist_*.selected.bg=#505050 -msglist_marked.fg=#b9d0aa -msglist_marked.selected.fg=#e7e7e7 +msglist_read.fg=#aea7c3 +msglist_deleted.fg=#2a2f48 +msglist_*.selected.bg=#424381 +msglist_marked.fg=#a0d0ba +msglist_marked.selected.fg=#dde0f8 msglist_marked.bg=#c0b080 msglist_marked.selected.bg=#e9acbf completion_pill.reverse=false selector_focused.bold=false -selector_focused.bg=#505050 -selector_focused.fg=#e7e7e7 +selector_focused.bg=#424381 +selector_focused.fg=#dde0f8 selector_chooser.bold=false -selector_chooser.bg=#505050 -selector_chooser.fg=#e7e7e7 +selector_chooser.bg=#424381 +selector_chooser.fg=#dde0f8 default.selected.bold=false -default.selected.bg=#505050 -default.selected.fg=#e7e7e7 +default.selected.bg=#424381 +default.selected.fg=#dde0f8 completion_default.selected.bg=#9fbfe7 [viewer] *.default=true @@ -52,10 +52,10 @@ header.fg = #a0c0d0 signature.fg = #e9acbf diff_chunk.fg = #a0c0d0 diff_chunk_func.fg = #c0b080 -diff_add.fg = #b9d0aa +diff_add.fg = #a0d0ba diff_del.fg = #eca28f -quote_1.fg = #b9d0aa +quote_1.fg = #a0d0ba quote_2.fg = #a0c0d0 quote_3.fg = #e9acbf quote_4.fg = #c0b080 -quote_x.fg = #606060 +quote_x.fg = #3c3e55 diff --git a/modules/mixins/dotfiles/config/bat/themes/magnolia.tmTheme b/modules/mixins/dotfiles/config/bat/themes/magnolia.tmTheme @@ -10,21 +10,21 @@ <key>settings</key> <dict> <key>background</key> - <string>#1c1c1c</string> + <string>#2a2f48</string> <key>divider</key> - <string>#2f2f2f</string> + <string>#3c3e55</string> <key>foreground</key> - <string>#e7e7e7</string> + <string>#dde0f8</string> <key>caret</key> - <string>#e7e7e7</string> + <string>#dde0f8</string> <key>invisibles</key> - <string>#2f2f2f</string> + <string>#3c3e55</string> <key>lineHighlight</key> - <string>#505050</string> + <string>#424381</string> <key>selection</key> <string>#e9acbf</string> <key>selectionForeground</key> - <string>#e7e7e7</string> + <string>#dde0f8</string> </dict> </dict> <dict> diff --git a/modules/mixins/dotfiles/config/dunst/dunstrc b/modules/mixins/dotfiles/config/dunst/dunstrc @@ -18,30 +18,30 @@ show_indicators = no stack_duplicates = no [urgency_low] - background = "#334c50" - foreground = "#d7dfd9" + background = "#2a2f48" + foreground = "#dde0f8" timeout = 30 [urgency_normal] - background = "#334c50" - foreground = "#d7dfd9" + background = "#2a2f48" + foreground = "#dde0f8" timeout = 30 [urgency_critical] - background = "#671822" - foreground = "#d7dfd9" + background = "#4a1e2e" + foreground = "#dde0f8" timeout = 0 [khal_notifier] appname = khal_notifier urgency = normal - background = "#7a3f6a" - foreground = "#d7dfd9" + background = "#424381" + foreground = "#dde0f8" timeout = 0 [aerc] appname = aerc urgency = normal - background = "#7a3f6a" - foreground = "#d7dfd9" + background = "#424381" + foreground = "#dde0f8" timeout = 0 diff --git a/modules/mixins/dotfiles/config/emacs/lisp/ui.el b/modules/mixins/dotfiles/config/emacs/lisp/ui.el @@ -2,7 +2,7 @@ (use-package doric-themes :config - (load-theme 'doric-obsidian t)) + (load-theme 'doric-mermaid t)) (use-package tree-sitter :config diff --git a/modules/mixins/dotfiles/config/foot/foot.ini b/modules/mixins/dotfiles/config/foot/foot.ini @@ -1,54 +0,0 @@ -[main] -font=Comic Code:style=Regular:size=12 -font-bold=Comic Code:style=Regular:size=12 -font-italic=Comic Code:style=Regular:size=12 -font-bold-italic=Comic Code:style=Regular:size=12 - -[scrollback] -lines=10000 - -[mouse] -hide-when-typing=yes - -[cursor] -style=block -blink=no - -[colors-dark] -alpha = 0.925 -cursor=181818 eeddbb - -background=181818 -foreground=e7e7e7 - -selection-foreground=e7e7e7 -selection-background=505050 - -regular0=2f2f2f -regular1=eca28f -regular2=b9d0aa -regular3=c0b080 -regular4=9fbfe7 -regular5=e9acbf -regular6=a0c0d0 -regular7=e7e7e7 - -bright0=2f2f2f -bright1=eca28f -bright2=b9d0aa -bright3=c0b080 -bright4=9fbfe7 -bright5=e9acbf -bright6=a0c0d0 -bright7=e7e7e7 - -[key-bindings] -clipboard-copy=Control+Shift+c -clipboard-paste=Control+Shift+v -primary-paste=Shift+Insert -search-start=Control+Shift+r -font-increase=Control+plus Control+equal -font-decrease=Control+minus -font-reset=Control+0 -spawn-terminal=Control+Shift+n -show-urls-launch=Alt+Control+o diff --git a/modules/mixins/dotfiles/config/foot/foot_cc.ini b/modules/mixins/dotfiles/config/foot/foot_cc.ini @@ -0,0 +1,54 @@ +[main] +font=Comic Code:style=Regular:size=12 +font-bold=Comic Code:style=Regular:size=12 +font-italic=Comic Code:style=Regular:size=12 +font-bold-italic=Comic Code:style=Regular:size=12 + +[scrollback] +lines=10000 + +[mouse] +hide-when-typing=yes + +[cursor] +style=block +blink=no + +[colors-dark] +alpha = 0.925 +cursor=2a2f48 e08ca0 + +background=2a2f48 +foreground=dde0f8 + +selection-background=424381 +selection-foreground=dde0f8 + +regular0=3c3e55 +regular1=eca28f +regular2=a0d0ba +regular3=c0b080 +regular4=9fbfe7 +regular5=e9acbf +regular6=a0c0d0 +regular7=dde0f8 + +bright0=aea7c3 +bright1=eca28f +bright2=a0d0ba +bright3=c0b080 +bright4=9fbfe7 +bright5=e9acbf +bright6=a0c0d0 +bright7=dde0f8 + +[key-bindings] +clipboard-copy=Control+Shift+c +clipboard-paste=Control+Shift+v +primary-paste=Shift+Insert +search-start=Control+Shift+r +font-increase=Control+plus Control+equal +font-decrease=Control+minus +font-reset=Control+0 +spawn-terminal=Control+Shift+n +show-urls-launch=Alt+Control+o diff --git a/modules/mixins/dotfiles/config/foot/foot_cl.ini b/modules/mixins/dotfiles/config/foot/foot_cl.ini @@ -0,0 +1,54 @@ +[main] +font=Codelia:style=Regular:size=12 +font-bold=Codelia:style=Regular:size=12 +font-italic=Codelia:style=Regular:size=12 +font-bold-italic=Codelia:style=Regular:size=12 + +[scrollback] +lines=10000 + +[mouse] +hide-when-typing=yes + +[cursor] +style=block +blink=no + +[colors-dark] +alpha = 0.925 +cursor=2a2f48 e08ca0 + +background=2a2f48 +foreground=dde0f8 + +selection-background=424381 +selection-foreground=dde0f8 + +regular0=3c3e55 +regular1=eca28f +regular2=a0d0ba +regular3=c0b080 +regular4=9fbfe7 +regular5=e9acbf +regular6=a0c0d0 +regular7=dde0f8 + +bright0=aea7c3 +bright1=eca28f +bright2=a0d0ba +bright3=c0b080 +bright4=9fbfe7 +bright5=e9acbf +bright6=a0c0d0 +bright7=dde0f8 + +[key-bindings] +clipboard-copy=Control+Shift+c +clipboard-paste=Control+Shift+v +primary-paste=Shift+Insert +search-start=Control+Shift+r +font-increase=Control+plus Control+equal +font-decrease=Control+minus +font-reset=Control+0 +spawn-terminal=Control+Shift+n +show-urls-launch=Alt+Control+o diff --git a/modules/mixins/dotfiles/config/foot/foot_pp.ini b/modules/mixins/dotfiles/config/foot/foot_pp.ini @@ -16,31 +16,31 @@ blink=no [colors-dark] alpha = 0.925 -cursor=181818 eeddbb +cursor=2a2f48 e08ca0 -background=181818 -foreground=e7e7e7 +background=2a2f48 +foreground=dde0f8 -selection-foreground=e7e7e7 -selection-background=505050 +selection-background=424381 +selection-foreground=dde0f8 -regular0=2f2f2f +regular0=3c3e55 regular1=eca28f -regular2=b9d0aa +regular2=a0d0ba regular3=c0b080 regular4=9fbfe7 regular5=e9acbf regular6=a0c0d0 -regular7=e7e7e7 +regular7=dde0f8 -bright0=2f2f2f +bright0=aea7c3 bright1=eca28f -bright2=b9d0aa +bright2=a0d0ba bright3=c0b080 bright4=9fbfe7 bright5=e9acbf bright6=a0c0d0 -bright7=e7e7e7 +bright7=dde0f8 [key-bindings] clipboard-copy=Control+Shift+c diff --git a/modules/mixins/dotfiles/config/foot/foot_uw.ini b/modules/mixins/dotfiles/config/foot/foot_uw.ini @@ -16,31 +16,31 @@ blink=no [colors-dark] alpha = 0.925 -cursor=181818 eeddbb +cursor=2a2f48 e08ca0 -background=181818 -foreground=e7e7e7 +background=2a2f48 +foreground=dde0f8 -selection-foreground=e7e7e7 -selection-background=505050 +selection-background=424381 +selection-foreground=dde0f8 -regular0=2f2f2f +regular0=3c3e55 regular1=eca28f -regular2=b9d0aa +regular2=a0d0ba regular3=c0b080 regular4=9fbfe7 regular5=e9acbf regular6=a0c0d0 -regular7=e7e7e7 +regular7=dde0f8 -bright0=2f2f2f +bright0=aea7c3 bright1=eca28f -bright2=b9d0aa +bright2=a0d0ba bright3=c0b080 bright4=9fbfe7 bright5=e9acbf bright6=a0c0d0 -bright7=e7e7e7 +bright7=dde0f8 [key-bindings] clipboard-copy=Control+Shift+c diff --git a/modules/mixins/dotfiles/config/nvim/fnl/init.fnl b/modules/mixins/dotfiles/config/nvim/fnl/init.fnl @@ -37,7 +37,7 @@ {:src (gh :saghen/blink.cmp) :version (vim.version.range "^1")}] {:load true}) - (vim.cmd.colorscheme :doric-obsidian) + (vim.cmd.colorscheme :doric-mermaid) (vim.api.nvim_set_hl 0 :Normal {:bg :NONE}) (vim.api.nvim_set_hl 0 :NormalFloat {:bg :NONE}) (vim.api.nvim_set_hl 0 :NormalNC {:bg :NONE}) diff --git a/modules/mixins/dotfiles/config/shell/profile/fzf b/modules/mixins/dotfiles/config/shell/profile/fzf @@ -3,8 +3,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \ --ansi \ --layout=reverse \ --border=rounded \ - --color=bg+:#505050,bg:-1,spinner:#e9acbf,hl:#eca28f \ - --color=fg:#e7e7e7,header:#eca28f,info:#a0c0d0,pointer:#e9acbf \ - --color=marker:#e9acbf,fg+:#e7e7e7,prompt:#9fbfe7,hl+:#eca28f \ - --color=border:#2f2f2f \ + --color=bg+:#424381,bg:-1,spinner:#e9acbf,hl:#eca28f \ + --color=fg:#dde0f8,header:#eca28f,info:#a0c0d0,pointer:#e9acbf \ + --color=marker:#e9acbf,fg+:#dde0f8,prompt:#9fbfe7,hl+:#eca28f \ + --color=border:#2a2f48 \ " diff --git a/modules/mixins/dotfiles/config/shell/rc/aliased-short-names b/modules/mixins/dotfiles/config/shell/rc/aliased-short-names @@ -141,3 +141,4 @@ alias em='emacsclient -t' alias foot_uw='foot --config=$HOME/.config/foot/foot_uw.ini' alias foot_pp='foot --config=$HOME/.config/foot/foot_pp.ini' +alias foot_cc='foot --config=$HOME/.config/foot/foot_cc.ini' diff --git a/modules/mixins/dotfiles/home/gitconfig b/modules/mixins/dotfiles/home/gitconfig @@ -4,9 +4,6 @@ [includeIf "gitdir:~/src/sr.ht/"] path = ~/misc/git/gitconfig-sendmail -[init] - defaultBranch = master - [user] name = mtmn email = miro@haravara.org @@ -30,20 +27,13 @@ gol = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit [pull] - rebase = false + rebase = true [merge] conflictstyle = diff3 -[diff] - colorMoved = default - external = difft - -[difftool] - prompt = false - -[worktree] - guessRemote = true +[rerere] + enabled = true [core] excludesFile = ~/.config/git/ignore diff --git a/modules/mixins/dotfiles/home/tmux.conf b/modules/mixins/dotfiles/home/tmux.conf @@ -13,20 +13,20 @@ set -g status-interval 30 set -g status-left '' set -g status-right '#(test -f /tmp/pracomer.log && cat /tmp/pracomer.log) #(plants) %a %h-%d %H:%M #(cat /sys/class/power_supply/BAT*/capacity 2>/dev/null)%% ' -set -g status-style "fg=#e7e7e7,bg=#2f2f2f" -set -g message-style "fg=#e7e7e7,bg=#505050" -set -g message-command-style "fg=#e7e7e7,bg=#505050" -set -g mode-style "fg=#e7e7e7,bg=#505050" +set -g status-style "fg=#dde0f8,bg=default" +set -g message-style "fg=#dde0f8,bg=#424381" +set -g message-command-style "fg=#dde0f8,bg=#424381" +set -g mode-style "fg=#dde0f8,bg=#424381" -set -g pane-border-style "fg=#969696" -set -g pane-active-border-style "fg=#eeddbb" +set -g pane-border-style "fg=#aea7c3" +set -g pane-active-border-style "fg=#e08ca0" -set -g window-status-style "fg=#969696,bg=#2f2f2f" -set -g window-status-current-style "fg=#e7e7e7,bg=#505050,bold" -set -g window-status-bell-style "fg=#eca28f,bg=#2f2f2f,bold" +set -g window-status-style "fg=#aea7c3,bg=default" +set -g window-status-current-style "fg=#dde0f8,bg=#424381,bold" +set -g window-status-bell-style "fg=#eca28f,bg=default,bold" -set -g status-left-style "fg=#e7e7e7,bg=#2f2f2f" -set -g status-right-style "fg=#e7e7e7,bg=#2f2f2f" +set -g status-left-style "fg=#dde0f8,bg=default" +set -g status-right-style "fg=#dde0f8,bg=default" setw -g xterm-keys on set -ga terminal-overrides ',xterm*:XT'