From 03098ec5d9ac9c612f6697fb33caeef80eb45104 Mon Sep 17 00:00:00 2001 From: nicco Date: Mon, 21 Jul 2025 18:01:00 +0200 Subject: [PATCH 1/5] add delta for git --- files/git/gitconfig | 6 ++++++ home/pkgs.nix | 1 + 2 files changed, 7 insertions(+) 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 f7137c1..9f12457 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -20,6 +20,7 @@ with pkgs; woff2 rsync yq + delta # Rust utils bat From c4e7214a17a27e5cbd3171ff3e71fcbb2b1c9a60 Mon Sep 17 00:00:00 2001 From: nicco Date: Mon, 21 Jul 2025 18:01:06 +0200 Subject: [PATCH 2/5] cli tools --- hosts/ordio.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ordio.nix b/hosts/ordio.nix index 0e266dc..fba5872 100644 --- a/hosts/ordio.nix +++ b/hosts/ordio.nix @@ -15,6 +15,8 @@ pkgs: with pkgs; [ mkcert dnsmasq + awscli2 + mysql84 ]; }; } From 412d5200f2980ba233685e71818339a0281a237d Mon Sep 17 00:00:00 2001 From: nicco Date: Thu, 31 Jul 2025 10:45:32 +0200 Subject: [PATCH 3/5] switch back to vscode --- cask.nix | 2 ++ darwin.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cask.nix b/cask.nix index d208ea9..cc30aa5 100644 --- a/cask.nix +++ b/cask.nix @@ -23,11 +23,13 @@ "utm" "balenaetcher" "outerbase-studio" + "hoppscotch" # Base "obsidian" "figma" "zen" + "zen@twilight" "bitwarden" "spotify" "slack" 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" ]; From 3f30b041c78c3e819c593346352243853fbaf3fb Mon Sep 17 00:00:00 2001 From: nicco Date: Thu, 31 Jul 2025 10:45:42 +0200 Subject: [PATCH 4/5] add ios stuff --- hosts/ordio.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ordio.nix b/hosts/ordio.nix index fba5872..4137c1d 100644 --- a/hosts/ordio.nix +++ b/hosts/ordio.nix @@ -17,6 +17,8 @@ dnsmasq awscli2 mysql84 + cocoapods + xcodes ]; }; } From 8d79067cb285b36cf375d732525880bc37b801dd Mon Sep 17 00:00:00 2001 From: nicco Date: Thu, 31 Jul 2025 11:10:10 +0200 Subject: [PATCH 5/5] remove zen --- cask.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/cask.nix b/cask.nix index cc30aa5..206b52a 100644 --- a/cask.nix +++ b/cask.nix @@ -29,7 +29,6 @@ "obsidian" "figma" "zen" - "zen@twilight" "bitwarden" "spotify" "slack"