diff options
Diffstat (limited to 'dotfiles/hyprland')
| -rw-r--r-- | dotfiles/hyprland/.config/foot/foot.ini | 44 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/fuzzel/fuzzel.ini | 4 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/gammastep/config.ini | 21 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/hypr/hyprland.conf | 16 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/hypr/hyprlock.conf | 22 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/themes/dupre/Xresources | 4 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/themes/dupre/waybar.css | 24 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/themes/hudson/Xresources | 4 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/themes/hudson/waybar.css | 24 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/waybar/config | 10 | ||||
| -rw-r--r-- | dotfiles/hyprland/.config/waybar/style.css | 59 | ||||
| -rwxr-xr-x | dotfiles/hyprland/.local/bin/screenshot | 23 | ||||
| -rwxr-xr-x | dotfiles/hyprland/.local/bin/waybar-disk | 7 | ||||
| -rwxr-xr-x | dotfiles/hyprland/.local/bin/waybar-netspeed | 2 |
14 files changed, 162 insertions, 102 deletions
diff --git a/dotfiles/hyprland/.config/foot/foot.ini b/dotfiles/hyprland/.config/foot/foot.ini index 8fe19b3..4e9681c 100644 --- a/dotfiles/hyprland/.config/foot/foot.ini +++ b/dotfiles/hyprland/.config/foot/foot.ini @@ -1,5 +1,5 @@ -# foot terminal configuration - Dupre theme -# Warm, earthy colors from dupre-theme.el +# foot terminal configuration - Hudson theme +# Tomorrow Night + Goldenrod accent [main] term=xterm-256color @@ -10,29 +10,29 @@ pad=8x8 lines=10000 [colors] -# Dupre theme colors (from Emacs dupre-theme.el) -background=151311 -foreground=f0fef0 +# Hudson theme - Tomorrow Night + Goldenrod accent +background=222222 +foreground=eeeeee -# Regular colors (0-7) - dupre palette -regular0=252321 # black (dupre-bg+1) -regular1=d47c59 # red (dupre-red) -regular2=a4ac64 # green (dupre-green) -regular3=d7af5f # yellow (dupre-yellow) -regular4=67809c # blue (dupre-blue) +# Regular colors (0-7) +regular0=222222 # black +regular1=cc6666 # red +regular2=b5bd68 # green +regular3=f0c674 # yellow +regular4=81a2be # blue regular5=b294bb # magenta -regular6=8a9496 # cyan (dupre-steel) -regular7=d0cbc0 # white (dupre-gray+2) +regular6=8abeb7 # cyan +regular7=c5c8c6 # white # Bright colors (8-15) -bright0=474544 # bright black (dupre-bg+2) -bright1=edb08f # bright red (dupre-red+1) -bright2=ccc768 # bright green (dupre-green+1) -bright3=ffd75f # bright yellow (dupre-yellow+1) -bright4=b2c3cc # bright blue (dupre-blue+1) +bright0=444444 # bright black +bright1=d54e53 # bright red +bright2=b9ca4a # bright green +bright3=e0b040 # bright yellow (adjusted for gold) +bright4=7aa6da # bright blue bright5=c397d8 # bright magenta -bright6=acb0b3 # bright cyan (dupre-steel+1) -bright7=f0fef0 # bright white (dupre-fg) +bright6=70c0b1 # bright cyan +bright7=eeeeee # bright white -# Cursor: muted gold on dark -cursor=151311 d7af5f +# Cursor: goldenrod on dark +cursor=222222 daa520 diff --git a/dotfiles/hyprland/.config/fuzzel/fuzzel.ini b/dotfiles/hyprland/.config/fuzzel/fuzzel.ini index 0efda0d..39dabc0 100644 --- a/dotfiles/hyprland/.config/fuzzel/fuzzel.ini +++ b/dotfiles/hyprland/.config/fuzzel/fuzzel.ini @@ -1,5 +1,5 @@ -# Fuzzel config - matching waybar DWM-inspired theme -# Colors from waybar: bg=#222222, cpu=#bbbbbb, clock=#eeeeee, accent=#daa520 +# Fuzzel config - Hudson theme +# Tomorrow Night + Goldenrod accent [main] # size is in points (fontconfig syntax) diff --git a/dotfiles/hyprland/.config/gammastep/config.ini b/dotfiles/hyprland/.config/gammastep/config.ini index f50a701..bbb15ee 100644 --- a/dotfiles/hyprland/.config/gammastep/config.ini +++ b/dotfiles/hyprland/.config/gammastep/config.ini @@ -1,25 +1,8 @@ -[gammastep] -; Color temperature in Kelvin (same as redshift) +[general] temp-day=6500 temp-night=4500 - -; Brightness (1.0 = full, 0.8 = 20% dimmed) brightness-day=1.0 brightness-night=1.0 - -; Gamma correction gamma=1.0 - -; Fade between day/night fade=1 - -; Wayland adjustment method (not randr) -adjustment-method=wayland - -; Location for sunrise/sunset calculation -location-provider=manual - -[manual] -; New Orleans, LA -lat=29.951065 -lon=-90.071533 +location-provider=geoclue2 diff --git a/dotfiles/hyprland/.config/hypr/hyprland.conf b/dotfiles/hyprland/.config/hypr/hyprland.conf index 390d905..a279ced 100644 --- a/dotfiles/hyprland/.config/hypr/hyprland.conf +++ b/dotfiles/hyprland/.config/hypr/hyprland.conf @@ -10,12 +10,13 @@ monitor=,preferred,auto,auto # ============================================================================ # Startup Applications # ============================================================================ -exec-once = hyprpm reload +exec-once = hyprpm reload && sleep 1 && hyprctl dismissnotify -1 exec-once = waybar exec-once = swww-daemon && sleep 1 && swww img ~/pictures/wallpaper/trondheim-norway.jpg exec-once = dunst exec-once = hypridle -exec-once = gammastep-indicator +exec-once = /usr/lib/geoclue-2.0/demos/agent +exec-once = gammastep exec-once = blueman-applet exec-once = /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP @@ -28,7 +29,7 @@ exec-once = insync start # Environment Variables # ============================================================================ env = XCURSOR_SIZE,24 -env = XCURSOR_THEME,capitaine-cursors-light +env = XCURSOR_THEME,Bibata-Modern-Ice env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_SESSION_TYPE,wayland env = XDG_SESSION_DESKTOP,Hyprland @@ -73,7 +74,7 @@ animations { # Layout (master-stack like DWM tile) # ============================================================================ master { - new_status = slave + new_status = master mfact = 0.55 } @@ -100,6 +101,7 @@ input { misc { force_default_wallpaper = 0 disable_hyprland_logo = true + focus_on_activate = true } # ============================================================================ @@ -294,9 +296,9 @@ bind = CTRL ALT, SPACE, exec, amixer set Capture toggle && amixer get Capture | # Bluetooth (from DWM and sxhkdrc) bind = $mod SHIFT, B, exec, blueman-manager -# Screenshots (grim + slurp + satty for annotation) -bind = $mod, S, exec, grim -g "$(slurp)" - | satty --filename - --output-filename ~/pictures/screenshots/$(date +%Y.%m.%d-%H%M%S).png -bind = , Print, exec, grim - | satty --filename - --output-filename ~/pictures/screenshots/$(date +%Y.%m.%d-%H%M%S).png +# Screenshots (grim + slurp + fuzzel menu) +bind = $mod, S, exec, screenshot region +bind = $mod, Print, exec, screenshot fullscreen # Lock screen (from sxhkdrc: super+Escape) bind = $mod, ESCAPE, exec, hyprlock diff --git a/dotfiles/hyprland/.config/hypr/hyprlock.conf b/dotfiles/hyprland/.config/hypr/hyprlock.conf index fd85651..f9c08bb 100644 --- a/dotfiles/hyprland/.config/hypr/hyprlock.conf +++ b/dotfiles/hyprland/.config/hypr/hyprlock.conf @@ -1,5 +1,5 @@ -# Hyprlock configuration - Dupre theme -# Warm, earthy colors from dupre-theme.el +# Hyprlock configuration - Hudson theme +# Tomorrow Night + Goldenrod accent general { disable_loading_bar = false @@ -25,7 +25,7 @@ label { monitor = text = $TIME12 text_align = center - color = rgb(969385) + color = rgb(bbbbbb) font_size = 64 font_family = BerkeleyMono Nerd Font position = 0, 15% @@ -40,7 +40,7 @@ image { size = 120 rounding = -1 border_size = 3 - border_color = rgb(d7af5f) + border_color = rgb(daa520) position = 0, 0% halign = center valign = center @@ -54,7 +54,7 @@ label { monitor = text = $USER text_align = center - color = rgb(d7af5f) + color = rgb(daa520) font_size = 36 font_family = BerkeleyMono Nerd Font position = 0, -7% @@ -71,19 +71,19 @@ input-field { dots_spacing = 0.15 dots_center = true dots_rounding = -1 - outer_color = rgb(151311) - inner_color = rgb(151311) - font_color = rgb(969385) + outer_color = rgb(222222) + inner_color = rgb(222222) + font_color = rgb(bbbbbb) fade_on_empty = true fade_timeout = 1000 placeholder_text = <i>Password...</i> hide_input = false rounding = 8 - check_color = rgb(d7af5f) - fail_color = rgb(d47c59) + check_color = rgb(daa520) + fail_color = rgb(d54e53) fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i> fail_transition = 300 - capslock_color = rgb(ccc768) + capslock_color = rgb(e0b040) numlock_color = -1 bothlock_color = -1 invert_numlock = false diff --git a/dotfiles/hyprland/.config/themes/dupre/Xresources b/dotfiles/hyprland/.config/themes/dupre/Xresources index be8f7f4..1646b87 100644 --- a/dotfiles/hyprland/.config/themes/dupre/Xresources +++ b/dotfiles/hyprland/.config/themes/dupre/Xresources @@ -4,8 +4,8 @@ !! X Font Settings Xft.dpi: 109 -Xcursor.size: 32 -Xcursor.theme: Vimix-white-cursors +Xcursor.size: 24 +Xcursor.theme: Bibata-Modern-Ice Xft.autohint: 0 Xft.lcdfilter: lcddefault Xft.hintstyle: hintfull diff --git a/dotfiles/hyprland/.config/themes/dupre/waybar.css b/dotfiles/hyprland/.config/themes/dupre/waybar.css index e83f851..18ba0f1 100644 --- a/dotfiles/hyprland/.config/themes/dupre/waybar.css +++ b/dotfiles/hyprland/.config/themes/dupre/waybar.css @@ -49,7 +49,7 @@ window#waybar { #cpu, #temperature, #memory, -#disk, +#custom-disk, #custom-netspeed, #battery, #wireplumber, @@ -73,7 +73,7 @@ window#waybar { #cpu:hover, #temperature:hover, #memory:hover, -#disk:hover, +#custom-disk:hover, #custom-netspeed:hover, #wireplumber:hover, #sysmonitor:hover, @@ -90,8 +90,24 @@ window#waybar { color: #969385; } -#wireplumber.muted { - color: #58574e; +#custom-netspeed.disconnected { + color: #d47c59; +} + +#temperature.warning { + color: #d7af5f; +} + +#temperature.critical { + color: #d47c59; +} + +#custom-disk.warning { + color: #d7af5f; +} + +#custom-disk.critical { + color: #d47c59; } #battery.warning { diff --git a/dotfiles/hyprland/.config/themes/hudson/Xresources b/dotfiles/hyprland/.config/themes/hudson/Xresources index 96e4803..4b35809 100644 --- a/dotfiles/hyprland/.config/themes/hudson/Xresources +++ b/dotfiles/hyprland/.config/themes/hudson/Xresources @@ -10,8 +10,8 @@ Xft.hintstyle: hintfull Xft.hinting: 1 Xft.antialias: 1 Xft.rgba: rgb -Xcursor.size: 32 -Xcursor.theme: Vimix-white-cursors +Xcursor.size: 24 +Xcursor.theme: Bibata-Modern-Ice !! Emacs Emacs*toolBar: 0 diff --git a/dotfiles/hyprland/.config/themes/hudson/waybar.css b/dotfiles/hyprland/.config/themes/hudson/waybar.css index 9056529..299f1c2 100644 --- a/dotfiles/hyprland/.config/themes/hudson/waybar.css +++ b/dotfiles/hyprland/.config/themes/hudson/waybar.css @@ -49,7 +49,7 @@ window#waybar { #cpu, #temperature, #memory, -#disk, +#custom-disk, #custom-netspeed, #battery, #wireplumber, @@ -73,7 +73,7 @@ window#waybar { #cpu:hover, #temperature:hover, #memory:hover, -#disk:hover, +#custom-disk:hover, #custom-netspeed:hover, #wireplumber:hover, #sysmonitor:hover, @@ -90,8 +90,24 @@ window#waybar { color: #bbbbbb; } -#wireplumber.muted { - color: #666666; +#custom-netspeed.disconnected { + color: #ff5858; +} + +#temperature.warning { + color: #daa520; +} + +#temperature.critical { + color: #ff5858; +} + +#custom-disk.warning { + color: #daa520; +} + +#custom-disk.critical { + color: #ff5858; } #battery.warning { diff --git a/dotfiles/hyprland/.config/waybar/config b/dotfiles/hyprland/.config/waybar/config index 5b9879e..fdff160 100644 --- a/dotfiles/hyprland/.config/waybar/config +++ b/dotfiles/hyprland/.config/waybar/config @@ -28,7 +28,7 @@ "cpu", "temperature", "memory", - "disk", + "custom/disk", "battery" ] }, @@ -62,6 +62,7 @@ "interval": 10, "hwmon-path-abs": "/sys/devices/pci0000:00/0000:00:18.3/hwmon", "input-filename": "temp1_input", + "warning-threshold": 70, "critical-threshold": 80, "format": "<span size='large'></span> {temperatureC}°C", "format-critical": "<span size='large'></span> {temperatureC}°C", @@ -74,10 +75,11 @@ "on-click": "toggle-scratchpad monitor" }, - "disk": { + "custom/disk": { + "exec": "waybar-disk", + "return-type": "json", "interval": 30, - "format": "<span size='large'></span> {percentage_used}%", - "path": "/", + "format": "<span size='large'></span> {}", "on-click": "toggle-scratchpad monitor" }, diff --git a/dotfiles/hyprland/.config/waybar/style.css b/dotfiles/hyprland/.config/waybar/style.css index 03b11b6..299f1c2 100644 --- a/dotfiles/hyprland/.config/waybar/style.css +++ b/dotfiles/hyprland/.config/waybar/style.css @@ -1,5 +1,5 @@ -/* Waybar style - Dupre theme */ -/* Warm, earthy colors from dupre-theme.el */ +/* Waybar style - Hudson theme */ +/* Tomorrow Night + Goldenrod accent */ * { border: none; @@ -22,53 +22,48 @@ window#waybar { padding: 0.5rem; margin: 0.2rem; background-color: transparent; - color: #969385; + color: #bbbbbb; border-radius: 1rem; transition: all 0.3s ease; } #workspaces button.active { - background: #d7af5f; - color: #151311; + background: #daa520; + color: #222222; border-radius: 1rem; } #workspaces button.urgent { - background-color: rgba(212, 124, 89, 0.4); + background-color: rgba(255, 88, 88, 0.4); } .modules-right, .modules-left { - background-color: #151311; + background-color: #222222; border-radius: 1rem; padding: 0.2rem 0.6rem; margin: 0.3rem; - border: 0.095rem solid #d7af5f; + border: 0.095rem solid #daa520; box-shadow: 0rem 0.2rem 0.4rem rgba(0,0,0,0.5); } #cpu, #temperature, #memory, -#disk, +#custom-disk, #custom-netspeed, #battery, #wireplumber, -#idle_inhibitor, #tray, #clock, #custom-layout, #window { padding: 0.4rem; margin: 0.3rem; - color: #969385; + color: #bbbbbb; background-color: transparent; border-radius: 1rem; } -#idle_inhibitor { - margin-right: 0.8rem; -} - #sysmonitor { margin: 0.3rem; background-color: transparent; @@ -78,33 +73,49 @@ window#waybar { #cpu:hover, #temperature:hover, #memory:hover, -#disk:hover, +#custom-disk:hover, #custom-netspeed:hover, #wireplumber:hover, #sysmonitor:hover, #custom-layout:hover { - background-color: #474544; + background-color: #444444; border-radius: 1rem; } #clock { - color: #f0fef0; + color: #eeeeee; } #wireplumber { - color: #969385; + color: #bbbbbb; +} + +#custom-netspeed.disconnected { + color: #ff5858; +} + +#temperature.warning { + color: #daa520; +} + +#temperature.critical { + color: #ff5858; +} + +#custom-disk.warning { + color: #daa520; } -#wireplumber.muted { - color: #58574e; +#custom-disk.critical { + color: #ff5858; } #battery.warning { - color: #d7af5f; + color: #daa520; } #battery.critical { - color: #d47c59; + color: #ff5858; } #tray > .passive { @@ -113,5 +124,5 @@ window#waybar { #tray > .needs-attention { -gtk-icon-effect: highlight; - background-color: #d7af5f; + background-color: #daa520; } diff --git a/dotfiles/hyprland/.local/bin/screenshot b/dotfiles/hyprland/.local/bin/screenshot new file mode 100755 index 0000000..45925c6 --- /dev/null +++ b/dotfiles/hyprland/.local/bin/screenshot @@ -0,0 +1,23 @@ +#!/bin/sh +# Screenshot tool with fuzzel menu +# Usage: screenshot [region|fullscreen] + +DIR="$HOME/pictures/screenshots" +mkdir -p "$DIR" +FILE="$DIR/$(date +%Y-%m-%d_%H%M%S).png" + +# Capture +case "${1:-region}" in + region) grim -g "$(slurp)" "$FILE" || exit 1 ;; + fullscreen) grim "$FILE" || exit 1 ;; +esac + +# Menu +CHOICE=$(printf ' Copy Path\n Copy Image\n Annotate' | \ + fuzzel --dmenu --prompt "Screenshot: " --width 20 --lines 3) + +case "$CHOICE" in + *"Copy Path"*) echo -n "$FILE" | wl-copy --type text/plain ;; + *"Copy Image"*) wl-copy --type image/png < "$FILE" ;; + *"Annotate"*) satty --filename "$FILE" --output-filename "$FILE" --copy-command wl-copy ;; +esac diff --git a/dotfiles/hyprland/.local/bin/waybar-disk b/dotfiles/hyprland/.local/bin/waybar-disk new file mode 100755 index 0000000..6050653 --- /dev/null +++ b/dotfiles/hyprland/.local/bin/waybar-disk @@ -0,0 +1,7 @@ +#!/bin/sh +# Waybar disk usage module with warning/critical states +PCT=$(df --output=pcent / | tail -1 | tr -d ' %') +CLASS="" +[ "$PCT" -ge 80 ] && CLASS="warning" +[ "$PCT" -ge 90 ] && CLASS="critical" +printf '{"text": "%s%%", "class": "%s", "tooltip": "Root: %s%% used"}\n' "$PCT" "$CLASS" "$PCT" diff --git a/dotfiles/hyprland/.local/bin/waybar-netspeed b/dotfiles/hyprland/.local/bin/waybar-netspeed index 97e8e5e..a6296b0 100755 --- a/dotfiles/hyprland/.local/bin/waybar-netspeed +++ b/dotfiles/hyprland/.local/bin/waybar-netspeed @@ -6,7 +6,7 @@ INTERFACE=$(ip route | awk '/default/ {print $5; exit}') if [ -z "$INTERFACE" ]; then - echo '{"text": " Disconnected", "tooltip": "No network connection", "class": "disconnected"}' + echo '{"text": " Offline", "tooltip": "No network connection", "class": "disconnected"}' exit 0 fi |
