Commit 354b887
Changed files (2)
README.md
@@ -2,75 +2,69 @@
English | [简体中文](./README.zh-CN.md)
-My Nix configuration for a NixOS laptop and a NixOS VPS.
-
-I'm migrating my config to Dendritic Pattern.
+My [Dendritic Pattern][dendritic-pattern] Nix configuration, for a NixOS laptop and a NixOS VPS.
## Component List
| | NixOS |
| --------------------------- | ------------------------------------------------------------ |
| **Desktop** | [KDE Plasma 6][kde-plasma] |
-| **Terminal Emulator** | [WezTerm][wezterm] + [Ghostty][ghostty] |
-| **Terminal Multiplexer** | [Zellij][zellij] |
+| **Terminal** | [Ghostty][ghostty] + [Zellij][zellij] |
| **Shell** | [Fish][fish] + [Starship][starship] |
-| **Input Method** | [Fcitx5][fcitx5] + [Rime][rime] (use [rime-ice][rime-ice]) |
+| **Input Method** | [Fcitx5][fcitx5] + [Rime][rime] (using [rime-ice][rime-ice]) |
| **Color Theme** | [Catppuccin Macchiato][catppuccin] |
-| **File Manager** | [Yazi][yazi] + [Dolphin][kde-dolphin] |
+| **File Management** | [Yazi][yazi] + [Dolphin][kde-dolphin] |
| **Development Environment** | [VSCode][vscode] + [Helix][helix] (with [Zide][zide]) |
-| **Browser** | [Firefox][firefox] + [Chromium][chromium] (for PWA) |
-| **Secret Management** | [sops-nix][sops-nix], see [`./secrets`](./secrets/README.md) |
-| **Media Playback** | [mpv][mpv] (Video) + [Quod Libet][quodlibet] (Music) |
+| **Browser** | [Firefox][firefox] + [Chromium][chromium] (for web app) |
+| **Secrets Management** | [vaultix][vaultix] |
+| **Media Playback** | [mpv][mpv] (video) + [DeaDBeeF][deadbeef] (music) |
## Deployment
> [!WARNING]
> You should not deploy this configuration directly on your host, as it contains secrets that only I can decrypt and use.
->
-> This configuration includes some hardcoded absolute paths and should be placed in the home directory at `~/nix-config`.
### For Local NixOS
```bash
-sudo nixos-rebuild switch --flake .#kevin
+nh os boot .#kevin
```
### For Remote NixOS
```bash
-colmena apply
+deploy .
```
-## Acknowledgments
+## Acknowledgements
-- Nix Flakes
- - [ryan4yin/nix-config](https://github.com/ryan4yin/nix-config): The foundational architecture of this configuration originates from here.
- - [kamadorueda/machine](https://github.com/kamadorueda/machine): Resolves the issue with writing to VSCode's `settings.json`.
- - [xddxdd/nixos-config](https://github.com/xddxdd/nixos-config): Resolves the compatibility issue between Audacious and Fcitx5.
-- Dotfiles
- - [yyhhyyyyyy/selfproxy](https://github.com/yyhhyyyyyy/selfproxy): Referenced configurations for [mihomo][mihomo].
+- [ryan4yin/nix-config](https://github.com/ryan4yin/nix-config): The infrastructure of this configuration is derived from this config.
+- [kamadorueda/machine](https://github.com/kamadorueda/machine): Solved VSCode's `settings.json` write issue.
+- [xddxdd/nixos-config](https://github.com/xddxdd/nixos-config): Solved the Audacious and Fcitx5 cooperation issue (now deprecated).
+- [drupol/infra](https://github.com/drupol/infra): Actual configuration reference for [Dendritic pattern][dendritic-pattern].
+- [yyhhyyyyyy/selfproxy](https://github.com/yyhhyyyyyy/selfproxy): Referenced relevant configuration from [mihomo][mihomo].
<!-- Link List -->
[catppuccin]: https://github.com/catppuccin/catppuccin
[chromium]: https://chromium.googlesource.com/chromium/src
+[deadbeef]: https://github.com/DeaDBeeF-Player/deadbeef
+[dendritic-pattern]: https://github.com/mightyiam/dendritic
[fcitx5]: https://github.com/fcitx/fcitx5
[firefox]: https://github.com/mozilla-firefox/firefox
[fish]: https://github.com/fish-shell/fish-shell
[ghostty]: https://github.com/ghostty-org/ghostty
-[nushell]: https://github.com/nushell/nushell
[helix]: https://github.com/helix-editor/helix
[kde-dolphin]: https://invent.kde.org/system/dolphin
[kde-plasma]: https://invent.kde.org/plasma/plasma-desktop
[mihomo]: https://github.com/MetaCubeX/mihomo
[mpv]: https://github.com/mpv-player/mpv
-[quodlibet]: https://github.com/quodlibet/quodlibet
[rime]: https://github.com/rime/librime
[rime-ice]: https://github.com/iDvel/rime-ice
[starship]: https://github.com/starship/starship
-[sops-nix]: https://github.com/Mic92/sops-nix
-[wezterm]: https://github.com/wezterm/wezterm
+[vaultix]: https://github.com/milieuim/vaultix
[vscode]: https://github.com/microsoft/vscode
+[wezterm]: https://github.com/wezterm/wezterm
[yazi]: https://github.com/sxyazi/yazi
[zellij]: https://github.com/iXialumy/zellij
[zide]: https://github.com/josephschmitt/zide
README.zh-CN.md
@@ -2,75 +2,69 @@
[English](./README.md) | 简体中文
-我的 Nix 配置，用于一台 NixOS 笔记本和一台 NixOS VPS。
-
-我正在将配置迁移到 Dendritic 模式。
+我的 [Dendritic 模式][dendritic-pattern] Nix 配置，用于一台 NixOS 笔记本和一台 NixOS VPS。
## 组件列表
-| | NixOS |
-| -------------- | ------------------------------------------------------------------- |
-| **桌面** | [KDE Plasma 6][kde-plasma] |
-| **终端模拟器** | [WezTerm][wezterm] + [Ghostty][ghostty] |
-| **终端复用器** | [Zellij][zellij] |
-| **Shell** | [Fish][fish] + [Starship][starship] |
-| **输入法** | [Fcitx5][fcitx5] + [Rime][rime] (使用 [rime-ice][rime-ice]) |
-| **配色主题** | [Catppuccin Macchiato][catppuccin] |
-| **文件管理** | [Yazi][yazi] + [Dolphin][kde-dolphin] |
-| **开发环境** | [VSCode][vscode] + [Helix][helix] (with [Zide][zide]) |
-| **浏览器** | [Firefox][firefox] + [Chromium][chromium] (用于 PWA) |
-| **机密管理** | [sops-nix][sops-nix]，详见 [`./secrets`](./secrets/README.zh-CN.md) |
-| **媒体播放** | [mpv][mpv] (视频) + [Quod Libet][quodlibet] (音乐) |
+| | NixOS |
+| ------------ | ----------------------------------------------------------- |
+| **桌面** | [KDE Plasma 6][kde-plasma] |
+| **终端** | [Ghostty][ghostty] + [Zellij][zellij] |
+| **Shell** | [Fish][fish] + [Starship][starship] |
+| **输入法** | [Fcitx5][fcitx5] + [Rime][rime] (使用 [rime-ice][rime-ice]) |
+| **配色主题** | [Catppuccin Macchiato][catppuccin] |
+| **文件管理** | [Yazi][yazi] + [Dolphin][kde-dolphin] |
+| **开发环境** | [VSCode][vscode] + [Helix][helix] (搭配 [Zide][zide]) |
+| **浏览器** | [Firefox][firefox] + [Chromium][chromium] (用于 web app) |
+| **机密管理** | [vaultix][vaultix] |
+| **媒体播放** | [mpv][mpv] (视频) + [DeaDBeeF][deadbeef] (音乐) |
## 部署
> [!WARNING]
> 你不应该在你的主机上直接部署本配置，这个配置包含只有我自己可以解密使用的机密。
->
-> 这个配置包含部分硬编码的绝对路径，应当放在主用户的 `~/nix-config` 中。
### 对于本地 NixOS
```bash
-sudo nixos-rebuild switch --flake .#kevin
+nh os boot .#kevin
```
### 对于远程 NixOS
```bash
-colmena apply
+deploy .
```
## 致谢
-- Nix Flakes
- - [ryan4yin/nix-config](https://github.com/ryan4yin/nix-config): 本配置的基础架构源自此配置。
- - [kamadorueda/machine](https://github.com/kamadorueda/machine): 解决 VSCode 的 `settings.json` 写入问题。
- - [xddxdd/nixos-config](https://github.com/xddxdd/nixos-config): 解决 Audacious 与 Fcitx5 的配合问题。
-- Dotfiles
- - [yyhhyyyyyy/selfproxy](https://github.com/yyhhyyyyyy/selfproxy): 参考了 [mihomo][mihomo] 的相关配置。
+- [ryan4yin/nix-config](https://github.com/ryan4yin/nix-config): 本配置的基础架构源自此配置。
+- [kamadorueda/machine](https://github.com/kamadorueda/machine): 解决 VSCode 的 `settings.json` 写入问题。
+- [xddxdd/nixos-config](https://github.com/xddxdd/nixos-config): 解决 Audacious 与 Fcitx5 的配合问题（已弃用）。
+- [drupol/infra](https://github.com/drupol/infra): [Dendritic 模式][dendritic-pattern]实际配置参考。
+- [yyhhyyyyyy/selfproxy](https://github.com/yyhhyyyyyy/selfproxy): 参考了 [mihomo][mihomo] 的相关配置。
<!-- 链接列表 -->
[catppuccin]: https://github.com/catppuccin/catppuccin
[chromium]: https://chromium.googlesource.com/chromium/src
+[deadbeef]: https://github.com/DeaDBeeF-Player/deadbeef
+[dendritic-pattern]: https://github.com/mightyiam/dendritic
[fcitx5]: https://github.com/fcitx/fcitx5
[firefox]: https://github.com/mozilla-firefox/firefox
[fish]: https://github.com/fish-shell/fish-shell
[ghostty]: https://github.com/ghostty-org/ghostty
-[nushell]: https://github.com/nushell/nushell
[helix]: https://github.com/helix-editor/helix
[kde-dolphin]: https://invent.kde.org/system/dolphin
[kde-plasma]: https://invent.kde.org/plasma/plasma-desktop
[mihomo]: https://github.com/MetaCubeX/mihomo
[mpv]: https://github.com/mpv-player/mpv
-[quodlibet]: https://github.com/quodlibet/quodlibet
[rime]: https://github.com/rime/librime
[rime-ice]: https://github.com/iDvel/rime-ice
[starship]: https://github.com/starship/starship
-[sops-nix]: https://github.com/Mic92/sops-nix
-[wezterm]: https://github.com/wezterm/wezterm
+[vaultix]: https://github.com/milieuim/vaultix
[vscode]: https://github.com/microsoft/vscode
+[wezterm]: https://github.com/wezterm/wezterm
[yazi]: https://github.com/sxyazi/yazi
[zellij]: https://github.com/iXialumy/zellij
[zide]: https://github.com/josephschmitt/zide