modules/darwin/darwin-configuration.nix

@@ -1,6 +1,6 @@
 { inputs, config, pkgs, ... }: {
   # Expose the package set, including overlays, for convenience.
-  # darwinPackages = inputs.self.darwinConfigurations."Youwens-MacBook-Pro".pkgs;
+  darwinPackages = inputs.self.darwinConfigurations."Youwens-MacBook-Pro".pkgs;
 
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget

modules/darwin/yabai.nix

@@ -4,21 +4,14 @@
     enableScriptingAddition = true;
     config = {
       focus_follows_mouse = "autoraise";
-      mouse_follows_focus = "on";
+      mouse_follows_focus = "off";
       window_placement = "second_child";
       window_opacity = "off";
-      top_padding = 12;
+      top_padding = 36;
-      bottom_padding = 12;
+      bottom_padding = 10;
-      left_padding = 12;
+      left_padding = 10;
-      right_padding = 12;
+      right_padding = 10;
       window_gap = 10;
-      split_ratio = 0.50;
-      split_type = "auto";
-      layout = "bsp";
-      mouse_modifier = "fn";
-      mouse_action1 = "move";
-      mouse_action2 = "resize";
-      mouse_drop_action = "swap";
     };
   };
   services.skhd = { enable = true; };

modules/home-manager/common/core.nix

@@ -65,7 +65,7 @@
     useTheme = "gruvbox";
   };
 
-  programs.fish = {
+  programs.fish = pkgs.lib.mkDefault {
     enable = true;
     shellAliases = {
       rebuild = "sudo nixos-rebuild switch";

modules/home-manager/darwin/darwin-home.nix

@@ -46,10 +46,39 @@
     rust-analyzer
   ];
 
-  programs.git.extraConfig.commit.gpgsign = "false";
+  programs.git = {
+    enable = true;
+    userName = "Youwen Wu";
+    userEmail = "youwenw@gmail.com";
+    delta.enable = true;
+    extraConfig = {
+      init.defaultBranch = "main";
+      commit.gpgsign = "false";
+      user.signingkey = "8F5E6C1AF90976CA7102917A865658ED1FE61EC3";
+    };
+  };
 
-  programs.oh-my-posh.enableZshIntegration = true;
+  programs.kitty = {
+    enable = true;
+    theme = "Tokyo Night";
+    font.name = "CaskaydiaCove Nerd Font";
+    settings = {
+      font_size = 12;
+      window_padding_width = "8 8 0";
+      confirm_os_window_close = -1;
+      shell_integration = "enabled";
+      enable_audio_bell = "no";
+      background_opacity = "0.8";
+    };
+  };
 
+  programs.oh-my-posh = {
+    enable = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    enableBashIntegration = true;
+    useTheme = "gruvbox";
+  };
   programs.bash.enable = true;
   programs.zsh.enable = true;