diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 08f3eb8..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "fish/themes/val-cat"]
-	path = fish/themes/val-cat
-	url = https://git.zynh.me/Zynh0722/omf-theme.git
diff --git a/fish/themes/val-cat b/fish/themes/val-cat
deleted file mode 160000
index 75549ce..0000000
--- a/fish/themes/val-cat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75549ce64044336ed14e502f1c1ab8bf98184990
diff --git a/flake.lock b/flake.lock
index c1699d9..b79c4a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "fish_theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702794161,
+        "narHash": "sha256-uGtLlPvjLfrngdByjCYp9mUuZasg3Z6mGfkD1mdRs1o=",
+        "ref": "refs/heads/main",
+        "rev": "75549ce64044336ed14e502f1c1ab8bf98184990",
+        "revCount": 24,
+        "type": "git",
+        "url": "https://git.zynh.me/Zynh0722/omf-theme"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.zynh.me/Zynh0722/omf-theme"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -38,6 +54,7 @@
     },
     "root": {
       "inputs": {
+        "fish_theme": "fish_theme",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index b14d4ef..3a2573d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,11 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    fish_theme = {
+      url = "git+https://git.zynh.me/Zynh0722/omf-theme";
+      flake = false;
+    };
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
diff --git a/home.nix b/home.nix
index 1505fcb..2c262a3 100644
--- a/home.nix
+++ b/home.nix
@@ -1,8 +1,5 @@
-{ config, pkgs, extraSpecialArgs, ... }:
+{ config, pkgs, inputs, ... }:
 
-# let
-#
-# in
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
@@ -42,11 +39,11 @@
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {
-    "${config.xdg.dataHome}/omf/themes/val-cat" = {
-      enable = true;
-      source = config.lib.file.mkOutOfStoreSymlink /. + "${config.xdg.configHome}/nixos/fish/themes/val-cat";
-      recursive = true;
-    };
+    # "${config.xdg.dataHome}/omf/themes/val-cat" = {
+    #   enable = true;
+    #   source = config.lib.file.mkOutOfStoreSymlink /. + "${config.xdg.configHome}/nixos/fish/themes/val-cat";
+    #   recursive = true;
+    # };
   };
 
   home.sessionVariables = {
@@ -57,7 +54,7 @@
   programs.fish = {
     enable = true;
     interactiveShellInit =
-      builtins.readFile ./fish/themes/val-cat/fish_prompt.fish +
+      builtins.readFile "${inputs.fish_theme}/fish_prompt.fish" +
       ''
         set -U fish_greeting