From fd4aaf91bf1c02dce5d33bf517c621d3c86711a8 Mon Sep 17 00:00:00 2001
From: Jonathan Morley <jmorley@cvent.com>
Date: Tue, 18 Feb 2025 16:04:58 -0500
Subject: [PATCH 1/2] add more nixpkgs

---
 darwin.nix | 16 ++++------------
 flake.nix  |  1 +
 home.nix   | 26 +++++++++++++++-----------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/darwin.nix b/darwin.nix
index 2730945..8c634b9 100644
--- a/darwin.nix
+++ b/darwin.nix
@@ -50,21 +50,13 @@ in {
       [
         # https://github.com/NixOS/nixpkgs/issues/254944
         "1password"
-        # Not available in nixpkgs
-        "disk-inventory-x"
         # The 1Password extension does not unlock with biometrics if FF is installed via nix
         "firefox"
         # Not available in nixpkgs
         "lulu"
-        # Raycast won't configure itself to run at startup if installed by nix
-        "raycast"
-        # Nix is refusing to build slack
-        # mkdir: cannot create directory '/nix/store/8sxv71mr0sa9qdg02b4fflwaf0jglpra-slack-4.39.95/Applications/Slack.app': Operation not permitted
-        "slack"
-        # Nix is refusing to build vscode
-        # mkdir: cannot create directory '/nix/store/df3lynf0asnl973l6mhpk5749c5z642j-vscode-1.92.0/Applications/Visual Studio Code.app': Operation not permitted
-        "visual-studio-code"
-        # Warp from nix will complain about not being able to auto-update on startup
+        # Not available in nixpkgs
+        "oversight"
+        # https://github.com/warpdotdev/Warp/issues/1991
         "warp"
       ]
       # Not available in nixpkgs
@@ -101,7 +93,7 @@ in {
           "/Applications/Warp.app"
           "/Applications/Firefox.app"
         ]
-        ++ lib.optional cvent "/Applications/Slack.app"
+        ++ lib.optional cvent "${pkgs.slack}/Applications/Slack.app"
         ++ lib.optional cvent "/Applications/Microsoft Outlook.app";
       show-recents = false;
       wvous-bl-corner = 5; # Start Screen Saver
diff --git a/flake.nix b/flake.nix
index 5f4395b..3e72a99 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,7 @@
           })
         ];
         nixpkgs.config.allowUnfree = true;
+        nixpkgs.config.allowUnsupportedSystem = true;
 
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
diff --git a/home.nix b/home.nix
index be9e722..13ad42c 100644
--- a/home.nix
+++ b/home.nix
@@ -36,7 +36,9 @@ in {
   home.stateVersion = "24.11";
 
   programs.awscli.enable = true;
-  programs.bat.enable = true;
+  programs.bat = {
+    enable = true;
+  };
   programs.chromium = {
     enable = true;
     package = pkgs.google-chrome;
@@ -200,11 +202,13 @@ in {
     [
       coreutils
       dasel
+      disk-inventory-x
       docker-client
       docker-buildx
       dogdns
       du-dust
       duf
+      gh
       gnugrep
       gitify
       git-filter-repo
@@ -212,24 +216,19 @@ in {
       mtr
       oktaws
       openssl
+      pkg-config-unwrapped
+      raycast
+      slack
       tree
       unixtools.watch
+      vscode
     ]
     # Languages / Package Managers
     ++ [
       nodejs
-      nodePackages.pnpm
       python3
       rustup
     ]
-    # Libraries
-    ++ [
-      gettext # For compiling Python
-      gnupg # For fetching Java
-      groff # Needed by awscli
-      pkg-config-unwrapped
-    ]
-    ++ lib.optional (! pkgs.stdenv.isDarwin) gh
     ++ lib.optional pkgs.stdenv.isDarwin colima
     ++ lib.optional personal tailscale
     ++ lib.optional cvent zoom-us;
@@ -240,7 +239,9 @@ in {
       interactive = true;
       tty = true;
       rm = true;
-    }} --volume $(pwd):$(pwd) --workdir $(pwd)";
+      volume = "$(pwd):$(pwd)";
+      workdir = "$(pwd)";
+    }}";
     gls = ''${pkgs.git}/bin/git log --pretty='format:' --name-only | ${pkgs.gnugrep}/bin/grep -oP "^''$(${pkgs.git}/bin/git rev-parse --show-prefix)\K.*" | cut -d/ -f1 | sort -u'';
     nix-clean = "sudo nix-collect-garbage --delete-older-than 30d";
   };
@@ -251,6 +252,9 @@ in {
       pkgs.libyaml
       pkgs.openssl
     ];
+    # Adapted from batman --export-env
+    MANPAGER = "env BATMAN_IS_BEING_MANPAGER=yes ${pkgs.bat-extras.batman}/bin/batman";
+    MANROFFOPT= "-c";
   };
 
   home.file."colima template" = lib.mkIf pkgs.stdenv.isDarwin {

From 5a87ffffb3f15dacf4cf712f3689afcfc9880cf9 Mon Sep 17 00:00:00 2001
From: Jonathan Morley <jmorley@cvent.com>
Date: Tue, 18 Feb 2025 16:21:35 -0500
Subject: [PATCH 2/2] formatting

---
 home.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.nix b/home.nix
index 13ad42c..0753740 100644
--- a/home.nix
+++ b/home.nix
@@ -254,7 +254,7 @@ in {
     ];
     # Adapted from batman --export-env
     MANPAGER = "env BATMAN_IS_BEING_MANPAGER=yes ${pkgs.bat-extras.batman}/bin/batman";
-    MANROFFOPT= "-c";
+    MANROFFOPT = "-c";
   };
 
   home.file."colima template" = lib.mkIf pkgs.stdenv.isDarwin {