diff --git a/hosts/morty/home-config.nix b/hosts/morty/home-config.nix
index 000cb12..470520c 100644
--- a/hosts/morty/home-config.nix
+++ b/hosts/morty/home-config.nix
@@ -1,16 +1,11 @@
 { ... }: {
   config.modules = {
     application = {
-      gnupg.enable = true;
       zathura.enable = true;
       foot.enable = true;
     };
     cli = {
-      direnv.enable = true;
-      ghq.enable = true;
-      git.enable = true;
       neovim.enable = true;
-      utils.enable = true;
       vifm.enable = true;
       zsh.enable = true;
     };
@@ -28,10 +23,6 @@
       waybar = {
         laptop = true;
         gpuThermal.enable = false;
-        cpuThermal = {
-          hwmonPathAbs = "/sys/devices/platform/coretemp.0/hwmon/";
-          inputFilename = "temp1_input";
-        };
       };
     };
   };
diff --git a/taskfile.yaml b/taskfile.yaml
index c44ff2f..beafb64 100644
--- a/taskfile.yaml
+++ b/taskfile.yaml
@@ -18,21 +18,30 @@ tasks:
       - "**/*.nix"
 
   build:*:
+    silent: true
     vars:
       TARGET: "{{index .MATCH 0}}"
     cmds:
       - nixos-rebuild --flake .#{{.TARGET}} build
+    sources: 
+      - "**/*.nix"
 
   switch:*:
+    silent: true
     vars:
       TARGET: "{{index .MATCH 0}}"
+    requires:
+      vars: [TARGET]
     cmds:
-      - doas nixos-rebuild --flake .#{{.TARGET}} switch
-
+      - doas nixos-rebuild --flake .#{{}} switch
+    sources: 
+      - "**/*.nix"
 
   test:*:
+    silent: true
     vars:
       TARGET: "{{index .MATCH 0}}"
     cmds:
       - doas nixos-rebuild --flake .#{{.TARGET}} test
-
+    sources: 
+      - "**/*.nix"