diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix
index 828c732..21132b9 100644
--- a/hosts/macbook/default.nix
+++ b/hosts/macbook/default.nix
@@ -25,9 +25,10 @@ darwin.lib.darwinSystem {
     }
     ../common.nix
     ../../modules/darwin
+    ../../modules/mail
     ../../modules/applications/alacritty.nix
+    ../../modules/applications/kitty.nix
     ../../modules/applications/discord.nix
-    ../../modules/mail/himalaya.nix
     ../../modules/repositories/notes.nix
     ../../modules/programming/nix.nix
     ../../modules/programming/terraform.nix
diff --git a/modules/applications/kitty.nix b/modules/applications/kitty.nix
index 41cfd6f..cf5e2bb 100644
--- a/modules/applications/kitty.nix
+++ b/modules/applications/kitty.nix
@@ -6,7 +6,6 @@
       # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
       programs.kitty = {
         enable = true;
-        darwinLaunchOptions = null;
         environment = { };
         extraConfig = "";
         font.size = 14;
@@ -63,12 +62,10 @@
             ${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
 
           # Window
-          window_padding_width = 4;
+          window_padding_width = 6;
 
           tab_bar_edge = "top";
           tab_bar_style = "slant";
-
-          # macos_traditional_fullscreen = true;
         };
       };
     };
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index dce21ae..3ce9ed2 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -5,6 +5,7 @@
     ./fonts.nix
     ./hammerspoon.nix
     ./homebrew.nix
+    ./kitty.nix
     ./networking.nix
     ./nixpkgs.nix
     ./system.nix
diff --git a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
index fa27215..2be1b5a 100644
--- a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
@@ -56,7 +56,7 @@ function obj:init()
     -- Launcher shortcuts
     self.launcher:bind("ctrl", "space", function() end)
     self.launcher:bind("", "return", function()
-        self:switch("Alacritty.app")
+        self:switch("kitty.app")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")
diff --git a/modules/darwin/kitty.nix b/modules/darwin/kitty.nix
new file mode 100644
index 0000000..5191927
--- /dev/null
+++ b/modules/darwin/kitty.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, lib, ... }: {
+
+  # MacOS-specific settings for Kitty
+  home-manager.users.${config.user} = {
+    programs.kitty = {
+      darwinLaunchOptions = [ "--start-as=fullscreen" ];
+      font.size = lib.mkForce 20;
+      settings = {
+        shell = "${pkgs.fish}/bin/fish";
+        macos_traditional_fullscreen = true;
+        macos_quit_when_last_window_closed = true;
+      };
+    };
+  };
+
+}
diff --git a/modules/darwin/nixpkgs.nix b/modules/darwin/nixpkgs.nix
index b3e69ce..cde96ce 100644
--- a/modules/darwin/nixpkgs.nix
+++ b/modules/darwin/nixpkgs.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }: {
+{ config, pkgs, lib, ... }: {
 
   home-manager.users.${config.user} = {
 
@@ -21,7 +21,7 @@
         rebuild-home = lib.mkForce {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r ${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
+            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
             commandline --function execute
           '';
         };
diff --git a/modules/darwin/user.nix b/modules/darwin/user.nix
index 278325f..d3bfbc0 100644
--- a/modules/darwin/user.nix
+++ b/modules/darwin/user.nix
@@ -1,8 +1,9 @@
 { config, pkgs, lib, ... }: {
 
-  users.users."${config.user}" = { # macOS user
+  users.users."${config.user}" = {
+    # macOS user
     home = config.homePath;
-    shell = pkgs.zsh; # Default shell
+    shell = pkgs.fish; # Default shell
   };
 
 }