diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix
index a7ace97..a9e8421 100644
--- a/hosts/hakase/configuration.nix
+++ b/hosts/hakase/configuration.nix
@@ -7,16 +7,4 @@
     ./hardware-configuration.nix
     ../../modules/system/default.nix
   ];
-
-  programs = {
-    ssh.extraConfig = myConfig.ssh.extraConfig;
-    bash.interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]; then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-      fi
-    '';
-    zsh.enable = true;
-    fish.enable = true;
-  };
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 8203fd5..655ef5d 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -7,6 +7,8 @@
     ../../system/services.nix
     ../../system/user.nix
     ../../system/version.nix
+    ../../system/fonts.nix
+    ../../system/programs.nix
   ];
   environment.systemPackages = with pkgs; [
     git
diff --git a/system/fonts.nix b/system/fonts.nix
new file mode 100644
index 0000000..e69de29
diff --git a/system/programs.nix b/system/programs.nix
new file mode 100644
index 0000000..cb555d6
--- /dev/null
+++ b/system/programs.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  programs = {
+    ssh.extraConfig = myConfig.ssh.extraConfig;
+    bash.interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]; then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+    fish.enable = true;
+  };
+}