diff --git a/homes/x86_64-linux/cholli@workvm/default.nix b/homes/x86_64-linux/cholli@workvm/default.nix
index 95706b2..5e3dc3b 100644
--- a/homes/x86_64-linux/cholli@workvm/default.nix
+++ b/homes/x86_64-linux/cholli@workvm/default.nix
@@ -10,12 +10,10 @@ with lib.wyrdgard; {
   wyrdgard = {
     apps.cli-apps = {
       kitty = enabled;
-      fish = enabled;
       home-manager = enabled;
     };
 
     tools = {
-      git = enabled;
       direnv = enabled;
     };
   };
diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index 02ecb42..7ceef08 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -10,7 +10,7 @@ with lib.wyrdgard; let
   cfg = config.wyrdgard.apps.cli-apps.fish;
 in {
   options.wyrdgard.apps.cli-apps.fish = with types; {
-    enable = mkBoolOpt false "Whether or not to enable the fish shell";
+    enable = mkBoolOpt true "Whether or not to enable the fish shell";
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index bb46ec1..6af8826 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -1,17 +1,17 @@
 {
+  options,
   lib,
   config,
   pkgs,
   ...
-}: let
-  inherit (lib) types mkEnableOption mkIf;
-  inherit (lib.wyrdgard) mkOpt enabled;
-
+}: 
+with lib;
+with lib.wyrdgard; let
   cfg = config.wyrdgard.tools.git;
   user = config.wyrdgard.user;
 in {
   options.wyrdgard.tools.git = {
-    enable = mkEnableOption "Git";
+    enable = mkBoolOpt true "Enable Git (Default true)";
     userName = mkOpt types.str user.fullName "The name to configure git with.";
     userEmail = mkOpt types.str user.email "The email to configure git with.";
   };