From 417d48f0f58cab42f38c290fc38722d1dcc5f04e Mon Sep 17 00:00:00 2001 From: Uyanide Date: Wed, 29 Apr 2026 20:25:55 +0200 Subject: [PATCH] update --- README.md | 4 +- config/kitty/.config/kitty/floating.conf | 7 ++ config/kitty/.config/kitty/kitty.conf | 8 +- config/niri/.config/niri/config/binds.kdl | 8 +- config/niri/.config/niri/config/rules.kdl | 8 ++ config/nwg-look/.config/gtk-3.0/settings.ini | 25 +++++-- config/nwg-look/.config/gtk-4.0/settings.ini | 15 +++- .../Modules/Bar/Services/MonitorProcess.qml | 2 +- .../quickshell/Services/NotesService.qml | 2 +- config/scripts/.local/scripts/kitty-floating | 3 + config/wlogout/.config/wlogout/layout | 6 +- legacy/eww/.config/eww/Lyrics/eww.yuck | 2 +- memo/hyprland-ricing.txt | 75 ------------------- memo/niri-ricing.txt | 7 -- memo/packages.md | 1 + 15 files changed, 63 insertions(+), 110 deletions(-) create mode 100755 config/kitty/.config/kitty/floating.conf create mode 100755 config/scripts/.local/scripts/kitty-floating delete mode 100644 memo/hyprland-ricing.txt delete mode 100644 memo/niri-ricing.txt diff --git a/README.md b/README.md index b24d1b6..609eba9 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ https://github.com/user-attachments/assets/2550607a-48ea-4662-98ba-d26722b26b1b - Bar: ~~Waybar~~ | **Quickshell** - Shell: (bash & fish) | **Zsh** - Prompt: Oh My Posh | **Starship** -- Terminal: **Kitty** & (WezTerm | **Ghostty**) +- Terminal: **Kitty** | WezTerm | Ghostty - Power Menu: **Wlogout** & Quickshell - Colorscheme: **Catppuccin Mocha** - App Launcher: ~~Rofi~~ | ~~Fuzzel~~ | **vicinae** @@ -100,7 +100,7 @@ This feature is only enabled in Niri. Swww also manages wallpapers of the Hyprla ## Wallpaper & Colortheme The most suitable primary color (or so-called flavor) will be chosen from the [Catppuccin Mocha](https://catppuccin.com/palette/) palette and applied to various apps automatically after changing wallpaper. And also: - + - [wallpaper-chooser](https://github.com/Uyanide/Wallpaper_Chooser) to select wallpaper, which implements an Image Carousel with Qt Widgets. - [backgrounds collection](https://github.com/Uyanide/backgrounds) for personal use. diff --git a/config/kitty/.config/kitty/floating.conf b/config/kitty/.config/kitty/floating.conf new file mode 100755 index 0000000..387a77f --- /dev/null +++ b/config/kitty/.config/kitty/floating.conf @@ -0,0 +1,7 @@ +include kitty.conf + +remember_window_size false +initial_window_width 960 +initial_window_height 640 + +window_padding_width 5 diff --git a/config/kitty/.config/kitty/kitty.conf b/config/kitty/.config/kitty/kitty.conf index 2edba92..d17609d 100755 --- a/config/kitty/.config/kitty/kitty.conf +++ b/config/kitty/.config/kitty/kitty.conf @@ -3,13 +3,13 @@ listen_on unix:/tmp/kitty shell_integration enabled # kitty-scrollback.nvim Kitten alias -action_alias kitty_scrollback_nvim kitten $HOME/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py +# action_alias kitty_scrollback_nvim kitten $HOME/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py # Browse scrollback buffer in nvim -map kitty_mod+h kitty_scrollback_nvim +# map kitty_mod+h kitty_scrollback_nvim # Browse output of the last shell command in nvim -map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output +# map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output # Show clicked command output in nvim -mouse_map ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output +# mouse_map ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output # disable the stupid notification confirm_os_window_close 0 diff --git a/config/niri/.config/niri/config/binds.kdl b/config/niri/.config/niri/config/binds.kdl index 0784e39..a989459 100644 --- a/config/niri/.config/niri/config/binds.kdl +++ b/config/niri/.config/niri/config/binds.kdl @@ -14,9 +14,9 @@ binds { Mod+E repeat=false { spawn "dolphin" "--new-window"; } Mod+Shift+E repeat=false { spawn "nautilus" "--new-window"; } Mod+W repeat=false { spawn-sh "zen || zen-browser"; } - Mod+B repeat=false { spawn-sh "pkill -x -n btop || ghostty +new-window -e btop"; } - Mod+Shift+T repeat=false { spawn "ghostty" "+new-window"; } - Mod+Shift+Return repeat=false { spawn "ghostty" "+new-window"; } + Mod+B repeat=false { spawn-sh "pkill -x -n btop || kitty-floating -e btop"; } + Mod+Shift+T repeat=false { spawn "kitty-floating"; } + Mod+Shift+Return repeat=false { spawn "kitty-floating"; } Mod+T repeat=false { spawn "kitty"; } Mod+Return repeat=false { spawn "kitty"; } Mod+Shift+W repeat=false { spawn "wallreel"; } @@ -163,7 +163,7 @@ binds { // Session Mod+K allow-inhibiting=false repeat=false { quit; } - Mod+Shift+P allow-inhibiting=false repeat=false { spawn-sh "hyprlock & niri msg action power-off-monitors"; } + Mod+Shift+P allow-inhibiting=false repeat=false { spawn-sh "loginctl lock-session; niri msg action power-off-monitors"; } Mod+L allow-inhibiting=false repeat=false { spawn "loginctl" "lock-session"; } } diff --git a/config/niri/.config/niri/config/rules.kdl b/config/niri/.config/niri/config/rules.kdl index 8ab453d..e7dc95f 100644 --- a/config/niri/.config/niri/config/rules.kdl +++ b/config/niri/.config/niri/config/rules.kdl @@ -20,6 +20,7 @@ window-rule { window-rule { match app-id="org.wezfurlong.wezterm" match app-id="com.mitchellh.ghostty" + match app-id="kitty-floating" open-floating true default-column-width { proportion 0.5; } } @@ -61,6 +62,13 @@ window-rule { open-floating true } +// QQ +window-rule { + match app-id="QQ" title="资料卡" + match app-id="QQ" title="天气" + open-focused false +} + // Block from recording window-rule { match app-id="org.mozilla.Thunderbird" diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index a2e43ec..4831780 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -1,17 +1,26 @@ [Settings] -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-icon-theme-name=Papirus -gtk-font-name=Sarasa UI SC 10 +gtk-application-prefer-dark-theme=true +gtk-button-images=true +gtk-cursor-blink=true +gtk-cursor-blink-time=1000 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 +gtk-font-name=Sarasa UI SC, 10 +gtk-icon-theme-name=Papirus +gtk-menu-images=true +gtk-modules=colorreload-gtk-module:appmenu-gtk-module +gtk-primary-button-warps-slider=true +gtk-shell-shows-menubar=1 +gtk-sound-theme-name=ocean +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-toolbar-style=3 gtk-xft-antialias=1 +gtk-xft-dpi=122880 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=1 diff --git a/config/nwg-look/.config/gtk-4.0/settings.ini b/config/nwg-look/.config/gtk-4.0/settings.ini index af17726..4139029 100644 --- a/config/nwg-look/.config/gtk-4.0/settings.ini +++ b/config/nwg-look/.config/gtk-4.0/settings.ini @@ -1,7 +1,14 @@ [Settings] -gtk-theme-name=catppuccin-mocha-blue-standard+default -gtk-icon-theme-name=Papirus -gtk-font-name=Sarasa UI SC 10 +gtk-application-prefer-dark-theme=true +gtk-cursor-blink=true +gtk-cursor-blink-time=1000 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-application-prefer-dark-theme=1 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true +gtk-font-name=Sarasa UI SC, 10 +gtk-icon-theme-name=Papirus +gtk-primary-button-warps-slider=true +gtk-sound-theme-name=ocean +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-xft-dpi=122880 diff --git a/config/quickshell/.config/quickshell/Modules/Bar/Services/MonitorProcess.qml b/config/quickshell/.config/quickshell/Modules/Bar/Services/MonitorProcess.qml index 2180889..274fb30 100644 --- a/config/quickshell/.config/quickshell/Modules/Bar/Services/MonitorProcess.qml +++ b/config/quickshell/.config/quickshell/Modules/Bar/Services/MonitorProcess.qml @@ -18,7 +18,7 @@ Singleton { id: process running: false - command: ["ghostty", "+new-window", "-e", "btop"] + command: ["kitty-floating", "-e", "btop"] } } diff --git a/config/quickshell/.config/quickshell/Services/NotesService.qml b/config/quickshell/.config/quickshell/Services/NotesService.qml index 444a811..900734e 100644 --- a/config/quickshell/.config/quickshell/Services/NotesService.qml +++ b/config/quickshell/.config/quickshell/Services/NotesService.qml @@ -39,7 +39,7 @@ Singleton { function openNote(path) { recentNotePath = path; - Quickshell.execDetached(["ghostty", "+new-window", "-e", "helix", path]); + Quickshell.execDetached(["kitty-floating", "-e", "helix", path]); } function openRecent() { diff --git a/config/scripts/.local/scripts/kitty-floating b/config/scripts/.local/scripts/kitty-floating new file mode 100755 index 0000000..ea84093 --- /dev/null +++ b/config/scripts/.local/scripts/kitty-floating @@ -0,0 +1,3 @@ +#!/bin/sh + +kitty --app-id kitty-floating --config "$HOME/.config/kitty/floating.conf" $@ diff --git a/config/wlogout/.config/wlogout/layout b/config/wlogout/.config/wlogout/layout index afa51ce..c2adb51 100644 --- a/config/wlogout/.config/wlogout/layout +++ b/config/wlogout/.config/wlogout/layout @@ -1,6 +1,6 @@ { "label": "lock", - "action": "hyprlock &", + "action": "loginctl lock-session", "text": "Lock", "keybind": "l" } @@ -24,7 +24,7 @@ } { "label": "suspend", - "action": "sleep 0.1 && systemctl suspend", + "action": "systemctl suspend", "text": "Suspend", "keybind": "u" } @@ -33,4 +33,4 @@ "action": "systemctl reboot", "text": "Reboot", "keybind": "r" -} \ No newline at end of file +} diff --git a/legacy/eww/.config/eww/Lyrics/eww.yuck b/legacy/eww/.config/eww/Lyrics/eww.yuck index 4ad294c..d253c3f 100644 --- a/legacy/eww/.config/eww/Lyrics/eww.yuck +++ b/legacy/eww/.config/eww/Lyrics/eww.yuck @@ -92,4 +92,4 @@ :monitor 0 :geometry (geometry :x 1108 :y -45) (lyrics-single) -) \ No newline at end of file +) diff --git a/memo/hyprland-ricing.txt b/memo/hyprland-ricing.txt deleted file mode 100644 index c5bbb67..0000000 --- a/memo/hyprland-ricing.txt +++ /dev/null @@ -1,75 +0,0 @@ -things I have installed: - -full KDE Plasma 6 setup - which can provide: - SDDM theme # Breeze is enough - kcalc/kalc # calculator(s), what's the difference? - kcolorchooser # or hyprpicker - pipewire & friends - ... - -# hypr* -hyprland -hypridle -hyprlock -hyprshot -hyprpicker -plugin hyprexpo # workspaces overview -plugin hyprorganize # https://github.com/Uyanide/hyprplug - -# xdg-desktop-portal* -xdg-desktop-portal -xdg-desktop-portal-hyprland # not working with my Intel iGPU, but fine with NVIDIA dGPU -xdg-desktop-portal-gtk # for file picker -xdg-desktop-portal-gnome # why not? - -# terminal emulator(s) -kitty # normal terminal -ghostty # floating terminal, for btop for example - -# under surface -swww # wallpaper daemon -mako # notification daemon -gnome-keyring # --password-store=gnome-libsecret -wl-clipboard -cliphist # clipboard history -slurp # region selector -wf-recorder # screen recorder -brightnessctl -playerctl -pamixer -zoxide # better cd -eza # better ls -bat # better cat - -# GUI -waybar -eww -wlogout -rofi(-wayland) -mpv -network-manager-applet # nm-applet -blueman # bluetooth GUI & applet -pwvucontrol -gnome-text-editor # or kwrite, notepad replacement -btop # system monitor -activate-linux # :/ -polkit-gnome # polkit authentication agent -gradia # screenshots editor - -# fonts & themes -maplemono-nf-cn / ttf-maplemono-nf-cn-unhinted (archlinuxcn) -Sour Gummy -ttf-meslo-nerd -ttf-jetbrains-mono-nerd -spicetify # spotify tweaks -spicetify-maketplace # spotify themes -nwg-look # theme of GTK apps -catppuccin-gtk-theme-mocha # theme of GTK apps -kvantum - -# utils -bc -jq -python-colorthief -python-watchdog diff --git a/memo/niri-ricing.txt b/memo/niri-ricing.txt deleted file mode 100644 index 1dc6923..0000000 --- a/memo/niri-ricing.txt +++ /dev/null @@ -1,7 +0,0 @@ -things I have installed: - -in addition to everything in `./hyprland-ricing.txt`: - -xwayland-satellite -wlsunset -wezterm # replaces ghostty diff --git a/memo/packages.md b/memo/packages.md index 222509f..3fa6433 100644 --- a/memo/packages.md +++ b/memo/packages.md @@ -333,6 +333,7 @@ nvidia-prime nvidia-settings nvidia-utils nvme-cli +nvtop nwg-look obs-studio obsidian