diff --git a/cask.nix b/cask.nix index d208ea9..206b52a 100644 --- a/cask.nix +++ b/cask.nix @@ -23,6 +23,7 @@ "utm" "balenaetcher" "outerbase-studio" + "hoppscotch" # Base "obsidian" diff --git a/darwin.nix b/darwin.nix index 7b655b6..9b1fdcc 100644 --- a/darwin.nix +++ b/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" ]; diff --git a/files/git/gitconfig b/files/git/gitconfig index 26052ee..2303249 100644 --- a/files/git/gitconfig +++ b/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 diff --git a/home/pkgs.nix b/home/pkgs.nix index 8852473..a92ea22 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -20,6 +20,7 @@ with pkgs; woff2 rsync yq + delta # Rust utils bat diff --git a/hosts/ordio.nix b/hosts/ordio.nix index 0e266dc..4137c1d 100644 --- a/hosts/ordio.nix +++ b/hosts/ordio.nix @@ -15,6 +15,10 @@ pkgs: with pkgs; [ mkcert dnsmasq + awscli2 + mysql84 + cocoapods + xcodes ]; }; }