From 58d4005e4f6ca85fc1152ddc80867201da68f9f3 Mon Sep 17 00:00:00 2001 From: ryan4yin Date: Sun, 21 May 2023 11:44:45 +0800 Subject: [PATCH] feat: adjust overlays --- home/default.nix | 1 + home/fcitx5/default.nix | 15 +++++++ hosts/msi-rtx4090/default.nix | 41 +++++++----------- hosts/nixos-test/default.nix | 39 +++++++---------- modules/fcitx5/default.nix | 28 ------------ overlays/default.nix | 7 +++ {modules => overlays}/fcitx5/README.md | 0 overlays/fcitx5/default.nix | 10 +++++ .../share/rime-data/build/flypy.prism.bin | Bin .../share/rime-data/build/flypy.reverse.bin | Bin .../share/rime-data/build/flypy.table.bin | Bin .../share/rime-data/build/flypydz.prism.bin | Bin .../share/rime-data/build/flypydz.reverse.bin | Bin .../share/rime-data/build/flypydz.table.bin | Bin .../share/rime-data/default.yaml | 0 .../share/rime-data/flypy.schema.yaml | 0 .../share/rime-data/flypy_full全码字.txt | 0 .../share/rime-data/flypy_sys.txt | 0 .../share/rime-data/flypy_top.txt | 0 .../share/rime-data/flypy_user.txt | 0 .../rime-data/lua/calculator_translator.lua | 0 .../rime-data-flypy/share/rime-data/rime.lua | 0 .../share/rime-data/squirrel.custom.yaml | 0 .../share/rime-data/squirrel.yaml | 0 24 files changed, 64 insertions(+), 77 deletions(-) create mode 100644 home/fcitx5/default.nix delete mode 100644 modules/fcitx5/default.nix create mode 100644 overlays/default.nix rename {modules => overlays}/fcitx5/README.md (100%) create mode 100644 overlays/fcitx5/default.nix rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/build/flypy.prism.bin (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/build/flypy.reverse.bin (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/build/flypy.table.bin (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.prism.bin (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.reverse.bin (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.table.bin (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/default.yaml (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/flypy.schema.yaml (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/flypy_full全码字.txt (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/flypy_sys.txt (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/flypy_top.txt (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/flypy_user.txt (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/lua/calculator_translator.lua (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/rime.lua (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/squirrel.custom.yaml (100%) rename {modules => overlays}/fcitx5/rime-data-flypy/share/rime-data/squirrel.yaml (100%) diff --git a/home/default.nix b/home/default.nix index 11806cbf..91652e3a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,6 +3,7 @@ { imports = [ + ./fcitx5 ./hyprland # ./i3 ./programs diff --git a/home/fcitx5/default.nix b/home/fcitx5/default.nix new file mode 100644 index 00000000..31423df5 --- /dev/null +++ b/home/fcitx5/default.nix @@ -0,0 +1,15 @@ +{pkgs, config, ... }: { + + i18n.inputMethod = { + enabled = "fcitx5"; + fcitx5.addons = with pkgs; [ + # for flypy chinese input method + fcitx5-rime + # needed enable rime using configtool after installed + fcitx5-configtool + fcitx5-chinese-addons + # fcitx5-mozc # japanese input method + fcitx5-gtk # gtk im module + ]; + }; +} \ No newline at end of file diff --git a/hosts/msi-rtx4090/default.nix b/hosts/msi-rtx4090/default.nix index eb201159..4e9409c3 100644 --- a/hosts/msi-rtx4090/default.nix +++ b/hosts/msi-rtx4090/default.nix @@ -6,35 +6,26 @@ { config, pkgs, home-manager, nur, ... } @ args: { - imports = - [ - ({pkgs, config, ... }: { - config = { - # use it as an overlay - nixpkgs.overlays = [ - args.nixpkgs-wayland.overlay - ]; - }; - }) + imports = [ + # This adds a nur configuration option. + # Use `config.nur.repos..` in NixOS Module for packages from the NUR. + nur.nixosModules.nur - # This adds a nur configuration option. - # Use `config.nur.repos..` in NixOS Module for packages from the NUR. - nur.nixosModules.nur + ./cifs-mount.nix + # Include the results of the hardware scan. + ./hardware-configuration.nix - ./cifs-mount.nix - # Include the results of the hardware scan. - ./hardware-configuration.nix + ../../modules/fhs-fonts.nix + ../../modules/hyprland.nix + #../../modules/i3.nix + ../../modules/nur-packages.nix + ../../modules/system.nix + ../../modules/user_group.nix - ../../modules/fcitx5 - ../../modules/fhs-fonts.nix - ../../modules/hyprland.nix - #../../modules/i3.nix - ../../modules/nur-packages.nix - ../../modules/system.nix - ../../modules/user_group.nix + ../../secrets + ]; - ../../secrets - ]; + nixpkgs.overlays = import ../../overlays args; # Bootloader. boot.loader = { diff --git a/hosts/nixos-test/default.nix b/hosts/nixos-test/default.nix index d733eca5..e4615dbf 100644 --- a/hosts/nixos-test/default.nix +++ b/hosts/nixos-test/default.nix @@ -5,34 +5,25 @@ { config, pkgs, home-manager, nur, ... } @args: { - imports = - [ - ({pkgs, config, ... }: { - config = { - # use it as an overlay - nixpkgs.overlays = [ - args.nixpkgs-wayland.overlay - ]; - }; - }) + imports = [ + # This adds a nur configuration option. + # Use `config.nur.repos..` in NixOS Module for packages from the NUR. + nur.nixosModules.nur - # This adds a nur configuration option. - # Use `config.nur.repos..` in NixOS Module for packages from the NUR. - nur.nixosModules.nur + # Include the results of the hardware scan. + ./hardware-configuration.nix - # Include the results of the hardware scan. - ./hardware-configuration.nix + ../../modules/fhs-fonts.nix + ../../modules/hyprland.nix + #../../modules/i3.nix + ../../modules/nur-packages.nix + ../../modules/system.nix + ../../modules/user_group.nix - ../../modules/fcitx5 - ../../modules/fhs-fonts.nix - ../../modules/hyprland.nix - #../../modules/i3.nix - ../../modules/nur-packages.nix - ../../modules/system.nix - ../../modules/user_group.nix + ../../secrets + ]; - ../../secrets - ]; + nixpkgs.overlays = import ../../overlays args; # Bootloader. boot.loader = { diff --git a/modules/fcitx5/default.nix b/modules/fcitx5/default.nix deleted file mode 100644 index 9f31d596..00000000 --- a/modules/fcitx5/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, ... }: - -# related issues: https://github.com/hyprwm/Hyprland/discussions/421 -{ - # 为了不使用默认的 rime-data，改用我自定义的小鹤音形数据，这里需要 override - # 参考 https://github.com/NixOS/nixpkgs/blob/e4246ae1e7f78b7087dce9c9da10d28d3725025f/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix - nixpkgs.overlays = [ - (self: super: { - # 小鹤音形配置，配置来自 flypy.com 官方网盘的鼠须管配置压缩包「小鹤音形“鼠须管”for macOS.zip」 - # 我仅修改了 default.yaml 文件，将其中的半角括号改为了直角括号「 与 」。 - rime-data = ./rime-data-flypy; - fcitx5-rime = super.fcitx5-rime.override { rimeDataPkgs = [ ./rime-data-flypy ]; }; - }) - ]; - - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ - # for flypy chinese input method - fcitx5-rime - # needed enable rime using configtool after installed - fcitx5-configtool - fcitx5-chinese-addons - # fcitx5-mozc # japanese input method - fcitx5-gtk # gtk im module - ]; - }; -} diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 00000000..9582515f --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,7 @@ +args: + # execute and import all overlay files in the current directory with the given args + builtins.map + (f: (import (./. + "/${f}") args)) # execute and import the overlay file + (builtins.filter # find all overlay files in the current directory + (f: f != "default.nix") + (builtins.attrNames (builtins.readDir ./.))) diff --git a/modules/fcitx5/README.md b/overlays/fcitx5/README.md similarity index 100% rename from modules/fcitx5/README.md rename to overlays/fcitx5/README.md diff --git a/overlays/fcitx5/default.nix b/overlays/fcitx5/default.nix new file mode 100644 index 00000000..3b463753 --- /dev/null +++ b/overlays/fcitx5/default.nix @@ -0,0 +1,10 @@ +# 为了不使用默认的 rime-data，改用我自定义的小鹤音形数据，这里需要 override +# 参考 https://github.com/NixOS/nixpkgs/blob/e4246ae1e7f78b7087dce9c9da10d28d3725025f/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +{...}: + +(self: super: { + # 小鹤音形配置，配置来自 flypy.com 官方网盘的鼠须管配置压缩包「小鹤音形“鼠须管”for macOS.zip」 + # 我仅修改了 default.yaml 文件，将其中的半角括号改为了直角括号「 与 」。 + rime-data = ./rime-data-flypy; + fcitx5-rime = super.fcitx5-rime.override { rimeDataPkgs = [ ./rime-data-flypy ]; }; +}) diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/build/flypy.prism.bin b/overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypy.prism.bin similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/build/flypy.prism.bin rename to overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypy.prism.bin diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/build/flypy.reverse.bin b/overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypy.reverse.bin similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/build/flypy.reverse.bin rename to overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypy.reverse.bin diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/build/flypy.table.bin b/overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypy.table.bin similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/build/flypy.table.bin rename to overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypy.table.bin diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.prism.bin b/overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.prism.bin similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.prism.bin rename to overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.prism.bin diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.reverse.bin b/overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.reverse.bin similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.reverse.bin rename to overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.reverse.bin diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.table.bin b/overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.table.bin similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.table.bin rename to overlays/fcitx5/rime-data-flypy/share/rime-data/build/flypydz.table.bin diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/default.yaml b/overlays/fcitx5/rime-data-flypy/share/rime-data/default.yaml similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/default.yaml rename to overlays/fcitx5/rime-data-flypy/share/rime-data/default.yaml diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/flypy.schema.yaml b/overlays/fcitx5/rime-data-flypy/share/rime-data/flypy.schema.yaml similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/flypy.schema.yaml rename to overlays/fcitx5/rime-data-flypy/share/rime-data/flypy.schema.yaml diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/flypy_full全码字.txt b/overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_full全码字.txt similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/flypy_full全码字.txt rename to overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_full全码字.txt diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/flypy_sys.txt b/overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_sys.txt similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/flypy_sys.txt rename to overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_sys.txt diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/flypy_top.txt b/overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_top.txt similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/flypy_top.txt rename to overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_top.txt diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/flypy_user.txt b/overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_user.txt similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/flypy_user.txt rename to overlays/fcitx5/rime-data-flypy/share/rime-data/flypy_user.txt diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/lua/calculator_translator.lua b/overlays/fcitx5/rime-data-flypy/share/rime-data/lua/calculator_translator.lua similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/lua/calculator_translator.lua rename to overlays/fcitx5/rime-data-flypy/share/rime-data/lua/calculator_translator.lua diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/rime.lua b/overlays/fcitx5/rime-data-flypy/share/rime-data/rime.lua similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/rime.lua rename to overlays/fcitx5/rime-data-flypy/share/rime-data/rime.lua diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/squirrel.custom.yaml b/overlays/fcitx5/rime-data-flypy/share/rime-data/squirrel.custom.yaml similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/squirrel.custom.yaml rename to overlays/fcitx5/rime-data-flypy/share/rime-data/squirrel.custom.yaml diff --git a/modules/fcitx5/rime-data-flypy/share/rime-data/squirrel.yaml b/overlays/fcitx5/rime-data-flypy/share/rime-data/squirrel.yaml similarity index 100% rename from modules/fcitx5/rime-data-flypy/share/rime-data/squirrel.yaml rename to overlays/fcitx5/rime-data-flypy/share/rime-data/squirrel.yaml