Finalised Terminal Config

darwin/default.nix

@@ -1,26 +1,15 @@
-{
-  pkgs,
-  inputs,
-  self,
-  primaryUser,
-  ...
-}:
-{
+{ pkgs, inputs, self, primaryUser, ... }: {
   imports = [
     #    ./homebrew.nix
     ./settings.nix
     inputs.home-manager.darwinModules.home-manager
     inputs.nix-homebrew.darwinModules.nix-homebrew
-    #    inputs.catppuccin.nixosModules.catppuccin
   ];
 
   # nix config
   nix = {
     settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
+      experimental-features = [ "nix-command" "flakes" ];
       # disabled due to https://github.com/NixOS/nix/issues/7273
       # auto-optimise-store = true;
     };
@@ -39,26 +28,19 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    users.${primaryUser} = {
-      imports = [
-        ../home
-      ];
-    };
-    extraSpecialArgs = {
-      inherit inputs self primaryUser;
-    };
+    users.${primaryUser} = { imports = [ ../home ]; };
+    extraSpecialArgs = { inherit inputs self primaryUser; };
   };
 
   # macOS-specific settings
+  programs.fish.enable = true;
   system.primaryUser = primaryUser;
   users.users.${primaryUser} = {
     home = "/Users/${primaryUser}";
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
   };
   environment = {
-    systemPath = [
-      "/opt/homebrew/bin"
-    ];
+    systemPath = [ "/opt/homebrew/bin" ];
     pathsToLink = [ "/Applications" ];
   };
 }