diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-09-09T14·48-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-09-09T16·09+0000 |
| commit | 1c9843707914aecf3bfe4f51c47504b8d56791a4 (patch) | |
| tree | fb8d992aa129b11eb9816618a98e969452d67fdc /users/glittershark/system | |
| parent | 90451fdc0e7ff313f7f35ed55a890502f2b08867 (diff) | |
feat(gs/home): Add chupacabra home-manager to CI targets r/1780
Also move fcitx to system, since it's a nixos thing not a home-manager thing. Change-Id: I3e047494a478520e939d48fc72cc91a2d797bf74 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1969 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'users/glittershark/system')
| -rw-r--r-- | users/glittershark/system/home/default.nix | 4 | ||||
| -rw-r--r-- | users/glittershark/system/home/machines/chupacabra.nix | 1 | ||||
| -rw-r--r-- | users/glittershark/system/system/machines/chupacabra.nix | 1 | ||||
| -rw-r--r-- | users/glittershark/system/system/modules/fcitx.nix (renamed from users/glittershark/system/home/modules/fcitx.nix) | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix index a10e3f8dfc30..347f9596ed20 100644 --- a/users/glittershark/system/home/default.nix +++ b/users/glittershark/system/home/default.nix @@ -23,4 +23,8 @@ rec { }); chupacabra = home ./machines/chupacabra.nix; + + chupacabraHome = chupacabra.activation-script; + + meta.targets = [ "chupacabraHome" ]; } diff --git a/users/glittershark/system/home/machines/chupacabra.nix b/users/glittershark/system/home/machines/chupacabra.nix index e150c5ae5715..66531e9d7f31 100644 --- a/users/glittershark/system/home/machines/chupacabra.nix +++ b/users/glittershark/system/home/machines/chupacabra.nix @@ -11,7 +11,6 @@ in { ../modules/games.nix ../modules/rtlsdr.nix ../modules/urbint.nix - ../modules/fcitx.nix ]; # for when hacking diff --git a/users/glittershark/system/system/machines/chupacabra.nix b/users/glittershark/system/system/machines/chupacabra.nix index 5e9fb5795330..5d9414309676 100644 --- a/users/glittershark/system/system/machines/chupacabra.nix +++ b/users/glittershark/system/system/machines/chupacabra.nix @@ -6,6 +6,7 @@ ../modules/reusable/battery.nix ../modules/tvl.nix ../modules/urbint.nix + ../modules/fcitx.nix ../../../../../ops/nixos/v4l2loopback.nix ]; diff --git a/users/glittershark/system/home/modules/fcitx.nix b/users/glittershark/system/system/modules/fcitx.nix index 02fb4f559371..812f598f9f47 100644 --- a/users/glittershark/system/home/modules/fcitx.nix +++ b/users/glittershark/system/system/modules/fcitx.nix @@ -3,7 +3,7 @@ { i18n.inputMethod = { enabled = "fcitx"; - engines = with pkgs.fcitx-engines; [ + fcitx.engines = with pkgs.fcitx-engines; [ cloudpinyin ]; }; |