diff --git a/hosts/galanthus/configuration.nix b/hosts/galanthus/configuration.nix
index 6c92655..d9d9e3f 100644
--- a/hosts/galanthus/configuration.nix
+++ b/hosts/galanthus/configuration.nix
@@ -32,10 +32,6 @@
       ];
       trusted-users = [ "jan" ];
     };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-    };
   };
 
   users.users.jan = {
@@ -61,10 +57,10 @@
 
     nh = {
       enable = true;
-      # clean = { ## nix.gc already handles this
-      #   enable = true;
-      #   extraArgs = "--keep-since 4d --keep 3";
-      # };
+      clean = {
+        enable = true;
+        extraArgs = "--keep-since 7d --keep 3";
+      };
       flake = "${config.users.users.jan.home}/.config/nix";
     };
   };
diff --git a/hosts/malus/configuration.nix b/hosts/malus/configuration.nix
index d9127db..fd9c93f 100644
--- a/hosts/malus/configuration.nix
+++ b/hosts/malus/configuration.nix
@@ -28,12 +28,12 @@
         "@admin"
       ];
     };
-    # gc.automatic = true;
   };
 
   nixpkgs = {
     hostPlatform = "aarch64-darwin";
     config.allowUnfree = true;
+    ## TODO List packages that require this
   };
 
   home-manager = {
@@ -50,16 +50,11 @@
     enable = true;
     onActivation = {
       upgrade = true;
-      cleanup = "zap";
+      cleanup = "zap"; # Remove all files from the package
     };
   };
 
-  programs = {
-    zsh.enable = true;
-    fish.enable = true;
-  };
-
-  security.pam.services.sudo_local.touchIdAuth = true;
+  security.pam.services.sudo_local.touchIdAuth = true; # Enable TouchID for sudo
 
   system = {
     primaryUser = "jan";
@@ -72,6 +67,7 @@
         mru-spaces = false;
         largesize = 64;
         magnification = false;
+        ## TODO Check if this works again
         # persistent-apps = [
         #   "/Applications/Safari.app"
         #   "/System/Applications/Mail.app"
@@ -88,11 +84,10 @@
       };
       finder = {
         AppleShowAllExtensions = true;
-        FXPreferredViewStyle = "clmv";
-        ShowPathbar = true;
-        _FXShowPosixPathInTitle = true;
+        FXPreferredViewStyle = "clmv"; # Column view
+        ShowPathbar = true; # Show path at bottom
+        _FXShowPosixPathInTitle = true; # Show path at top
       };
-      # screencapture.location = "~/Pictures/Bildschirmfotos";
     };
 
     ## Set Git commit hash for darwin-version.
diff --git a/modules/home-manager/colors.nix b/modules/home-manager/colors.nix
index 3ba4510..4f8c012 100644
--- a/modules/home-manager/colors.nix
+++ b/modules/home-manager/colors.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   ## Catppuccin (https://catppuccin.com/)
+  ## Only use dark theme until Helix supports light theme (will be in the next release)
   programs = {
     bat = {
       config.theme = "catppuccin-macchiato";
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 5339811..0cc295e 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -23,23 +23,17 @@
     ## Mute login message in terminal
     file.".hushlogin".text = "";
 
-    sessionVariables = {
-      DIRENV_LOG_FORMAT = "";
-    };
+    ## Mute direnv output
+    sessionVariables.DIRENV_LOG_FORMAT = "";
 
     shellAliases = {
-      "yt" = "yt-dlp";
-      "yta" = "yt-dlp -x";
+      "yt" = "yt-dlp"; # Download video
+      "yta" = "yt-dlp -x"; # Download audio
     };
 
     packages = [ inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.default ];
   };
 
-  age = {
-    # identityPaths = [ "~/.ssh/id_ed25519" ];
-    secrets."openai".file = ../secrets/openai.age;
-  };
-
   xdg = {
     enable = true;
     userDirs = {
diff --git a/modules/home-manager/git/default.nix b/modules/home-manager/git/default.nix
index c9d9063..8deeb7d 100644
--- a/modules/home-manager/git/default.nix
+++ b/modules/home-manager/git/default.nix
@@ -3,10 +3,6 @@
     ./ignores.nix
   ];
 
-  home.sessionVariables = {
-    GITHUB_TOKEN = "$(gh auth token)";
-  };
-
   programs = {
     git = {
       enable = true;
@@ -64,16 +60,5 @@
         };
       };
     };
-
-    gh = {
-      enable = true;
-      settings.git_protocol = "ssh";
-    };
-
-    sapling = {
-      enable = true;
-      userName = "Jan Kremer";
-      userEmail = "mail@jankremer.eu";
-    };
   };
 }
diff --git a/modules/home-manager/shell/default.nix b/modules/home-manager/shell/default.nix
index cfb880c..ba399a4 100644
--- a/modules/home-manager/shell/default.nix
+++ b/modules/home-manager/shell/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./bat.nix
-    # ./fish.nix
     ./starship.nix
     ./zsh.nix
   ];
diff --git a/modules/home-manager/shell/fish.nix b/modules/home-manager/shell/fish.nix
deleted file mode 100644
index 25e5816..0000000
--- a/modules/home-manager/shell/fish.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  programs.fish = {
-    enable = true;
-
-    interactiveShellInit = # fish
-      ''
-        set fish_greeting
-        set fish_vi_key_bindings
-        set fish_vi_cursor
-
-        eval $(/opt/homebrew/bin/brew shellenv fish)
-      '';
-
-    shellAbbrs = {
-      gs = "git status";
-      gc = "git commit";
-      gca = "git commit -a";
-      gcaa = "git commit -a --amend";
-      gco = "git checkout";
-    };
-  };
-}
diff --git a/modules/home-manager/shell/zsh.nix b/modules/home-manager/shell/zsh.nix
index 2a89fdb..a017b17 100644
--- a/modules/home-manager/shell/zsh.nix
+++ b/modules/home-manager/shell/zsh.nix
@@ -2,7 +2,6 @@
 {
   programs.zsh = {
     enable = true;
-    # enableVteIntegration = true;
     dotDir = "${config.xdg.configHome}/zsh";
     history = {
       path = "${config.xdg.stateHome}/zsh/zsh_history";