akashi: fix up home

5 files changed, 14 insertions, 6 deletions

diff --git a/home/ebisu/core/default.nix b/home/ebisu/core/default.nix
index ff290cd..597c4ca 100644
--- a/home/ebisu/core/default.nix
+++ b/home/ebisu/core/default.nix
@@ -1,6 +1,11 @@
-{ config, inputs, ... }:
 {
-  imports = [
+  config,
+  inputs,
+  system ? builtins.currentSystem,
+  ...
+}:
+{
+  imports = with inputs; [
     ./editor
     ./education
     ./nix
@@ -8,7 +13,8 @@
     ./system
     ./utility
     ./language.nix
-    inputs.tailray.homeManagerModules.default
+    tailray.homeManagerModules.default
+    rui.homeManagerModules.${system}.default
   ];
 
   programs.home-manager.enable = true;
diff --git a/home/ebisu/core/system/fonts/default.nix b/home/ebisu/core/system/fonts/default.nix
index 0a7776f..6884079 100644
--- a/home/ebisu/core/system/fonts/default.nix
+++ b/home/ebisu/core/system/fonts/default.nix
@@ -50,7 +50,6 @@
       iosevka
       libertine
       sarasa-gothic
-      nerdfonts
       cantarell-fonts
       inter
       font-awesome
diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix
index d4946af..eec344d 100644
--- a/home/ebisu/default.nix
+++ b/home/ebisu/default.nix
@@ -20,7 +20,6 @@ inputs.home-manager.lib.homeManagerConfiguration {
     ./${host}
     chaotic.homeManagerModules.default
     pywal-nix.homeManagerModules.${pkgs.system}.default
-    rui.homeManagerModules.${pkgs.system}.default
     sops-nix.homeManagerModules.sops
   ];
 
@@ -31,6 +30,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
       self
       secrets
       flakeDirectory
+      system
       ;
   };
 }
diff --git a/home/ebisu/kansai/fortune/default.nix b/home/ebisu/kansai/fortune/default.nix
index b0c4608..f07c459 100644
--- a/home/ebisu/kansai/fortune/default.nix
+++ b/home/ebisu/kansai/fortune/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./communication
     ./desktop
     ./development
     ./filesystem
diff --git a/home/ebisu/kansai/fortune/system/default.nix b/home/ebisu/kansai/fortune/system/default.nix
index 69a53c1..6a2babd 100644
--- a/home/ebisu/kansai/fortune/system/default.nix
+++ b/home/ebisu/kansai/fortune/system/default.nix
@@ -1,6 +1,6 @@
+{ pkgs, ... }:
 {
   imports = [
-    ./communication
     ./shell
     ./terminal
     ./virtualisation
@@ -10,4 +10,6 @@
     ./tracing.nix
     ./variables.nix
   ];
+
+  home.packages = [ pkgs.nerdfonts ];
 }