diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl index d6d9ca0..9b5598f 100644 --- a/.config/niri/config.kdl +++ b/.config/niri/config.kdl @@ -238,7 +238,6 @@ spawn-at-startup "swww-daemon" spawn-at-startup "swww-daemon" "--namespace" "blur" spawn-at-startup "xwayland-satellite" spawn-at-startup "/usr/lib/pam_kwallet_init" -//spawn-at-startup "swayidle -w timeout 300 'gtklock -d' timeout 1200 'niri msg action power-off-monitors' before-sleep 'pgrep gtklock || gtklock -d'" environment { DISPLAY ":0" @@ -249,9 +248,6 @@ environment { binds { Mod+F1 { show-hotkey-overlay; } - // Launch pwvucontrol - //Mod+Ctrl+V hotkey-overlay-title="Open pwvucontrol" { spawn "flatpak" "run" "com.saivert.pwvucontrol"; } - Mod+Return hotkey-overlay-title="Terminal (foot)" { spawn "foot"; } Mod+F9 hotkey-overlay-title="Browser (firefox)" { spawn "firefox"; } Mod+E hotkey-overlay-title="Explorer (yazi)" { spawn "foot" "yazi"; } @@ -270,7 +266,7 @@ binds { // which ensures niri always processes them, even when an inhibitor is active. Mod+Alt+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } Mod+Shift+Escape hotkey-overlay-title="Exit niri" { quit; } - Super+Escape hotkey-overlay-title="Lock the Screen (gtklock)" { spawn "gtklock"; } + Super+Escape hotkey-overlay-title="Lock the Screen (gtklock)" { spawn "gtklock" "-d"; } XF86PowerOff hotkey-overlay-title="Lock screen and Hibernate ..." { spawn-sh "gtklock -d && sleep 3 && systemctl hibernate"; } XF86AudioRaiseVolume hotkey-overlay-title=null allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.01+"; } diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 5b02b9e..b948cd9 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -10,7 +10,7 @@ "format": " {volume}%", "format-muted": "x {volume}%", "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", - "on-click-right": "pwvucontrol-qt" + "on-click-right": "pavucontrol-qt" }, "niri/workspaces": { "format": "{index}" diff --git a/readme.md b/readme.md index 28346e3..715c71c 100644 --- a/readme.md +++ b/readme.md @@ -1,40 +1,56 @@ -# dotfiles (for niri) +# niri 散装配置集(dotfiles) -> it's all Yukitoha's fault! (x) +> 都怪雪叶!( -by the time I make this repo, I even haven't configure fcitx5. -so English README only. +~~by the time I make this repo, I even haven't configure fcitx5. so English README only.~~ > [!note] -> You may wanna try `stow`, which is not considered by me. -> in my case, just symlink them one by one, or at least, shell script. -> of course pull requests to directory structure are welcomed. +> 本仓库的配置管理方案比较原始:逐个做软链接处理。有觉得`stow`等工具好用,想要重新组织文件树的欢迎 pr. -## special thanks -- Vescrity (Yukitoha) +## 鸣谢 +- 雪叶 [@Vescrity](https://github.com/Vescrity) (Yukitoha) - fizzyizzy05 (Isabelle Jackson, mtf) -## requirements -- `niri`, and its optional deps (`yay -Si`). -- `swww` from fizzy dotfiles -- ZshIM from miku installation guide, basically to refer `powerlevel10k` zmodule. - - no `oh-my-zsh`. - - no other plugins from pacman, like `zsh-syntax-highlighting`. they are included in zim by default. -- `powershell-bin` (AUR) to easily trigger `start-process`. +## 已知依赖 +> [!note] +> 从 WSL 里测试开始,配这些组件先后花了我两个多月时间。 +> 恕我很难回忆出都用过什么。 -## my later replacements +- `niri`,以及`yay -Si`中指定的可选依赖。 +- `swww`(从 fizzy 那毛的双层背景方案) +- ZshIM (`zim`):主要为了 powerlevel10k. + - 不再考虑 `oh-my-zsh`. + - 也不需要用包管理器装插件(像语法高亮),这些 zim 默认就集成了。 +- `powershell-bin`:用于便捷地拉起新进程。 + +> 在`.sh`里总是纠结用`command &`还是`nohup`还是别的什么。 +> 而 pwsh 的`start-process`在 Linux 的实现似乎有用到 xdg-open,直接跑命令的效果又类似`command &`,实际用下来感觉不如 sh。 +> 但胜在容易写。搁 bash 里写`fuzzel-vsc-entries`就只能字符串拼接之后`echo`进管道,pwsh 则支持直接把 .NET 对象送进管道。 + +## 后续替换 ``` alacritty -> foot nautilus (gnome files) -> yazi (console) swaylock -> gtklock gnome-keyring -> kwallet (kd6), kwallet-pam (to auto unlock), kwalletmanager (optional) +com.saivert.pwvucontrol (flatpak) -> pavucontrol-qt (extra) ... ``` -## resources references -[Monaco Nerd Font Mono (MelodyEcho ver.)](https://glowmem.com/upload/articles/archlinux-note/Monaco_Nerd_Font_Mono-Regular.ttf) - -or just `ttf-monaco-nerd-font` from AUR, which may not suitable for VSCode though. +## 参考资源与备注 +- Nerd 字体:[Monaco Nerd Font Mono (MelodyEcho ver.)](https://glowmem.com/upload/articles/archlinux-note/Monaco_Nerd_Font_Mono-Regular.ttf) 或直接`ttf-monaco-nerd-font`(AUR)。后者在 VSCode 里表现不咋地。 > [!note] -> no wallpaper given. just run `.local/bin/chbg` to manually generate. +> 壁纸自己用`chbg`生成。 + +> [!important] +> Niri 里的 linuxqq 不能直接用`default-electron-flags`。改用以下标签: +> - `--enable-platform=wayland` +> - `--enable-wayland-ime` +> - `--wayland-text-input-version=3` +> +> 至于原因,可参见 archlinuxcn 社区论坛。 + +> [!note] +> `fcitx5`的配置基本上和 Miku 指南所述一致,就不再合进来了; +> 其余各 App 仍有一些兼容问题,排查后再更新此文档。