45 files changed, 18 insertions, 16 deletions
diff --git a/nix/default.nix b/config/default.nix
index a5e8f43..376b642 100644
--- a/nix/default.nix
+++ b/config/default.nix
@@ -183,12 +183,6 @@ in
 
 {
 
-  imports = [
-    ./programs
-    ./home
-    ./system
-  ];
-
   options = {
 
     #
diff --git a/nix/home/default.nix b/home/default.nix
index 5dedd5d..6e2cd05 100644
--- a/nix/home/default.nix
+++ b/home/default.nix
@@ -113,13 +113,13 @@
 
     xdg.configFile = {
       "aacs/keydb.cfg" = {
-        source = ../../files/keys/bluray.cfg;
+        source = ../files/keys/bluray.cfg;
       };
     };
 
     xdg.dataFile = {
       fonts = {
-        source = ../../files/fonts;
+        source = ../files/fonts;
         recursive = true;
       };
     };
@@ -177,7 +177,6 @@
     };
 
     programs.home-manager.enable = true;
-
   };
 }
 
diff --git a/hosts/kaworu.nix b/hosts/kaworu.nix
index 0f666fb..cf98de7 100644
--- a/hosts/kaworu.nix
+++ b/hosts/kaworu.nix
@@ -12,7 +12,10 @@ inputs.nixpkgs.lib.nixosSystem rec {
   specialArgs = { inherit inputs; };
   modules = [
     options
-    ../nix
+    ../config
+    ../home
+    ../programs
+    ../system
     {
       # options
       hostName = "kaworu";
diff --git a/hosts/shinji.nix b/hosts/shinji.nix
index 63d8ee0..563e6ad 100644
--- a/hosts/shinji.nix
+++ b/hosts/shinji.nix
@@ -12,7 +12,10 @@ inputs.nixpkgs.lib.nixosSystem rec {
   specialArgs = { inherit inputs; };
   modules = [
     options
-    ../nix
+    ../config
+    ../home
+    ../programs
+    ../system
     {
       # options
       hostName = "shinji";
diff --git a/options.nix b/options.nix
index 7aa143b..fb45323 100644
--- a/options.nix
+++ b/options.nix
@@ -5,7 +5,7 @@
 
   # custom theme
   theme = rec {
-    colors = (import ./nix/themes).catppuccin.mocha;
+    colors = (import ./themes).catppuccin.mocha;
 
     font = {
       size = 14;
diff --git a/nix/programs/default.nix b/programs/default.nix
index 022705b..022705b 100644
--- a/nix/programs/default.nix
+++ b/programs/default.nix
diff --git a/nix/programs/firefox/default.nix b/programs/firefox/default.nix
index 662f42a..662f42a 100644
--- a/nix/programs/firefox/default.nix
+++ b/programs/firefox/default.nix
diff --git a/nix/programs/firefox/extraPrefs.nix b/programs/firefox/extraPrefs.nix
index b9e9ed2..b9e9ed2 100644
--- a/nix/programs/firefox/extraPrefs.nix
+++ b/programs/firefox/extraPrefs.nix
diff --git a/nix/programs/firefox/policy.nix b/programs/firefox/policy.nix
index e0a2caa..e0a2caa 100644
--- a/nix/programs/firefox/policy.nix
+++ b/programs/firefox/policy.nix
diff --git a/nix/programs/firefox/policyExtensions.nix b/programs/firefox/policyExtensions.nix
index b2e5043..b2e5043 100644
--- a/nix/programs/firefox/policyExtensions.nix
+++ b/programs/firefox/policyExtensions.nix
diff --git a/nix/programs/firefox/policyPrefs.nix b/programs/firefox/policyPrefs.nix
index a8ac797..a8ac797 100644
--- a/nix/programs/firefox/policyPrefs.nix
+++ b/programs/firefox/policyPrefs.nix
diff --git a/nix/programs/firefox/userChrome.nix b/programs/firefox/userChrome.nix
index 2deefb5..2deefb5 100644
--- a/nix/programs/firefox/userChrome.nix
+++ b/programs/firefox/userChrome.nix
diff --git a/nix/programs/git/default.nix b/programs/git/default.nix
index d919b90..d919b90 100644
--- a/nix/programs/git/default.nix
+++ b/programs/git/default.nix
diff --git a/nix/programs/gpg/default.nix b/programs/gpg/default.nix
index ca1991a..e45617d 100644
--- a/nix/programs/gpg/default.nix
+++ b/programs/gpg/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  keysDir = ../../../files/keys;
+  keysDir = ../../files/keys;
   keys = lib.attrsets.mapAttrsToList (name: type: "${keysDir}/${name}") (builtins.readDir keysDir);
   gpgKeys = builtins.filter (path: lib.strings.hasSuffix "asc" path) keys;
 
diff --git a/nix/programs/hypr/default.nix b/programs/hypr/default.nix
index 08b2d93..08b2d93 100644
--- a/nix/programs/hypr/default.nix
+++ b/programs/hypr/default.nix
diff --git a/nix/programs/hypr/hypridle.nix b/programs/hypr/hypridle.nix
index d100291..d100291 100644
--- a/nix/programs/hypr/hypridle.nix
+++ b/programs/hypr/hypridle.nix
diff --git a/nix/programs/hypr/hyprland.nix b/programs/hypr/hyprland.nix
index 9631674..9631674 100644
--- a/nix/programs/hypr/hyprland.nix
+++ b/programs/hypr/hyprland.nix
diff --git a/nix/programs/hypr/hyprlock.nix b/programs/hypr/hyprlock.nix
index 8c8f63d..8c8f63d 100644
--- a/nix/programs/hypr/hyprlock.nix
+++ b/programs/hypr/hyprlock.nix
diff --git a/nix/programs/hypr/hyprpaper.nix b/programs/hypr/hyprpaper.nix
index ddcb6cd..ddcb6cd 100644
--- a/nix/programs/hypr/hyprpaper.nix
+++ b/programs/hypr/hyprpaper.nix
diff --git a/nix/programs/kitty/default.nix b/programs/kitty/default.nix
index 994da43..994da43 100644
--- a/nix/programs/kitty/default.nix
+++ b/programs/kitty/default.nix
diff --git a/nix/programs/mako/default.nix b/programs/mako/default.nix
index 2bd2a56..2bd2a56 100644
--- a/nix/programs/mako/default.nix
+++ b/programs/mako/default.nix
diff --git a/nix/programs/neovim/default.nix b/programs/neovim/default.nix
index a88b9d7..a88b9d7 100644
--- a/nix/programs/neovim/default.nix
+++ b/programs/neovim/default.nix
diff --git a/nix/programs/sops/default.nix b/programs/sops/default.nix
index 7fb5841..5df5f22 100644
--- a/nix/programs/sops/default.nix
+++ b/programs/sops/default.nix
@@ -17,7 +17,7 @@ in
     ];
 
     sops = {
-      defaultSopsFile = ../../../secrets.yaml;
+      defaultSopsFile = ../../secrets.yaml;
 
       gnupg.home = config.homePath + "/.gnupg";
       gnupg.sshKeyPaths = [];
diff --git a/nix/programs/ssh/config b/programs/ssh/config
index 5ae97b6..5ae97b6 100644
--- a/nix/programs/ssh/config
+++ b/programs/ssh/config
diff --git a/nix/programs/ssh/default.nix b/programs/ssh/default.nix
index e1691b3..e1691b3 100644
--- a/nix/programs/ssh/default.nix
+++ b/programs/ssh/default.nix
diff --git a/nix/programs/starship/default.nix b/programs/starship/default.nix
index 99858d4..99858d4 100644
--- a/nix/programs/starship/default.nix
+++ b/programs/starship/default.nix
diff --git a/nix/programs/steam/default.nix b/programs/steam/default.nix
index 35610ae..35610ae 100644
--- a/nix/programs/steam/default.nix
+++ b/programs/steam/default.nix
diff --git a/nix/programs/talc/default.nix b/programs/talc/default.nix
index 9c59d3f..9c59d3f 100644
--- a/nix/programs/talc/default.nix
+++ b/programs/talc/default.nix
diff --git a/nix/programs/unofficial-homestuck-collection/default.nix b/programs/unofficial-homestuck-collection/default.nix
index 19b792b..19b792b 100644
--- a/nix/programs/unofficial-homestuck-collection/default.nix
+++ b/programs/unofficial-homestuck-collection/default.nix
diff --git a/nix/programs/waybar/default.nix b/programs/waybar/default.nix
index 6e835fb..6e835fb 100644
--- a/nix/programs/waybar/default.nix
+++ b/programs/waybar/default.nix
diff --git a/nix/programs/waybar/style.nix b/programs/waybar/style.nix
index 0b84514..0b84514 100644
--- a/nix/programs/waybar/style.nix
+++ b/programs/waybar/style.nix
diff --git a/nix/programs/wireguard/default.nix b/programs/wireguard/default.nix
index ff9c954..ff9c954 100644
--- a/nix/programs/wireguard/default.nix
+++ b/programs/wireguard/default.nix
diff --git a/nix/programs/wofi/default.nix b/programs/wofi/default.nix
index cb08b43..cb08b43 100644
--- a/nix/programs/wofi/default.nix
+++ b/programs/wofi/default.nix
diff --git a/nix/programs/wofi/style.nix b/programs/wofi/style.nix
index 40fb861..40fb861 100644
--- a/nix/programs/wofi/style.nix
+++ b/programs/wofi/style.nix
diff --git a/nix/programs/zsh/default.nix b/programs/zsh/default.nix
index e0dce57..e0dce57 100644
--- a/nix/programs/zsh/default.nix
+++ b/programs/zsh/default.nix
diff --git a/nix/programs/zsh/zprofile b/programs/zsh/zprofile
index 4815b36..4815b36 100644
--- a/nix/programs/zsh/zprofile
+++ b/programs/zsh/zprofile
diff --git a/nix/programs/zsh/zshrc b/programs/zsh/zshrc
index b1c61a2..b1c61a2 100644
--- a/nix/programs/zsh/zshrc
+++ b/programs/zsh/zshrc
diff --git a/nix/system/default.nix b/system/default.nix
index 93e9396..2124703 100644
--- a/nix/system/default.nix
+++ b/system/default.nix
@@ -4,6 +4,9 @@
   # allow flakes
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
+  # allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
   # hostname
   networking.hostName = config.hostName;
 
@@ -103,8 +106,8 @@
 
   # certs
   security.pki.certificateFiles = [
-    ../../files/certs/freyanet.crt
-    ../../files/certs/tinternet.crt
+    ../files/certs/freyanet.crt
+    ../files/certs/tinternet.crt
   ];
 
   # mime
diff --git a/nix/themes/catppuccin/default.nix b/themes/catppuccin/default.nix
index 5d587ef..5d587ef 100644
--- a/nix/themes/catppuccin/default.nix
+++ b/themes/catppuccin/default.nix
diff --git a/nix/themes/catppuccin/frappe.nix b/themes/catppuccin/frappe.nix
index a917ba8..a917ba8 100644
--- a/nix/themes/catppuccin/frappe.nix
+++ b/themes/catppuccin/frappe.nix
diff --git a/nix/themes/catppuccin/latte.nix b/themes/catppuccin/latte.nix
index ca0d3d6..ca0d3d6 100644
--- a/nix/themes/catppuccin/latte.nix
+++ b/themes/catppuccin/latte.nix
diff --git a/nix/themes/catppuccin/macchiato.nix b/themes/catppuccin/macchiato.nix
index e069a93..e069a93 100644
--- a/nix/themes/catppuccin/macchiato.nix
+++ b/themes/catppuccin/macchiato.nix
diff --git a/nix/themes/catppuccin/mocha.nix b/themes/catppuccin/mocha.nix
index 84cb6ef..84cb6ef 100644
--- a/nix/themes/catppuccin/mocha.nix
+++ b/themes/catppuccin/mocha.nix
diff --git a/nix/themes/default.nix b/themes/default.nix
index 6111441..6111441 100644
--- a/nix/themes/default.nix
+++ b/themes/default.nix
diff --git a/nix/themes/tricolors.nix b/themes/tricolors.nix
index d136fb4..d136fb4 100644
--- a/nix/themes/tricolors.nix
+++ b/themes/tricolors.nix