Modularize flake

.config/nix/flake.nix

@@ -7,16 +7,16 @@
     darwin.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs: {
-    darwinConfigurations.TobAir = inputs.darwin.lib.darwinSystem {
+  outputs = inputs@{ nixpkgs, home-manager, darwin, ... }: {
+    darwinConfigurations.TobAir = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
-      pkgs = import inputs.nixpkgs {
+      pkgs = import nixpkgs {
         system = "aarch64-darwin";
         config.allowUnfree = true;
       };
       modules = [
         ./modules/darwin
-        inputs.home-manager.darwinModules.home-manager
+        home-manager.darwinModules.home-manager
         {
           home-manager = {
             useGlobalPkgs = true;

.config/nix/modules/darwin/default.nix

@@ -1,8 +1,11 @@
 ({ pkgs, ... }: {
   programs.zsh.enable = true;
-  environment.shells = [ pkgs.bash pkgs.zsh pkgs.fish ];
-  environment.loginShell = pkgs.zsh;
-  environment.systemPath = [ "/opt/homebrew/bin" ];
+  environment = {    
+    shells = with pkgs; [ bash zsh fish ];
+    loginShell = pkgs.zsh;
+    systemPath = [ "/opt/homebrew/bin" ];
+    pathsToLink = [ "/Applications" ];
+  };
   fonts.fonts = [
     (pkgs.nerdfonts.override {
       fonts = [
@@ -53,14 +56,16 @@
       alt - m : yabai -m window --toggle zoom-fullscreen
     '';
   };
-  system.defaults.dock.autohide = true;
-  system.defaults.dock.mru-spaces = false;
-  system.defaults.dock.orientation = "right";
-  system.defaults.NSGlobalDomain.InitialKeyRepeat = 14;
-  system.defaults.NSGlobalDomain.KeyRepeat = 1;
-  system.defaults.finder.AppleShowAllExtensions = true;
-  system.defaults.finder.AppleShowAllFiles = true;
-  system.defaults.finder.CreateDesktop = false;
+  system.defaults = {  
+    dock.autohide = true;
+    dock.mru-spaces = false;
+    dock.orientation = "right";
+    NSGlobalDomain.InitialKeyRepeat = 14;
+    NSGlobalDomain.KeyRepeat = 1;
+    finder.AppleShowAllExtensions = true;
+    finder.AppleShowAllFiles = true;
+    finder.CreateDesktop = false;
+  };
   users.users.tobi.home = "/Users/tobi";
   homebrew = {
     enable = true;

.config/nix/modules/home-manager/default.nix

@@ -2,12 +2,12 @@
   home.username = "tobi";
   home.homeDirectory = "/Users/tobi";
   home.stateVersion = "23.05";
-  home.packages = [
-    pkgs.raycast
-    pkgs.ripgrep
-    pkgs.fd
-    pkgs.curl
-    pkgs.less
+  home.packages = with pkgs; [
+    raycast
+    ripgrep
+    fd
+    curl
+    less
   ];
   home.sessionVariables = {
     PAGER = "less";
@@ -17,7 +17,16 @@
   programs.home-manager.enable = true;
   programs.bat.enable = true;
   programs.git.enable = true;
-  programs.zsh.enable = true;
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    syntaxHighlighting.enable = true;
+    shellAliases = {
+      ls = "ls --color=auto -F";
+      nixswitch = "pushd ~/.config/nix; darwin-rebuild switch --flake .#";
+      nixup = "pushd ~/.config/nix; nix flake update";
+    };
+  };
   programs.starship = {
     enable = true;
     enableZshIntegration = true;
@@ -30,5 +39,4 @@
     settings.font.size = 14;
     settings.font.normal.family = "Iosevka Comfy";
   };
-  programs.kitty.enable = true;
 }