Merge branch 'main' of github.com:cupcakearmy/nix

sync back

cask.nix

@@ -23,6 +23,7 @@
   "utm"
   "balenaetcher"
   "outerbase-studio"
+  "hoppscotch"
 
   # Base
   "obsidian"

darwin.nix

@@ -40,7 +40,7 @@
       persistent-apps = [
         "/Applications/Zen.app"
         "/Applications/Ghostty.app"
-        "/Applications/VSCodium.app"
+        "/Applications/Visual Studio Code.app"
         "/Applications/Spotify.app"
         "/System/Applications/System Settings.app"
       ];

files/git/gitconfig

@@ -4,9 +4,12 @@
 	process = git-lfs filter-process
 	required = true
 [core]
+    pager = delta
 	excludesfile = ~/.gitignore_global
 	autocrlf = input
 	ignorecase=false
+[interactive]
+    diffFilter = delta --color-only
 
 [pull]
 	rebase = false
@@ -27,3 +30,6 @@
 
 [include]
     path = ~/.gitconfig.local
+
+[delta]
+    navigate = true

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752814804,
-        "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
+        "lastModified": 1753943136,
+        "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
+        "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752900028,
-        "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
+        "lastModified": 1753844155,
+        "narHash": "sha256-w81jpZeM3AtYlTKIhT05p3IqvJRIHZPyp0Acgb6hXWc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
+        "rev": "e44b8dc0882d66e2627a8ff252b04a22f4a629fd",
         "type": "github"
       },
       "original": {

home/pkgs.nix

@@ -20,6 +20,7 @@ with pkgs;
   woff2
   rsync
   yq
+  delta
 
   # Rust utils
   bat

hosts/ordio.nix

@@ -15,6 +15,10 @@
       pkgs: with pkgs; [
         mkcert
         dnsmasq
+        awscli2
+        mysql84
+        cocoapods
+        xcodes
       ];
   };
 }