Merge pull request #9 from fjij/work-laptop

Add work laptop

flake.nix

@@ -112,6 +112,12 @@
           pkgs = nixpkgs.legacyPackages."x86_64-linux";
           modules = [ ./home-manager-configs/work.nix ];
         };
+
+        "work-laptop" = home-manager.lib.homeManagerConfiguration {
+          inherit extraSpecialArgs;
+          pkgs = nixpkgs.legacyPackages."aarch64-darwin";
+          modules = [ ./home-manager-configs/work-laptop.nix ];
+        };
       };
 
       devShells = eachSystem (pkgs: {

home-manager-configs/work-laptop.nix

@@ -0,0 +1,12 @@
+{
+  imports = [ ../home-manager-modules ];
+  home = {
+    username = "wharris";
+    homeDirectory = "/Users/wharris";
+  };
+  nixpkgs.config.allowUnfree = true;
+  fjij.mac-gui.enable = true;
+  fjij.tools.enable = true;
+  fjij.base.enable = true;
+  fjij.nixvim.enable = true;
+}

home-manager-modules/alacritty.nix

@@ -29,6 +29,9 @@ in
     };
 
     home.activation.patchAlacrittyMacosApp = lib.mkIf cfg.macApp (
+      # Troubleshooting: If Alacritty immediately closes, it might because SHELL
+      # is not set to the correct shell. This might take a `chsh` and a reboot
+      # to properly work.
       let
         appDir = "${config.home.homeDirectory}/Applications";
         localApp = "${appDir}/Alacritty.app";

scripts/misc.nix

@@ -21,9 +21,9 @@
     name = "homeManagerUseFish";
     text = ''
       # Add fish to list of allowed shells
-      echo $(which fish) | sudo tee -a /etc/shells
+      which fish | sudo tee -a /etc/shells
       # Change shell to fish for current user
-      sudo chsh -s $(which fish) $(whoami)
+      sudo chsh -s "$(which fish)" "$(whoami)"
     '';
   };
 }