From 1c9843707914aecf3bfe4f51c47504b8d56791a4 Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Wed, 9 Sep 2020 10:48:29 -0400
Subject: feat(gs/home): Add chupacabra home-manager to CI targets

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>
---
 users/glittershark/system/home/default.nix               |  4 ++++
 users/glittershark/system/home/machines/chupacabra.nix   |  1 -
 users/glittershark/system/home/modules/fcitx.nix         | 10 ----------
 users/glittershark/system/system/machines/chupacabra.nix |  1 +
 users/glittershark/system/system/modules/fcitx.nix       | 10 ++++++++++
 5 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 users/glittershark/system/home/modules/fcitx.nix
 create mode 100644 users/glittershark/system/system/modules/fcitx.nix

(limited to 'users/glittershark/system')

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/home/modules/fcitx.nix b/users/glittershark/system/home/modules/fcitx.nix
deleted file mode 100644
index 02fb4f559371..000000000000
--- a/users/glittershark/system/home/modules/fcitx.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  i18n.inputMethod = {
-    enabled = "fcitx";
-    engines = with pkgs.fcitx-engines; [
-      cloudpinyin
-    ];
-  };
-}
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/system/modules/fcitx.nix b/users/glittershark/system/system/modules/fcitx.nix
new file mode 100644
index 000000000000..812f598f9f47
--- /dev/null
+++ b/users/glittershark/system/system/modules/fcitx.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  i18n.inputMethod = {
+    enabled = "fcitx";
+    fcitx.engines = with pkgs.fcitx-engines; [
+      cloudpinyin
+    ];
+  };
+}
-- 
cgit 1.4.1