diff options
| -rw-r--r-- | appearance.lua | 6 | ||||
| -rw-r--r-- | current_wallpaper | 2 | ||||
| -rw-r--r-- | scripts/open_launcher.sh | 0 | ||||
| -rwxr-xr-x | scripts/switch_wallpaper.sh | 8 | ||||
| -rw-r--r-- | startup.lua | 3 | ||||
| -rw-r--r-- | variables.lua | 4 |
6 files changed, 15 insertions, 8 deletions
diff --git a/appearance.lua b/appearance.lua index 45a5240..a5d46cf 100644 --- a/appearance.lua +++ b/appearance.lua @@ -5,16 +5,16 @@ hl.config({ general = { -- 边距 gaps_in = 4, - gaps_out = { top = 0, right = 8, bottom = 8, left = 8 }, + gaps_out = { top = 8, right = 8, bottom = 8, left = 8 }, -- gaps_out = { top = 0, right = 0, bottom = 0, left = 0 }, -- 边框 - border_size = 2, + border_size = 1, -- 边框颜色 col = { active_border = { colors = { "rgba(EFEFEF32)" }, angle = 45 }, - inactive_border = "rgba(2A4A7400)", + inactive_border = "rgba(FFFFFF00)", }, -- 拖动窗口边缘缩放 diff --git a/current_wallpaper b/current_wallpaper index 5dd24c6..e62d213 100644 --- a/current_wallpaper +++ b/current_wallpaper @@ -1 +1 @@ -/home/catilgrass/图片/Wallpapers/7.png +/home/catilgrass/图片/Wallpapers/8.jpeg diff --git a/scripts/open_launcher.sh b/scripts/open_launcher.sh new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/scripts/open_launcher.sh diff --git a/scripts/switch_wallpaper.sh b/scripts/switch_wallpaper.sh index 90842d0..a499d45 100755 --- a/scripts/switch_wallpaper.sh +++ b/scripts/switch_wallpaper.sh @@ -1,11 +1,17 @@ #!/bin/bash -# 壁纸切换：wofi 选择 -> 写入 current_wallpaper -> 重载 swaybg +# 壁纸切换：noctalia 优先，否则回退到 wofi 选择 -> 写入 current_wallpaper -> 重载 swaybg WALLPAPER_DIR="/home/catilgrass/图片/Wallpapers" CURRENT_FILE="/home/catilgrass/.config/hypr/current_wallpaper" THUMB_DIR="/tmp/wallpaper_thumbs" +# 如果 noctalia 正在运行，直接调用其消息接口 +if pgrep -x noctalia > /dev/null 2>&1; then + noctalia msg panel-open wallpaper + exit $? +fi + # 检查壁纸目录 if [ ! -d "$WALLPAPER_DIR" ]; then echo "错误: 壁纸目录不存在: $WALLPAPER_DIR" diff --git a/startup.lua b/startup.lua index 9462fc5..1d54f71 100644 --- a/startup.lua +++ b/startup.lua @@ -6,7 +6,8 @@ hl.on("hyprland.start", function() -- 顶部菜单 / shell -- hl.exec_cmd("polybar -q -c ~/.config/polybar/config.ini -r") -- hl.exec_cmd("waybar") - hl.exec_cmd("ashell --config-path /home/catilgrass/.config/ashell/config.toml") + -- hl.exec_cmd("ashell --config-path /home/catilgrass/.config/ashell/config.toml") + hl.exec_cmd("noctalia") -- Seatd hl.exec_cmd("seatd -g video") diff --git a/variables.lua b/variables.lua index 6d326ab..5c6917a 100644 --- a/variables.lua +++ b/variables.lua @@ -7,10 +7,10 @@ local screenshotFn = "/home/catilgrass/Image/Screenshot/screen_$(date +%Y%m%d_%H return { terminal = "kitty", -- 终端 fileManager = "nautilus", -- 文件管理器 - menu = "wofi --allow-images --hide-scroll --dmenu --show drun --width 400", -- 应用程序菜单 + menu = 'pgrep noctalia > /dev/null && noctalia msg panel-open launcher || wofi --allow-images --hide-scroll --dmenu --show drun --width 400', -- 应用程序菜单 -- menu = "rofi -show drun -show-icons", systemMonitor = "kitty htop", -- 系统监视器 clipboardManager = 'cliphist list | wofi --dmenu --width 350 --pre-display-cmd "echo \'%s\' | cut -f 2" | cliphist decode | wl-copy', -- 截图工具 - screenshot = 'grim -t png -c -g "$(slurp)" ' .. screenshotFn .. ' && notify-send "截图保存至' .. screenshotFn .. '" | wl-copy < ' .. screenshotFn, + screenshot = 'pgrep noctalia > /dev/null && noctalia msg screenshot-region || (grim -t png -c -g "$(slurp)" ' .. screenshotFn .. ' && notify-send "截图保存至' .. screenshotFn .. '" | wl-copy < ' .. screenshotFn .. ')', } |