diff options
61 files changed, 126 insertions, 35 deletions
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 index 7224d49..978af1b 100644..100755 --- 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 index dcb5f46..dcb5f46 100644..100755 --- a/fish/rose_pine.theme +++ b/fish/rose_pine.theme 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 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 index 9218c5b..9218c5b 100644..100755 --- a/typst/grace_personal_template.typ +++ b/typst/grace_personal_template.typ diff --git a/typst/themes/rose-pine-moon.tmTheme b/typst/themes/rose-pine-moon.tmTheme index 136ebac..136ebac 100644..100755 --- a/typst/themes/rose-pine-moon.tmTheme +++ b/typst/themes/rose-pine-moon.tmTheme diff --git a/typst/typst.toml b/typst/typst.toml index 1acac64..1acac64 100644..100755 --- a/typst/typst.toml +++ b/typst/typst.toml diff --git a/vim/.config/nvim/.luarc.json b/vim/.config/nvim/.luarc.json index e69de29..e69de29 100644..100755 --- a/vim/.config/nvim/.luarc.json +++ b/vim/.config/nvim/.luarc.json diff --git a/vim/.config/nvim/init.lua b/vim/.config/nvim/init.lua index 3fa4cb9..3fa4cb9 100644..100755 --- a/vim/.config/nvim/init.lua +++ b/vim/.config/nvim/init.lua diff --git a/vim/.config/nvim/lsp/asm-lsp.lua b/vim/.config/nvim/lsp/asm-lsp.lua index 28678c0..28678c0 100644..100755 --- a/vim/.config/nvim/lsp/asm-lsp.lua +++ b/vim/.config/nvim/lsp/asm-lsp.lua diff --git a/vim/.config/nvim/lsp/astro.lua b/vim/.config/nvim/lsp/astro.lua index 45a9e8b..45a9e8b 100644..100755 --- a/vim/.config/nvim/lsp/astro.lua +++ b/vim/.config/nvim/lsp/astro.lua diff --git a/vim/.config/nvim/lsp/basedpyright.lua b/vim/.config/nvim/lsp/basedpyright.lua index 86fb411..86fb411 100644..100755 --- a/vim/.config/nvim/lsp/basedpyright.lua +++ b/vim/.config/nvim/lsp/basedpyright.lua diff --git a/vim/.config/nvim/lsp/ccls.lua b/vim/.config/nvim/lsp/ccls.lua index f0a08c5..f0a08c5 100644..100755 --- a/vim/.config/nvim/lsp/ccls.lua +++ b/vim/.config/nvim/lsp/ccls.lua diff --git a/vim/.config/nvim/lsp/clangd.lua b/vim/.config/nvim/lsp/clangd.lua index a3add02..a3add02 100644..100755 --- a/vim/.config/nvim/lsp/clangd.lua +++ b/vim/.config/nvim/lsp/clangd.lua diff --git a/vim/.config/nvim/lsp/codebook.lua b/vim/.config/nvim/lsp/codebook.lua index 226046e..226046e 100644..100755 --- a/vim/.config/nvim/lsp/codebook.lua +++ b/vim/.config/nvim/lsp/codebook.lua diff --git a/vim/.config/nvim/lsp/csharp-ls.lua b/vim/.config/nvim/lsp/csharp-ls.lua index 037650b..037650b 100644..100755 --- a/vim/.config/nvim/lsp/csharp-ls.lua +++ b/vim/.config/nvim/lsp/csharp-ls.lua diff --git a/vim/.config/nvim/lsp/cspell-ls.lua b/vim/.config/nvim/lsp/cspell-ls.lua index b3c60db..b3c60db 100644..100755 --- a/vim/.config/nvim/lsp/cspell-ls.lua +++ b/vim/.config/nvim/lsp/cspell-ls.lua diff --git a/vim/.config/nvim/lsp/css.lua b/vim/.config/nvim/lsp/css.lua index 9314747..9314747 100644..100755 --- a/vim/.config/nvim/lsp/css.lua +++ b/vim/.config/nvim/lsp/css.lua diff --git a/vim/.config/nvim/lsp/eslint.lua b/vim/.config/nvim/lsp/eslint.lua index 07d4ed7..07d4ed7 100644..100755 --- a/vim/.config/nvim/lsp/eslint.lua +++ b/vim/.config/nvim/lsp/eslint.lua diff --git a/vim/.config/nvim/lsp/fish-lsp.lua b/vim/.config/nvim/lsp/fish-lsp.lua index d0e6500..d0e6500 100644..100755 --- a/vim/.config/nvim/lsp/fish-lsp.lua +++ b/vim/.config/nvim/lsp/fish-lsp.lua diff --git a/vim/.config/nvim/lsp/gdscript.lua b/vim/.config/nvim/lsp/gdscript.lua index aaba5a3..aaba5a3 100644..100755 --- a/vim/.config/nvim/lsp/gdscript.lua +++ b/vim/.config/nvim/lsp/gdscript.lua diff --git a/vim/.config/nvim/lsp/gopls.lua b/vim/.config/nvim/lsp/gopls.lua index 1cec249..1cec249 100644..100755 --- a/vim/.config/nvim/lsp/gopls.lua +++ b/vim/.config/nvim/lsp/gopls.lua diff --git a/vim/.config/nvim/lsp/html.lua b/vim/.config/nvim/lsp/html.lua index e9ac9c4..e9ac9c4 100644..100755 --- a/vim/.config/nvim/lsp/html.lua +++ b/vim/.config/nvim/lsp/html.lua diff --git a/vim/.config/nvim/lsp/json.lua b/vim/.config/nvim/lsp/json.lua index 3ef906c..3ef906c 100644..100755 --- a/vim/.config/nvim/lsp/json.lua +++ b/vim/.config/nvim/lsp/json.lua diff --git a/vim/.config/nvim/lsp/luals.lua b/vim/.config/nvim/lsp/luals.lua index 745f38a..745f38a 100644..100755 --- a/vim/.config/nvim/lsp/luals.lua +++ b/vim/.config/nvim/lsp/luals.lua diff --git a/vim/.config/nvim/lsp/pyright.lua b/vim/.config/nvim/lsp/pyright.lua index b501b85..b501b85 100644..100755 --- a/vim/.config/nvim/lsp/pyright.lua +++ b/vim/.config/nvim/lsp/pyright.lua diff --git a/vim/.config/nvim/lsp/ruff.lua b/vim/.config/nvim/lsp/ruff.lua index 7fb61ea..7fb61ea 100644..100755 --- a/vim/.config/nvim/lsp/ruff.lua +++ b/vim/.config/nvim/lsp/ruff.lua diff --git a/vim/.config/nvim/lsp/rust-analyzer.lua b/vim/.config/nvim/lsp/rust-analyzer.lua index 31c9b63..31c9b63 100644..100755 --- a/vim/.config/nvim/lsp/rust-analyzer.lua +++ b/vim/.config/nvim/lsp/rust-analyzer.lua diff --git a/vim/.config/nvim/lsp/superhtml.lua b/vim/.config/nvim/lsp/superhtml.lua index fcbe24b..fcbe24b 100644..100755 --- a/vim/.config/nvim/lsp/superhtml.lua +++ b/vim/.config/nvim/lsp/superhtml.lua diff --git a/vim/.config/nvim/lsp/tailwind-ls.lua b/vim/.config/nvim/lsp/tailwind-ls.lua index 9ab35a8..9ab35a8 100644..100755 --- a/vim/.config/nvim/lsp/tailwind-ls.lua +++ b/vim/.config/nvim/lsp/tailwind-ls.lua diff --git a/vim/.config/nvim/lsp/textlsp.lua b/vim/.config/nvim/lsp/textlsp.lua index a1dbfc8..a1dbfc8 100644..100755 --- a/vim/.config/nvim/lsp/textlsp.lua +++ b/vim/.config/nvim/lsp/textlsp.lua diff --git a/vim/.config/nvim/lsp/tinymist.lua b/vim/.config/nvim/lsp/tinymist.lua index eddcd7e..eddcd7e 100644..100755 --- a/vim/.config/nvim/lsp/tinymist.lua +++ b/vim/.config/nvim/lsp/tinymist.lua diff --git a/vim/.config/nvim/lsp/ty.lua b/vim/.config/nvim/lsp/ty.lua index 92efaa0..92efaa0 100644..100755 --- a/vim/.config/nvim/lsp/ty.lua +++ b/vim/.config/nvim/lsp/ty.lua diff --git a/vim/.config/nvim/lsp/zigscient.lua b/vim/.config/nvim/lsp/zigscient.lua index bdb256f..bdb256f 100644..100755 --- a/vim/.config/nvim/lsp/zigscient.lua +++ b/vim/.config/nvim/lsp/zigscient.lua diff --git a/vim/.config/nvim/lsp/zls.lua b/vim/.config/nvim/lsp/zls.lua index 6716521..6716521 100644..100755 --- a/vim/.config/nvim/lsp/zls.lua +++ b/vim/.config/nvim/lsp/zls.lua diff --git a/vim/.config/nvim/lua/custom-lualine.lua b/vim/.config/nvim/lua/custom-lualine.lua index 9bed3a6..9bed3a6 100644..100755 --- a/vim/.config/nvim/lua/custom-lualine.lua +++ b/vim/.config/nvim/lua/custom-lualine.lua diff --git a/vim/.config/nvim/lua/diagnostics.lua b/vim/.config/nvim/lua/diagnostics.lua index 52f747e..52f747e 100644..100755 --- a/vim/.config/nvim/lua/diagnostics.lua +++ b/vim/.config/nvim/lua/diagnostics.lua diff --git a/vim/.config/nvim/lua/godot.lua b/vim/.config/nvim/lua/godot.lua index 327ed33..327ed33 100644..100755 --- a/vim/.config/nvim/lua/godot.lua +++ b/vim/.config/nvim/lua/godot.lua diff --git a/vim/.config/nvim/lua/native-lsp.lua b/vim/.config/nvim/lua/native-lsp.lua index ee97f80..ee97f80 100644..100755 --- a/vim/.config/nvim/lua/native-lsp.lua +++ b/vim/.config/nvim/lua/native-lsp.lua diff --git a/vim/.config/nvim/lua/packed.lua b/vim/.config/nvim/lua/packed.lua index 28a21cc..28a21cc 100644..100755 --- a/vim/.config/nvim/lua/packed.lua +++ b/vim/.config/nvim/lua/packed.lua diff --git a/vim/.config/nvim/lua/plugins.lua b/vim/.config/nvim/lua/plugins.lua index 303177d..303177d 100644..100755 --- a/vim/.config/nvim/lua/plugins.lua +++ b/vim/.config/nvim/lua/plugins.lua diff --git a/vim/.config/nvim/lua/remap.lua b/vim/.config/nvim/lua/remap.lua index 0128949..0128949 100644..100755 --- a/vim/.config/nvim/lua/remap.lua +++ b/vim/.config/nvim/lua/remap.lua diff --git a/vim/.config/nvim/lua/standard-lint.lua b/vim/.config/nvim/lua/standard-lint.lua index 2f06ce5..2f06ce5 100644..100755 --- a/vim/.config/nvim/lua/standard-lint.lua +++ b/vim/.config/nvim/lua/standard-lint.lua diff --git a/vim/.config/nvim/lua/westwood-lint.lua b/vim/.config/nvim/lua/westwood-lint.lua index 04501b2..04501b2 100644..100755 --- a/vim/.config/nvim/lua/westwood-lint.lua +++ b/vim/.config/nvim/lua/westwood-lint.lua diff --git a/vim/.config/nvim/nvim-pack-lock.json b/vim/.config/nvim/nvim-pack-lock.json index d89884f..523bf2e 100644..100755 --- 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 index 549c809..549c809 100644..100755 --- a/vim/.vim/settings.vim +++ b/vim/.vim/settings.vim diff --git a/vim/.vimrc b/vim/.vimrc index 83af16a..83af16a 100644..100755 --- a/vim/.vimrc +++ b/vim/.vimrc |