From d90256a16f68eb8391799fc2d66e0174cdadf536 Mon Sep 17 00:00:00 2001 From: js0ny Date: Mon, 27 Jan 2025 15:24:03 +0000 Subject: [PATCH] Minor fix --- bootstrap/set_symlink_unix.bash | 1 + bootstrap/set_symlink_win.ps1 | 13 +- common/inputrc | 6 +- common/starship.toml | 5 + .../ipython/profile_default/ipython_config.py | 2 +- .../{starup => startup}/keymap.py | 138 +++++++++--------- .../{starup => startup}/magic_ps.py | 31 ++-- tools/ipython/profile_default/starup/README | 11 -- tools/nvim/lazy-lock.json | 50 +++---- 9 files changed, 134 insertions(+), 123 deletions(-) rename tools/ipython/profile_default/{starup => startup}/keymap.py (96%) rename tools/ipython/profile_default/{starup => startup}/magic_ps.py (55%) delete mode 100644 tools/ipython/profile_default/starup/README diff --git a/bootstrap/set_symlink_unix.bash b/bootstrap/set_symlink_unix.bash index 3e36ff0..5c5479c 100644 --- a/bootstrap/set_symlink_unix.bash +++ b/bootstrap/set_symlink_unix.bash @@ -20,6 +20,7 @@ ln -sf $DOTFILES/common/lesskey $XDG_CONFIG_HOME/lesskey # ln -sf $DOTFILES/common/npmrc $NPM_CONFIG_USERCONFIG ln -sf $DOTFILES/common/NuGet.Config $XDG_CONFIG_HOME/NuGet/NuGet.Config ln -sf $DOTFILES/common/pip.conf $XDG_CONFIG_HOME/pip/pip.conf +ln -sf $DOTFILES/common/starship.toml ~/.config/starship.toml ln -sf $DOTFILES/common/tmux.conf $XDG_CONFIG_HOME/tmux/tmux.conf ln -sf $DOTFILES/common/vimrc $XDG_CONFIG_HOME/vim/vimrc ln -sf $DOTFILES/common/zellij.config.kdl ~/.config/zellij/config.kdl diff --git a/bootstrap/set_symlink_win.ps1 b/bootstrap/set_symlink_win.ps1 index 4640ea0..643013d 100644 --- a/bootstrap/set_symlink_win.ps1 +++ b/bootstrap/set_symlink_win.ps1 @@ -8,11 +8,13 @@ $DOTFILES = Join-Path $Env:UserProfile ".dotfiles" $BASE_COMMON = Join-Path $DOTFILES "common" $BASE_TOOLS = Join-Path $DOTFILES "tools" $BASE_WIN = Join-Path $DOTFILES "platforms" "win" +$STARTUP = [System.Environment]::GetFolderPath("Startup") + $linkDots = @{ "$BASE_WIN\wslconfig" = "$Env:UserProfile\.wslconfig" + "$BASE_WIN\glzr" = "$Env:UserProfile\.glzr" "$BASE_WIN\neovide.toml" = "$Env:AppData\neovide\config.toml" - "$BASE_WIN\vsvimrc" = "$Env:Vim\.vsvimrc" - "$BASE_WIN\komorebi" = "$Env:KOMOREBI_CONFIG_HOME" + "$BASE_WIN\vsvimrc" = "$Env:UserProfile\.vsvimrc" "$BASE_COMMON\condarc.yaml" = "$Env:XDG_CONFIG_HOME\conda\.condarc" "$BASE_COMMON\gitconfig" = "$Env:UserProfile\.gitconfig" "$BASE_COMMON\glow.yaml" = "$Env:AppData\glow\glow.yml" @@ -21,9 +23,10 @@ $linkDots = @{ "$BASE_COMMON\lesskey" = "$Env:LessKeyIn" "$BASE_COMMON\npmrc" = "$Env:NPM_CONFIG_USERCONFIG" "$BASE_COMMON\NuGet.Config" = "$Env:AppData\NuGet\NuGet.Config" - "$BASE_COMMON\obsidian.vimrc" = "$Env:UserProfile\Obsidian\.obsidian.vimrc" + "$BASE_COMMON\starship.toml" = "$Env:UserProfile\.config\starship.toml" "$BASE_COMMON\pip.conf" = "$Env:AppData\pip\pip.ini" - "$BASE_COMMON\vimrc.noxdg.vimrc" = "$Env:Vim\_vimrc" + "$BASE_COMMON\vimrc.noxdg.vimrc" = "$Env:UserProfile\_vimrc" + "$BASE_TOOLS\ipython" = "$Env:IPYTHONDIR" "$BASE_TOOLS\ipython" = "$Env:IPYTHONDIR" "$BASE_TOOLS\nvim" = "$Env:XDG_CONFIG_HOME\nvim" } @@ -41,3 +44,5 @@ foreach ($target in $linkDots.Keys) { } New-Item -ItemType SymbolicLink -Target "$BASE_WIN\Microsoft.PowerShell_profile.ps1" -Path "$Env:UserProfile\Documents\PowerShell\Microsoft.PowerShell_profile.ps1" -Force + +Copy-Item (Join-Path $BASE_WIN "ahk" "bin" "Caps.exe") $STARTUP diff --git a/common/inputrc b/common/inputrc index 9611b92..d8e568e 100644 --- a/common/inputrc +++ b/common/inputrc @@ -1,13 +1,13 @@ -# $DOTFILES/common/gitconfig.example +# $DOTFILES/common/inputrc # Date: 2024-12-22 # Author: js0ny # GNU Readline config file, works for programs that use that library # e.g. Python REPL, Lua REPL, Bash on Linux # Location: -# $XDG_CONFIG_HOME/readline/inputrc +# ~/.inputrc # Linking: -# ln -sf $DOTFILES/common/inputrc $XDG_CONFIG_HOME/readline/inputrc +# ln -sf $DOTFILES/common/inputrc ~/.inputrc # Colemak Key Remaps set editing-mode vi diff --git a/common/starship.toml b/common/starship.toml index 861ec4a..0b6cbec 100644 --- a/common/starship.toml +++ b/common/starship.toml @@ -328,6 +328,11 @@ symbol = " " style = "bg:#86BBD8 fg:#794427" format = '[ $symbol ($version) ]($style)' +[python] +symbol = " " +style = "bg:#86BBD8 fg:#794427" +format = '[ $symbol ($version) ]($style)' + # }}} diff --git a/tools/ipython/profile_default/ipython_config.py b/tools/ipython/profile_default/ipython_config.py index 3c7c713..448cb9c 100644 --- a/tools/ipython/profile_default/ipython_config.py +++ b/tools/ipython/profile_default/ipython_config.py @@ -1,4 +1,4 @@ -c.TerminalIPythonApp.display_banner = True +c.TerminalIPythonApp.display_banner = False c.TerminalInteractiveShell.editing_mode = 'vi' c.TerminalInteractiveShell.confirm_exit = False diff --git a/tools/ipython/profile_default/starup/keymap.py b/tools/ipython/profile_default/startup/keymap.py similarity index 96% rename from tools/ipython/profile_default/starup/keymap.py rename to tools/ipython/profile_default/startup/keymap.py index 828d26d..2dae6da 100644 --- a/tools/ipython/profile_default/starup/keymap.py +++ b/tools/ipython/profile_default/startup/keymap.py @@ -1,69 +1,69 @@ -from prompt_toolkit.key_binding import KeyBindings -from prompt_toolkit.key_binding.vi_state import InputMode -from prompt_toolkit.filters import Condition -from IPython import get_ipython - -ip = get_ipython() -key_bindings = KeyBindings() - -@Condition -def in_navigation_mode(): - return ip.pt_app.app.vi_state.input_mode == InputMode.NAVIGATION - -# colemak keymap hnei -@key_bindings.add("n", filter=in_navigation_mode) -def _(event): - "Move cursor down by visual line" - event.current_buffer.auto_down(count=event.arg) - -@key_bindings.add("e", filter=in_navigation_mode) -def _(event): - "Move cursor up by visual line" - event.current_buffer.auto_up(count=event.arg) - -@key_bindings.add("i", filter=in_navigation_mode) -def _(event): - "Move cursor right" - event.current_buffer.cursor_right(count=event.arg) - -# Insert with 'l' and 'L' -@key_bindings.add("l", filter=in_navigation_mode) -def _(event): - "Enter insert mode (similar position to 'i' in Colemak)" - event.app.vi_state.input_mode = InputMode.INSERT - -@key_bindings.add("L", filter=in_navigation_mode) -def _(event): - "Enter insert mode at the beginning of the line" - event.current_buffer.cursor_position += event.current_buffer.document.get_start_of_line_position() - -# Ne[k]st -@key_bindings.add("k", filter=in_navigation_mode) -def _(event): - "Find next match" - event.current_buffer.forward_search() - -@key_bindings.add("K", filter=in_navigation_mode) -def _(event): - "Find previous match" - event.current_buffer.reverse_search() - -# [J]ump -@key_bindings.add("j", filter=in_navigation_mode) -def _(event): - "Move to end of next word" - event.current_buffer.cursor_right_word() - -@key_bindings.add("J", filter=in_navigation_mode) -def _(event): - "Move to end of next word with capital E" - event.current_buffer.cursor_right_word(end=True) - -# Yank to end of line with 'Y' -@key_bindings.add("Y", filter=in_navigation_mode) -def _(event): - "Yank to the end of the line" - text_to_yank = event.current_buffer.document.text_after_cursor - event.app.clipboard.set_text(text_to_yank) - -ip.pt_app.key_bindings = key_bindings +from prompt_toolkit.key_binding import KeyBindings +from prompt_toolkit.key_binding.vi_state import InputMode +from prompt_toolkit.filters import Condition +from IPython import get_ipython + +ip = get_ipython() +key_bindings = KeyBindings() + +@Condition +def in_navigation_mode(): + return ip.pt_app.app.vi_state.input_mode == InputMode.NAVIGATION + +# colemak keymap hnei +@key_bindings.add("n", filter=in_navigation_mode) +def _(event): + "Move cursor down by visual line" + event.current_buffer.auto_down(count=event.arg) + +@key_bindings.add("e", filter=in_navigation_mode) +def _(event): + "Move cursor up by visual line" + event.current_buffer.auto_up(count=event.arg) + +@key_bindings.add("i", filter=in_navigation_mode) +def _(event): + "Move cursor right" + event.current_buffer.cursor_right(count=event.arg) + +# Insert with 'l' and 'L' +@key_bindings.add("l", filter=in_navigation_mode) +def _(event): + "Enter insert mode (similar position to 'i' in Colemak)" + event.app.vi_state.input_mode = InputMode.INSERT + +@key_bindings.add("L", filter=in_navigation_mode) +def _(event): + "Enter insert mode at the beginning of the line" + event.current_buffer.cursor_position += event.current_buffer.document.get_start_of_line_position() + +# Ne[k]st +@key_bindings.add("k", filter=in_navigation_mode) +def _(event): + "Find next match" + event.current_buffer.forward_search() + +@key_bindings.add("K", filter=in_navigation_mode) +def _(event): + "Find previous match" + event.current_buffer.reverse_search() + +# [J]ump +@key_bindings.add("j", filter=in_navigation_mode) +def _(event): + "Move to end of next word" + event.current_buffer.cursor_right_word() + +@key_bindings.add("J", filter=in_navigation_mode) +def _(event): + "Move to end of next word with capital E" + event.current_buffer.cursor_right_word(end=True) + +# Yank to end of line with 'Y' +@key_bindings.add("Y", filter=in_navigation_mode) +def _(event): + "Yank to the end of the line" + text_to_yank = event.current_buffer.document.text_after_cursor + event.app.clipboard.set_text(text_to_yank) + +ip.pt_app.key_bindings = key_bindings diff --git a/tools/ipython/profile_default/starup/magic_ps.py b/tools/ipython/profile_default/startup/magic_ps.py similarity index 55% rename from tools/ipython/profile_default/starup/magic_ps.py rename to tools/ipython/profile_default/startup/magic_ps.py index 351e003..7afe737 100644 --- a/tools/ipython/profile_default/starup/magic_ps.py +++ b/tools/ipython/profile_default/startup/magic_ps.py @@ -1,10 +1,21 @@ -from IPython.core.magic import register_line_magic - -@register_line_magic -def ps(cmd): - output = get_ipython().getoutput(f"pwsh -NoProfile -Command {cmd}") - # If no variable is assigned to the output, print it - if get_ipython().last_execution_result is None: - print("\n".join(output)) - else: - return "\n".join(output) +from IPython.core.magic import register_line_magic + +@register_line_magic +def ps(cmd): + output = get_ipython().getoutput(f"pwsh -NoProfile -Command {cmd}") + # If no variable is assigned to the output, print it + if get_ipython().last_execution_result is None: + print("\n".join(output)) + else: + return "\n".join(output) + + + +@register_line_magic +def nu(cmd): + output = get_ipython().getoutput(f"nu -c {cmd}") + # If no variable is assigned to the output, print it + if get_ipython().last_execution_result is None: + print("\n".join(output)) + else: + return "\n".join(output) diff --git a/tools/ipython/profile_default/starup/README b/tools/ipython/profile_default/starup/README deleted file mode 100644 index 61d4700..0000000 --- a/tools/ipython/profile_default/starup/README +++ /dev/null @@ -1,11 +0,0 @@ -This is the IPython startup directory - -.py and .ipy files in this directory will be run *prior* to any code or files specified -via the exec_lines or exec_files configurables whenever you load this profile. - -Files will be run in lexicographical order, so you can control the execution order of files -with a prefix, e.g.:: - - 00-first.py - 50-middle.py - 99-last.ipy diff --git a/tools/nvim/lazy-lock.json b/tools/nvim/lazy-lock.json index 2262d55..9cae34f 100644 --- a/tools/nvim/lazy-lock.json +++ b/tools/nvim/lazy-lock.json @@ -1,54 +1,54 @@ { - "LuaSnip": { "branch": "master", "commit": "2592b91577136dbb355a4708be1e60619456b7f6" }, + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, "auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" }, - "betterTerm.nvim": { "branch": "main", "commit": "6f03af3a1ed4d054ecbcb0aa8266ddaf610aa657" }, - "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" }, - "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, + "betterTerm.nvim": { "branch": "main", "commit": "5d3f41d9e8b3553d49764906a14e45a08dbe2308" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "code_runner.nvim": { "branch": "main", "commit": "65218f8f646fe61e506090522df357539642ae83" }, - "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, + "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "9541f5e8e24571723cb02a5c2bf078aeacc5a711" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" }, "grug-far.nvim": { "branch": "main", "commit": "635e69adf3a714621bd0a289314bc23c5848babb" }, "hover.nvim": { "branch": "main", "commit": "140c4d0ae9397b76baa46b87c574f5377de09309" }, "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, - "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, "lazygit.nvim": { "branch": "main", "commit": "77a0d42943d8265271e6e6beaed72da54eeb17e7" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "luasnip-latex-snippets.nvim": { "branch": "main", "commit": "cab134611eb755abe9ba95f5d86969f5cece448d" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, - "nvim-lspconfig": { "branch": "master", "commit": "7b0a2f6b14485bb5a237fc1328a487ff3e4a08c5" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "e5bf88e5ea1c4cea5ea96b1e970cb264f7a401a1" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, - "nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" }, - "nvim-treesitter": { "branch": "master", "commit": "454354e5998edb448111574e58d5f5f2d6a940bd" }, - "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" }, - "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, + "nvim-tree.lua": { "branch": "master", "commit": "d529a99f88e0dff02e0aa275db2f595cd252a2c8" }, + "nvim-treesitter": { "branch": "master", "commit": "d34e62afd3e483fe0fa2f24b6323f3bb1d35ddcc" }, + "nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" }, + "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "onedarkpro.nvim": { "branch": "main", "commit": "0feb5f55dd777352f2dddd7478dd13d050864ee3" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "onedarkpro.nvim": { "branch": "main", "commit": "44775f8206ee43b692e7f3dc894ddc47996ee523" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "render-markdown.nvim": { "branch": "main", "commit": "634acd5da964c32f6947cd0c7802d7a116662665" }, - "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, + "render-markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" }, + "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" }, "vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, - "vim-just": { "branch": "main", "commit": "ed67f198e981f555c0f9e9ed5b69b4b06543a9e1" }, + "vim-just": { "branch": "main", "commit": "0f7d26de0c48e2620b733e51f4159aae13dc3bee" }, "vim-visual-multi-colemak-hnei": { "branch": "master", "commit": "2cc37d77590d6569d991ebd8d96ab5867eb5a47a" }, - "vim-wakatime": { "branch": "master", "commit": "cf51327a9e08935569614d1cb24e779ee9f45519" }, - "vimtex": { "branch": "master", "commit": "a707d39e77cb27a6d02922f269875d1727860dcf" }, - "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" }, + "vim-wakatime": { "branch": "master", "commit": "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d" }, + "vimtex": { "branch": "master", "commit": "83e331dcad5ce28012e656eea3906b5b897db2ba" }, + "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" }, "winbar.nvim": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" }, - "yanky.nvim": { "branch": "main", "commit": "f9b905994cccf3c55f41af3a0a1f4c76c844e411" } + "yanky.nvim": { "branch": "main", "commit": "d2696b30e389dced94d5acab728f524a25f308d2" } }