diff --git a/.memo/hyprland-ricing b/.memo/hyprland-ricing index 8b3ff76..1da141c 100644 --- a/.memo/hyprland-ricing +++ b/.memo/hyprland-ricing @@ -7,7 +7,7 @@ hyprlock hyprshot hyprland-plugin-hyprexpo # 类似监控室老大爷视角 :/ -xdg-desktop-portal-hyprland +xdg-desktop-portal-hyprland # not working with my Intel iGPU, but fine with NVIDIA dGPU xdg-desktop-portal-gnome xdg-desktop-portal-gtk diff --git a/.scripts/change_wallpaper.fish b/.scripts/change-wallpaper.fish similarity index 100% rename from .scripts/change_wallpaper.fish rename to .scripts/change-wallpaper.fish diff --git a/.scripts/fetch-weather.sh b/.scripts/fetch-weather.sh new file mode 100755 index 0000000..f13a91b --- /dev/null +++ b/.scripts/fetch-weather.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +$HOME/.config/eww/Main/scripts/weather --getdata diff --git a/.scripts/set_nv_env.sh b/.scripts/set_nv_env.sh index 6056aa6..9771b85 100755 --- a/.scripts/set_nv_env.sh +++ b/.scripts/set_nv_env.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh export __NV_PRIME_RENDER_OFFLOAD=1 export __GLX_VENDOR_LIBRARY_NAME=nvidia diff --git a/.scripts/toggle-player.sh b/.scripts/toggle-player.sh deleted file mode 100755 index 264dc52..0000000 --- a/.scripts/toggle-player.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/env bash - -if [ -n "$(eww active-windows | grep -i "player")" ]; then - eww close player -elif [ -n "$(pgrep -i "spotify")" ]; then - eww open player -fi \ No newline at end of file diff --git a/.scripts/unset_nv_env.sh b/.scripts/unset_nv_env.sh index a4e4c72..bf7342d 100755 --- a/.scripts/unset_nv_env.sh +++ b/.scripts/unset_nv_env.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia __VK_LAYER_NV_optimus=NVIDIA_only unset __NV_PRIME_RENDER_OFFLOAD diff --git a/.scripts/hyprland_workspace_action.sh b/.scripts/workspace-action.sh similarity index 100% rename from .scripts/hyprland_workspace_action.sh rename to .scripts/workspace-action.sh diff --git a/README.md b/README.md index 8b13789..18762a0 100644 --- a/README.md +++ b/README.md @@ -1 +1,29 @@ +## Hyprland & most of Hypr\* ecosystem +Based on [end-4/dots-hyprland](https://github.com/end-4/dots-hyprland) but without ags. + +## Eww + +Modified "Main Dashboard" from [syndrizzle/hotfiles](https://github.com/syndrizzle/hotfiles/tree/bspwm) without notification center. + +## Grub theme + +Based on [vinceliuice/Elegant-grub2-themes](https://github.com/vinceliuice/Elegant-grub2-themes) with [illustration from 紺屋鴉江](https://www.pixiv.net/artworks/119683453) + +## Waybar + +Gathered from internet, based on I don't know who (such config files had been laying in my disk before I could even notice and already looked nice without further configurations) (and I'm pretty sure they were not the default config files shipped with the waybar package) + +## Colorscheme for basically everything + +[Catppuccin-mocha(-blue)](https://catppuccin.com) + +## Fonts + +Not unified, combination of: + +- MesloLGM Nerd Font (& Mono) +- Font Awesome 6 Free +- Maple Mono CN +- Noto Sans +- ... diff --git a/eww/Main/eww.scss b/eww/Main/eww.scss index 858c23b..81bac63 100644 --- a/eww/Main/eww.scss +++ b/eww/Main/eww.scss @@ -5,7 +5,7 @@ .main-window { background-color: $bg; - font-family: 'Fira Sans Semibold', 'Font Awesome 6 Free', FontAwesome; + font-family: 'Font Awesome 6 Free'; border-radius: 20px; border: 3px solid $blue; } @@ -51,7 +51,7 @@ } .weather-icon { - font-family: 'JetBrainsMono Nerd Font'; + font-family: 'MesloLGM Nerd Font'; font-size: 60px; } @@ -88,22 +88,22 @@ } .volume-scale highlight { - background-color: $green; + background-color: $sapphire; border-radius: 15px; } .brightness-scale highlight { - background-color: $yellow; + background-color: $teal; border-radius: 15px; } .cpu-scale highlight { - background-color: $red; + background-color: $yellow; border-radius: 15px; } .memory-scale highlight { - background-color: $blue; + background-color: $peach; border-radius: 15px; } diff --git a/eww/Main/eww.yuck b/eww/Main/eww.yuck index 4d084d4..c323e9d 100644 --- a/eww/Main/eww.yuck +++ b/eww/Main/eww.yuck @@ -94,5 +94,5 @@ :windowtype "normal" :wm-ignore true :monitor 0 - :geometry (geometry :x 2 :y 0 :width 600 :height 846) + :geometry (geometry :x 2 :y 0 :width 600 :height 868) (main)) diff --git a/eww/eww.scss b/eww/eww.scss index f348ddd..48eea40 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -13,5 +13,8 @@ $cyan: #89dceb; $gray: #585b70; $gray-alt: #313244; $lavender: #b4befe; +$sapphire: #74c7ec; +$teal: #94e2d5; +$peach: #fab387; @import './Main/eww.scss'; diff --git a/hypr/hyprland/keybinds.conf b/hypr/hyprland/keybinds.conf index 2e5c6ea..2df28a5 100755 --- a/hypr/hyprland/keybinds.conf +++ b/hypr/hyprland/keybinds.conf @@ -7,7 +7,7 @@ bind = Super, C, exec, code --password-store=gnome-libsecret # Launch VSCode (ed bind = Super, E, exec, nautilus --new-window # Launch Dolphin (file manager) bind = Super, W, exec, firefox --new-window # Launch Firefox bind = Super, X, exec, gnome-text-editor --new-window # Launch GNOME Text Editor -bind = Super, B, exec, ghostty -e btop # Launch btop (system monitor) +bind = Super, B, exec, killall btop || ghostty -e btop # Launch btop (system monitor) bind = Ctrl+Super, V, exec, pavucontrol # Launch pavucontrol (volume mixer) bind = Ctrl+Super+Shift, V, exec, easyeffects # Launch EasyEffects (equalizer & other audio effects) @@ -17,7 +17,7 @@ bind = Super, T, exec, kitty # Launch kitty (terminal) bind = Super+Shift, T, exec, ghostty # Launch ghostty (terminal) bind = Super, Return, exec, kitty # [hidden] bind = Super+Shift, Return, exec, ghostty # [hidden] -bind = Super, Super_L, exec, pkill fuzzel || fuzzel # Launch fuzzel (app launcher) +bind = Super, Super_L, exec, eww open main --toggle # Launch dashboard (eww) bind = Alt, Space, exec, pkill fuzzel || fuzzel # [hidden] Launch fuzzel (app launcher) # bind = , mouse:276, exec, pkill fuzzel || fuzzel # [hidden] Launch fuzzel (app launcher) bind = Super, Space, exec, pkill fuzzel || fuzzel -d -l 0 | xargs -r -I{} bash -c '{}' # Launch fuzzel (command launcher) @@ -39,7 +39,7 @@ bind = Super+Shift, C, exec, hyprpicker -a # Pick color (Hex) >> clipboard # bind = Ctrl+Alt, R, exec, ~/.config/ags/scripts/record-script.sh --fullscreen # [hidden] Record screen (no sound) bind = Super+Alt, R, exec, ~/.scripts/record-script.sh --fullscreen-sound # Record screen (with sound) # wallpaper -bind = Super+Shift, W, exec, fish ~/.scripts/change_wallpaper.fish # Change wallpaper +bind = Super+Shift, W, exec, fish ~/.scripts/change-wallpaper.fish # Change wallpaper ##! Session # bind = Ctrl+Super, L, exec, ags run-js 'lock.lock()' # [hidden] @@ -104,16 +104,16 @@ bind = Super, D, fullscreen, 1 ##! Workspace navigation # Switching #/# bind = Super, Hash,, # Focus workspace # (1, 2, 3, 4, ...) -bind = Super, 1, exec, ~/.scripts/hyprland_workspace_action.sh workspace 1 # [hidden] -bind = Super, 2, exec, ~/.scripts/hyprland_workspace_action.sh workspace 2 # [hidden] -bind = Super, 3, exec, ~/.scripts/hyprland_workspace_action.sh workspace 3 # [hidden] -bind = Super, 4, exec, ~/.scripts/hyprland_workspace_action.sh workspace 4 # [hidden] -bind = Super, 5, exec, ~/.scripts/hyprland_workspace_action.sh workspace 5 # [hidden] -bind = Super, 6, exec, ~/.scripts/hyprland_workspace_action.sh workspace 6 # [hidden] -bind = Super, 7, exec, ~/.scripts/hyprland_workspace_action.sh workspace 7 # [hidden] -bind = Super, 8, exec, ~/.scripts/hyprland_workspace_action.sh workspace 8 # [hidden] -bind = Super, 9, exec, ~/.scripts/hyprland_workspace_action.sh workspace 9 # [hidden] -bind = Super, 0, exec, ~/.scripts/hyprland_workspace_action.sh workspace 10 # [hidden] +bind = Super, 1, exec, ~/.scripts/workspace-action.sh workspace 1 # [hidden] +bind = Super, 2, exec, ~/.scripts/workspace-action.sh workspace 2 # [hidden] +bind = Super, 3, exec, ~/.scripts/workspace-action.sh workspace 3 # [hidden] +bind = Super, 4, exec, ~/.scripts/workspace-action.sh workspace 4 # [hidden] +bind = Super, 5, exec, ~/.scripts/workspace-action.sh workspace 5 # [hidden] +bind = Super, 6, exec, ~/.scripts/workspace-action.sh workspace 6 # [hidden] +bind = Super, 7, exec, ~/.scripts/workspace-action.sh workspace 7 # [hidden] +bind = Super, 8, exec, ~/.scripts/workspace-action.sh workspace 8 # [hidden] +bind = Super, 9, exec, ~/.scripts/workspace-action.sh workspace 9 # [hidden] +bind = Super, 0, exec, ~/.scripts/workspace-action.sh workspace 10 # [hidden] #/# bind = Ctrl+Super, ←/→,, # Workspace: focus left/right bind = Ctrl+Super, Right, workspace, +1 # [hidden] bind = Ctrl+Super, Left, workspace, -1 # [hidden] @@ -134,16 +134,16 @@ bind = Super, mouse:275, togglespecialworkspace, s # [hidden] ##! Workspace management # Move window to workspace Super + Alt + [0-9] #/# bind = Super+Alt, Hash,, # Window: move to workspace # (1, 2, 3, 4, ...) -bind = Super+Alt, 1, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 1 # [hidden] -bind = Super+Alt, 2, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 2 # [hidden] -bind = Super+Alt, 3, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 3 # [hidden] -bind = Super+Alt, 4, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 4 # [hidden] -bind = Super+Alt, 5, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 5 # [hidden] -bind = Super+Alt, 6, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 6 # [hidden] -bind = Super+Alt, 7, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 7 # [hidden] -bind = Super+Alt, 8, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 8 # [hidden] -bind = Super+Alt, 9, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 9 # [hidden] -bind = Super+Alt, 0, exec, ~/.scripts/hyprland_workspace_action.sh movetoworkspacesilent 10 # [hidden] +bind = Super+Alt, 1, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 1 # [hidden] +bind = Super+Alt, 2, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 2 # [hidden] +bind = Super+Alt, 3, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 3 # [hidden] +bind = Super+Alt, 4, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 4 # [hidden] +bind = Super+Alt, 5, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 5 # [hidden] +bind = Super+Alt, 6, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 6 # [hidden] +bind = Super+Alt, 7, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 7 # [hidden] +bind = Super+Alt, 8, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 8 # [hidden] +bind = Super+Alt, 9, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 9 # [hidden] +bind = Super+Alt, 0, exec, ~/.scripts/workspace-action.sh movetoworkspacesilent 10 # [hidden] bind = Ctrl+Super+Shift, Right, movetoworkspace, +1 # [hidden] bind = Ctrl+Super+Shift, Left, movetoworkspace, -1 # [hidden] bind = Ctrl+Super, Up, workspace, -5 # [hidden] diff --git a/mpv/bookmarker.json b/mpv/bookmarker.json index 9b684a8..e69de29 100644 --- a/mpv/bookmarker.json +++ b/mpv/bookmarker.json @@ -1 +0,0 @@ -[{"version":2,"name":"27-第二十七:寻仙台开启!-1080P 高清-AVC.mp4 @ 00:00:08.233","pos":8.233000,"path":"/home/wrq/down/沙雕动漫/第一百二十二集:疯狂钢管舞!/27-第二十七:寻仙台开启!-1080P 高清-AVC.mp4"}] \ No newline at end of file diff --git a/waybar/config.jsonc b/waybar/config.jsonc index b248a47..d286e47 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -65,6 +65,8 @@ // "on-click": "fuzzel", // "on-click-middle": "pkill -9 fuzzel", "on-click": "eww open main --toggle", + "on-click-right": "pkill fuzzel || fuzzel", + "on-click-middle": "hyprctl dispatch killactive", "min-length": 2, "max-length": 2 }, @@ -150,18 +152,18 @@ "memory": { "interval": 30, // "format": " {used:0.2f} / {total:0.0f} GB", - "format": " {percentage}%", - "on-click": "ghostty -e btop", + "format": "󰍛 {percentage}%", + "on-click": "killall btop || ghostty -e btop", "min-length": 7, "max-length": 7 }, "cpu": { "interval": 1, //"format": " {}%", // Icon: microchip - "format": " {usage}%", + "format": "󰘚 {usage}%", "max-length": 7, "min-length": 7, - "on-click": "ghostty -e btop" + "on-click": "killall btop || ghostty -e btop" }, "battery": { "interval": 2, @@ -183,7 +185,7 @@ "format-alt": "{percent}% {icon}", "format-alt-click": "click-right", //"format-icons": ["", ""], - "format-icons": ["", ""], + "format-icons": [""], "on-scroll-down": "brightnessctl -d intel_backlight set 5%-", "on-scroll-up": "brightnessctl -d intel_backlight set +5%", "max-length": 7, diff --git a/waybar/style.css b/waybar/style.css index 0d79701..08fa0f0 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,8 +1,7 @@ @import 'mocha.css'; * { - font-family: 'Fira Sans Semibold', 'Font Awesome 6 Free', FontAwesome, 'MesloLGM Nerd Font', 'Maple Mono CN ExtraLight', - Arial, sans-serif; + font-family: 'Font Awesome 6 Free', 'MesloLGM Nerd Font', 'Maple Mono CN ExtraLight', 'Noto Sans', Arial, sans-serif; font-size: 12px; /* Slightly smaller font size */ font-weight: 900; margin: 0;