From 38bf9661a1ba6a53d21c692a9e777c4323742e51 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Thu, 19 Feb 2026 16:51:25 -0500 Subject: [PATCH 1/4] Update tools and Zed settings --- modules/profiles/home/tools/common.nix | 4 ++-- modules/profiles/home/zed-editor.nix | 6 +++++- users/et/profiles/zed-editor.nix | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 users/et/profiles/zed-editor.nix diff --git a/modules/profiles/home/tools/common.nix b/modules/profiles/home/tools/common.nix index 689b515..8ebddcb 100644 --- a/modules/profiles/home/tools/common.nix +++ b/modules/profiles/home/tools/common.nix @@ -3,10 +3,9 @@ comma curl curlie - dogdns + doggo fd gnused - graphite-cli htop httpie jq @@ -16,6 +15,7 @@ nixd nix-index nix-output-monitor + pgcli ripgrep tldr ]; diff --git a/modules/profiles/home/zed-editor.nix b/modules/profiles/home/zed-editor.nix index ceabfac..69bdcb6 100644 --- a/modules/profiles/home/zed-editor.nix +++ b/modules/profiles/home/zed-editor.nix @@ -1,7 +1,8 @@ { pkgs, lib, ... }: { programs.zed-editor = { enable = true; - extensions = [ "nix" "nord" ]; + extensions = + [ "haskell" "html" "just" "log" "nix" "nord" "sql" "starlark" ]; userSettings = { # Keymaps base_keymap = "Atom"; @@ -26,6 +27,9 @@ # Git git.inline_blame.enabled = false; + # File associations + file_types = { "Haskell" = [ "ghci" ]; }; + # Language-specific languages = { Nix = { diff --git a/users/et/profiles/zed-editor.nix b/users/et/profiles/zed-editor.nix deleted file mode 100644 index ae6790a..0000000 --- a/users/et/profiles/zed-editor.nix +++ /dev/null @@ -1 +0,0 @@ -{ programs.zed-editor.extensions = [ "haskell" ]; } From 0bf54059b6c6cb307b7602c87add7ab924b10d0b Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Tue, 24 Feb 2026 09:43:56 -0500 Subject: [PATCH 2/4] Update secrets input, Zed settings tweaks --- flake.lock | 8 ++++---- modules/profiles/home/zed-editor.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 2641503..925b5b2 100644 --- a/flake.lock +++ b/flake.lock @@ -4533,11 +4533,11 @@ ] }, "locked": { - "lastModified": 1769469089, - "narHash": "sha256-7XDEInTFGLaiOOqK3Lp5PiyXuonUfwtG/qwJqkns6Pw=", + "lastModified": 1771943863, + "narHash": "sha256-uSsGDhojfy6BbjHJ6gRnbCnrsspoMTWeWg3Ci2Nbdj8=", "ref": "refs/heads/main", - "rev": "451e1d0c6e14cd046338fc4e6cfde5d5fc820f99", - "revCount": 34, + "rev": "7054ab1713cd73ec5bdd917a38ad69603683c0c7", + "revCount": 35, "type": "git", "url": "ssh://git@github.com/ethnt/tilde-secrets" }, diff --git a/modules/profiles/home/zed-editor.nix b/modules/profiles/home/zed-editor.nix index 69bdcb6..218035b 100644 --- a/modules/profiles/home/zed-editor.nix +++ b/modules/profiles/home/zed-editor.nix @@ -50,7 +50,6 @@ }; # AI - show_completions_on_input = false; show_edit_predictions = false; }; }; From 2a518a692d6692658b532944a30e000da816b8fa Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 25 Feb 2026 09:58:17 -0500 Subject: [PATCH 3/4] Quick updates to Justfile and EditorConfig --- .editorconfig | 7 ------- Justfile | 3 --- 2 files changed, 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index 5413c8a..a0a8adc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,13 +8,6 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.bash] -indent_style = table - -[*.gpg] -insert_final_newline = false -end_of_line = crlf - [Justfile] indent_style = space indent_size = 4 diff --git a/Justfile b/Justfile index 3e68cec..5b493e7 100644 --- a/Justfile +++ b/Justfile @@ -1,10 +1,7 @@ hostname := `hostname` -username := `whoami` - cachix-cache-name := "tilde" attic-cache-name := "tilde" cache-jobs := "5" - nh-build-flags := "--out-link result" default: From b4dd15acc03f56b8c12027cc8f3831553496034f Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 25 Feb 2026 10:18:25 -0500 Subject: [PATCH 4/4] Update git aliases, add lazygit --- modules/profiles/home/git/common.nix | 61 ++++++++++++++++---------- modules/profiles/home/lazygit.nix | 6 +++ modules/profiles/home/tools/common.nix | 4 -- modules/suites/home.nix | 1 + users/et/profiles/tools.nix | 2 +- 5 files changed, 46 insertions(+), 28 deletions(-) create mode 100644 modules/profiles/home/lazygit.nix diff --git a/modules/profiles/home/git/common.nix b/modules/profiles/home/git/common.nix index 19123cf..73ac535 100644 --- a/modules/profiles/home/git/common.nix +++ b/modules/profiles/home/git/common.nix @@ -4,32 +4,47 @@ programs.git = { enable = true; - settings = let - delta = lib.getExe pkgs.delta; - git = lib.getExe config.programs.git.package; - fzf = lib.getExe pkgs.fzf; - gh = lib.getExe pkgs.gh; - superprune = pkgs.writeShellScript "git-alias-superprune" '' - echo 'Fetching remote then deleting branches that are gone. This may take a moment' - - ${git} fetch -p - - gone=$(git for-each-ref --format '%(refname) %(upstream:track)' refs/heads | awk '$2 == "[gone]" {sub("refs/heads/", "", $1); print $1}') - for branch in $gone; do - ${git} branch -D $branch; - done; - ''; - co = pkgs.writeShellScript "git-alias-co" '' - ${git} checkout "$(${git} branch --sort="-committerdate" | ${fzf} | tr -d '[:space:]')"; - ''; - wipe = pkgs.writeShellScript "git-alias-wipe" '' - ${git} add . - ${git} stash - ''; + settings = let delta = lib.getExe pkgs.delta; in { user.name = "Ethan Turkeltaub"; - alias = { + alias = let + gh = lib.getExe pkgs.gh; + mkGitShellScript = { name, text, extraRuntimeInputs ? [ ] }: + lib.getExe (pkgs.writeShellApplication { + inherit name text; + + runtimeInputs = [ config.programs.git.package ] + ++ extraRuntimeInputs; + }); + superprune = mkGitShellScript { + name = "git-alias-superprune"; + text = '' + echo 'Fetching remote then deleting branches that are gone. This may take a moment' + + git fetch -p + + gone=$(git for-each-ref --format '%(refname) %(upstream:track)' refs/heads | awk '$2 == "[gone]" {sub("refs/heads/", "", $1); print $1}') + for branch in $gone; do + git branch -D "$branch"; + done; + ''; + }; + co = mkGitShellScript { + name = "git-alias-co"; + extraRuntimeInputs = [ pkgs.fzf ]; + text = '' + git checkout "$(git branch --sort="-committerdate" | fzf | tr -d '[:space:]')"; + ''; + }; + wipe = mkGitShellScript { + name = "git-alias-wipe"; + text = '' + git add . + git stash + ''; + }; + in { s = "status"; superprune = "!sh ${superprune}"; co = "!sh ${co}"; diff --git a/modules/profiles/home/lazygit.nix b/modules/profiles/home/lazygit.nix new file mode 100644 index 0000000..3ddb9af --- /dev/null +++ b/modules/profiles/home/lazygit.nix @@ -0,0 +1,6 @@ +{ + programs.lazygit = { + enable = true; + enableFishIntegration = true; + }; +} diff --git a/modules/profiles/home/tools/common.nix b/modules/profiles/home/tools/common.nix index 8ebddcb..412e428 100644 --- a/modules/profiles/home/tools/common.nix +++ b/modules/profiles/home/tools/common.nix @@ -26,9 +26,5 @@ # Alias `man` to `batman` man = lib.getExe' pkgs.bat-extras.batman "batman"; - - # Alias `ctop` to use correct `$TERM` - ctop = - ''TERM="(string-replace tmux screen $TERM)" ${lib.getExe pkgs.ctop}''; }; } diff --git a/modules/suites/home.nix b/modules/suites/home.nix index 60ce24c..dbae1db 100644 --- a/modules/suites/home.nix +++ b/modules/suites/home.nix @@ -13,6 +13,7 @@ with profiles; fzf ghostty helix + lazygit navi paths rippkgs diff --git a/users/et/profiles/tools.nix b/users/et/profiles/tools.nix index f34c2bc..f57e5f4 100644 --- a/users/et/profiles/tools.nix +++ b/users/et/profiles/tools.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - home.packages = with pkgs; [ graphite-cli fnm mkcert ]; + home.packages = with pkgs; [ fnm mkcert ]; programs.fish.interactiveShellInit = let fnm = pkgs.lib.getExe pkgs.fnm; in ''