From ddf0c7981fbeaa6a45591a66132a330c804259ec Mon Sep 17 00:00:00 2001 From: Grace Yoder Date: Tue, 15 Sep 2026 17:26:29 -0400 Subject: hx and vcs changes --- home/base.nix | 4 ++-- home/cs_purdue.nix | 0 home/ghostty.nix | 0 home/helix.nix | 6 +++++ home/langs.nix | 0 home/packages.nix | 0 home/pkgs_mac.nix | 0 home/shell.nix | 0 home/tmux.nix | 0 home/typst.nix | 0 home/vcs.nix | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++---- home/vim.nix | 0 12 files changed, 70 insertions(+), 6 deletions(-) mode change 100644 => 100755 home/base.nix mode change 100644 => 100755 home/cs_purdue.nix mode change 100644 => 100755 home/ghostty.nix mode change 100644 => 100755 home/helix.nix mode change 100644 => 100755 home/langs.nix mode change 100644 => 100755 home/packages.nix mode change 100644 => 100755 home/pkgs_mac.nix mode change 100644 => 100755 home/shell.nix mode change 100644 => 100755 home/tmux.nix mode change 100644 => 100755 home/typst.nix mode change 100644 => 100755 home/vcs.nix mode change 100644 => 100755 home/vim.nix (limited to 'home') diff --git a/home/base.nix b/home/base.nix old mode 100644 new mode 100755 index 03e1ff3..d6d734c --- a/home/base.nix +++ b/home/base.nix @@ -6,8 +6,8 @@ sessionVariables = { XDG_CONFIG_HOME = "${config.home.homeDirectory}/.config"; - EDITOR = "nvim"; - VISUAL = "nvim"; + EDITOR = "hx"; + VISUAL = "hx"; }; }; diff --git a/home/cs_purdue.nix b/home/cs_purdue.nix old mode 100644 new mode 100755 diff --git a/home/ghostty.nix b/home/ghostty.nix old mode 100644 new mode 100755 diff --git a/home/helix.nix b/home/helix.nix old mode 100644 new mode 100755 index ef4eafc..ab345c8 --- a/home/helix.nix +++ b/home/helix.nix @@ -101,9 +101,15 @@ in t = ":new"; v = "vsplit"; }; + "C-k" = "page_cursor_half_up"; + "C-j" = "page_cursor_half_down"; + "K" = "hover"; + "ret" = "goto_word"; }; keys.select = { "C-w" = "no_op"; + "C-k" = "page_cursor_half_up"; + "C-j" = "page_cursor_half_down"; }; }; diff --git a/home/langs.nix b/home/langs.nix old mode 100644 new mode 100755 diff --git a/home/packages.nix b/home/packages.nix old mode 100644 new mode 100755 diff --git a/home/pkgs_mac.nix b/home/pkgs_mac.nix old mode 100644 new mode 100755 diff --git a/home/shell.nix b/home/shell.nix old mode 100644 new mode 100755 diff --git a/home/tmux.nix b/home/tmux.nix old mode 100644 new mode 100755 diff --git a/home/typst.nix b/home/typst.nix old mode 100644 new mode 100755 diff --git a/home/vcs.nix b/home/vcs.nix old mode 100644 new mode 100755 index 4855b94..194798f --- a/home/vcs.nix +++ b/home/vcs.nix @@ -21,10 +21,68 @@ }; remotes.origin.auto-track-bookmarks = "*"; remotes.github.auto-track-bookmarks = "*"; - aliases.tug = [ - "bookmark" - "advance" - ]; + aliases = { + tug = [ + "bookmark" + "advance" + "--to" + "coalesce(@ ~ empty(), @-)" + ]; + + fn = [ + "util" + "exec" + "--" + "bash" + "-c" + '' + set -euo pipefail + + cd "$JJ_WORKSPACE_ROOT" + bookmark="''${1:-main}" + jj git fetch + jj new "$bookmark" + '' + "" + ]; + + tcp = [ + "util" + "exec" + "--" + "bash" + "-c" + '' + set -euo pipefail + + cd "$JJ_WORKSPACE_ROOT" + jj tug + if [ "$#" -eq 0 ]; then + jj new + else + jj commit -m "$*" + fi + jj git push + '' + "" + ]; + + sp = [ + "util" + "exec" + "--" + "bash" + "-c" + '' + set -euo pipefail + + cd "$JJ_WORKSPACE_ROOT" + jj squash --ignore-immutable + jj git push + '' + "" + ]; + }; }; }; diff --git a/home/vim.nix b/home/vim.nix old mode 100644 new mode 100755 -- cgit v1.3.1