diff --git a/DankMaterialShell/firefox.css b/DankMaterialShell/firefox.css index bee65a1..5d83551 100644 --- a/DankMaterialShell/firefox.css +++ b/DankMaterialShell/firefox.css @@ -1,54 +1,54 @@ @media -moz-pref("userChrome.theme-material") { :root { - --md-sys-color-primary: #0d6680; - --md-sys-color-surface-tint: #0d6680; + --md-sys-color-primary: #216487; + --md-sys-color-surface-tint: #216487; --md-sys-color-on-primary: #ffffff; - --md-sys-color-primary-container: #baeaff; - --md-sys-color-on-primary-container: #001f29; - --md-sys-color-secondary: #4c616b; + --md-sys-color-primary-container: #c6e7ff; + --md-sys-color-on-primary-container: #001e2d; + --md-sys-color-secondary: #4f616e; --md-sys-color-on-secondary: #ffffff; - --md-sys-color-secondary-container: #cfe6f1; - --md-sys-color-on-secondary-container: #071e26; - --md-sys-color-tertiary: #5c5b7e; + --md-sys-color-secondary-container: #d2e5f4; + --md-sys-color-on-secondary-container: #0b1d28; + --md-sys-color-tertiary: #62597c; --md-sys-color-on-tertiary: #ffffff; - --md-sys-color-tertiary-container: #e2dfff; - --md-sys-color-on-tertiary-container: #181837; + --md-sys-color-tertiary-container: #e8ddff; + --md-sys-color-on-tertiary-container: #1e1635; --md-sys-color-error: #ba1a1a; --md-sys-color-on-error: #ffffff; --md-sys-color-error-container: #ffdad6; --md-sys-color-on-error-container: #410002; - --md-sys-color-background: #f5fafd; - --md-sys-color-on-background: #171c1f; - --md-sys-color-surface: #f5fafd; - --md-sys-color-on-surface: #171c1f; - --md-sys-color-surface-variant: #dce4e8; - --md-sys-color-on-surface-variant: #40484c; - --md-sys-color-outline: #70787d; - --md-sys-color-outline-variant: #c0c8cc; + --md-sys-color-background: #f6fafe; + --md-sys-color-on-background: #181c1f; + --md-sys-color-surface: #f6fafe; + --md-sys-color-on-surface: #181c1f; + --md-sys-color-surface-variant: #dde3ea; + --md-sys-color-on-surface-variant: #41484d; + --md-sys-color-outline: #71787e; + --md-sys-color-outline-variant: #c1c7ce; --md-sys-color-shadow: #000000; --md-sys-color-scrim: #000000; - --md-sys-color-inverse-surface: #2c3134; - --md-sys-color-inverse-on-surface: #edf1f5; - --md-sys-color-inverse-primary: #89d0ee; - --md-sys-color-primary-fixed: #baeaff; - --md-sys-color-on-primary-fixed: #001f29; - --md-sys-color-primary-fixed-dim: #89d0ee; - --md-sys-color-on-primary-fixed-variant: #004d62; - --md-sys-color-secondary-fixed: #cfe6f1; - --md-sys-color-on-secondary-fixed: #071e26; - --md-sys-color-secondary-fixed-dim: #b4cad5; - --md-sys-color-on-secondary-fixed-variant: #354a53; - --md-sys-color-tertiary-fixed: #e2dfff; - --md-sys-color-on-tertiary-fixed: #181837; - --md-sys-color-tertiary-fixed-dim: #c4c3ea; - --md-sys-color-on-tertiary-fixed-variant: #444465; - --md-sys-color-surface-dim: #d6dbde; - --md-sys-color-surface-bright: #f5fafd; + --md-sys-color-inverse-surface: #2d3135; + --md-sys-color-inverse-on-surface: #eef1f6; + --md-sys-color-inverse-primary: #92cef5; + --md-sys-color-primary-fixed: #c6e7ff; + --md-sys-color-on-primary-fixed: #001e2d; + --md-sys-color-primary-fixed-dim: #92cef5; + --md-sys-color-on-primary-fixed-variant: #004c6b; + --md-sys-color-secondary-fixed: #d2e5f4; + --md-sys-color-on-secondary-fixed: #0b1d28; + --md-sys-color-secondary-fixed-dim: #b6c9d8; + --md-sys-color-on-secondary-fixed-variant: #374955; + --md-sys-color-tertiary-fixed: #e8ddff; + --md-sys-color-on-tertiary-fixed: #1e1635; + --md-sys-color-tertiary-fixed-dim: #ccc1e9; + --md-sys-color-on-tertiary-fixed-variant: #4a4263; + --md-sys-color-surface-dim: #d7dadf; + --md-sys-color-surface-bright: #f6fafe; --md-sys-color-surface-container-lowest: #ffffff; - --md-sys-color-surface-container-low: #f0f4f7; - --md-sys-color-surface-container: #f5fafd; - --md-sys-color-surface-container-high: #f5fafd; - --md-sys-color-surface-container-highest: #f5fafd; + --md-sys-color-surface-container-low: #f0f4f8; + --md-sys-color-surface-container: #f6fafe; + --md-sys-color-surface-container-high: #f6fafe; + --md-sys-color-surface-container-highest: #f6fafe; --m3-radius: 12px; --m3-radius-sm: 10px; @@ -71,55 +71,55 @@ @media (prefers-color-scheme: dark) { :root { - --md-sys-color-primary: #89d0ee; - --md-sys-color-surface-tint: #89d0ee; - --md-sys-color-on-primary: #003545; - --md-sys-color-primary-container: #004d62; - --md-sys-color-on-primary-container: #baeaff; - --md-sys-color-secondary: #b4cad5; - --md-sys-color-on-secondary: #1e333c; - --md-sys-color-secondary-container: #354a53; - --md-sys-color-on-secondary-container: #cfe6f1; - --md-sys-color-tertiary: #c4c3ea; - --md-sys-color-on-tertiary: #2d2d4d; - --md-sys-color-tertiary-container: #444465; - --md-sys-color-on-tertiary-container: #e2dfff; + --md-sys-color-primary: #92cef5; + --md-sys-color-surface-tint: #92cef5; + --md-sys-color-on-primary: #00344b; + --md-sys-color-primary-container: #004c6b; + --md-sys-color-on-primary-container: #c6e7ff; + --md-sys-color-secondary: #b6c9d8; + --md-sys-color-on-secondary: #21323e; + --md-sys-color-secondary-container: #374955; + --md-sys-color-on-secondary-container: #d2e5f4; + --md-sys-color-tertiary: #ccc1e9; + --md-sys-color-on-tertiary: #332b4b; + --md-sys-color-tertiary-container: #4a4263; + --md-sys-color-on-tertiary-container: #e8ddff; --md-sys-color-error: #ffb4ab; --md-sys-color-on-error: #690005; --md-sys-color-error-container: #93000a; --md-sys-color-on-error-container: #ffdad6; - --md-sys-color-background: #0f1417; - --md-sys-color-on-background: #dee3e6; - --md-sys-color-surface: #0f1417; - --md-sys-color-on-surface: #dee3e6; - --md-sys-color-surface-variant: #40484c; - --md-sys-color-on-surface-variant: #c0c8cc; - --md-sys-color-outline: #8a9296; - --md-sys-color-outline-variant: #40484c; + --md-sys-color-background: #101417; + --md-sys-color-on-background: #dfe3e7; + --md-sys-color-surface: #101417; + --md-sys-color-on-surface: #dfe3e7; + --md-sys-color-surface-variant: #41484d; + --md-sys-color-on-surface-variant: #c1c7ce; + --md-sys-color-outline: #8b9198; + --md-sys-color-outline-variant: #41484d; --md-sys-color-shadow: #000000; --md-sys-color-scrim: #000000; - --md-sys-color-inverse-surface: #dee3e6; - --md-sys-color-inverse-on-surface: #2c3134; - --md-sys-color-inverse-primary: #0d6680; - --md-sys-color-primary-fixed: #baeaff; - --md-sys-color-on-primary-fixed: #001f29; - --md-sys-color-primary-fixed-dim: #89d0ee; - --md-sys-color-on-primary-fixed-variant: #004d62; - --md-sys-color-secondary-fixed: #cfe6f1; - --md-sys-color-on-secondary-fixed: #071e26; - --md-sys-color-secondary-fixed-dim: #b4cad5; - --md-sys-color-on-secondary-fixed-variant: #354a53; - --md-sys-color-tertiary-fixed: #e2dfff; - --md-sys-color-on-tertiary-fixed: #181837; - --md-sys-color-tertiary-fixed-dim: #c4c3ea; - --md-sys-color-on-tertiary-fixed-variant: #444465; - --md-sys-color-surface-dim: #0f1417; + --md-sys-color-inverse-surface: #dfe3e7; + --md-sys-color-inverse-on-surface: #2d3135; + --md-sys-color-inverse-primary: #216487; + --md-sys-color-primary-fixed: #c6e7ff; + --md-sys-color-on-primary-fixed: #001e2d; + --md-sys-color-primary-fixed-dim: #92cef5; + --md-sys-color-on-primary-fixed-variant: #004c6b; + --md-sys-color-secondary-fixed: #d2e5f4; + --md-sys-color-on-secondary-fixed: #0b1d28; + --md-sys-color-secondary-fixed-dim: #b6c9d8; + --md-sys-color-on-secondary-fixed-variant: #374955; + --md-sys-color-tertiary-fixed: #e8ddff; + --md-sys-color-on-tertiary-fixed: #1e1635; + --md-sys-color-tertiary-fixed-dim: #ccc1e9; + --md-sys-color-on-tertiary-fixed-variant: #4a4263; + --md-sys-color-surface-dim: #101417; --md-sys-color-surface-bright: #353a3d; - --md-sys-color-surface-container-lowest: #0a0f11; - --md-sys-color-surface-container-low: #171c1f; - --md-sys-color-surface-container: #1b2023; - --md-sys-color-surface-container-high: #252b2d; - --md-sys-color-surface-container-highest: #303638; + --md-sys-color-surface-container-lowest: #0a0f12; + --md-sys-color-surface-container-low: #181c1f; + --md-sys-color-surface-container: #1c2024; + --md-sys-color-surface-container-high: #262a2e; + --md-sys-color-surface-container-highest: #313539; --m3-elev-1: 0 1px 2px color-mix(in srgb, var(--md-sys-color-shadow) 50%, transparent), 0 1px 3px color-mix(in srgb, var(--md-sys-color-shadow) 35%, transparent); --m3-elev-2: 0 4px 10px color-mix(in srgb, var(--md-sys-color-shadow) 55%, transparent), 0 1px 3px color-mix(in srgb, var(--md-sys-color-shadow) 35%, transparent); diff --git a/DankMaterialShell/settings.json b/DankMaterialShell/settings.json index 2e28e5f..b93f349 100644 --- a/DankMaterialShell/settings.json +++ b/DankMaterialShell/settings.json @@ -12,7 +12,7 @@ "widgetBackgroundColor": "sch", "widgetBackgroundCustomColor": "#6750A4", "widgetBackgroundCustomStrength": 0.5, - "widgetColorMode": "default", + "widgetColorMode": "colorful", "controlCenterTileColorMode": "primary", "buttonColorMode": "primary", "cornerRadius": 12, @@ -265,7 +265,7 @@ "type": "regex" } ], - "centeringMode": "geometric", + "centeringMode": "index", "clockDateFormat": "", "lockDateFormat": "", "greeterRememberLastSession": true, @@ -342,10 +342,10 @@ } ], "networkPreference": "wifi", - "iconThemeDark": "Adwaita", + "iconThemeDark": "System Default", "iconThemeLight": "System Default", "iconThemePerMode": false, - "lastAppliedIconTheme": "Adwaita", + "lastAppliedIconTheme": "", "cursorSettings": { "theme": "breeze_cursors", "size": 24, @@ -418,21 +418,12 @@ "batteryCriticalNotificationType": 1, "batteryAutoPowerSaver": false, "lockBeforeSuspend": true, - "loginctlLockIntegration": true, + "loginctlLockIntegration": false, "fadeToLockEnabled": true, "fadeToLockGracePeriod": 5, "fadeToDpmsEnabled": true, "fadeToDpmsGracePeriod": 5, "launchPrefix": "", - "brightnessDevicePins": {}, - "wifiNetworkPins": {}, - "bluetoothDevicePins": { - "preferredDevice": [ - "08:F0:B6:12:DE:C2" - ] - }, - "audioInputDevicePins": {}, - "audioOutputDevicePins": {}, "gtkThemingEnabled": false, "qtThemingEnabled": false, "syncModeWithPortal": true, @@ -482,7 +473,7 @@ "dockUseOverlayLayer": false, "dockGroupByApp": false, "dockRestoreSpecialWorkspaceOnClick": false, - "dockOpenOnOverview": false, + "dockOpenOnOverview": true, "dockPosition": 1, "dockSpacing": 4, "dockBottomGap": 0, @@ -537,7 +528,7 @@ "lockScreenVideoCycling": false, "lockScreenWallpaperPath": "", "lockScreenWallpaperFillMode": "", - "lockScreenFontFamily": "", + "lockScreenFontFamily": "Maple Mono NF CN", "hideBrightnessSlider": false, "notificationTimeoutLow": 5000, "notificationTimeoutNormal": 5000, @@ -637,14 +628,16 @@ { "id": "network_speed_monitor", "enabled": true - }, - { - "id": "focusedWindow", - "enabled": true, - "focusedWindowCompactMode": true } ], "centerWidgets": [ + { + "id": "focusedWindow", + "enabled": true, + "focusedWindowSize": 3, + "focusedWindowCompactMode": true, + "focusedWindowShowIcon": true + }, { "id": "music", "enabled": true, @@ -835,5 +828,5 @@ "barInsetPaddingShared": -1, "barInsetPaddingSyncAll": false, "frameBarInsetPadding": -1, - "configVersion": 12 + "configVersion": 13 } \ No newline at end of file diff --git a/kitty/dank-tabs.conf b/kitty/dank-tabs.conf deleted file mode 100644 index 32e750d..0000000 --- a/kitty/dank-tabs.conf +++ /dev/null @@ -1,23 +0,0 @@ -tab_bar_edge top -tab_bar_style powerline -tab_powerline_style slanted -tab_bar_align left -tab_bar_min_tabs 2 -tab_bar_margin_width 0.0 -tab_bar_margin_height 2.5 1.5 -tab_bar_margin_color #0f1417 - -tab_bar_background #0f1417 - -active_tab_foreground #003545 -active_tab_background #89d0ee -active_tab_font_style bold - -inactive_tab_foreground #c0c8cc -inactive_tab_background #0f1417 -inactive_tab_font_style normal - -tab_activity_symbol " ● " - -tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title[:30]}{title[30:] and '…'} [{index}]" -active_tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title[:30]}{title[30:] and '…'} [{index}]" diff --git a/kitty/dank-theme.conf b/kitty/dank-theme.conf deleted file mode 100644 index a54be25..0000000 --- a/kitty/dank-theme.conf +++ /dev/null @@ -1,25 +0,0 @@ -cursor #dee3e6 -cursor_text_color #c0c8cc - -foreground #dee3e6 -background #0f1417 -selection_foreground #1e333c -selection_background #b4cad5 -url_color #89d0ee - -color0 #0f1417 -color1 #ff72a0 -color2 #77ee84 -color3 #fff672 -color4 #6ebfe2 -color5 #18546e -color6 #89d0ee -color7 #eaf5f9 -color8 #8f979a -color9 #ff9fbe -color10 #a5ffaf -color11 #fff9a5 -color12 #a3e3ff -color13 #b3e8ff -color14 #cef0ff -color15 #f8fdff diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 304be62..d1223aa 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -3,8 +3,8 @@ font_size 12.0 # Window Configuration window_padding_width 0 -background_opacity 0.85 -background_blur 32 +background_opacity 0.66 +# background_blur 32 hide_window_decorations yes # Cursor Configuration @@ -26,20 +26,26 @@ map ctrl+plus change_font_size all +1.0 map ctrl+minus change_font_size all -1.0 map ctrl+0 change_font_size all 0 -# Tab configuration -tab_bar_style powerline -tab_bar_align left +# Tab bar layout (shape only; colors come from themes/noctalia.conf) +tab_bar_edge top +tab_bar_style powerline +tab_powerline_style slanted +tab_bar_align left +tab_bar_min_tabs 2 +tab_bar_margin_width 0.0 +tab_bar_margin_height 2.5 1.5 +tab_activity_symbol " ● " +tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title[:30]}{title[30:] and '…'} [{index}]" +active_tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title[:30]}{title[30:] and '…'} [{index}]" # Shell integration shell_integration enabled -# Dank color generation -include dank-tabs.conf -include dank-theme.conf - # BEGIN_KITTY_FONTS font_family family="Maple Mono NF CN" bold_font auto italic_font auto bold_italic_font auto -# END_KITTY_FONTS \ No newline at end of file +# END_KITTY_FONTS + +# Theme (single source of truth) diff --git a/local_bin/qq-smart-launch b/local_bin/qq-smart-launch new file mode 100755 index 0000000..a76e9d1 --- /dev/null +++ b/local_bin/qq-smart-launch @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +# QQ 智能启动：已运行则激活主窗口，否则正常启动 + +QQ_BIN="/usr/bin/linuxqq" +APP_IDS=("qq" "QQ" "linuxqq") + +# 1) QQ 进程没在跑 → 直接启动 +if ! pgrep -f "/opt/QQ/qq" >/dev/null 2>&1; then + exec "$QQ_BIN" "$@" +fi + +# 2) 进程在跑：先检查 niri 里有没有已 map 的 QQ 窗口，有就直接 focus +WIN_ID="" +if command -v niri >/dev/null 2>&1; then + # 解析 niri 输出：找 App ID 匹配的第一行所属 Window ID + current_id="" + while IFS= read -r line; do + if [[ "$line" =~ ^Window\ ID\ ([0-9]+): ]]; then + current_id="${BASH_REMATCH[1]}" + elif [[ "$line" =~ ^\ +App\ ID:\ \"([^\"]+)\"$ ]]; then + app="${BASH_REMATCH[1]}" + for match in "${APP_IDS[@]}"; do + if [[ "$app" == "$match" ]]; then + WIN_ID="$current_id" + break 2 + fi + done + fi + done < <(niri msg windows 2>/dev/null) +fi + +if [[ -n "$WIN_ID" ]]; then + niri msg action focus-window -- "$WIN_ID" >/dev/null 2>&1 + exit 0 +fi + +# 3) 进程在跑但窗口没在 niri → 隐藏在托盘的情况 +# Electron 的 requestSingleInstanceLock：第二次执行会让第一实例显示主窗口然后自己退出 +exec "$QQ_BIN" "$@" diff --git a/local_share_applications/qq.desktop b/local_share_applications/qq.desktop new file mode 100644 index 0000000..3620063 --- /dev/null +++ b/local_share_applications/qq.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=QQ +Exec=/home/atdunbg/.local/bin/qq-smart-launch %U +Terminal=false +Type=Application +Icon=qq +StartupWMClass=QQ +Categories=Network; +Comment=QQ diff --git a/niri/config.kdl b/niri/config.kdl index 4117f5f..93e1717 100644 --- a/niri/config.kdl +++ b/niri/config.kdl @@ -5,6 +5,14 @@ config-notification { disable-failed } + +// xwayland-satellite { +// use-drm-mode: true +// } + +// Spawn Noctalia shell at niri session startup +spawn-at-startup "noctalia" + // Outputs from existing configuration output "eDP-1" { @@ -58,16 +66,8 @@ gestures { input { keyboard { xkb { - // You can set rules, model, layout, variant and options. - // For more information, see xkeyboard-config(7). - - // For example: - // layout "us,ru" - // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" - - // If this section is empty, niri will fetch xkb settings - // from org.freedesktop.locale1. You can control these using - // localectl set-x11-keymap. + // CapsLock 等同 Ctrl（macOS 风格） + options "ctrl:nocaps" } // Enable numlock on startup, omitting this setting disables it. @@ -92,11 +92,7 @@ input { } mouse { - // off - // natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // scroll-method "no-scroll" + accel-profile "flat" } trackpoint { @@ -130,6 +126,7 @@ input { layout { // Set gaps around windows in logical pixels. background-color "transparent" + gaps 4 // When to center a column when changing focus, options are: // - "never", default behavior, focusing an off-screen column will keep at the left // or right edge of the screen. @@ -166,27 +163,56 @@ layout { // `draw-border-with-background`. border { off - width 4 - active-color "#707070" // Neutral gray - inactive-color "#d0d0d0" // Light gray - urgent-color "#cc4444" // Softer red + } + focus-ring { + width 1 + active-color "#89d0ee99" + inactive-color "#00000000" + urgent-color "#ffb4ab99" } shadow { - softness 30 - spread 5 + softness 40 + spread 8 offset x=0 y=5 - color "#0007" + color "#00000060" + } + tab-indicator { + active-color "#89d0ee" + inactive-color "#8a9296" + urgent-color "#ffb4ab" + } + insert-hint { + color "#89d0ee80" } struts { } } +// Noctalia: blurred overview wallpaper (Option 1) — backdrop layer placed within niri overview backdrop layer-rule { - match namespace="^quickshell$" + match namespace="^noctalia-backdrop" place-within-backdrop true } + +// Noctalia: disable xray on bar/panel/dock/notification/OSD surfaces for realistic blur +// (noctalia auto-publishes blur regions when ext-background-effects is available) +layer-rule { + match namespace="^noctalia-(bar-[^\"]+|notification|dock|panel|attached-panel|osd)$" + background-effect { + xray false + } +} + +// Noctalia: blur the window switcher overlay +layer-rule { + match namespace="noctalia-window-switcher" + background-effect { + blur true + xray false + } +} overview { workspace-shadow { - off + on } } // Add lines like this to spawn processes at startup. @@ -196,54 +222,70 @@ overview { // This line starts waybar, a commonly used bar for Wayland compositors. environment { XDG_CURRENT_DESKTOP "niri" - // 输入法环境变量（解决 Linux QQ 等应用无法输入中文） + XDG_MENU_PREFIX "niri-" GTK_IM_MODULE "fcitx5" QT_IM_MODULE "fcitx5" XMODIFIERS "@im=fcitx5" SDL_IM_MODULE "fcitx5" GLFW_IM_MODULE "ibus" + + QT_QPA_PLATFORM "wayland" + QT_QPA_PLATFORMTHEME "qt6ct" + QT_QPA_PLATFORMTHEME_QT6 "qt6ct" + + // Scaling fixes + QT_AUTO_SCREEN_SCALE_FACTOR "1" + XCURSOR_SIZE "36" + GDK_BACKEND "wayland" } hotkey-overlay { skip-at-startup } prefer-no-csd screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" -animations { - // macOS 风格动画配置：流畅、自然、无震荡 - // 工作区切换：轻微弹性，更自然 +// Cursor settings (migrated from dms/cursor.kdl) +cursor { + xcursor-theme "breeze_cursors" + xcursor-size 24 + hide-when-typing + hide-after-inactive-ms 5000 +} + +animations { + // 工作区切换 workspace-switch { spring damping-ratio=0.95 stiffness=850 epsilon=0.0001 } - // 窗口打开：柔和适中 + // 窗口打开 window-open { duration-ms 200 curve "ease-out-cubic" } - // 窗口关闭：柔和适中 + // 窗口关闭 window-close { duration-ms 180 curve "ease-out-cubic" } - // 水平视图移动：平滑的弹簧效果 + // 水平视图移动 horizontal-view-movement { spring damping-ratio=1.0 stiffness=600 epsilon=0.0001 } - // 窗口移动：平滑自然 + // 窗口移动 window-movement { spring damping-ratio=1.0 stiffness=600 epsilon=0.0001 } - // 窗口调整大小：跟随手势，物理感 + // 窗口调整大小 window-resize { spring damping-ratio=1.0 stiffness=600 epsilon=0.0001 } - // 配置通知：快速弹出 + // 配置通知 config-notification-open-close { spring damping-ratio=1.0 stiffness=1000 epsilon=0.001 } @@ -254,7 +296,7 @@ animations { curve "ease-out-cubic" } - // 概览界面：快速响应 + // 概览界面 overview-open-close { spring damping-ratio=1.0 stiffness=700 epsilon=0.0001 } @@ -274,8 +316,6 @@ window-rule { window-rule { match app-id=r#"^org\.gnome\."# draw-border-with-background false - geometry-corner-radius 12 - clip-to-geometry true } window-rule { match app-id=r#"^gnome-control-center$"# @@ -311,32 +351,264 @@ window-rule { match app-id="zoom" open-floating true } -// Open dms windows as floating by default +// Noctalia: floating settings window at fixed size window-rule { - match app-id=r#"org.quickshell$"# - match app-id=r#"com.danklinux.dms$"# + match app-id="dev.noctalia.Noctalia" open-floating true + default-column-width { fixed 1080; } + default-window-height { fixed 920; } +} + +// Global: rounded corners, no background border, blur behind all windows +window-rule { + geometry-corner-radius 8 + clip-to-geometry true + draw-border-with-background false + background-effect { + blur true + xray false + } } debug { honor-xdg-activation-with-invalid-serial } // Override to disable super+tab +// Alt+Tab and Mod+Tab both trigger niri's native window switcher (with live preview thumbnails) recent-windows { + // Migrated from dms/alttab.kdl + dms/colors.kdl + highlight { + corner-radius 12 + active-color "#004d62" + urgent-color "#ffb4ab" + } binds { Alt+Tab { next-window scope="output"; } Alt+Shift+Tab { previous-window scope="output"; } + Mod+Tab { next-window scope="output"; } + Mod+Shift+Tab { previous-window scope="output"; } Alt+grave { next-window filter="app-id"; } Alt+Shift+grave { previous-window filter="app-id"; } } } -// Include dms files -include "dms/colors.kdl" -include "dms/layout.kdl" -include "dms/alttab.kdl" -include "dms/binds.kdl" -include "dms/outputs.kdl" -include "dms/cursor.kdl" +// Keybinds migrated from dms/binds.kdl — DMS ipc calls replaced with noctalia msg +binds { + // === System & Overview === + Mod+D repeat=false { toggle-overview; } + Mod+Shift+Slash { show-hotkey-overlay; } -include "dms/windowrules.kdl" + // === Application Launchers === + Mod+T hotkey-overlay-title="Open Terminal" { spawn "kitty"; } + Mod+E hotkey-overlay-title="Open File Manager" { spawn "dolphin"; } + Mod+Space hotkey-overlay-title="Application Launcher" { + spawn-sh "noctalia msg panel-toggle launcher"; + } + Mod+M hotkey-overlay-title="Task Manager" { + spawn "kitty" "-e" "btop"; + } + Mod+Comma hotkey-overlay-title="Settings" { + spawn-sh "noctalia msg settings-toggle"; + } + Mod+Y hotkey-overlay-title="Browse Wallpapers" { + spawn-sh "noctalia msg wallpaper-next"; + } + Mod+N hotkey-overlay-title="Notification Center" { + spawn-sh "noctalia msg panel-toggle control-center"; + } + Mod+Shift+N hotkey-overlay-title="Notepad" { + spawn-sh "noctalia msg settings-open-plugin noctalia/notes"; + } + + // === Security === + Mod+Alt+L hotkey-overlay-title="Lock Screen" { + spawn-sh "noctalia msg session lock"; + } + Mod+Shift+E { quit; } + Ctrl+Alt+Delete hotkey-overlay-title="Task Manager" { + spawn "kitty" "-e" "btop"; + } + + // === Audio Controls === + XF86AudioRaiseVolume allow-when-locked=true { + spawn-sh "noctalia msg volume-up 3"; + } + XF86AudioLowerVolume allow-when-locked=true { + spawn-sh "noctalia msg volume-down 3"; + } + XF86AudioMute allow-when-locked=true { + spawn-sh "noctalia msg volume-mute"; + } + XF86AudioMicMute allow-when-locked=true { + spawn-sh "noctalia msg mic-mute"; + } + XF86AudioPause allow-when-locked=true { + spawn-sh "noctalia msg media toggle"; + } + XF86AudioPlay allow-when-locked=true { + spawn-sh "noctalia msg media toggle"; + } + XF86AudioPrev allow-when-locked=true { + spawn-sh "noctalia msg media previous"; + } + XF86AudioNext allow-when-locked=true { + spawn-sh "noctalia msg media next"; + } + + // === Brightness Controls === + XF86MonBrightnessUp allow-when-locked=true { + spawn-sh "noctalia msg brightness-up current 5"; + } + XF86MonBrightnessDown allow-when-locked=true { + spawn-sh "noctalia msg brightness-down current 5"; + } + + // === Window Management === + Mod+Q repeat=false { close-window; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+Shift+T { toggle-window-floating; } + Mod+Shift+V { switch-focus-between-floating-and-tiling; } + Mod+W { toggle-column-tabbed-display; } + + // === Focus Navigation === + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + // === Window Movement === + Mod+Shift+Left { move-column-left; } + Mod+Shift+Down { move-window-down; } + Mod+Shift+Up { move-window-up; } + Mod+Shift+Right { move-column-right; } + Mod+Shift+H { move-column-left; } + Mod+Shift+J { move-window-down; } + Mod+Shift+K { move-window-up; } + Mod+Shift+L { move-column-right; } + + // === Column Navigation === + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + // === Monitor Navigation === + Mod+Ctrl+Left { focus-monitor-left; } + // Mod+Ctrl+Down { focus-monitor-down; } + // Mod+Ctrl+Up { focus-monitor-up; } + Mod+Ctrl+Right { focus-monitor-right; } + Mod+Ctrl+H { focus-monitor-left; } + Mod+Ctrl+J { focus-monitor-down; } + Mod+Ctrl+K { focus-monitor-up; } + Mod+Ctrl+L { focus-monitor-right; } + + // === Move to Monitor === + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + + // === Workspace Navigation === + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Down { move-column-to-workspace-down; } + Mod+Ctrl+Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + // === Move Workspaces === + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + // === Mouse Wheel Navigation === + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + + // === Numbered Workspaces === + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + + // === Move to Numbered Workspaces === + Mod+Shift+1 { move-column-to-workspace 1; } + Mod+Shift+2 { move-column-to-workspace 2; } + Mod+Shift+3 { move-column-to-workspace 3; } + Mod+Shift+4 { move-column-to-workspace 4; } + Mod+Shift+5 { move-column-to-workspace 5; } + Mod+Shift+6 { move-column-to-workspace 6; } + Mod+Shift+7 { move-column-to-workspace 7; } + Mod+Shift+8 { move-column-to-workspace 8; } + Mod+Shift+9 { move-column-to-workspace 9; } + + // === Column Management === + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + Mod+Period { expel-window-from-column; } + + // === Sizing & Layout === + Mod+R { switch-preset-column-width; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+Ctrl+F { expand-column-to-available-width; } + Mod+C { center-column; } + Mod+Ctrl+C { center-visible-columns; } + + // === Manual Sizing === + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + // === Screenshots === + XF86Launch1 { screenshot; } + Ctrl+XF86Launch1 { screenshot-screen; } + Alt+XF86Launch1 { screenshot-window; } + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + + // === Noctalia-specific additions === + Mod+S { spawn-sh "noctalia msg panel-toggle control-center"; } + Mod+Shift+B { spawn-sh "noctalia msg caffeine-toggle"; } + + // === System Controls === + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + Mod+Shift+P { power-off-monitors; } + + // === clipboard === + Mod+V { spawn-sh "noctalia msg panel-toggle clipboard"; } +} + + +include "noctalia.kdl" diff --git a/niri/dms/alttab.kdl b/niri/dms/alttab.kdl deleted file mode 100644 index 5f9bdcd..0000000 --- a/niri/dms/alttab.kdl +++ /dev/null @@ -1,10 +0,0 @@ -// ! DO NOT EDIT ! -// ! AUTO-GENERATED BY DMS ! -// ! CHANGES WILL BE OVERWRITTEN ! -// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! - -recent-windows { - highlight { - corner-radius 12 - } -} diff --git a/niri/dms/binds.kdl b/niri/dms/binds.kdl deleted file mode 100644 index 8f10c01..0000000 --- a/niri/dms/binds.kdl +++ /dev/null @@ -1,221 +0,0 @@ -binds { - // === System & Overview === - Mod+D repeat=false { toggle-overview; } - Mod+Tab repeat=false { toggle-overview; } - Mod+Shift+Slash { show-hotkey-overlay; } - - // === Application Launchers === - Mod+T hotkey-overlay-title="Open Terminal" { spawn "kitty"; } - Mod+Space hotkey-overlay-title="Application Launcher" { - spawn "dms" "ipc" "call" "spotlight" "toggle"; - } - Mod+V hotkey-overlay-title="Clipboard Manager" { - spawn "dms" "ipc" "call" "clipboard" "toggle"; - } - Mod+M hotkey-overlay-title="Task Manager" { - spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; - } - - Super+X hotkey-overlay-title="Power Menu: Toggle" { spawn "dms" "ipc" "call" "powermenu" "toggle"; } - Mod+Comma hotkey-overlay-title="Settings" { - spawn "dms" "ipc" "call" "settings" "focusOrToggle"; - } - Mod+Y hotkey-overlay-title="Browse Wallpapers" { - spawn "dms" "ipc" "call" "dankdash" "wallpaper"; - } - Mod+N hotkey-overlay-title="Notification Center" { spawn "dms" "ipc" "call" "notifications" "toggle"; } - Mod+Shift+N hotkey-overlay-title="Notepad" { spawn "dms" "ipc" "call" "notepad" "toggle"; } - - // === Security === - Mod+Alt+L hotkey-overlay-title="Lock Screen" { - spawn "dms" "ipc" "call" "lock" "lock"; - } - Mod+Shift+E { quit; } - Ctrl+Alt+Delete hotkey-overlay-title="Task Manager" { - spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; - } - - // === Audio Controls === - XF86AudioRaiseVolume allow-when-locked=true { - spawn "dms" "ipc" "call" "audio" "increment" "3"; - } - XF86AudioLowerVolume allow-when-locked=true { - spawn "dms" "ipc" "call" "audio" "decrement" "3"; - } - XF86AudioMute allow-when-locked=true { - spawn "dms" "ipc" "call" "audio" "mute"; - } - XF86AudioMicMute allow-when-locked=true { - spawn "dms" "ipc" "call" "audio" "micmute"; - } - XF86AudioPause allow-when-locked=true { - spawn "dms" "ipc" "call" "mpris" "playPause"; - } - XF86AudioPlay allow-when-locked=true { - spawn "dms" "ipc" "call" "mpris" "playPause"; - } - XF86AudioPrev allow-when-locked=true { - spawn "dms" "ipc" "call" "mpris" "previous"; - } - XF86AudioNext allow-when-locked=true { - spawn "dms" "ipc" "call" "mpris" "next"; - } - Ctrl+XF86AudioRaiseVolume allow-when-locked=true { - spawn "dms" "ipc" "call" "mpris" "increment" "3"; - } - Ctrl+XF86AudioLowerVolume allow-when-locked=true { - spawn "dms" "ipc" "call" "mpris" "decrement" "3"; - } - - // === Brightness Controls === - XF86MonBrightnessUp allow-when-locked=true { - spawn "dms" "ipc" "call" "brightness" "increment" "5" ""; - } - XF86MonBrightnessDown allow-when-locked=true { - spawn "dms" "ipc" "call" "brightness" "decrement" "5" ""; - } - - // === Window Management === - Mod+Q repeat=false { close-window; } - Mod+F { maximize-column; } - Mod+Shift+F { fullscreen-window; } - Mod+Shift+T { toggle-window-floating; } - Mod+Shift+V { switch-focus-between-floating-and-tiling; } - Mod+W { toggle-column-tabbed-display; } - Mod+Shift+W hotkey-overlay-title="Create window rule" { spawn "dms" "ipc" "call" "window-rules" "toggle"; } - - // === Focus Navigation === - Mod+Left { focus-column-left; } - Mod+Down { focus-window-down; } - Mod+Up { focus-window-up; } - Mod+Right { focus-column-right; } - Mod+H { focus-column-left; } - Mod+J { focus-window-down; } - Mod+K { focus-window-up; } - Mod+L { focus-column-right; } - - // === Window Movement === - Mod+Shift+Left { move-column-left; } - Mod+Shift+Down { move-window-down; } - Mod+Shift+Up { move-window-up; } - Mod+Shift+Right { move-column-right; } - Mod+Shift+H { move-column-left; } - Mod+Shift+J { move-window-down; } - Mod+Shift+K { move-window-up; } - Mod+Shift+L { move-column-right; } - - // === Column Navigation === - Mod+Home { focus-column-first; } - Mod+End { focus-column-last; } - Mod+Ctrl+Home { move-column-to-first; } - Mod+Ctrl+End { move-column-to-last; } - - // === Monitor Navigation === - Mod+Ctrl+Left { focus-monitor-left; } - //Mod+Ctrl+Down { focus-monitor-down; } - //Mod+Ctrl+Up { focus-monitor-up; } - Mod+Ctrl+Right { focus-monitor-right; } - Mod+Ctrl+H { focus-monitor-left; } - Mod+Ctrl+J { focus-monitor-down; } - Mod+Ctrl+K { focus-monitor-up; } - Mod+Ctrl+L { focus-monitor-right; } - - // === Move to Monitor === - Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } - Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } - Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } - Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } - Mod+Shift+Ctrl+H { move-column-to-monitor-left; } - Mod+Shift+Ctrl+J { move-column-to-monitor-down; } - Mod+Shift+Ctrl+K { move-column-to-monitor-up; } - Mod+Shift+Ctrl+L { move-column-to-monitor-right; } - - // === Workspace Navigation === - Mod+Page_Down { focus-workspace-down; } - Mod+Page_Up { focus-workspace-up; } - Mod+U { focus-workspace-down; } - Mod+I { focus-workspace-up; } - Mod+Ctrl+Down { move-column-to-workspace-down; } - Mod+Ctrl+Up { move-column-to-workspace-up; } - Mod+Ctrl+U { move-column-to-workspace-down; } - Mod+Ctrl+I { move-column-to-workspace-up; } - - // === Workspace Management === - Ctrl+Shift+R hotkey-overlay-title="Rename Workspace" { - spawn "dms" "ipc" "call" "workspace-rename" "open"; - } - - // === Move Workspaces === - Mod+Shift+Page_Down { move-workspace-down; } - Mod+Shift+Page_Up { move-workspace-up; } - Mod+Shift+U { move-workspace-down; } - Mod+Shift+I { move-workspace-up; } - - // === Mouse Wheel Navigation === - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } - - Mod+WheelScrollRight { focus-column-right; } - Mod+WheelScrollLeft { focus-column-left; } - Mod+Ctrl+WheelScrollRight { move-column-right; } - Mod+Ctrl+WheelScrollLeft { move-column-left; } - - Mod+Shift+WheelScrollDown { focus-column-right; } - Mod+Shift+WheelScrollUp { focus-column-left; } - Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } - Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } - - // === Numbered Workspaces === - Mod+1 { focus-workspace 1; } - Mod+2 { focus-workspace 2; } - Mod+3 { focus-workspace 3; } - Mod+4 { focus-workspace 4; } - Mod+5 { focus-workspace 5; } - Mod+6 { focus-workspace 6; } - Mod+7 { focus-workspace 7; } - Mod+8 { focus-workspace 8; } - Mod+9 { focus-workspace 9; } - - // === Move to Numbered Workspaces === - Mod+Shift+1 { move-column-to-workspace 1; } - Mod+Shift+2 { move-column-to-workspace 2; } - Mod+Shift+3 { move-column-to-workspace 3; } - Mod+Shift+4 { move-column-to-workspace 4; } - Mod+Shift+5 { move-column-to-workspace 5; } - Mod+Shift+6 { move-column-to-workspace 6; } - Mod+Shift+7 { move-column-to-workspace 7; } - Mod+Shift+8 { move-column-to-workspace 8; } - Mod+Shift+9 { move-column-to-workspace 9; } - - // === Column Management === - Mod+BracketLeft { consume-or-expel-window-left; } - Mod+BracketRight { consume-or-expel-window-right; } - Mod+Period { expel-window-from-column; } - - // === Sizing & Layout === - Mod+R { switch-preset-column-width; } - Mod+Shift+R { switch-preset-window-height; } - Mod+Ctrl+R { reset-window-height; } - Mod+Ctrl+F { expand-column-to-available-width; } - Mod+C { center-column; } - Mod+Ctrl+C { center-visible-columns; } - - // === Manual Sizing === - Mod+Minus { set-column-width "-10%"; } - Mod+Equal { set-column-width "+10%"; } - Mod+Shift+Minus { set-window-height "-10%"; } - Mod+Shift+Equal { set-window-height "+10%"; } - - // === Screenshots === - XF86Launch1 { screenshot; } - Ctrl+XF86Launch1 { screenshot-screen; } - Alt+XF86Launch1 { screenshot-window; } - Print { screenshot; } - Ctrl+Print { screenshot-screen; } - Alt+Print { screenshot-window; } - // === System Controls === - Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - Mod+Shift+P { power-off-monitors; } -} diff --git a/niri/dms/colors.kdl b/niri/dms/colors.kdl deleted file mode 100644 index cce1334..0000000 --- a/niri/dms/colors.kdl +++ /dev/null @@ -1,39 +0,0 @@ -// ! Auto-generated file. Do not edit directly. -// Remove `include "dms/colors.kdl"` from your config to override. - -layout { - background-color "transparent" - - focus-ring { - active-color "#89d0ee" - inactive-color "#8a9296" - urgent-color "#ffb4ab" - } - - border { - active-color "#89d0ee" - inactive-color "#8a9296" - urgent-color "#ffb4ab" - } - - shadow { - color "#00000070" - } - - tab-indicator { - active-color "#89d0ee" - inactive-color "#8a9296" - urgent-color "#ffb4ab" - } - - insert-hint { - color "#89d0ee80" - } -} - -recent-windows { - highlight { - active-color "#004d62" - urgent-color "#ffb4ab" - } -} diff --git a/niri/dms/cursor.kdl b/niri/dms/cursor.kdl deleted file mode 100644 index 81d21f0..0000000 --- a/niri/dms/cursor.kdl +++ /dev/null @@ -1,11 +0,0 @@ -// ! DO NOT EDIT ! -// ! AUTO-GENERATED BY DMS ! -// ! CHANGES WILL BE OVERWRITTEN ! -// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! - -cursor { - xcursor-theme "breeze_cursors" - xcursor-size 24 - hide-when-typing - hide-after-inactive-ms 5000 -} \ No newline at end of file diff --git a/niri/dms/layout.kdl b/niri/dms/layout.kdl deleted file mode 100644 index 44dd0f5..0000000 --- a/niri/dms/layout.kdl +++ /dev/null @@ -1,23 +0,0 @@ -// ! DO NOT EDIT ! -// ! AUTO-GENERATED BY DMS ! -// ! CHANGES WILL BE OVERWRITTEN ! -// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! - -layout { - gaps 4 - - border { - width 2 - } - - focus-ring { - width 2 - } -} - -window-rule { - geometry-corner-radius 12 - clip-to-geometry true - tiled-state true - draw-border-with-background false -} diff --git a/niri/dms/outputs.kdl b/niri/dms/outputs.kdl deleted file mode 100644 index 41ff35f..0000000 --- a/niri/dms/outputs.kdl +++ /dev/null @@ -1,31 +0,0 @@ -/-output "eDP-1" { - // Uncomment this line to disable this output. - // off - - // Resolution and, optionally, refresh rate of the output. - // The format is "x" or "x@". - // If the refresh rate is omitted, niri will pick the highest refresh rate - // 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" - - // You can use integer or fractional scale, for example use 1.5 for 150% scale. - scale 2 - - // Transform allows to rotate the output counter-clockwise, valid values are: - // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. - transform "normal" - - // Position of the output in the global coordinate space. - // This affects directional monitor actions like "focus-monitor-left", and cursor movement. - // The cursor can only move between directly adjacent outputs. - // Output scale and rotation has to be taken into account for positioning: - // outputs are sized in logical, or scaled, pixels. - // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, - // so to put another output directly adjacent to it on the right, set its x to 1920. - // If the position is unset or results in an overlap, the output is instead placed - // automatically. - position x=1280 y=0 -} - diff --git a/niri/dms/windowrules.kdl b/niri/dms/windowrules.kdl deleted file mode 100644 index e69de29..0000000 diff --git a/niri/dms/wpblur.kdl b/niri/dms/wpblur.kdl deleted file mode 100644 index 3d58802..0000000 --- a/niri/dms/wpblur.kdl +++ /dev/null @@ -1,9 +0,0 @@ -// ! DO NOT EDIT ! -// ! AUTO-GENERATED BY DMS ! -// ! CHANGES WILL BE OVERWRITTEN ! -// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE ! - -layer-rule { - match namespace="dms:blurwallpaper" - place-within-backdrop true -} diff --git a/niri/noctalia.kdl b/niri/noctalia.kdl new file mode 100644 index 0000000..132dbe7 --- /dev/null +++ b/niri/noctalia.kdl @@ -0,0 +1,32 @@ +layout { + + focus-ring { + active-color "#9dcaff" + inactive-color "#101418" + urgent-color "#ffb4ab" + } + + border { + active-color "#9dcaff" + inactive-color "#101418" + urgent-color "#ffb4ab" + } + + + tab-indicator { + active-color "#9dcaff" + inactive-color "#0678c4" + urgent-color "#ffb4ab" + } + + insert-hint { + color "#9dcaff80" + } +} + +recent-windows { + highlight { + active-color "#9dcaff" + urgent-color "#ffb4ab" + } +} diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index b0de0c0..c8c25aa 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,45 +1,47 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, + "base16-nvim": { "branch": "master", "commit": "09944b3120451d2881dc8cfb13c85c11949f477d" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "cmake-tools.nvim": { "branch": "master", "commit": "22859d754b5de738cfe9945e0910729f63deefd0" }, - "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" }, + "conform.nvim": { "branch": "master", "commit": "016802de402556da54c36bd7359b441266b01cdd" }, "dashboard-nvim": { "branch": "master", "commit": "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "flash.nvim": { "branch": "main", "commit": "b6346946d10d07998efee029fb0f7a593806d0cd" }, - "gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" }, + "flash.nvim": { "branch": "main", "commit": "5f0f270fdc7c5b0c21d903ee85b9cb06f2ac636a" }, + "gitsigns.nvim": { "branch": "main", "commit": "5be654f2232c10ddcad19c1607a67b6b4b78fc29" }, "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" }, + "lspsaga.nvim": { "branch": "main", "commit": "cf6fc9473bba1d332eda9887855ea29ed9b37701" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4068c3ebd4cb335b25239e5ea35c22ee6007962" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9d28935aa95fa6c1dc7c4d6747f101a72a8a4bec" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, + "nui.nvim": { "branch": "main", "commit": "10fc361835c856ba4233ef5ea135b919bf3dce97" }, + "nvim-autopairs": { "branch": "master", "commit": "430522f95fe4fb7c511ec64f8c1a90cc6a66c05c" }, "nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" }, "nvim-dap-ui": { "branch": "master", "commit": "cc9dd33aade7f20bae414d0cba163bc60d4d4b43" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lspconfig": { "branch": "master", "commit": "b386c50cd7816f8c8a2b13b298a218af1f5a75c6" }, + "nvim-lspconfig": { "branch": "master", "commit": "221c43884319e791519f0d6c94a7f2fbcd653278" }, "nvim-nio": { "branch": "master", "commit": "edcc181a875301dd21840189aa2f2f9ad69fc172" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-surround": { "branch": "main", "commit": "2e93e154de9ff326def6480a4358bfc149d5da2c" }, - "nvim-tree.lua": { "branch": "master", "commit": "4213bd6eabac38b16dd6615002b6243b23cf3bf6" }, - "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-tree.lua": { "branch": "master", "commit": "531b807b8f0d6f75016a0ee1e0cd5ce2086e9d95" }, + "nvim-treesitter": { "branch": "main", "commit": "e82ef6ae2c3eeb96c6916b29917f96bf630b2cdb" }, "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" }, - "nvim-web-devicons": { "branch": "master", "commit": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f" }, + "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" }, "oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" }, "persistent-breakpoints.nvim": { "branch": "main", "commit": "d1656221836207787b8a7969cc2dc72668c4742a" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "a798325b7f36acc62741d1029930a7b96d4dd4bf" }, - "rustaceanvim": { "branch": "main", "commit": "614a3e30e6e94c5aee204fe5d5b6a50cdaac4be6" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "012f1480cd9a5fc99fce7678e0a536421a53fc46" }, + "rustaceanvim": { "branch": "main", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "b25b749b9db64d375d782094e2b9dce53ad53a40" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "telescope.nvim": { "branch": "master", "commit": "40aedd8a68c78a656a10a8d62d80c54af59420fb" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" }, "vim-illuminate": { "branch": "master", "commit": "91313e598ca62e110bc71535c49069b66b9883c9" }, diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index 246cca6..7b69b13 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -79,9 +79,36 @@ keymap("n", "sv", "vsplit", { desc = "垂直分屏" }) keymap("n", "sh", "split", { desc = "水平分屏" }) keymap("n", "sc", "close", { desc = "关闭窗口" }) --- Buffer 导航 -keymap("n", "", "bprevious", { desc = "下一个 buffer" }) -keymap("n", "", "bnext", { desc = "上一个 buffer" }) +-- Buffer 导航（跳过终端类 buffer） +local function skip_terminal_buffers(direction) + local bufs = vim.api.nvim_list_bufs() + -- 收集所有可显示、非终端、非特殊类型的 buffer + local valid = {} + for _, b in ipairs(bufs) do + if vim.api.nvim_buf_is_loaded(b) and vim.bo[b].buflisted then + local bt = vim.bo[b].buftype + -- 跳过 terminal/nofile/help/quickfix 等 + if bt == "" or bt == "acwrite" then + table.insert(valid, b) + end + end + end + if #valid == 0 then return end + + -- 找当前 buffer 在 valid 列表中的位置 + local current = vim.api.nvim_get_current_buf() + local idx = 1 + for i, b in ipairs(valid) do + if b == current then idx = i break end + end + + -- 按方向计算下一个（-1 = previous, 1 = next） + local next_idx = (idx + direction - 1) % #valid + 1 + vim.api.nvim_set_current_buf(valid[next_idx]) +end + +keymap("n", "", function() skip_terminal_buffers(-1) end, { desc = "上一个 buffer" }) +keymap("n", "", function() skip_terminal_buffers(1) end, { desc = "下一个 buffer" }) -- Buffer 操作 keymap("n", "bc", "Bdelete", { desc = "关闭当前 buffer" }) diff --git a/nvim/lua/matugen.lua b/nvim/lua/matugen.lua new file mode 100644 index 0000000..5c712e0 --- /dev/null +++ b/nvim/lua/matugen.lua @@ -0,0 +1,59 @@ + local M = {} + +function M.setup() + require('base16-colorscheme').setup({ + base00 = '#101418', + base01 = '#1c2025', + base02 = '#272a2f', + base03 = '#8a919c', + base04 = '#c0c7d3', + base05 = '#e0e2e9', + base06 = '#e0e2e9', + base07 = '#e0e2e9', + base08 = '#ffb4ab', + base09 = '#ecb2ff', + base0A = '#adc9ec', + base0B = '#9dcaff', + base0C = '#ecb2ff', + base0D = '#9dcaff', + base0E = '#adc9ec', + base0F = '#d1e4ff', + }) + + local hi = function(group, opts) + vim.api.nvim_set_hl(0, group, opts) + end + + hi('TelescopeNormal', { fg = '#e0e2e9', bg = '#101418' }) + hi('TelescopeBorder', { fg = '#8a919c', bg = '#101418' }) + hi('TelescopePromptNormal', { fg = '#e0e2e9', bg = '#101418' }) + hi('TelescopePromptBorder', { fg = '#8a919c', bg = '#101418' }) + hi('TelescopePromptPrefix', { fg = '#9dcaff', bg = '#101418' }) + hi('TelescopePromptCounter', { fg = '#c0c7d3', bg = '#101418' }) + hi('TelescopePromptTitle', { fg = '#101418', bg = '#9dcaff' }) + hi('TelescopePreviewTitle', { fg = '#101418', bg = '#adc9ec' }) + hi('TelescopeResultsTitle', { fg = '#101418', bg = '#ecb2ff' }) + hi('TelescopeSelection', { fg = '#e0e2e9', bg = '#272a2f' }) + hi('TelescopeSelectionCaret', { fg = '#9dcaff', bg = '#272a2f' }) + hi('TelescopeMatching', { fg = '#9dcaff', bold = true }) +end + +-- Register a signal handler for SIGUSR1 (matugen updates). +-- The handler re-requires this module, which re-runs the code below, so the +-- previous handle is stopped first; otherwise handlers double on every signal. +if _G.__matugen_signal then + _G.__matugen_signal:stop() + _G.__matugen_signal:close() +end + +local signal = vim.uv.new_signal() +_G.__matugen_signal = signal +signal:start( + 'sigusr1', + vim.schedule_wrap(function() + package.loaded['matugen'] = nil + require('matugen').setup() + end) +) + +return M diff --git a/nvim/lua/plugins/base16.lua b/nvim/lua/plugins/base16.lua new file mode 100644 index 0000000..6873df2 --- /dev/null +++ b/nvim/lua/plugins/base16.lua @@ -0,0 +1,6 @@ +return { 'RRethy/base16-nvim', + config = function() + local ok, matugen = pcall(require, 'matugen') + if ok then matugen.setup() end + end, +} diff --git a/nvim/lua/plugins/cmake-tools.lua b/nvim/lua/plugins/cmake-tools.lua index c97c615..9fd19c1 100644 --- a/nvim/lua/plugins/cmake-tools.lua +++ b/nvim/lua/plugins/cmake-tools.lua @@ -15,6 +15,8 @@ return { cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" }, cmake_build_directory = "build", cmake_soft_link_compile_commands = true, + cmake_parallel_jobs = tostring(vim.loop.cpu_info() and #vim.loop.cpu_info() or 8), + cmake_build_options = { "--parallel", tostring(vim.loop.cpu_info() and #vim.loop.cpu_info() or 8) }, cmake_dap_configuration = { name = "cpp", type = "codelldb", diff --git a/nvim/lua/plugins/colorscheme.lua b/nvim/lua/plugins/colorscheme.lua index 59fb7e5..88de4af 100644 --- a/nvim/lua/plugins/colorscheme.lua +++ b/nvim/lua/plugins/colorscheme.lua @@ -1,45 +1,141 @@ -- ============================================================================= --- colorscheme.lua — 主题 +-- colorscheme.lua — tokyonight(UI 主题, 全透明) + VSCode Dark+ 代码配色覆盖 -- ============================================================================= return { - { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = { - style = "night", - transparent = true, - styles = { - sidebars = "transparent", - floats = "transparent", - }, - on_highlights = function(hl, c) - -- bufferline 标签栏背景透明 - hl.BufferLineFill = { bg = "NONE" } - hl.BufferLineBackGround = { bg = "NONE", fg = c.fg_gutter } - hl.BufferLineBackGroundVisible = { bg = "NONE", fg = c.fg } - hl.BufferLineBackGroundSelected = { bg = c.bg_highlight, fg = c.fg, bold = true } - hl.BufferLineSeparator = { fg = c.fg_gutter } - hl.BufferLineSeparatorSelected = { fg = c.blue } - end, - }, - config = function(_, opts) - require("tokyonight").setup(opts) - vim.cmd.colorscheme("tokyonight") + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = { + style = "night", + transparent = true, + styles = { + sidebars = "transparent", + floats = "transparent", -- 浮动窗也透明(用户原本就是这个状态) + }, + on_highlights = function(hl, c) + -- bufferline 标签栏背景透明 + hl.BufferLineFill = { bg = "NONE" } + hl.BufferLineBackGround = { bg = "NONE", fg = c.fg_gutter } + hl.BufferLineBackGroundVisible = { bg = "NONE", fg = c.fg } + hl.BufferLineBackGroundSelected = { bg = c.bg_highlight, fg = c.fg, bold = true } + hl.BufferLineSeparator = { fg = c.fg_gutter } + hl.BufferLineSeparatorSelected = { fg = c.blue } + end, + }, + config = function(_, opts) + require("tokyonight").setup(opts) + vim.cmd.colorscheme("tokyonight") - -- inlay hints 去掉背景 - vim.api.nvim_create_autocmd("ColorScheme", { - pattern = "tokyonight", - callback = function() - vim.api.nvim_set_hl(0, "LspInlayHint", { - bg = "NONE", fg = "#565f89", italic = true, - }) + -- VSCode Dark+ 代码配色覆盖(只覆盖代码高亮组,UI/border/inlay hint 全走 tokyonight 默认) + local vs = { + variable = "#9CDCFE", -- 浅蓝 + builtin_var = "#569CD6", -- 蓝 + parameter = "#9CDCFE", + field = "#9CDCFE", + property = "#9CDCFE", + func = "#DCDCAA", -- 浅黄 + builtin_fn = "#DCDCAA", + method = "#DCDCAA", + type = "#4EC9B0", -- teal + builtin_type = "#4EC9B0", + struct = "#4EC9B0", + class = "#4EC9B0", + enum = "#4EC9B0", + constructor = "#4EC9B0", + module = "#4EC9B0", + constant = "#4FC1FF", + builtin_const = "#569CD6", + macro = "#B5CEA8", + keyword = "#569CD6", + keyword_ctrl = "#C586C0", -- pink(控制流) + operator = "#D4D4D4", -- 灰白 + punctuation = "#D4D4D4", + string = "#CE9178", -- 橙 + string_escape = "#D7BA7D", + number = "#B5CEA8", -- 浅绿 + boolean = "#569CD6", + comment = "#565f89", -- 灰绿 + } + + local override = function() + local set = function(name, spec) + vim.api.nvim_set_hl(0, name, spec) + end + + -- treesitter + set("@variable", { fg = vs.variable }) + set("@variable.builtin", { fg = vs.builtin_var }) + set("@variable.parameter", { fg = vs.parameter, italic = true }) + set("@variable.member", { fg = vs.field }) + set("@field", { fg = vs.field }) + set("@property", { fg = vs.property }) + set("@function", { fg = vs.func }) + set("@function.call", { fg = vs.func }) + set("@function.builtin", { fg = vs.builtin_fn }) + set("@method", { fg = vs.method }) + set("@method.call", { fg = vs.method }) + set("@constructor", { fg = vs.constructor }) + set("@type", { fg = vs.type }) + set("@type.builtin", { fg = vs.builtin_type }) + set("@type.definition", { fg = vs.type }) + set("@struct", { fg = vs.struct }) + set("@class", { fg = vs.class }) + set("@enum", { fg = vs.enum }) + set("@module", { fg = vs.module }) + set("@constant", { fg = vs.constant }) + set("@constant.builtin", { fg = vs.builtin_const }) + set("@macro", { fg = vs.macro }) + set("@keyword", { fg = vs.keyword }) + set("@keyword.function", { fg = vs.keyword_ctrl }) + set("@keyword.operator", { fg = vs.keyword }) + set("@keyword.return", { fg = vs.keyword_ctrl }) + set("@operator", { fg = vs.operator }) + set("@punctuation", { fg = vs.punctuation }) + set("@punctuation.bracket", { fg = vs.punctuation }) + set("@punctuation.delimiter", { fg = vs.punctuation }) + set("@punctuation.special", { fg = vs.string_escape }) + set("@string", { fg = vs.string }) + set("@string.escape", { fg = vs.string_escape }) + set("@string.special", { fg = vs.string_escape }) + set("@number", { fg = vs.number }) + set("@boolean", { fg = vs.boolean }) + set("@float", { fg = vs.number }) + set("@comment", { fg = vs.comment, italic = true }) + set("@tag", { fg = vs.keyword }) + set("@tag.attribute", { fg = vs.variable }) + set("@tag.delimiter", { fg = vs.punctuation }) + set("@attribute", { fg = vs.keyword }) + set("@label", { fg = vs.variable }) + + -- LSP semantic tokens (clangd / lua_ls 发送) + set("@lsp.type.variable", { fg = vs.variable }) + set("@lsp.type.parameter", { fg = vs.parameter, italic = true }) + set("@lsp.type.property", { fg = vs.property }) + set("@lsp.type.function", { fg = vs.func }) + set("@lsp.type.method", { fg = vs.method }) + set("@lsp.type.class", { fg = vs.class }) + set("@lsp.type.struct", { fg = vs.struct }) + set("@lsp.type.enum", { fg = vs.enum }) + set("@lsp.type.enumMember", { fg = vs.constant }) + set("@lsp.type.constant", { fg = vs.constant }) + set("@lsp.type.field", { fg = vs.field }) + set("@lsp.type.typeParameter", { fg = vs.type }) + set("@lsp.mod.readonly", { fg = vs.constant }) + set("@lsp.typemod.variable.readonly", { fg = vs.constant }) + set("@lsp.typemod.variable.global", { fg = vs.constant }) + + -- inlay hint 透明背景 + 用户原来的紫灰色 #565f89 + set("LspInlayHint", { bg = "NONE", fg = "#565f89", italic = true }) + end + + -- 切到 tokyonight 后立即覆盖,ColorScheme 事件再覆盖一次(防 lazy reload) + vim.api.nvim_create_autocmd("ColorScheme", { + pattern = "tokyonight", + callback = override, + }) + override() end, - }) - vim.api.nvim_set_hl(0, "LspInlayHint", { - bg = "NONE", fg = "#565f89", italic = true, - }) - end, - }, -} \ No newline at end of file + }, +} diff --git a/nvim/lua/plugins/conform.lua b/nvim/lua/plugins/conform.lua index 07cf91f..050fb97 100644 --- a/nvim/lua/plugins/conform.lua +++ b/nvim/lua/plugins/conform.lua @@ -33,7 +33,10 @@ return { }, formatters = { ["clang-format"] = { - args = { "--style={BasedOnStyle: LLVM, IndentWidth: 4, TabWidth: 4, UseTab: Never, ColumnLimit: 0}" }, + -- 用 prepend_args (不是 args!): 保留 conform 默认的 "-assume-filename $FILENAME". + -- 若用 args 会覆盖默认值, 导致 clang-format 读 stdin 时丢失文件名 → 语言检测/样式查找出问题. + -- 优先读项目 .clang-format 文件; 没有该文件时用此内联 4 空格样式兜底. + prepend_args = { "--style={BasedOnStyle: LLVM, IndentWidth: 4, TabWidth: 4, UseTab: Never, ColumnLimit: 0}" }, }, }, }, diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index a7983b5..3583dcd 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -25,6 +25,32 @@ return { }, }, + -- lspsaga: LSP UI 增强(hover 滚动、智能定位、诊断、重命名等) + -- 替代手写 hover 滚动逻辑,自带 VSCode 风格滚动键 /// + { + "nvimdev/lspsaga.nvim", + event = "LspAttach", + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-tree/nvim-web-devicons", + }, + opts = { + lightbulb = { enable = false }, + hover = { + max_width = 0.6, + max_height = 0.8, + }, + ui = { + border = "rounded", + code_action = "bulb", + }, + scroll_preview = { + scroll_down = "", + scroll_up = "", + }, + }, + }, + -- LSP 配置（Neovim 0.11+ vim.lsp.config API） { "neovim/nvim-lspconfig", @@ -33,11 +59,12 @@ return { "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim", "saghen/blink.cmp", + "nvimdev/lspsaga.nvim", }, config = function() local caps = require("blink.cmp").get_lsp_capabilities() - -- LSP 附加时自动开启 inlay hints + -- LSP 附加时绑定 keymap + 开 inlay hints vim.api.nvim_create_autocmd("LspAttach", { callback = function(args) local map = function(keys, func, desc) @@ -45,18 +72,27 @@ return { end map("gd", vim.lsp.buf.definition, "跳转到定义") map("gr", vim.lsp.buf.references, "查找引用") - map("K", vim.lsp.buf.hover, "悬浮文档") - map("rn", vim.lsp.buf.rename, "重命名") - map("", vim.lsp.buf.code_action, "代码操作") - map("d", vim.diagnostic.open_float, "行诊断") - map("[d", vim.diagnostic.goto_prev, "上一个诊断") - map("]d", vim.diagnostic.goto_next, "下一个诊断") + map("K", "Lspsaga hover_doc", "悬浮文档") + map("rn", "Lspsaga rename", "重命名") + map("", "Lspsaga code_action", "代码操作") + map("d", "Lspsaga show_line_diagnostics", "行诊断") + map("[d", "Lspsaga diagnostic_jump_prev", "上一个诊断") + map("]d", "Lspsaga diagnostic_jump_next", "下一个诊断") -- 开启 inlay hints vim.lsp.inlay_hint.enable(true, { bufnr = args.buf }) end, }) + -- 诊断全局配置 + vim.diagnostic.config({ + virtual_text = false, + signs = true, + underline = true, + update_in_insert = false, + float = { border = "rounded" }, + }) + -- Lua vim.lsp.config['lua_ls'] = { cmd = { 'lua-language-server' }, diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index cf57acf..968a382 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -5,7 +5,7 @@ return { { "nvim-telescope/telescope.nvim", - branch = "0.1.x", + branch = "master", -- 0.1.x 没适配新 treesitter main 分支 API（ft_to_lang 已移除） dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope-ui-select.nvim", diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 1e6dda2..3c9164c 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -5,6 +5,7 @@ return { { "nvim-treesitter/nvim-treesitter", + branch = "main", -- master 已被上游归档，main 是现行分支 event = { "BufReadPre", "BufNewFile" }, build = ":TSUpdate", opts = { diff --git a/nvim/lua/runner.lua b/nvim/lua/runner.lua index bf7afff..1caef02 100644 --- a/nvim/lua/runner.lua +++ b/nvim/lua/runner.lua @@ -4,6 +4,14 @@ local M = {} +--- 获取 CPU 核心数，用于并行构建 +---@return integer +local function cpu_count() + local info = vim.loop.cpu_info() + return info and #info or 8 +end +local NPROC = tostring(cpu_count()) + --- 检测当前项目类型 ---@return "rust"|"cmake"|"python"|"go"|"unknown" function M.detect() @@ -62,31 +70,31 @@ local function run_in_terminal(cmd, title) term:toggle() end ---- 构建（使用底部终端） +--- 构建（使用底部终端，多核并行） function M.build() local project = M.detect() if project == "rust" then - run_in_terminal("cargo build", "Cargo Build") + run_in_terminal("cargo build -j " .. NPROC, "Cargo Build") elseif project == "cmake" then vim.cmd("CMakeBuild") elseif project == "go" then - run_in_terminal("go build ./...", "Go Build") + run_in_terminal("go build -p " .. NPROC .. " ./...", "Go Build") else vim.notify("未识别的项目类型，无法自动构建", vim.log.levels.WARN) end end ---- 运行（使用底部终端） +--- 运行（使用底部终端，编译阶段并行） function M.run() local project = M.detect() if project == "rust" then - run_in_terminal("cargo run", "Cargo Run") + run_in_terminal("cargo run -j " .. NPROC, "Cargo Run") elseif project == "cmake" then vim.cmd("CMakeRun") elseif project == "go" then - run_in_terminal("go run .", "Go Run") + run_in_terminal("go run -p " .. NPROC .. " .", "Go Run") elseif project == "python" then run_in_terminal("python " .. vim.fn.expand("%"), "Python Run") else @@ -107,19 +115,19 @@ function M.debug() end end ---- 测试（使用底部终端） +--- 测试（使用底部终端，并行执行） function M.test() local project = M.detect() if project == "rust" then - run_in_terminal("cargo test", "Cargo Test") + run_in_terminal("cargo test -j " .. NPROC, "Cargo Test") elseif project == "cmake" then vim.cmd("CMakeBuild") - run_in_terminal("ctest --test-dir build", "CTest") + run_in_terminal("ctest --test-dir build -j " .. NPROC, "CTest") elseif project == "go" then - run_in_terminal("go test ./...", "Go Test") + run_in_terminal("go test -p " .. NPROC .. " ./...", "Go Test") elseif project == "python" then - run_in_terminal("pytest", "Pytest") + run_in_terminal("pytest -n " .. NPROC, "Pytest") else vim.notify("未识别的项目类型，无法自动测试", vim.log.levels.WARN) end diff --git a/qq-flags.conf b/qq-flags.conf new file mode 100644 index 0000000..457234c --- /dev/null +++ b/qq-flags.conf @@ -0,0 +1,16 @@ +--ozone-platform-hint=auto +--enable-features=WaylandWindowDecorations,ChromiumWaylandFractionalScaleManager,VaapiVideoDecoder,VaapiVideoEncoder +--disable-features=UseChromeOSDirectVideoDecoder +--enable-gpu-rasterization +--enable-zero-copy +--enable-oop-rasterization +--enable-accelerated-video-decode +--canvas-oop-rasterization +--use-vulkan +--ignore-gpu-blocklist +--disable-gpu-driver-bug-workarounds +--disable-gpu-sandbox +--gtk-version=4 +--force-device-scale-factor=1.5 +--high-dpi-support=1 +--enable-wayland-ime diff --git a/wallpaper/寂光_1_original.png b/wallpaper/寂光_1_original.png new file mode 100644 index 0000000..3b2f61b Binary files /dev/null and b/wallpaper/寂光_1_original.png differ diff --git a/wallpaper/小屋_3_original.png b/wallpaper/小屋_3_original.png new file mode 100644 index 0000000..d9e59db Binary files /dev/null and b/wallpaper/小屋_3_original.png differ diff --git a/wallpaper/春泽_1_original.png b/wallpaper/春泽_1_original.png new file mode 100644 index 0000000..92388c9 Binary files /dev/null and b/wallpaper/春泽_1_original.png differ diff --git a/wallpaper/浮光_4_original.png b/wallpaper/浮光_4_original.png new file mode 100644 index 0000000..9979df1 Binary files /dev/null and b/wallpaper/浮光_4_original.png differ