diff options
| -rw-r--r-- | config/btop/btop.conf | 5 | ||||
| -rw-r--r-- | config/niri/config.kdl | 8 | ||||
| -rw-r--r-- | config/waybar/style.css | 13 | ||||
| -rw-r--r-- | zsh/functions/status.zsh | 41 | ||||
| -rw-r--r-- | zsh/modules/prompt.zsh | 2 |
5 files changed, 51 insertions, 18 deletions
diff --git a/config/btop/btop.conf b/config/btop/btop.conf index c706619..142ae84 100644 --- a/config/btop/btop.conf +++ b/config/btop/btop.conf @@ -1,4 +1,4 @@ -#? Config file for btop v. 1.4.5 +#? Config file for btop v. 1.4.4 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" @@ -109,9 +109,6 @@ cpu_bottom = False #* Shows the system uptime in the CPU box. show_uptime = True -#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo. -show_cpu_watts = True - #* Show cpu temperature. check_temp = True diff --git a/config/niri/config.kdl b/config/niri/config.kdl index af5eab5..454db2f 100644 --- a/config/niri/config.kdl +++ b/config/niri/config.kdl @@ -73,7 +73,7 @@ input { // Find more information on the wiki: // https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs // Remember to uncomment the node by removing "/-"! -/-output "eDP-1" { +output "eDP-1" { // Uncomment this line to disable this output. // off @@ -83,10 +83,10 @@ input { // for the resolution. // If the mode is omitted altogether or is invalid, niri will pick one automatically. // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. - mode "1920x1080@120.030" + mode "3024x1964@60.000" // You can use integer or fractional scale, for example use 1.5 for 150% scale. - scale 2 + scale 1.68 // Transform allows to rotate the output counter-clockwise, valid values are: // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. @@ -288,7 +288,7 @@ window-rule { window-rule { match is-focused=false - opacity 0.85 + opacity 0.8 } // Open the Firefox picture-in-picture player as floating by default. diff --git a/config/waybar/style.css b/config/waybar/style.css index 90489da..52799bb 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -4,9 +4,8 @@ } window#waybar { - /* background-color: #0F261F; */ - background-color: rgba(15, 38, 31, 0.95); - color: #DAE6E3; + background-color: rgba(255, 255, 250, 0.95); + color: #0F261F; transition-property: background-color; transition-duration: .5s; } @@ -28,8 +27,8 @@ button:hover { } #workspaces button { - color: #DAE6E3; - padding: 0 5px; + color: #8096A2; + padding: 0 8px; background-color: transparent; } @@ -39,7 +38,6 @@ button:hover { } #workspaces button.active { - padding: 0 5px; background-color: #23C17C; color: #0F261F; } @@ -147,7 +145,7 @@ menu { } menuitem { - color: #DAE6E3; + color: #0F261F; border: none; border-radius: 0; padding: 5px 0; @@ -156,7 +154,6 @@ menuitem:hover { background: #4F8FE6; } menu separator { - background-color: #90A6A2; margin: 5px 0; } diff --git a/zsh/functions/status.zsh b/zsh/functions/status.zsh index 3062ce8..f7f38ce 100644 --- a/zsh/functions/status.zsh +++ b/zsh/functions/status.zsh @@ -29,11 +29,50 @@ function node_info { echo "%{%F{yellow}%}js%{%F{black}%} ${nodeinfo:-no}" } +function jj_info { + # Check if we're in a jj repo + if ! jj root &> /dev/null; then + return + fi + + # Get current change ID (short form) + change=$(jj log -r @ --no-graph -T 'change_id.shortest()' 2> /dev/null) + + if [ ! -z "$change" ]; then + echo -n "@%F{cyan}$change%f" + + # Get status output + status_output=$(jj status 2> /dev/null) + + # Modified files + if echo "$status_output" | rg -q '^M '; then + echo -n "%{%F{yellow}%}△%f" + fi + + # Added files + if echo "$status_output" | rg -q '^A '; then + echo -n "%{%F{green}%}+%f" + fi + + # Deleted files + if echo "$status_output" | rg -q '^D '; then + echo -n "%{%F{red}%}×%f" + fi + + # Unknown/untracked files + if echo "$status_output" | rg -q '^\? '; then + echo -n "%{%F{magenta}%}+%f" + fi + + echo -n "%f" + fi +} + function git_info { branch=$(git branch --show-current 2> /dev/null) if [ ! -z $branch ]; then - echo -n "@%F{cyan}$branch%f" + echo -n "@%F{cyan}$branch%f" status_output=$(git status --short) diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh index 5b79b3e..9b41e32 100644 --- a/zsh/modules/prompt.zsh +++ b/zsh/modules/prompt.zsh @@ -46,7 +46,7 @@ function prompt_setup { # Define prompts. PROMPT=' -%{%F{black}%}$(env_info)%{%F{magenta}%}%n%{%F{8}%}@%{%F{cyan}%}$(hostname -s)%{%f%} %{%B%F{blue}%}${PWD/#$HOME/~}%{%f%b%}$(git_info)%{%f%} + %{%F{black}%}$(env_info)%{%F{magenta}%}%n%{%F{8}%}@%{%F{cyan}%}$(hostname -s)%{%f%} %{%B%F{blue}%}${PWD/#$HOME/~}%{%f%b%}$(jj_info)$(git_info)%{%f%} %(?,,%{${%B%F{white}%}[%?]%{%f%b%} )%% ' } |