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 --- configuration.nix | 26 ++----------- darwin.nix | 23 +++++++++--- fish/rose_pine.theme | 0 home.nix | 0 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 host.nix | 4 ++ hosts/turing.nix | 28 ++++++++++++++ typst/grace_personal_template.typ | 0 typst/themes/rose-pine-moon.tmTheme | 0 typst/typst.toml | 0 vim/.config/nvim/.luarc.json | 0 vim/.config/nvim/init.lua | 0 vim/.config/nvim/lsp/asm-lsp.lua | 0 vim/.config/nvim/lsp/astro.lua | 0 vim/.config/nvim/lsp/basedpyright.lua | 0 vim/.config/nvim/lsp/ccls.lua | 0 vim/.config/nvim/lsp/clangd.lua | 0 vim/.config/nvim/lsp/codebook.lua | 0 vim/.config/nvim/lsp/csharp-ls.lua | 0 vim/.config/nvim/lsp/cspell-ls.lua | 0 vim/.config/nvim/lsp/css.lua | 0 vim/.config/nvim/lsp/eslint.lua | 0 vim/.config/nvim/lsp/fish-lsp.lua | 0 vim/.config/nvim/lsp/gdscript.lua | 0 vim/.config/nvim/lsp/gopls.lua | 0 vim/.config/nvim/lsp/html.lua | 0 vim/.config/nvim/lsp/json.lua | 0 vim/.config/nvim/lsp/luals.lua | 0 vim/.config/nvim/lsp/pyright.lua | 0 vim/.config/nvim/lsp/ruff.lua | 0 vim/.config/nvim/lsp/rust-analyzer.lua | 0 vim/.config/nvim/lsp/superhtml.lua | 0 vim/.config/nvim/lsp/tailwind-ls.lua | 0 vim/.config/nvim/lsp/textlsp.lua | 0 vim/.config/nvim/lsp/tinymist.lua | 0 vim/.config/nvim/lsp/ty.lua | 0 vim/.config/nvim/lsp/zigscient.lua | 0 vim/.config/nvim/lsp/zls.lua | 0 vim/.config/nvim/lua/custom-lualine.lua | 0 vim/.config/nvim/lua/diagnostics.lua | 0 vim/.config/nvim/lua/godot.lua | 0 vim/.config/nvim/lua/native-lsp.lua | 0 vim/.config/nvim/lua/packed.lua | 0 vim/.config/nvim/lua/plugins.lua | 0 vim/.config/nvim/lua/remap.lua | 0 vim/.config/nvim/lua/standard-lint.lua | 0 vim/.config/nvim/lua/westwood-lint.lua | 0 vim/.config/nvim/nvim-pack-lock.json | 4 ++ vim/.vim/settings.vim | 0 vim/.vimrc | 0 61 files changed, 126 insertions(+), 35 deletions(-) mode change 100644 => 100755 darwin.nix mode change 100644 => 100755 fish/rose_pine.theme mode change 100644 => 100755 home.nix 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 create mode 100644 host.nix create mode 100755 hosts/turing.nix mode change 100644 => 100755 typst/grace_personal_template.typ mode change 100644 => 100755 typst/themes/rose-pine-moon.tmTheme mode change 100644 => 100755 typst/typst.toml mode change 100644 => 100755 vim/.config/nvim/.luarc.json mode change 100644 => 100755 vim/.config/nvim/init.lua mode change 100644 => 100755 vim/.config/nvim/lsp/asm-lsp.lua mode change 100644 => 100755 vim/.config/nvim/lsp/astro.lua mode change 100644 => 100755 vim/.config/nvim/lsp/basedpyright.lua mode change 100644 => 100755 vim/.config/nvim/lsp/ccls.lua mode change 100644 => 100755 vim/.config/nvim/lsp/clangd.lua mode change 100644 => 100755 vim/.config/nvim/lsp/codebook.lua mode change 100644 => 100755 vim/.config/nvim/lsp/csharp-ls.lua mode change 100644 => 100755 vim/.config/nvim/lsp/cspell-ls.lua mode change 100644 => 100755 vim/.config/nvim/lsp/css.lua mode change 100644 => 100755 vim/.config/nvim/lsp/eslint.lua mode change 100644 => 100755 vim/.config/nvim/lsp/fish-lsp.lua mode change 100644 => 100755 vim/.config/nvim/lsp/gdscript.lua mode change 100644 => 100755 vim/.config/nvim/lsp/gopls.lua mode change 100644 => 100755 vim/.config/nvim/lsp/html.lua mode change 100644 => 100755 vim/.config/nvim/lsp/json.lua mode change 100644 => 100755 vim/.config/nvim/lsp/luals.lua mode change 100644 => 100755 vim/.config/nvim/lsp/pyright.lua mode change 100644 => 100755 vim/.config/nvim/lsp/ruff.lua mode change 100644 => 100755 vim/.config/nvim/lsp/rust-analyzer.lua mode change 100644 => 100755 vim/.config/nvim/lsp/superhtml.lua mode change 100644 => 100755 vim/.config/nvim/lsp/tailwind-ls.lua mode change 100644 => 100755 vim/.config/nvim/lsp/textlsp.lua mode change 100644 => 100755 vim/.config/nvim/lsp/tinymist.lua mode change 100644 => 100755 vim/.config/nvim/lsp/ty.lua mode change 100644 => 100755 vim/.config/nvim/lsp/zigscient.lua mode change 100644 => 100755 vim/.config/nvim/lsp/zls.lua mode change 100644 => 100755 vim/.config/nvim/lua/custom-lualine.lua mode change 100644 => 100755 vim/.config/nvim/lua/diagnostics.lua mode change 100644 => 100755 vim/.config/nvim/lua/godot.lua mode change 100644 => 100755 vim/.config/nvim/lua/native-lsp.lua mode change 100644 => 100755 vim/.config/nvim/lua/packed.lua mode change 100644 => 100755 vim/.config/nvim/lua/plugins.lua mode change 100644 => 100755 vim/.config/nvim/lua/remap.lua mode change 100644 => 100755 vim/.config/nvim/lua/standard-lint.lua mode change 100644 => 100755 vim/.config/nvim/lua/westwood-lint.lua mode change 100644 => 100755 vim/.config/nvim/nvim-pack-lock.json mode change 100644 => 100755 vim/.vim/settings.vim mode change 100644 => 100755 vim/.vimrc diff --git a/configuration.nix b/configuration.nix index d03bd22..a321226 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,28 +1,8 @@ { config, ... }: - let - home-manager = builtins.fetchTarball - "https://github.com/nix-community/home-manager/archive/master.tar.gz"; + host = import ./. + "/host.nix"; + conf = import ./. + "/hosts/${host.name}.nix"; in { - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - imports = [ - ./darwin.nix - "${home-manager}/nix-darwin" - ]; - - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - backupFileExtension = "backup"; - users.${config.system.primaryUser} = { - imports = [ ./home.nix ]; - home.username = config.system.primaryUser; - home.homeDirectory = "/Users/${config.system.primaryUser}"; - }; - }; + config = conf; } diff --git a/darwin.nix b/darwin.nix old mode 100644 new mode 100755 index 7224d49..978af1b --- a/darwin.nix +++ b/darwin.nix @@ -1,9 +1,13 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - paneru = builtins.getFlake - "github:karinushka/paneru/bcf248ef60aa4c0b49002161b97bc6e268b05aa7"; - hostName = "turing"; + paneru = builtins.getFlake "github:karinushka/paneru/bcf248ef60aa4c0b49002161b97bc6e268b05aa7"; + hostName = import ./host.nix; primaryUser = if lib.hasSuffix "cs.purdue.edu" hostName then "yoder177" else "grace"; in { @@ -13,7 +17,10 @@ in nixpkgs.hostPlatform = "aarch64-darwin"; networking.hostName = hostName; - environment.systemPackages = [ pkgs.raycast pkgs.thaw ]; + environment.systemPackages = [ + pkgs.raycast + pkgs.thaw + ]; system = { primaryUser = primaryUser; @@ -39,7 +46,11 @@ in animation_speed = 12.0; - preset_column_widths = [ 0.45 0.65 0.9 ]; + preset_column_widths = [ + 0.45 + 0.65 + 0.9 + ]; window_resize_cycle = true; create_virtual_workspace_automatically = true; virtual_workspace_animations = true; diff --git a/fish/rose_pine.theme b/fish/rose_pine.theme old mode 100644 new mode 100755 diff --git a/home.nix b/home.nix old mode 100644 new mode 100755 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 diff --git a/host.nix b/host.nix new file mode 100644 index 0000000..9c5563a --- /dev/null +++ b/host.nix @@ -0,0 +1,4 @@ +{ + name = "turing"; + user = "grace"; +} diff --git a/hosts/turing.nix b/hosts/turing.nix new file mode 100755 index 0000000..d03bd22 --- /dev/null +++ b/hosts/turing.nix @@ -0,0 +1,28 @@ +{ config, ... }: + +let + home-manager = builtins.fetchTarball + "https://github.com/nix-community/home-manager/archive/master.tar.gz"; +in +{ + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + + imports = [ + ./darwin.nix + "${home-manager}/nix-darwin" + ]; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "backup"; + users.${config.system.primaryUser} = { + imports = [ ./home.nix ]; + home.username = config.system.primaryUser; + home.homeDirectory = "/Users/${config.system.primaryUser}"; + }; + }; +} diff --git a/typst/grace_personal_template.typ b/typst/grace_personal_template.typ old mode 100644 new mode 100755 diff --git a/typst/themes/rose-pine-moon.tmTheme b/typst/themes/rose-pine-moon.tmTheme old mode 100644 new mode 100755 diff --git a/typst/typst.toml b/typst/typst.toml old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/.luarc.json b/vim/.config/nvim/.luarc.json old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/asm-lsp.lua b/vim/.config/nvim/lsp/asm-lsp.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/astro.lua b/vim/.config/nvim/lsp/astro.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/basedpyright.lua b/vim/.config/nvim/lsp/basedpyright.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/ccls.lua b/vim/.config/nvim/lsp/ccls.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/clangd.lua b/vim/.config/nvim/lsp/clangd.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/codebook.lua b/vim/.config/nvim/lsp/codebook.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/csharp-ls.lua b/vim/.config/nvim/lsp/csharp-ls.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/cspell-ls.lua b/vim/.config/nvim/lsp/cspell-ls.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/css.lua b/vim/.config/nvim/lsp/css.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/eslint.lua b/vim/.config/nvim/lsp/eslint.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/fish-lsp.lua b/vim/.config/nvim/lsp/fish-lsp.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/gdscript.lua b/vim/.config/nvim/lsp/gdscript.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/gopls.lua b/vim/.config/nvim/lsp/gopls.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/html.lua b/vim/.config/nvim/lsp/html.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/json.lua b/vim/.config/nvim/lsp/json.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/luals.lua b/vim/.config/nvim/lsp/luals.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/pyright.lua b/vim/.config/nvim/lsp/pyright.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/ruff.lua b/vim/.config/nvim/lsp/ruff.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/rust-analyzer.lua b/vim/.config/nvim/lsp/rust-analyzer.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/superhtml.lua b/vim/.config/nvim/lsp/superhtml.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/tailwind-ls.lua b/vim/.config/nvim/lsp/tailwind-ls.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/textlsp.lua b/vim/.config/nvim/lsp/textlsp.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/tinymist.lua b/vim/.config/nvim/lsp/tinymist.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/ty.lua b/vim/.config/nvim/lsp/ty.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/zigscient.lua b/vim/.config/nvim/lsp/zigscient.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lsp/zls.lua b/vim/.config/nvim/lsp/zls.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/custom-lualine.lua b/vim/.config/nvim/lua/custom-lualine.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/diagnostics.lua b/vim/.config/nvim/lua/diagnostics.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/godot.lua b/vim/.config/nvim/lua/godot.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/native-lsp.lua b/vim/.config/nvim/lua/native-lsp.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/packed.lua b/vim/.config/nvim/lua/packed.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/plugins.lua b/vim/.config/nvim/lua/plugins.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/remap.lua b/vim/.config/nvim/lua/remap.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/standard-lint.lua b/vim/.config/nvim/lua/standard-lint.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/lua/westwood-lint.lua b/vim/.config/nvim/lua/westwood-lint.lua old mode 100644 new mode 100755 diff --git a/vim/.config/nvim/nvim-pack-lock.json b/vim/.config/nvim/nvim-pack-lock.json old mode 100644 new mode 100755 index d89884f..523bf2e --- a/vim/.config/nvim/nvim-pack-lock.json +++ b/vim/.config/nvim/nvim-pack-lock.json @@ -61,6 +61,10 @@ "rev": "21f5324bfac14e22ba26553caf69ec76ae8a7662", "src": "https://github.com/nvim-neotest/nvim-nio" }, + "nvim-platformio.lua": { + "rev": "d5143c88698f78ce35fb5083b3668c94ea047a01", + "src": "https://github.com/anurag3301/nvim-platformio.lua" + }, "nvim-treesitter": { "rev": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849", "src": "https://github.com/nvim-treesitter/nvim-treesitter", diff --git a/vim/.vim/settings.vim b/vim/.vim/settings.vim old mode 100644 new mode 100755 diff --git a/vim/.vimrc b/vim/.vimrc old mode 100644 new mode 100755 -- cgit v1.3.1