home: move fortune modules up into kansai module

129 files changed, 16 insertions, 18 deletions

diff --git a/home/ebisu/kansai/fortune/communication/catgirl.nix b/home/ebisu/kansai/communication/catgirl.nix
index dc5ce6f..dc5ce6f 100644
--- a/home/ebisu/kansai/fortune/communication/catgirl.nix
+++ b/home/ebisu/kansai/communication/catgirl.nix
diff --git a/home/ebisu/kansai/fortune/communication/default.nix b/home/ebisu/kansai/communication/default.nix
index a6d40b1..a6d40b1 100644
--- a/home/ebisu/kansai/fortune/communication/default.nix
+++ b/home/ebisu/kansai/communication/default.nix
diff --git a/home/ebisu/kansai/fortune/communication/discord/default.nix b/home/ebisu/kansai/communication/discord/default.nix
index a978822..a978822 100644
--- a/home/ebisu/kansai/fortune/communication/discord/default.nix
+++ b/home/ebisu/kansai/communication/discord/default.nix
diff --git a/home/ebisu/kansai/fortune/communication/discord/vesktop.nix b/home/ebisu/kansai/communication/discord/vesktop.nix
index 50d788f..50d788f 100644
--- a/home/ebisu/kansai/fortune/communication/discord/vesktop.nix
+++ b/home/ebisu/kansai/communication/discord/vesktop.nix
diff --git a/home/ebisu/kansai/fortune/communication/irc.nix b/home/ebisu/kansai/communication/irc.nix
index 81ce13e..81ce13e 100644
--- a/home/ebisu/kansai/fortune/communication/irc.nix
+++ b/home/ebisu/kansai/communication/irc.nix
diff --git a/home/ebisu/kansai/default.nix b/home/ebisu/kansai/default.nix
index cbc1a81..0eb0e8b 100644
--- a/home/ebisu/kansai/default.nix
+++ b/home/ebisu/kansai/default.nix
@@ -1,11 +1,26 @@
 {
   config,
+  inputs,
   pkgs,
   self,
   ...
 }:
 {
-  imports = [ ./fortune ];
+  imports = [
+    ./communication
+    ./desktop
+    ./development
+    ./multimedia
+    ./networking
+    ./scripts
+    ./system
+    ./gaming.nix
+  ];
+
   pywal-nix.wallpaper = "${self}/home/${config.home.username}/shared/wallpaper.png";
   nix.package = pkgs.nix;
+
+  home.packages = [
+    inputs.notion-repackaged.packages.${pkgs.system}.notion-repackaged
+  ];
 }
