diff --git a/defaults/default.nix b/defaults/default.nix index 9b9ac3f..f2eea34 100644 --- a/defaults/default.nix +++ b/defaults/default.nix @@ -10,7 +10,6 @@ let in { imports = [ - ./jp.nix ./plasma.nix ./browsers.nix @@ -29,7 +28,6 @@ in config = lib.mkIf cfg.enable { nixowos.${name} = lib.mkDefault { - jp.enable = true; plasma.enable = config.services.desktopManager.plasma6.enable; browsers.enable = true; diff --git a/defaults/jp.nix b/defaults/jp.nix deleted file mode 100644 index 16c984b..0000000 --- a/defaults/jp.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: - -let - name = "jp"; - cfg = config.nixowos.defaults.${name}; -in -{ - options.nixowos.defaults.${name} = { - enable = lib.mkEnableOption name; - }; - - config = lib.mkIf cfg.enable { - # for typing in japanese - i18n.inputMethod = { - # set this for the defaults to be realized! - # enable = true; - type = lib.mkDefault "fcitx5"; - fcitx5 = { - waylandFrontend = lib.mkDefault true; - addons = - with pkgs; - lib.mkIf config.nixowos.allowAddingPackages [ - fcitx5-mozc # japanese module - fcitx5-gtk - ]; - - settings = lib.mkDefault { - globalOptions = { - # also require "alt" for triggering IME - # this is to avoid conflicts with other apps/games - "Hotkey/TriggerKeys"."0" = "Control+Alt+space"; - }; - - # basic configuration for switching between normal mode and mozc - inputMethod = { - "Groups/0" = { - Name = "Default"; - "Default Layout" = "us"; - DefaultIM = "mozc"; - }; - - "Groups/0/Items/0" = { - Name = "keyboard-us"; - Layout = "us"; - }; - - "Groups/0/Items/1" = { - Name = "mozc"; - Layout = "us"; - }; - - GroupOrder."0" = "Default"; - }; - - addons.classicui.globalSection.Theme = lib.mkIf config.services.desktopManager.plasma6.enable "plasma"; - }; - }; - }; - }; -}