migrate: bash→fish, reorganize packages between system/home, add kwallet PAM auto-unlock, add python3+pip+pnpm
This commit is contained in:
+17
-3
@@ -60,6 +60,14 @@
|
|||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.displayManager.sddm.enable = true;
|
services.displayManager.sddm.enable = true;
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
security.pam.services.login.kwallet = {
|
||||||
|
enable = true;
|
||||||
|
forceRun = true;
|
||||||
|
};
|
||||||
|
security.pam.services.sddm.kwallet = {
|
||||||
|
enable = true;
|
||||||
|
forceRun = true;
|
||||||
|
};
|
||||||
services.xserver.xkb.layout = "us";
|
services.xserver.xkb.layout = "us";
|
||||||
|
|
||||||
# 字体
|
# 字体
|
||||||
@@ -103,15 +111,15 @@
|
|||||||
users.users.test = {
|
users.users.test = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "test";
|
description = "test";
|
||||||
|
shell = pkgs.fish;
|
||||||
extraGroups = [ "networkmanager" "wheel" ];
|
extraGroups = [ "networkmanager" "wheel" ];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
kdePackages.kate
|
|
||||||
nodejs
|
|
||||||
bubblewrap
|
bubblewrap
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── 程序与服务 ──────────────────────────────────────────────
|
# ── 程序与服务 ──────────────────────────────────────────────
|
||||||
|
programs.fish.enable = true;
|
||||||
programs.firefox.enable = true;
|
programs.firefox.enable = true;
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
programs.nix-ld.enable = true;
|
programs.nix-ld.enable = true;
|
||||||
@@ -119,7 +127,13 @@
|
|||||||
services.gnome.gnome-keyring.enable = true;
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
# ── 系统级软件包 ────────────────────────────────────────────
|
# ── 系统级软件包 ────────────────────────────────────────────
|
||||||
environment.systemPackages = with pkgs; [ ];
|
environment.systemPackages = with pkgs; [
|
||||||
|
rsync
|
||||||
|
wget
|
||||||
|
htop
|
||||||
|
btop
|
||||||
|
(python3.withPackages (ps: with ps; [ pip ]))
|
||||||
|
];
|
||||||
|
|
||||||
# ── 系统状态版本(请勿修改) ────────────────────────────────
|
# ── 系统状态版本(请勿修改) ────────────────────────────────
|
||||||
system.stateVersion = "25.11";
|
system.stateVersion = "25.11";
|
||||||
|
|||||||
@@ -13,11 +13,22 @@
|
|||||||
google-chrome
|
google-chrome
|
||||||
neovim
|
neovim
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
htop
|
|
||||||
btop
|
|
||||||
wechat
|
wechat
|
||||||
gpu-screen-recorder
|
gpu-screen-recorder
|
||||||
gpu-screen-recorder-gtk
|
gpu-screen-recorder-gtk
|
||||||
|
android-tools
|
||||||
|
openjdk21
|
||||||
|
cloudflared
|
||||||
|
obsidian
|
||||||
|
zed-editor
|
||||||
|
postgresql
|
||||||
|
rclone
|
||||||
|
feishu
|
||||||
|
wpsoffice-cn
|
||||||
|
flutter
|
||||||
|
nodejs
|
||||||
|
pnpm
|
||||||
|
kdePackages.kate
|
||||||
];
|
];
|
||||||
|
|
||||||
# 用 Home Manager 固定 Fcitx5 输入法配置,仅保留拼音
|
# 用 Home Manager 固定 Fcitx5 输入法配置,仅保留拼音
|
||||||
@@ -46,10 +57,10 @@
|
|||||||
# 让 nix-shell 等传统命令也能安装 unfree 软件
|
# 让 nix-shell 等传统命令也能安装 unfree 软件
|
||||||
xdg.configFile."nixpkgs/config.nix".text = "{ allowUnfree = true; }";
|
xdg.configFile."nixpkgs/config.nix".text = "{ allowUnfree = true; }";
|
||||||
|
|
||||||
programs.bash = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
initExtra = ''
|
interactiveShellInit = ''
|
||||||
export PATH="$HOME/.npm-global/bin:$PATH"
|
fish_add_path "$HOME/.npm-global/bin"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user