diff options
Diffstat (limited to 'home')
| -rwxr-xr-x[-rw-r--r--] | home/base.nix | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/cs_purdue.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/ghostty.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/helix.nix | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/langs.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/packages.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/pkgs_mac.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/shell.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/tmux.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/typst.nix | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/vcs.nix | 66 | ||||
| -rwxr-xr-x[-rw-r--r--] | home/vim.nix | 0 |
12 files changed, 70 insertions, 6 deletions
diff --git a/home/base.nix b/home/base.nix index 03e1ff3..d6d734c 100644..100755 --- 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 index b74df52..b74df52 100644..100755 --- a/home/cs_purdue.nix +++ b/home/cs_purdue.nix diff --git a/home/ghostty.nix b/home/ghostty.nix index fbdd5c3..fbdd5c3 100644..100755 --- a/home/ghostty.nix +++ b/home/ghostty.nix diff --git a/home/helix.nix b/home/helix.nix index ef4eafc..ab345c8 100644..100755 --- 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 index 1a25791..1a25791 100644..100755 --- a/home/langs.nix +++ b/home/langs.nix diff --git a/home/packages.nix b/home/packages.nix index 83c65e1..83c65e1 100644..100755 --- a/home/packages.nix +++ b/home/packages.nix diff --git a/home/pkgs_mac.nix b/home/pkgs_mac.nix index 08d63e4..08d63e4 100644..100755 --- a/home/pkgs_mac.nix +++ b/home/pkgs_mac.nix diff --git a/home/shell.nix b/home/shell.nix index f98de94..f98de94 100644..100755 --- a/home/shell.nix +++ b/home/shell.nix diff --git a/home/tmux.nix b/home/tmux.nix index f6c59da..f6c59da 100644..100755 --- a/home/tmux.nix +++ b/home/tmux.nix diff --git a/home/typst.nix b/home/typst.nix index a5b1147..a5b1147 100644..100755 --- a/home/typst.nix +++ b/home/typst.nix diff --git a/home/vcs.nix b/home/vcs.nix index 4855b94..194798f 100644..100755 --- 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 index c8c882c..c8c882c 100644..100755 --- a/home/vim.nix +++ b/home/vim.nix |