36 files changed, 22 insertions, 16 deletions
diff --git a/home/ebisu/kansai/fortune/communication/catgirl.nix b/home/ebisu/core/communication/catgirl.nix
index c7f4790..c7f4790 100644
--- a/home/ebisu/kansai/fortune/communication/catgirl.nix
+++ b/home/ebisu/core/communication/catgirl.nix
diff --git a/home/ebisu/kansai/fortune/communication/default.nix b/home/ebisu/core/communication/default.nix
index a6d40b1..a6d40b1 100644
--- a/home/ebisu/kansai/fortune/communication/default.nix
+++ b/home/ebisu/core/communication/default.nix
diff --git a/home/ebisu/kansai/fortune/communication/discord/default.nix b/home/ebisu/core/communication/discord/default.nix
index a978822..a978822 100644
--- a/home/ebisu/kansai/fortune/communication/discord/default.nix
+++ b/home/ebisu/core/communication/discord/default.nix
diff --git a/home/ebisu/kansai/fortune/communication/discord/vesktop.nix b/home/ebisu/core/communication/discord/vesktop.nix
index 50d788f..50d788f 100644
--- a/home/ebisu/kansai/fortune/communication/discord/vesktop.nix
+++ b/home/ebisu/core/communication/discord/vesktop.nix
diff --git a/home/ebisu/kansai/fortune/communication/irc.nix b/home/ebisu/core/communication/irc.nix
index 81ce13e..81ce13e 100644
--- a/home/ebisu/kansai/fortune/communication/irc.nix
+++ b/home/ebisu/core/communication/irc.nix
diff --git a/home/ebisu/core/default.nix b/home/ebisu/core/default.nix
index fbcd911..3cb2b99 100644
--- a/home/ebisu/core/default.nix
+++ b/home/ebisu/core/default.nix
@@ -1,6 +1,14 @@
 { config, inputs, ... }:
 {
   imports = [
+    ./communication
+    ./editor
+    ./education
+    ./nix
+    ./rice
+    ./system
+    ./utility
+    ./language.nix
     inputs.tailray.homeManagerModules.default
   ];
 
diff --git a/home/ebisu/kansai/fortune/editor/default.nix b/home/ebisu/core/editor/default.nix
index fd98a64..fd98a64 100644
--- a/home/ebisu/kansai/fortune/editor/default.nix
+++ b/home/ebisu/core/editor/default.nix
diff --git a/home/ebisu/kansai/fortune/editor/vscode-fhs.nix b/home/ebisu/core/editor/vscode-fhs.nix
index e26bb85..e26bb85 100644
--- a/home/ebisu/kansai/fortune/editor/vscode-fhs.nix
+++ b/home/ebisu/core/editor/vscode-fhs.nix
diff --git a/home/ebisu/kansai/fortune/education/calculator.nix b/home/ebisu/core/education/calculator.nix
index 1022e18..1022e18 100644
--- a/home/ebisu/kansai/fortune/education/calculator.nix
+++ b/home/ebisu/core/education/calculator.nix
diff --git a/home/ebisu/kansai/fortune/education/default.nix b/home/ebisu/core/education/default.nix
index f9f54cc..f9f54cc 100644
--- a/home/ebisu/kansai/fortune/education/default.nix
+++ b/home/ebisu/core/education/default.nix
diff --git a/home/ebisu/kansai/fortune/language.nix b/home/ebisu/core/language.nix
index 6bb8476..6bb8476 100644
--- a/home/ebisu/kansai/fortune/language.nix
+++ b/home/ebisu/core/language.nix
diff --git a/home/ebisu/kansai/fortune/nix/default.nix b/home/ebisu/core/nix/default.nix
index 0de3430..0de3430 100644
--- a/home/ebisu/kansai/fortune/nix/default.nix
+++ b/home/ebisu/core/nix/default.nix
diff --git a/home/ebisu/kansai/fortune/nix/development/default.nix b/home/ebisu/core/nix/development/default.nix
index 7c92172..7c92172 100644
--- a/home/ebisu/kansai/fortune/nix/development/default.nix
+++ b/home/ebisu/core/nix/development/default.nix
diff --git a/home/ebisu/kansai/fortune/nix/development/formatting.nix b/home/ebisu/core/nix/development/formatting.nix
index f543d06..f543d06 100644
--- a/home/ebisu/kansai/fortune/nix/development/formatting.nix
+++ b/home/ebisu/core/nix/development/formatting.nix
diff --git a/home/ebisu/kansai/fortune/nix/development/lsp.nix b/home/ebisu/core/nix/development/lsp.nix
index 7f7e8fc..7f7e8fc 100644
--- a/home/ebisu/kansai/fortune/nix/development/lsp.nix
+++ b/home/ebisu/core/nix/development/lsp.nix
diff --git a/home/ebisu/kansai/fortune/nix/development/tools.nix b/home/ebisu/core/nix/development/tools.nix
index 16b5d6b..16b5d6b 100644
--- a/home/ebisu/kansai/fortune/nix/development/tools.nix
+++ b/home/ebisu/core/nix/development/tools.nix
diff --git a/home/ebisu/kansai/fortune/nix/direnv.nix b/home/ebisu/core/nix/direnv.nix
index 9f73981..9f73981 100644
--- a/home/ebisu/kansai/fortune/nix/direnv.nix
+++ b/home/ebisu/core/nix/direnv.nix
diff --git a/home/ebisu/kansai/fortune/nix/rui.nix b/home/ebisu/core/nix/rui.nix
index 23a879f..23a879f 100644
--- a/home/ebisu/kansai/fortune/nix/rui.nix
+++ b/home/ebisu/core/nix/rui.nix
diff --git a/home/ebisu/kansai/fortune/rice/bottom.nix b/home/ebisu/core/rice/bottom.nix
index 8f3bc4b..8f3bc4b 100644
--- a/home/ebisu/kansai/fortune/rice/bottom.nix
+++ b/home/ebisu/core/rice/bottom.nix
diff --git a/home/ebisu/kansai/fortune/rice/default.nix b/home/ebisu/core/rice/default.nix
index e9c70a1..e9c70a1 100644
--- a/home/ebisu/kansai/fortune/rice/default.nix
+++ b/home/ebisu/core/rice/default.nix
diff --git a/home/ebisu/kansai/fortune/rice/fastfetch.nix b/home/ebisu/core/rice/fastfetch.nix
index 8020e57..8020e57 100644
--- a/home/ebisu/kansai/fortune/rice/fastfetch.nix
+++ b/home/ebisu/core/rice/fastfetch.nix
diff --git a/home/ebisu/kansai/fortune/rice/glances.nix b/home/ebisu/core/rice/glances.nix
index 98ca51b..98ca51b 100644
--- a/home/ebisu/kansai/fortune/rice/glances.nix
+++ b/home/ebisu/core/rice/glances.nix
diff --git a/home/ebisu/kansai/fortune/rice/gtk.nix b/home/ebisu/core/rice/gtk.nix
index a3b5c5f..a3b5c5f 100644
--- a/home/ebisu/kansai/fortune/rice/gtk.nix
+++ b/home/ebisu/core/rice/gtk.nix
diff --git a/home/ebisu/core/system/default.nix b/home/ebisu/core/system/default.nix
new file mode 100644
index 0000000..ffa08f2
--- /dev/null
+++ b/home/ebisu/core/system/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./encryption
+    ./fonts
+    ./xdg.nix
+  ];
+
+  home.packages = with pkgs; [
+    gnome-logs
+    procs
+  ];
+}
diff --git a/home/ebisu/kansai/fortune/system/encryption/bitwarden.nix b/home/ebisu/core/system/encryption/bitwarden.nix
index 2e5cb32..2e5cb32 100644
--- a/home/ebisu/kansai/fortune/system/encryption/bitwarden.nix
+++ b/home/ebisu/core/system/encryption/bitwarden.nix
diff --git a/home/ebisu/kansai/fortune/system/encryption/default.nix b/home/ebisu/core/system/encryption/default.nix
index 06b7c90..06b7c90 100644
--- a/home/ebisu/kansai/fortune/system/encryption/default.nix
+++ b/home/ebisu/core/system/encryption/default.nix
diff --git a/home/ebisu/kansai/fortune/system/fonts/default.nix b/home/ebisu/core/system/fonts/default.nix
index 0a7776f..0a7776f 100644
--- a/home/ebisu/kansai/fortune/system/fonts/default.nix
+++ b/home/ebisu/core/system/fonts/default.nix
diff --git a/home/ebisu/kansai/fortune/system/fonts/meowsans/MeowSans_Font/MeowSans-Regular.ttf b/home/ebisu/core/system/fonts/meowsans/MeowSans_Font/MeowSans-Regular.ttf
index 0d12d34..0d12d34 100644
--- a/home/ebisu/kansai/fortune/system/fonts/meowsans/MeowSans_Font/MeowSans-Regular.ttf
+++ b/home/ebisu/core/system/fonts/meowsans/MeowSans_Font/MeowSans-Regular.ttf
diff --git a/home/ebisu/kansai/fortune/system/fonts/meowsans/MeowSans_Font/MeowSans.ttf b/home/ebisu/core/system/fonts/meowsans/MeowSans_Font/MeowSans.ttf
index 8bb6c1a..8bb6c1a 100644
--- a/home/ebisu/kansai/fortune/system/fonts/meowsans/MeowSans_Font/MeowSans.ttf
+++ b/home/ebisu/core/system/fonts/meowsans/MeowSans_Font/MeowSans.ttf
diff --git a/home/ebisu/kansai/fortune/system/fonts/meowsans/default.nix b/home/ebisu/core/system/fonts/meowsans/default.nix
index fbf57fc..fbf57fc 100644
--- a/home/ebisu/kansai/fortune/system/fonts/meowsans/default.nix
+++ b/home/ebisu/core/system/fonts/meowsans/default.nix
diff --git a/home/ebisu/kansai/fortune/system/xdg.nix b/home/ebisu/core/system/xdg.nix
index 7a0bf32..7a0bf32 100644
--- a/home/ebisu/kansai/fortune/system/xdg.nix
+++ b/home/ebisu/core/system/xdg.nix
diff --git a/home/ebisu/kansai/fortune/utility/ai.nix b/home/ebisu/core/utility/ai.nix
index 37b4e4d..37b4e4d 100644
--- a/home/ebisu/kansai/fortune/utility/ai.nix
+++ b/home/ebisu/core/utility/ai.nix
diff --git a/home/ebisu/kansai/fortune/utility/default.nix b/home/ebisu/core/utility/default.nix
index f21b623..f21b623 100644
--- a/home/ebisu/kansai/fortune/utility/default.nix
+++ b/home/ebisu/core/utility/default.nix
diff --git a/home/ebisu/kansai/fortune/default.nix b/home/ebisu/kansai/fortune/default.nix
index 34bd34e..b0c4608 100644
--- a/home/ebisu/kansai/fortune/default.nix
+++ b/home/ebisu/kansai/fortune/default.nix
@@ -1,20 +1,13 @@
 { ... }:
 {
   imports = [
-    ./communication
     ./desktop
     ./development
-    ./editor
-    ./education
     ./filesystem
     ./multimedia
     ./networking
-    ./nix
-    ./rice
     ./scripts
     ./system
-    ./utility
     ./gaming.nix
-    ./language.nix
   ];
 }
diff --git a/home/ebisu/kansai/fortune/system/default.nix b/home/ebisu/kansai/fortune/system/default.nix
index a30ffe1..ee06d93 100644
--- a/home/ebisu/kansai/fortune/system/default.nix
+++ b/home/ebisu/kansai/fortune/system/default.nix
@@ -1,8 +1,5 @@
-{ pkgs, ... }:
 {
   imports = [
-    ./encryption
-    ./fonts
     ./shell
     ./terminal
     ./virtualisation
@@ -11,11 +8,5 @@
     ./ssh.nix
     ./tracing.nix
     ./variables.nix
-    ./xdg.nix
-  ];
-
-  home.packages = with pkgs; [
-    gnome-logs
-    procs
   ];
 }
diff --git a/home/ebisu/kansai/fortune/system/virtualisation/default.nix b/home/ebisu/kansai/fortune/system/virtualisation/default.nix
index bc74b7e..8f0d59c 100644
--- a/home/ebisu/kansai/fortune/system/virtualisation/default.nix
+++ b/home/ebisu/kansai/fortune/system/virtualisation/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   imports = [ ./docker.nix ];
+
   home.packages = with pkgs; [
     bottles
     wine