aerc: migrate out of home-manager directory

hosts/common/default.nix

@@ -5,6 +5,7 @@
     ./feeds.nix
     ./fs.nix
     ./hardware.nix
+    ./home
     ./i2p.nix
     ./ids.nix
     ./machine-id.nix
@@ -47,7 +48,6 @@
     "nixpkgs-overlays=${../..}/overlays"
   ];
 
-  # TODO: move this into home-manager?
   fonts = {
     enableDefaultFonts = true;
     fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];

hosts/common/home/aerc.nix

@@ -5,7 +5,7 @@ lib.mkIf config.sane.home-manager.enable
 {
   sops.secrets."aerc_accounts" = {
     owner = config.users.users.colin.name;
-    sopsFile = ../../secrets/universal/aerc_accounts.conf;
+    sopsFile = ../../../secrets/universal/aerc_accounts.conf;
     format = "binary";
   };
   sane.fs."/home/colin/.config/aerc/accounts.conf" = sane-lib.fs.wantedSymlinkTo config.sops.secrets.aerc_accounts.path;

hosts/common/home/default.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./aerc.nix
+  ];
+}

modules/home-manager/default.nix

@@ -14,7 +14,6 @@ let
 in
 {
   imports = [
-    ./aerc.nix
     ./firefox.nix
     ./gfeeds.nix
     ./git.nix