hosts/macbook/default.nix

@@ -25,10 +25,9 @@ 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

modules/applications/kitty.nix

@@ -6,6 +6,7 @@
       # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
       programs.kitty = {
         enable = true;
+        darwinLaunchOptions = null;
         environment = { };
         extraConfig = "";
         font.size = 14;
@@ -62,10 +63,12 @@
             ${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
 
           # Window
-          window_padding_width = 6;
+          window_padding_width = 4;
 
           tab_bar_edge = "top";
           tab_bar_style = "slant";
+
+          # macos_traditional_fullscreen = true;
         };
       };
     };

modules/darwin/default.nix

@@ -5,7 +5,6 @@
     ./fonts.nix
     ./hammerspoon.nix
     ./homebrew.nix
-    ./kitty.nix
     ./networking.nix
     ./nixpkgs.nix
     ./system.nix

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("kitty.app")
+        self:switch("Alacritty.app")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")

modules/darwin/kitty.nix

@@ -1,16 +0,0 @@
-{ 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;
-      };
-    };
-  };
-
-}

modules/darwin/nixpkgs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ config, 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
           '';
         };

modules/darwin/user.nix

@@ -1,9 +1,8 @@
 { config, pkgs, lib, ... }: {
 
-  users.users."${config.user}" = {
-    # macOS user
+  users.users."${config.user}" = { # macOS user
     home = config.homePath;
-    shell = pkgs.fish; # Default shell
+    shell = pkgs.zsh; # Default shell
   };
 
 }

modules/darwin/utilities.nix

@@ -18,7 +18,7 @@ in {
   home-manager.users.${config.user} = {
 
     home.packages = with pkgs; [
-      # visidata # CSV inspector
+      visidata # CSV inspector
       dos2unix # Convert Windows text files
       inetutils # Includes telnet
       youtube-dl # Convert web videos