diff --git a/home/ebisu/kansai/fortune/desktop/clipboard.nix b/home/ebisu/kansai/desktop/clipboard.nix
index 0f99fcd..0f99fcd 100644
--- a/home/ebisu/kansai/fortune/desktop/clipboard.nix
+++ b/home/ebisu/kansai/desktop/clipboard.nix
diff --git a/home/ebisu/kansai/fortune/desktop/default.nix b/home/ebisu/kansai/desktop/default.nix
index 02a4395..02a4395 100644
--- a/home/ebisu/kansai/fortune/desktop/default.nix
+++ b/home/ebisu/kansai/desktop/default.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/default.nix b/home/ebisu/kansai/desktop/hyprland/default.nix
index 2e9546e..2e9546e 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/default.nix
+++ b/home/ebisu/kansai/desktop/hyprland/default.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hypridle.nix b/home/ebisu/kansai/desktop/hyprland/hypridle.nix
index d1b0835..d1b0835 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hypridle.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hypridle.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/animations.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/animations.nix
index a61026d..a61026d 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/animations.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/animations.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/binds.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/binds.nix
index 692b17c..692b17c 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/binds.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/binds.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/decoration.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/decoration.nix
index 2625f42..2625f42 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/decoration.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/decoration.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/default.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/default.nix
index 52b9b08..52b9b08 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/default.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/default.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/environment.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/environment.nix
index 252b53a..252b53a 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/environment.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/environment.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/executions.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/executions.nix
index 446ed73..446ed73 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/executions.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/executions.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/general.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/general.nix
index 460b5d0..460b5d0 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/general.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/general.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/plugins.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/plugins.nix
index db0c978..db0c978 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/plugins.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/plugins.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/rules.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/rules.nix
index 79dbb83..79dbb83 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/rules.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/rules.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/common.sh b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/common.sh
index 325fd90..325fd90 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/common.sh
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/common.sh
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/fake_fullscreen_status b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/fake_fullscreen_status
index e198758..e198758 100755
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/fake_fullscreen_status
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/fake_fullscreen_status
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/move_focus_to_monitor b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/move_focus_to_monitor
index 27562a9..27562a9 100755
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/move_focus_to_monitor
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/move_focus_to_monitor
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/move_window_to_monitor b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/move_window_to_monitor
index 06e4f94..06e4f94 100755
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/move_window_to_monitor
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/move_window_to_monitor
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/move_window_to_workspace b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/move_window_to_workspace
index 4256a9f..4256a9f 100755
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/move_window_to_workspace
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/move_window_to_workspace
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/source.bak/screenshot.ab b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/source.bak/screenshot.ab
index 6bc510d..6bc510d 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/source.bak/screenshot.ab
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/source.bak/screenshot.ab
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/switch_workspace b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/switch_workspace
index fc8900c..fc8900c 100755
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/switch_workspace
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/switch_workspace
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/toggle_gaps b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/toggle_gaps
index d593ab2..d593ab2 100755
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/toggle_gaps
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/toggle_gaps
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/toggle_layout b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/toggle_layout
index 1ef8774..1ef8774 100755
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/scripts/toggle_layout
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/scripts/toggle_layout
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/workspaces.nix b/home/ebisu/kansai/desktop/hyprland/hyprland/workspaces.nix
index 2df3efd..2df3efd 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprland/workspaces.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprland/workspaces.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprlock.nix b/home/ebisu/kansai/desktop/hyprland/hyprlock.nix
index 4141a85..4141a85 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprlock.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprlock.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprlock.nix.bak b/home/ebisu/kansai/desktop/hyprland/hyprlock.nix.bak
index 96edf76..96edf76 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprlock.nix.bak
+++ b/home/ebisu/kansai/desktop/hyprland/hyprlock.nix.bak
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/hyprpaper.nix b/home/ebisu/kansai/desktop/hyprland/hyprpaper.nix
index 84c3fba..84c3fba 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/hyprpaper.nix
+++ b/home/ebisu/kansai/desktop/hyprland/hyprpaper.nix
diff --git a/home/ebisu/kansai/fortune/desktop/hyprland/inspo.txt b/home/ebisu/kansai/desktop/hyprland/inspo.txt
index 39d2483..39d2483 100644
--- a/home/ebisu/kansai/fortune/desktop/hyprland/inspo.txt
+++ b/home/ebisu/kansai/desktop/hyprland/inspo.txt
diff --git a/home/ebisu/kansai/fortune/desktop/mako.nix b/home/ebisu/kansai/desktop/mako.nix
index b4c0e19..b4c0e19 100644
--- a/home/ebisu/kansai/fortune/desktop/mako.nix
+++ b/home/ebisu/kansai/desktop/mako.nix
diff --git a/home/ebisu/kansai/fortune/desktop/rofi.nix b/home/ebisu/kansai/desktop/rofi.nix
index 26994de..26994de 100644
--- a/home/ebisu/kansai/fortune/desktop/rofi.nix
+++ b/home/ebisu/kansai/desktop/rofi.nix
diff --git a/home/ebisu/kansai/fortune/desktop/screenshot.nix b/home/ebisu/kansai/desktop/screenshot.nix
index 481ffb5..481ffb5 100644
--- a/home/ebisu/kansai/fortune/desktop/screenshot.nix
+++ b/home/ebisu/kansai/desktop/screenshot.nix
diff --git a/home/ebisu/kansai/fortune/desktop/waybar/common-modules.nix b/home/ebisu/kansai/desktop/waybar/common-modules.nix
index 04d1c91..04d1c91 100644
--- a/home/ebisu/kansai/fortune/desktop/waybar/common-modules.nix
+++ b/home/ebisu/kansai/desktop/waybar/common-modules.nix
diff --git a/home/ebisu/kansai/fortune/desktop/waybar/default.nix b/home/ebisu/kansai/desktop/waybar/default.nix
index 877669c..877669c 100644
--- a/home/ebisu/kansai/fortune/desktop/waybar/default.nix
+++ b/home/ebisu/kansai/desktop/waybar/default.nix
diff --git a/home/ebisu/kansai/fortune/desktop/waybar/style.css b/home/ebisu/kansai/desktop/waybar/style.css
index fda45d1..fda45d1 100644
--- a/home/ebisu/kansai/fortune/desktop/waybar/style.css
+++ b/home/ebisu/kansai/desktop/waybar/style.css
diff --git a/home/ebisu/kansai/fortune/desktop/waybar/style.css.bak b/home/ebisu/kansai/desktop/waybar/style.css.bak
index 3858c71..3858c71 100644
--- a/home/ebisu/kansai/fortune/desktop/waybar/style.css.bak
+++ b/home/ebisu/kansai/desktop/waybar/style.css.bak
diff --git a/home/ebisu/kansai/fortune/desktop/wlogout.nix b/home/ebisu/kansai/desktop/wlogout.nix
index 4bcdb31..4bcdb31 100644
--- a/home/ebisu/kansai/fortune/desktop/wlogout.nix
+++ b/home/ebisu/kansai/desktop/wlogout.nix
diff --git a/home/ebisu/kansai/fortune/development/database.nix b/home/ebisu/kansai/development/database.nix
index 27f7f28..27f7f28 100644
--- a/home/ebisu/kansai/fortune/development/database.nix
+++ b/home/ebisu/kansai/development/database.nix
diff --git a/home/ebisu/kansai/fortune/development/default.nix b/home/ebisu/kansai/development/default.nix
index 3e1e809..3e1e809 100644
--- a/home/ebisu/kansai/fortune/development/default.nix
+++ b/home/ebisu/kansai/development/default.nix
diff --git a/home/ebisu/kansai/fortune/development/infrastructure.nix b/home/ebisu/kansai/development/infrastructure.nix
index 4372f23..4372f23 100644
--- a/home/ebisu/kansai/fortune/development/infrastructure.nix
+++ b/home/ebisu/kansai/development/infrastructure.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/agnostic.nix b/home/ebisu/kansai/development/languages/agnostic.nix
index 7be3d6a..7be3d6a 100644
--- a/home/ebisu/kansai/fortune/development/languages/agnostic.nix
+++ b/home/ebisu/kansai/development/languages/agnostic.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/assembly.nix b/home/ebisu/kansai/development/languages/assembly.nix
index a1dad35..a1dad35 100644
--- a/home/ebisu/kansai/fortune/development/languages/assembly.nix
+++ b/home/ebisu/kansai/development/languages/assembly.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/crystal.nix b/home/ebisu/kansai/development/languages/crystal.nix
index b5092b4..b5092b4 100644
--- a/home/ebisu/kansai/fortune/development/languages/crystal.nix
+++ b/home/ebisu/kansai/development/languages/crystal.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/default.nix b/home/ebisu/kansai/development/languages/default.nix
index c56d868..c56d868 100644
--- a/home/ebisu/kansai/fortune/development/languages/default.nix
+++ b/home/ebisu/kansai/development/languages/default.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/dotnet.nix b/home/ebisu/kansai/development/languages/dotnet.nix
index 2bd09b5..2bd09b5 100644
--- a/home/ebisu/kansai/fortune/development/languages/dotnet.nix
+++ b/home/ebisu/kansai/development/languages/dotnet.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/gleam.nix b/home/ebisu/kansai/development/languages/gleam.nix
index bdea22c..bdea22c 100644
--- a/home/ebisu/kansai/fortune/development/languages/gleam.nix
+++ b/home/ebisu/kansai/development/languages/gleam.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/go.nix b/home/ebisu/kansai/development/languages/go.nix
index e389414..e389414 100644
--- a/home/ebisu/kansai/fortune/development/languages/go.nix
+++ b/home/ebisu/kansai/development/languages/go.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/haskell.nix b/home/ebisu/kansai/development/languages/haskell.nix
index 34194f4..34194f4 100644
--- a/home/ebisu/kansai/fortune/development/languages/haskell.nix
+++ b/home/ebisu/kansai/development/languages/haskell.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/javascript.nix b/home/ebisu/kansai/development/languages/javascript.nix
index cc7b899..cc7b899 100644
--- a/home/ebisu/kansai/fortune/development/languages/javascript.nix
+++ b/home/ebisu/kansai/development/languages/javascript.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/jvm/clojure.nix b/home/ebisu/kansai/development/languages/jvm/clojure.nix
index c796cd9..c796cd9 100644
--- a/home/ebisu/kansai/fortune/development/languages/jvm/clojure.nix
+++ b/home/ebisu/kansai/development/languages/jvm/clojure.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/jvm/default.nix b/home/ebisu/kansai/development/languages/jvm/default.nix
index 7e8e9bc..7e8e9bc 100644
--- a/home/ebisu/kansai/fortune/development/languages/jvm/default.nix
+++ b/home/ebisu/kansai/development/languages/jvm/default.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/jvm/scala.nix b/home/ebisu/kansai/development/languages/jvm/scala.nix
index b116274..b116274 100644
--- a/home/ebisu/kansai/fortune/development/languages/jvm/scala.nix
+++ b/home/ebisu/kansai/development/languages/jvm/scala.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/lisp.nix b/home/ebisu/kansai/development/languages/lisp.nix
index af039fa..af039fa 100644
--- a/home/ebisu/kansai/fortune/development/languages/lisp.nix
+++ b/home/ebisu/kansai/development/languages/lisp.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/nim.nix b/home/ebisu/kansai/development/languages/nim.nix
index 8343ea6..8343ea6 100644
--- a/home/ebisu/kansai/fortune/development/languages/nim.nix
+++ b/home/ebisu/kansai/development/languages/nim.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/ocaml.nix b/home/ebisu/kansai/development/languages/ocaml.nix
index f7721fe..f7721fe 100644
--- a/home/ebisu/kansai/fortune/development/languages/ocaml.nix
+++ b/home/ebisu/kansai/development/languages/ocaml.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/protobuf.nix b/home/ebisu/kansai/development/languages/protobuf.nix
index 19b01c3..19b01c3 100644
--- a/home/ebisu/kansai/fortune/development/languages/protobuf.nix
+++ b/home/ebisu/kansai/development/languages/protobuf.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/python.nix b/home/ebisu/kansai/development/languages/python.nix
index aaaa97e..aaaa97e 100644
--- a/home/ebisu/kansai/fortune/development/languages/python.nix
+++ b/home/ebisu/kansai/development/languages/python.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/rust.nix b/home/ebisu/kansai/development/languages/rust.nix
index 516c61e..516c61e 100644
--- a/home/ebisu/kansai/fortune/development/languages/rust.nix
+++ b/home/ebisu/kansai/development/languages/rust.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/shell.nix b/home/ebisu/kansai/development/languages/shell.nix
index fa0dd45..fa0dd45 100644
--- a/home/ebisu/kansai/fortune/development/languages/shell.nix
+++ b/home/ebisu/kansai/development/languages/shell.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/swift.nix b/home/ebisu/kansai/development/languages/swift.nix
index da5bbc7..da5bbc7 100644
--- a/home/ebisu/kansai/fortune/development/languages/swift.nix
+++ b/home/ebisu/kansai/development/languages/swift.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/vlang.nix b/home/ebisu/kansai/development/languages/vlang.nix
index bd3cd77..bd3cd77 100644
--- a/home/ebisu/kansai/fortune/development/languages/vlang.nix
+++ b/home/ebisu/kansai/development/languages/vlang.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/yaml.nix b/home/ebisu/kansai/development/languages/yaml.nix
index 468ab45..468ab45 100644
--- a/home/ebisu/kansai/fortune/development/languages/yaml.nix
+++ b/home/ebisu/kansai/development/languages/yaml.nix
diff --git a/home/ebisu/kansai/fortune/development/languages/zig.nix b/home/ebisu/kansai/development/languages/zig.nix
index 4cb900b..4cb900b 100644
--- a/home/ebisu/kansai/fortune/development/languages/zig.nix
+++ b/home/ebisu/kansai/development/languages/zig.nix
diff --git a/home/ebisu/kansai/fortune/development/tools/build.nix b/home/ebisu/kansai/development/tools/build.nix
index 6b0c770..6b0c770 100644
--- a/home/ebisu/kansai/fortune/development/tools/build.nix
+++ b/home/ebisu/kansai/development/tools/build.nix
diff --git a/home/ebisu/kansai/fortune/development/tools/default.nix b/home/ebisu/kansai/development/tools/default.nix
index ecde494..ecde494 100644
--- a/home/ebisu/kansai/fortune/development/tools/default.nix
+++ b/home/ebisu/kansai/development/tools/default.nix
diff --git a/home/ebisu/kansai/fortune/development/tools/git.nix b/home/ebisu/kansai/development/tools/git.nix
index 0616c40..0616c40 100644
--- a/home/ebisu/kansai/fortune/development/tools/git.nix
+++ b/home/ebisu/kansai/development/tools/git.nix
diff --git a/home/ebisu/kansai/fortune/default.nix b/home/ebisu/kansai/fortune/default.nix
deleted file mode 100644
index 789ff32..0000000
--- a/home/ebisu/kansai/fortune/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ inputs, ... }:
-{
-  imports = [
-    ./communication
-    ./desktop
-    ./development
-    ./multimedia
-    ./networking
-    ./scripts
-    ./system
-    ./gaming.nix
-  ];
-
-  home.packages = [
-    inputs.notion-repackaged.packages.x86_64-linux.notion-repackaged
-  ];
-}
diff --git a/home/ebisu/kansai/fortune/gaming.nix b/home/ebisu/kansai/gaming.nix
index 33d89db..33d89db 100644
--- a/home/ebisu/kansai/fortune/gaming.nix
+++ b/home/ebisu/kansai/gaming.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/audio/default.nix b/home/ebisu/kansai/multimedia/audio/default.nix
index 635d449..635d449 100644
--- a/home/ebisu/kansai/fortune/multimedia/audio/default.nix
+++ b/home/ebisu/kansai/multimedia/audio/default.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/audio/spotify.nix b/home/ebisu/kansai/multimedia/audio/spotify.nix
index ad0b0b4..ad0b0b4 100644
--- a/home/ebisu/kansai/fortune/multimedia/audio/spotify.nix
+++ b/home/ebisu/kansai/multimedia/audio/spotify.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/browser.nix b/home/ebisu/kansai/multimedia/browser.nix
index 466bb7b..466bb7b 100644
--- a/home/ebisu/kansai/fortune/multimedia/browser.nix
+++ b/home/ebisu/kansai/multimedia/browser.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/default.nix b/home/ebisu/kansai/multimedia/default.nix
index 84c4bc4..84c4bc4 100644
--- a/home/ebisu/kansai/fortune/multimedia/default.nix
+++ b/home/ebisu/kansai/multimedia/default.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/document.nix b/home/ebisu/kansai/multimedia/document.nix
index b306b62..b306b62 100644
--- a/home/ebisu/kansai/fortune/multimedia/document.nix
+++ b/home/ebisu/kansai/multimedia/document.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/image.nix b/home/ebisu/kansai/multimedia/image.nix
index 6e788cb..6e788cb 100644
--- a/home/ebisu/kansai/fortune/multimedia/image.nix
+++ b/home/ebisu/kansai/multimedia/image.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/reddit.nix b/home/ebisu/kansai/multimedia/reddit.nix
index 009bf65..009bf65 100644
--- a/home/ebisu/kansai/fortune/multimedia/reddit.nix
+++ b/home/ebisu/kansai/multimedia/reddit.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/video/anime.nix b/home/ebisu/kansai/multimedia/video/anime.nix
index 471bb7a..471bb7a 100644
--- a/home/ebisu/kansai/fortune/multimedia/video/anime.nix
+++ b/home/ebisu/kansai/multimedia/video/anime.nix
diff --git a/home/ebisu/kansai/fortune/multimedia/video/default.nix b/home/ebisu/kansai/multimedia/video/default.nix
index da366ab..da366ab 100644
--- a/home/ebisu/kansai/fortune/multimedia/video/default.nix
+++ b/home/ebisu/kansai/multimedia/video/default.nix
diff --git a/home/ebisu/kansai/fortune/networking/default.nix b/home/ebisu/kansai/networking/default.nix
index d5a14ca..d5a14ca 100644
--- a/home/ebisu/kansai/fortune/networking/default.nix
+++ b/home/ebisu/kansai/networking/default.nix
diff --git a/home/ebisu/kansai/fortune/networking/glance.nix b/home/ebisu/kansai/networking/glance.nix
index 80fa419..80fa419 100644
--- a/home/ebisu/kansai/fortune/networking/glance.nix
+++ b/home/ebisu/kansai/networking/glance.nix
diff --git a/home/ebisu/kansai/fortune/networking/i2p.nix b/home/ebisu/kansai/networking/i2p.nix
index 77b72cc..77b72cc 100644
--- a/home/ebisu/kansai/fortune/networking/i2p.nix
+++ b/home/ebisu/kansai/networking/i2p.nix
diff --git a/home/ebisu/kansai/fortune/networking/smolnet/bollux.nix b/home/ebisu/kansai/networking/smolnet/bollux.nix
index f0f05f9..f0f05f9 100644
--- a/home/ebisu/kansai/fortune/networking/smolnet/bollux.nix
+++ b/home/ebisu/kansai/networking/smolnet/bollux.nix
diff --git a/home/ebisu/kansai/fortune/networking/smolnet/default.nix b/home/ebisu/kansai/networking/smolnet/default.nix
index fe69274..fe69274 100644
--- a/home/ebisu/kansai/fortune/networking/smolnet/default.nix
+++ b/home/ebisu/kansai/networking/smolnet/default.nix
diff --git a/home/ebisu/kansai/fortune/networking/tools/default.nix b/home/ebisu/kansai/networking/tools/default.nix
index 7081ac3..7081ac3 100644
--- a/home/ebisu/kansai/fortune/networking/tools/default.nix
+++ b/home/ebisu/kansai/networking/tools/default.nix
diff --git a/home/ebisu/kansai/fortune/networking/tools/dns.nix b/home/ebisu/kansai/networking/tools/dns.nix
index f7e487a..f7e487a 100644
--- a/home/ebisu/kansai/fortune/networking/tools/dns.nix
+++ b/home/ebisu/kansai/networking/tools/dns.nix
diff --git a/home/ebisu/kansai/fortune/networking/tools/http/default.nix b/home/ebisu/kansai/networking/tools/http/default.nix
index b763a1f..b763a1f 100644
--- a/home/ebisu/kansai/fortune/networking/tools/http/default.nix
+++ b/home/ebisu/kansai/networking/tools/http/default.nix
diff --git a/home/ebisu/kansai/fortune/networking/tools/http/httpie.nix b/home/ebisu/kansai/networking/tools/http/httpie.nix
index f27ef26..f27ef26 100644
--- a/home/ebisu/kansai/fortune/networking/tools/http/httpie.nix
+++ b/home/ebisu/kansai/networking/tools/http/httpie.nix
diff --git a/home/ebisu/kansai/fortune/networking/tools/http/wget.nix b/home/ebisu/kansai/networking/tools/http/wget.nix
index c5d2936..c5d2936 100644
--- a/home/ebisu/kansai/fortune/networking/tools/http/wget.nix
+++ b/home/ebisu/kansai/networking/tools/http/wget.nix
diff --git a/home/ebisu/kansai/fortune/networking/tools/scanning.nix b/home/ebisu/kansai/networking/tools/scanning.nix
index fe9c1fa..fe9c1fa 100644
--- a/home/ebisu/kansai/fortune/networking/tools/scanning.nix
+++ b/home/ebisu/kansai/networking/tools/scanning.nix
diff --git a/home/ebisu/kansai/fortune/networking/tools/shark.nix b/home/ebisu/kansai/networking/tools/shark.nix
index d4b8c51..d4b8c51 100644
--- a/home/ebisu/kansai/fortune/networking/tools/shark.nix
+++ b/home/ebisu/kansai/networking/tools/shark.nix
diff --git a/home/ebisu/kansai/fortune/scripts/default.nix b/home/ebisu/kansai/scripts/default.nix
index 26a1231..26a1231 100644
--- a/home/ebisu/kansai/fortune/scripts/default.nix
+++ b/home/ebisu/kansai/scripts/default.nix
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/.gitignore b/home/ebisu/kansai/scripts/scripts/.gitignore
index 9f4e1cb..9f4e1cb 100644
--- a/home/ebisu/kansai/fortune/scripts/scripts/.gitignore
+++ b/home/ebisu/kansai/scripts/scripts/.gitignore
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/altserver b/home/ebisu/kansai/scripts/scripts/altserver
index 0a0d5f9..0a0d5f9 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/altserver
+++ b/home/ebisu/kansai/scripts/scripts/altserver
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/anidub b/home/ebisu/kansai/scripts/scripts/anidub
index aacf84f..aacf84f 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/anidub
+++ b/home/ebisu/kansai/scripts/scripts/anidub
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/anime b/home/ebisu/kansai/scripts/scripts/anime
index 60b143b..60b143b 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/anime
+++ b/home/ebisu/kansai/scripts/scripts/anime
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/apod b/home/ebisu/kansai/scripts/scripts/apod
index a8814a9..a8814a9 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/apod
+++ b/home/ebisu/kansai/scripts/scripts/apod
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/catboy b/home/ebisu/kansai/scripts/scripts/catboy
index cc75e52..cc75e52 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/catboy
+++ b/home/ebisu/kansai/scripts/scripts/catboy
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/chan2 b/home/ebisu/kansai/scripts/scripts/chan2
index 525d5f1..525d5f1 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/chan2
+++ b/home/ebisu/kansai/scripts/scripts/chan2
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/fim b/home/ebisu/kansai/scripts/scripts/fim
index 51898ab..51898ab 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/fim
+++ b/home/ebisu/kansai/scripts/scripts/fim
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/gmiwatch b/home/ebisu/kansai/scripts/scripts/gmiwatch
index cf3e52a..cf3e52a 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/gmiwatch
+++ b/home/ebisu/kansai/scripts/scripts/gmiwatch
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/hon b/home/ebisu/kansai/scripts/scripts/hon
index b4436ec..b4436ec 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/hon
+++ b/home/ebisu/kansai/scripts/scripts/hon
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/locs b/home/ebisu/kansai/scripts/scripts/locs
index 7b0ea19..7b0ea19 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/locs
+++ b/home/ebisu/kansai/scripts/scripts/locs
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/neovide-lunarvim b/home/ebisu/kansai/scripts/scripts/neovide-lunarvim
index dd9abcd..dd9abcd 100644
--- a/home/ebisu/kansai/fortune/scripts/scripts/neovide-lunarvim
+++ b/home/ebisu/kansai/scripts/scripts/neovide-lunarvim
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/nvfan b/home/ebisu/kansai/scripts/scripts/nvfan
index 108b92f..108b92f 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/nvfan
+++ b/home/ebisu/kansai/scripts/scripts/nvfan
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/reco b/home/ebisu/kansai/scripts/scripts/reco
index 9402a1a..9402a1a 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/reco
+++ b/home/ebisu/kansai/scripts/scripts/reco
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/setbg b/home/ebisu/kansai/scripts/scripts/setbg
index a399344..a399344 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/setbg
+++ b/home/ebisu/kansai/scripts/scripts/setbg
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/shiori b/home/ebisu/kansai/scripts/scripts/shiori
index 5f825e7..5f825e7 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/shiori
+++ b/home/ebisu/kansai/scripts/scripts/shiori
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/skyla b/home/ebisu/kansai/scripts/scripts/skyla
index a0d9030..a0d9030 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/skyla
+++ b/home/ebisu/kansai/scripts/scripts/skyla
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/start-vm b/home/ebisu/kansai/scripts/scripts/start-vm
index 03e12ce..03e12ce 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/start-vm
+++ b/home/ebisu/kansai/scripts/scripts/start-vm
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/tup-init b/home/ebisu/kansai/scripts/scripts/tup-init
index 387fa53..387fa53 100644
--- a/home/ebisu/kansai/fortune/scripts/scripts/tup-init
+++ b/home/ebisu/kansai/scripts/scripts/tup-init
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/vivwal b/home/ebisu/kansai/scripts/scripts/vivwal
index 995359e..995359e 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/vivwal
+++ b/home/ebisu/kansai/scripts/scripts/vivwal
diff --git a/home/ebisu/kansai/fortune/scripts/scripts/worlds b/home/ebisu/kansai/scripts/scripts/worlds
index 834079a..834079a 100755
--- a/home/ebisu/kansai/fortune/scripts/scripts/worlds
+++ b/home/ebisu/kansai/scripts/scripts/worlds
diff --git a/home/ebisu/kansai/fortune/system/default.nix b/home/ebisu/kansai/system/default.nix
index 6a2babd..6a2babd 100644
--- a/home/ebisu/kansai/fortune/system/default.nix
+++ b/home/ebisu/kansai/system/default.nix
diff --git a/home/ebisu/kansai/fortune/system/peripheral.nix b/home/ebisu/kansai/system/peripheral.nix
index 7b91dfe..7b91dfe 100644
--- a/home/ebisu/kansai/fortune/system/peripheral.nix
+++ b/home/ebisu/kansai/system/peripheral.nix
diff --git a/home/ebisu/kansai/fortune/system/shell/default.nix b/home/ebisu/kansai/system/shell/default.nix
index 82c4a71..82c4a71 100644
--- a/home/ebisu/kansai/fortune/system/shell/default.nix
+++ b/home/ebisu/kansai/system/shell/default.nix
diff --git a/home/ebisu/kansai/fortune/system/shell/fish.nix b/home/ebisu/kansai/system/shell/fish.nix
index d7ff424..d7ff424 100644
--- a/home/ebisu/kansai/fortune/system/shell/fish.nix
+++ b/home/ebisu/kansai/system/shell/fish.nix
diff --git a/home/ebisu/kansai/fortune/system/shell/starship.nix b/home/ebisu/kansai/system/shell/starship.nix
index 4daeefc..4daeefc 100644
--- a/home/ebisu/kansai/fortune/system/shell/starship.nix
+++ b/home/ebisu/kansai/system/shell/starship.nix
diff --git a/home/ebisu/kansai/fortune/system/sops.nix b/home/ebisu/kansai/system/sops.nix
index e229626..e229626 100644
--- a/home/ebisu/kansai/fortune/system/sops.nix
+++ b/home/ebisu/kansai/system/sops.nix
diff --git a/home/ebisu/kansai/fortune/system/ssh.nix b/home/ebisu/kansai/system/ssh.nix
index 6a47791..6a47791 100644
--- a/home/ebisu/kansai/fortune/system/ssh.nix
+++ b/home/ebisu/kansai/system/ssh.nix
diff --git a/home/ebisu/kansai/fortune/system/terminal/default.nix b/home/ebisu/kansai/system/terminal/default.nix
index 6cd5378..6cd5378 100644
--- a/home/ebisu/kansai/fortune/system/terminal/default.nix
+++ b/home/ebisu/kansai/system/terminal/default.nix
diff --git a/home/ebisu/kansai/fortune/system/terminal/foot.nix b/home/ebisu/kansai/system/terminal/foot.nix
index 36fd525..36fd525 100644
--- a/home/ebisu/kansai/fortune/system/terminal/foot.nix
+++ b/home/ebisu/kansai/system/terminal/foot.nix
diff --git a/home/ebisu/kansai/fortune/system/terminal/kitty.nix b/home/ebisu/kansai/system/terminal/kitty.nix
index bf20b17..bf20b17 100644
--- a/home/ebisu/kansai/fortune/system/terminal/kitty.nix
+++ b/home/ebisu/kansai/system/terminal/kitty.nix
diff --git a/home/ebisu/kansai/fortune/system/tracing.nix b/home/ebisu/kansai/system/tracing.nix
index 9a96847..9a96847 100644
--- a/home/ebisu/kansai/fortune/system/tracing.nix
+++ b/home/ebisu/kansai/system/tracing.nix
diff --git a/home/ebisu/kansai/fortune/system/variables.nix b/home/ebisu/kansai/system/variables.nix
index c958b85..c958b85 100644
--- a/home/ebisu/kansai/fortune/system/variables.nix
+++ b/home/ebisu/kansai/system/variables.nix
diff --git a/home/ebisu/kansai/fortune/system/virtualisation/default.nix b/home/ebisu/kansai/system/virtualisation/default.nix
index 3a8591d..3a8591d 100644
--- a/home/ebisu/kansai/fortune/system/virtualisation/default.nix
+++ b/home/ebisu/kansai/system/virtualisation/default.nix
diff --git a/home/ebisu/kansai/fortune/system/virtualisation/docker.nix b/home/ebisu/kansai/system/virtualisation/docker.nix
index 737ef3d..737ef3d 100644
--- a/home/ebisu/kansai/fortune/system/virtualisation/docker.nix
+++ b/home/ebisu/kansai/system/virtualisation/docker.nix