diff --git a/nixops/desktop.nix b/nixops/desktop.nix index 77c5b837..f8ba22f8 100644 --- a/nixops/desktop.nix +++ b/nixops/desktop.nix @@ -126,8 +126,8 @@ in }; i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ table-extra m17n ]; + enabled = "fcitx5"; + fcitx5.addons = [ pkgs.fcitx5-table-extra pkgs.fcitx5-m17n ]; }; fonts.fonts = [ pkgs.noto-fonts pkgs.noto-fonts-cjk pkgs.noto-fonts-emoji pkgs.noto-fonts-extra pkgs.emacs-all-the-icons-fonts ]; @@ -154,6 +154,7 @@ in hardware.bluetooth.enable = true; + programs.zsh.enable = true; programs.fish.enable = true; programs.fish.promptInit = '' any-nix-shell fish --info-right | source diff --git a/nixops/rpi.nix b/nixops/rpi.nix index e50abb2e..18d84482 100644 --- a/nixops/rpi.nix +++ b/nixops/rpi.nix @@ -62,6 +62,7 @@ in xc3sprog screen gdb minicom picocom ]; + programs.zsh.enable = true; programs.fish.enable = true; programs.wireshark.enable = true;