commit 75b94b133540b9a6c07ebee086ae4169fa74ac8a parent d400040b3403bc687c42843da9a179edbec42b88 Author: mtmn <miro@haravara.org> Date: Wed, 10 Jun 2026 22:15:59 +0200 feat: change colors, improve scrape_configs, etc. Diffstat:
18 files changed, 204 insertions(+), 188 deletions(-)
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix Binary files differ. diff --git a/hosts/void/overlays/config/ghostty/config.ghostty b/hosts/void/overlays/config/ghostty/config.ghostty @@ -10,31 +10,31 @@ font-synthetic-style = no-bold,no-italic,no-bold-italic cursor-style = block cursor-style-blink = false -cursor-color = #fd3333 -cursor-text = #15050f shell-integration-features = no-cursor -background = #383035 -foreground = #e0d5b7 -cursor-color = #94d0eb -selection-background = #3d5e57 -selection-foreground = #e0d5b7 -palette = 0=#484040 -palette = 1=#eca28f -palette = 2=#b9d0aa -palette = 3=#c0b060 -palette = 4=#9fbfe7 -palette = 5=#e9acbf -palette = 6=#a0c0d0 -palette = 7=#e0d5b7 -palette = 8=#afa497 -palette = 9=#eca28f -palette = 10=#b9d0aa -palette = 11=#c0b060 -palette = 12=#9fbfe7 -palette = 13=#e9acbf -palette = 14=#a0c0d0 -palette = 15=#e0d5b7 +background = #101010 +background-opacity = 0.935 +foreground = #ebebeb +cursor-color = #ebebeb +cursor-text = #101010 +selection-background = #373737 +selection-foreground = #ebebeb +palette = 0=#101010 +palette = 1=#ec8989 +palette = 2=#6cc24a +palette = 3=#ceb581 +palette = 4=#8abae1 +palette = 5=#db9fe9 +palette = 6=#abebe2 +palette = 7=#ebebeb +palette = 8=#242424 +palette = 9=#ffc4c4 +palette = 10=#8fe06a +palette = 11=#ffe6b5 +palette = 12=#c9e6fd +palette = 13=#f7d7ff +palette = 14=#ddfcf8 +palette = 15=#d0d0d0 keybind = ctrl+shift+c=copy_to_clipboard keybind = ctrl+shift+v=paste_from_clipboard 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,12 +7,12 @@ alt="Mod4" term="foot" wobsock="$XDG_RUNTIME_DIR/wob.sock" -dmenu_args="-vi -fn 'Ttyp0 OTB:size=10' -l 10 -h 20 -nb '#383035' -nf '#e0d5b7' -sb '#3d5e57' -sf '#e0d5b7' -nhb '#383035' -nhf '#a0c0d0'" +dmenu_args="-vi -fn 'Ttyp0 OTB:size=10' -l 10 -h 20 -nb '#101010' -nf '#ebebeb' -sb '#373737' -sf '#ebebeb' -nhb '#101010' -nhf '#6cc24a'" rivertile -view-padding 0 -outer-padding 0 -main-ratio 0.50 & -riverctl border-color-focused "0x50447f" -riverctl border-color-unfocused "0x332d38" +riverctl border-color-focused "0xa6e88a" +riverctl border-color-unfocused "0x373737" riverctl border-width 1 riverctl set-repeat 50 300 @@ -126,7 +126,7 @@ riverctl map normal $alt+Shift Tab send-to-previous-tags riverctl map normal $mod Tab focus-previous-tags riverctl map normal $mod+Shift Tab send-to-previous-tags -swaybg -m fill -c "#15050f" -i "$HOME/misc/random/wallpapers/curtains.jpg" & +swaybg -m fill -c "#101010" -i "$HOME/misc/random/wallpapers/curtains.jpg" & mkfifo "$wobsock" && tail -f "$wobsock" | wob & wl-paste --watch cliphist store & diff --git a/modules/mixins/dotfiles/config/dunst/dunstrc b/modules/mixins/dotfiles/config/dunst/dunstrc @@ -18,13 +18,13 @@ show_indicators = no stack_duplicates = no [urgency_low] - background = "#3d5e57" - foreground = "#e0d5b7" + background = "#424381" + foreground = "#dde0f8" timeout = 30 [urgency_normal] - background = "#3d5e57" - foreground = "#e0d5b7" + background = "#424381" + foreground = "#dde0f8" timeout = 30 [urgency_critical] diff --git a/modules/mixins/dotfiles/config/foot/foot_cc.ini b/modules/mixins/dotfiles/config/foot/foot_cc.ini @@ -15,32 +15,32 @@ style=block blink=no [colors-dark] -alpha = 0.975 -cursor=15050f 94d0eb - -background=383035 -foreground=e0d5b7 - -selection-background=3d5e57 -selection-foreground=e0d5b7 - -regular0=484040 -regular1=eca28f -regular2=b9d0aa -regular3=c0b060 -regular4=9fbfe7 -regular5=e9acbf -regular6=a0c0d0 -regular7=e0d5b7 - -bright0=afa497 -bright1=eca28f -bright2=b9d0aa -bright3=c0b060 -bright4=9fbfe7 -bright5=e9acbf -bright6=a0c0d0 -bright7=e0d5b7 +alpha = 0.935 +cursor=101010 ebebeb + +background=101010 +foreground=ebebeb + +selection-background=373737 +selection-foreground=ebebeb + +regular0=101010 +regular1=ec8989 +regular2=6cc24a +regular3=ceb581 +regular4=8abae1 +regular5=db9fe9 +regular6=abebe2 +regular7=ebebeb + +bright0=242424 +bright1=ffc4c4 +bright2=8fe06a +bright3=ffe6b5 +bright4=c9e6fd +bright5=f7d7ff +bright6=ddfcf8 +bright7=d0d0d0 [key-bindings] clipboard-copy=Control+Shift+c @@ -52,3 +52,6 @@ font-decrease=Control+minus font-reset=Control+0 spawn-terminal=Control+Shift+n show-urls-launch=Alt+Control+o + +[csd] +preferred=none diff --git a/modules/mixins/dotfiles/config/foot/foot_cl.ini b/modules/mixins/dotfiles/config/foot/foot_cl.ini @@ -15,32 +15,32 @@ style=block blink=no [colors-dark] -alpha = 0.975 -cursor=15050f 94d0eb - -background=383035 -foreground=e0d5b7 - -selection-background=3d5e57 -selection-foreground=e0d5b7 - -regular0=484040 -regular1=eca28f -regular2=b9d0aa -regular3=c0b060 -regular4=9fbfe7 -regular5=e9acbf -regular6=a0c0d0 -regular7=e0d5b7 - -bright0=afa497 -bright1=eca28f -bright2=b9d0aa -bright3=c0b060 -bright4=9fbfe7 -bright5=e9acbf -bright6=a0c0d0 -bright7=e0d5b7 +alpha = 0.935 +cursor=101010 ebebeb + +background=101010 +foreground=ebebeb + +selection-background=373737 +selection-foreground=ebebeb + +regular0=101010 +regular1=ec8989 +regular2=6cc24a +regular3=ceb581 +regular4=8abae1 +regular5=db9fe9 +regular6=abebe2 +regular7=ebebeb + +bright0=242424 +bright1=ffc4c4 +bright2=8fe06a +bright3=ffe6b5 +bright4=c9e6fd +bright5=f7d7ff +bright6=ddfcf8 +bright7=d0d0d0 [key-bindings] clipboard-copy=Control+Shift+c @@ -52,3 +52,6 @@ font-decrease=Control+minus font-reset=Control+0 spawn-terminal=Control+Shift+n show-urls-launch=Alt+Control+o + +[csd] +preferred=none diff --git a/modules/mixins/dotfiles/config/foot/foot_pp.ini b/modules/mixins/dotfiles/config/foot/foot_pp.ini @@ -15,32 +15,32 @@ style=block blink=no [colors-dark] -alpha = 0.975 -cursor=15050f 94d0eb - -background=383035 -foreground=e0d5b7 - -selection-background=3d5e57 -selection-foreground=e0d5b7 - -regular0=484040 -regular1=eca28f -regular2=b9d0aa -regular3=c0b060 -regular4=9fbfe7 -regular5=e9acbf -regular6=a0c0d0 -regular7=e0d5b7 - -bright0=afa497 -bright1=eca28f -bright2=b9d0aa -bright3=c0b060 -bright4=9fbfe7 -bright5=e9acbf -bright6=a0c0d0 -bright7=e0d5b7 +alpha = 0.935 +cursor=101010 ebebeb + +background=101010 +foreground=ebebeb + +selection-background=373737 +selection-foreground=ebebeb + +regular0=101010 +regular1=ec8989 +regular2=6cc24a +regular3=ceb581 +regular4=8abae1 +regular5=db9fe9 +regular6=abebe2 +regular7=ebebeb + +bright0=242424 +bright1=ffc4c4 +bright2=8fe06a +bright3=ffe6b5 +bright4=c9e6fd +bright5=f7d7ff +bright6=ddfcf8 +bright7=d0d0d0 [key-bindings] clipboard-copy=Control+Shift+c @@ -52,3 +52,6 @@ font-decrease=Control+minus font-reset=Control+0 spawn-terminal=Control+Shift+n show-urls-launch=Alt+Control+o + +[csd] +preferred=none diff --git a/modules/mixins/dotfiles/config/foot/foot_uw.ini b/modules/mixins/dotfiles/config/foot/foot_uw.ini @@ -15,32 +15,32 @@ style=block blink=no [colors-dark] -alpha = 0.975 -cursor=15050f 94d0eb - -background=383035 -foreground=e0d5b7 - -selection-background=3d5e57 -selection-foreground=e0d5b7 - -regular0=484040 -regular1=eca28f -regular2=b9d0aa -regular3=c0b060 -regular4=9fbfe7 -regular5=e9acbf -regular6=a0c0d0 -regular7=e0d5b7 - -bright0=afa497 -bright1=eca28f -bright2=b9d0aa -bright3=c0b060 -bright4=9fbfe7 -bright5=e9acbf -bright6=a0c0d0 -bright7=e0d5b7 +alpha = 0.935 +cursor=101010 ebebeb + +background=101010 +foreground=ebebeb + +selection-background=373737 +selection-foreground=ebebeb + +regular0=101010 +regular1=ec8989 +regular2=6cc24a +regular3=ceb581 +regular4=8abae1 +regular5=db9fe9 +regular6=abebe2 +regular7=ebebeb + +bright0=242424 +bright1=ffc4c4 +bright2=8fe06a +bright3=ffe6b5 +bright4=c9e6fd +bright5=f7d7ff +bright6=ddfcf8 +bright7=d0d0d0 [key-bindings] clipboard-copy=Control+Shift+c @@ -52,3 +52,6 @@ font-decrease=Control+minus font-reset=Control+0 spawn-terminal=Control+Shift+n show-urls-launch=Alt+Control+o + +[csd] +preferred=none diff --git a/modules/mixins/dotfiles/config/nvim/fnl/init.fnl b/modules/mixins/dotfiles/config/nvim/fnl/init.fnl @@ -21,7 +21,7 @@ (vim.system [:cargo :build :--release] {:cwd path}))))}) (vim.pack.add - [(gh :aymenhafeez/doric-themes.nvim) + (gh :casedami/neomodern.nvim) (gh :windwp/nvim-autopairs) (gh :ibhagwan/fzf-lua) (gh :smoka7/hop.nvim) @@ -37,7 +37,7 @@ {:src (gh :saghen/blink.cmp) :version (vim.version.range "^1")}] {:load true}) - (vim.cmd.colorscheme :doric-valley) + ((. (require :neomodern) :load) :iceclimber) (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+:#3d5e57,bg:-1,spinner:#e9acbf,hl:#eca28f \ - --color=fg:#e0d5b7,header:#eca28f,info:#a0c0d0,pointer:#e9acbf \ - --color=marker:#e9acbf,fg+:#e0d5b7,prompt:#9fbfe7,hl+:#eca28f \ - --color=border:#383035 \ + --color=bg+:#373737,bg:-1,spinner:#6cc24a,hl:#6cc24a \ + --color=fg:#ebebeb,header:#808080,info:#808080,pointer:#6cc24a \ + --color=marker:#6cc24a,fg+:#ebebeb,prompt:#6cc24a,hl+:#6cc24a \ + --color=border:#101010 \ " diff --git a/modules/mixins/dotfiles/config/shell/rc/git b/modules/mixins/dotfiles/config/shell/rc/git @@ -1,6 +1,6 @@ #!/bin/sh -alias cdg='cd "$(git rev-parse --show-toplevel)" && unset _VCS_LAST_PWD' -alias gst='git status && unset _VCS_LAST_PWD' +alias cdg='cd "$(git rev-parse --show-toplevel)"' +alias gst='git status' alias ng='nvim -c ":Neogit"' alias lg='lazygit' diff --git a/modules/mixins/dotfiles/config/shell/rc/prompt-functions b/modules/mixins/dotfiles/config/shell/rc/prompt-functions @@ -2,9 +2,9 @@ _SNOWFLAKE=$(printf '\342\235\204') _C_RESET=$(tput sgr0) _C_1=$(tput setaf 1) -_C_2=$(tput setaf 3) -_C_3=$(tput setaf 4) -_C_4=$(tput setaf 5) +_C_2=$(tput setaf 7) +_C_3=$(tput setaf 244) +_C_4=$(tput setaf 2) _C_6=$(tput setaf 6) colour_part() { @@ -45,8 +45,12 @@ _jj_prompt() { } _git_prompt() { - git_head='' - git_state='' + local branch + local git_state + local git_head + local git_dir + local tag + if branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"; then if [ "$branch" != HEAD ]; then git_head=$branch @@ -55,21 +59,16 @@ _git_prompt() { else git_head=$(git rev-parse --short HEAD) fi - git_dir=$(git rev-parse --absolute-git-dir 2>/dev/null) - case "$git_dir" in - */worktrees/*) - git_head=$(basename "$(git rev-parse --show-toplevel 2>/dev/null)") - ;; - *) - [ "$git_head" = master ] && unset git_head - [ "$git_head" = main ] && unset git_head - ;; - esac - if [ -d "$git_dir/rebase-apply" ] || [ -d "$git_dir/rebase-merge" ]; then + + git_dir=$(git rev-parse --git-dir) + + if [ -d "$git_dir/rebase-apply" ]; then + git_state=rebase + elif [ -d "$git_dir/rebase-merge" ]; then git_state=rebase elif [ -f "$git_dir/MERGE_HEAD" ]; then git_state=merge - elif [ -f "$git_dir/CHERRY_PICK_HEAD" ] || [ -f "$git_dir/sequencer/todo" ]; then + elif [ -f "$git_dir/CHERRY_PICK_HEAD" ] || [ -f .git/sequencer/todo ]; then git_state=cherry-pick elif [ -f "$git_dir/REVERT_HEAD" ]; then git_state=revert @@ -77,8 +76,12 @@ _git_prompt() { git_state=bisect fi fi - colour_part 2 "${git_head-}" - colour_part 1 "${git_state-}" + + [ "$git_head" = master ] && unset git_head + [ "$git_head" = main ] && unset git_head + + colour_part 2 "$git_head" + colour_part 1 "$git_state" } _virt_prompt() { @@ -120,7 +123,7 @@ _user_prompt() { _pwd_prompt() { [ "$PWD" = "$HOME" ] && return - colour_part 4 "${_PWD_PART:-${PWD##*/}}" + colour_part 4 "${PWD##*/}" } _vcs_prompt() { @@ -128,17 +131,6 @@ _vcs_prompt() { } _prompt_precmd() { - [ "$PWD" = "$_VCS_LAST_PWD" ] && return - _VCS_LAST_PWD=$PWD - _PWD_PART='' - if git_dir=$(git rev-parse --absolute-git-dir 2>/dev/null); then - case "$git_dir" in - */worktrees/*) - main_git="${git_dir%/worktrees/*}" - _PWD_PART=$(basename "${main_git%/.git}") - ;; - esac - fi _VCS_CACHE=$(_jj_prompt || _git_prompt) } diff --git a/modules/mixins/dotfiles/config/zsh/rc/magdalena b/modules/mixins/dotfiles/config/zsh/rc/magdalena @@ -5,12 +5,12 @@ magdalena_goto_file() { } magdalena_goto_dir() { - dir=$(magdalena goto-dir) && cd "$dir" && zle reset-prompt 2>/dev/null && unset _VCS_LAST_PWD || true + dir=$(magdalena goto-dir) && cd "$dir" && zle reset-prompt 2>/dev/null || true } magdalena_favorites() { local result=$(magdalena favorites) && cd "$result" - zle reset-prompt 2>/dev/null && unset _VCS_LAST_PWD || true + zle reset-prompt 2>/dev/null || true } zle -N magdalena_goto_file 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=#e0d5b7,bg=default" -set -g message-style "fg=#e0d5b7,bg=#3d5e57" -set -g message-command-style "fg=#e0d5b7,bg=#3d5e57" -set -g mode-style "fg=#e0d5b7,bg=#3d5e57" +set -g status-style "fg=#ebebeb,bg=default" +set -g message-style "fg=#ebebeb,bg=#373737" +set -g message-command-style "fg=#ebebeb,bg=#373737" +set -g mode-style "fg=#ebebeb,bg=#373737" -set -g pane-border-style "fg=#afa497" -set -g pane-active-border-style "fg=#94d0eb" +set -g pane-border-style "fg=#373737" +set -g pane-active-border-style "fg=#6cc24a" -set -g window-status-style "fg=#afa497,bg=default" -set -g window-status-current-style "fg=#e0d5b7,bg=#3d5e57,bold" -set -g window-status-bell-style "fg=#eca28f,bg=#484040,bold" +set -g window-status-style "fg=#808080,bg=default" +set -g window-status-current-style "fg=#101010,bg=#6cc24a,bold" +set -g window-status-bell-style "fg=#ec8989,bg=#373737,bold" -set -g status-left-style "fg=#e0d5b7,bg=default" -set -g status-right-style "fg=#e0d5b7,bg=default" +set -g status-left-style "fg=#ebebeb,bg=default" +set -g status-right-style "fg=#ebebeb,bg=default" setw -g xterm-keys on set -ga terminal-overrides ',xterm*:XT' diff --git a/modules/services/monitoring/default.nix b/modules/services/monitoring/default.nix @@ -99,7 +99,9 @@ in { (lib.optionals cfg.exporters.enable [ { job_name = "node_exporter"; - static_configs = [{targets = ["127.0.0.1:${toString config.services.prometheus.exporters.node.port}"];}]; + static_configs = + [{targets = ["127.0.0.1:${toString config.services.prometheus.exporters.node.port}"];}] + ++ cfg.exporters.extraNodeStaticConfigs; } { job_name = "systemd_exporter"; diff --git a/modules/services/monitoring/exporters.nix b/modules/services/monitoring/exporters.nix @@ -7,6 +7,11 @@ in { options.services.haravara.monitoring.exporters = { enable = lib.mkEnableOption "Enable node and systemd Prometheus exporters" // {default = true;}; + extraNodeStaticConfigs = lib.mkOption { + type = lib.types.listOf lib.types.attrs; + default = []; + description = "Additional static_configs appended to the node_exporter job"; + }; }; config = lib.mkIf (cfg.enable && cfg.exporters.enable) { diff --git a/modules/services/monitoring/grafana.nix b/modules/services/monitoring/grafana.nix @@ -35,6 +35,11 @@ url = "https://grafana.com/api/dashboards/9578/revisions/4/download"; sha256 = "16jvazvjswiyn281z4r7wmwb18841d3ar24951538kma28l05izy"; } + { + name = "node_exporter_bsd.json"; + url = "https://grafana.com/api/dashboards/4260/revisions/19/download"; + sha256 = "ad3aef8744750f1b61f8905b1cddffe1f4274f5594e4aba5e8193f1a617ce765"; + } ] ++ lib.optional config.services.haravara.seaweedfs.enable { name = "seaweedfs.json";