diff options
| -rw-r--r-- | justfile | 1 | ||||
| -rw-r--r-- | mut/aerospace/aerospace.toml | 1 | ||||
| -rwxr-xr-x | mut/bin/pnsh-nvim | 5 | ||||
| -rwxr-xr-x | mut/bin/xdg-open | 5 | ||||
| -rw-r--r-- | mut/carapace/specs/upctl.yaml | 5 | ||||
| -rw-r--r-- | mut/neovim/lua/my/init.lua | 2 | ||||
| -rw-r--r-- | mut/nushell/config.nu | 6 | ||||
| -rw-r--r-- | mut/vis/visrc.lua | 31 |
8 files changed, 50 insertions, 6 deletions
@@ -76,5 +76,6 @@ NIXNAME := "vm-aarch64" ! [ -d ~/.config/git ] && ln -sf /nix-config/mut/git ~/.config/git ! [ -d ~/.config/nushell ] && ln -sf /nix-config/mut/nushell ~/.config/nushell + ! [ -d ~/.config/vis ] && ln -sf /nix-config/mut/vis ~/.config/vis rm -rf "$HOME/Library/Application Support/nushell"; ln -sf /nix-config/mut/nushell "$HOME/Library/Application Support/nushell" true diff --git a/mut/aerospace/aerospace.toml b/mut/aerospace/aerospace.toml index ce9f5fd..aacd535 100644 --- a/mut/aerospace/aerospace.toml +++ b/mut/aerospace/aerospace.toml @@ -90,6 +90,7 @@ automatically-unhide-macos-hidden-apps = false # You can uncomment the following lines to open up terminal with alt + enter shortcut # (like in i3) cmd-shift-d = 'exec-and-forget source /etc/profile; PATH="$HOME/.local/bin:/opt/homebrew/bin:/opt/homebrew/sbin:$PATH" passmenu' + cmd-f = 'fullscreen' cmd-d = 'exec-and-forget source /etc/profile; PATH="$HOME/.local/bin:/opt/homebrew/bin:/opt/homebrew/sbin:$PATH" dmenu' cmd-enter = '''exec-and-forget osascript -e ' tell application "System Events" diff --git a/mut/bin/pnsh-nvim b/mut/bin/pnsh-nvim index f23fd6f..833a67d 100755 --- a/mut/bin/pnsh-nvim +++ b/mut/bin/pnsh-nvim @@ -10,6 +10,7 @@ let args = ( " --entrypoint=/usr/bin/nu" + " --env=TERM=xterm" + $" --env=TERMINFO" + +$" --env=EDITOR=vis" + $" --volume=($env.TERMINFO):($env.TERMINFO)" + " --env=_ZO_DATA_DIR=/hostfs/.local/share/zoxide" + " --volume=/etc/profiles/per-user/ivi/etc/profile.d:/etc/profiles/per-user/ivi/etc/profile.d" + @@ -36,6 +37,6 @@ $" --volume=($env | default "/var/run" XDG_RUNTIME_DIR | get XDG_RUNTIME_DIR)/do --pnsh-host-bindfs-disabled --pnsh-docker-extra-args=$"($args)" --with-docker - --docker-image=pionativedev.azurecr.io/pionative/pnsh-nvim - --docker-tag=darwin + --docker-image=pionativedev.azurecr.io/pionative/pnsh-vis + --docker-tag=latest ) diff --git a/mut/bin/xdg-open b/mut/bin/xdg-open index ca18836..f401d16 100755 --- a/mut/bin/xdg-open +++ b/mut/bin/xdg-open @@ -1,2 +1,5 @@ #!/bin/bash -nu --commands "^echo $1 | nc 127.0.0.1 1994 | echo" +case "$(file --mime-type $1 | awk '{print $2}')" in + text/*|application/json) exec "$EDITOR" $1 ;; + *) nu --commands "^echo $1 | nc 127.0.0.1 1994 | echo" ;; +esac diff --git a/mut/carapace/specs/upctl.yaml b/mut/carapace/specs/upctl.yaml new file mode 100644 index 0000000..7574e24 --- /dev/null +++ b/mut/carapace/specs/upctl.yaml @@ -0,0 +1,5 @@ +name: upctl +description: upctl +parsing: disabled +completion: + positionalany: ["$carapace.bridge.Cobra([upctl])"] diff --git a/mut/neovim/lua/my/init.lua b/mut/neovim/lua/my/init.lua index 3d539e7..76bf1f0 100644 --- a/mut/neovim/lua/my/init.lua +++ b/mut/neovim/lua/my/init.lua @@ -16,6 +16,7 @@ vim.api.nvim_set_hl(0, "VirtualTextWarning", {link= "Grey"}) vim.api.nvim_set_hl(0, "VirtualTextError", {link= "DiffDelete"}) vim.api.nvim_set_hl(0, "VirtualTextInfo", {link= "DiffChange"}) vim.api.nvim_set_hl(0, "VirtualTextHint", {link= "DiffAdd"}) +vim.diagnostic.config({virtual_text = false, virtual_lines = { highlight_whole_line = false, only_current_line = true } }) local map = vim.keymap.set local unmap = vim.keymap.del @@ -40,7 +41,6 @@ end map("n", "gb", ":GBrowse<CR>") map("n", "g<cr>", ":G<cr>") map("n", "ge", function() vim.diagnostic.open_float() end) --- (vim.diagnostic.config {:virtual_text false}) map("n", "-", ":Oil<cr>") map("n", "<leader>qf", cope) map("n", "<leader>q<BS>", ":cclose<cr>") diff --git a/mut/nushell/config.nu b/mut/nushell/config.nu index d47f885..4602133 100644 --- a/mut/nushell/config.nu +++ b/mut/nushell/config.nu @@ -1,10 +1,9 @@ if ($env | default "" DOCKER_NAME | get DOCKER_NAME | is-empty) { + if (pidof gpg-agent | is-empty) { gpgconf --launch gpg-agent } if ("~/.gnupg/S.gpg-agent.ssh" | path exists) { ln -sf ("~/.gnupg/S.gpg-agent.ssh" | path expand) $env.SSH_AUTH_SOCK } try {pnsh-nvim} -} else { - use ~/Programming/Pionative/quickstart/.venv/bin/activate.nu } # Nushell Config File # @@ -912,8 +911,11 @@ alias p = pnsh-nvim alias k = kubectl alias d = docker alias t = terraform +alias g = git +alias f = nvim +G +only let pistarchio_dir = "~/Programming/Pionative/pistarchio" | path expand $env.PISTARCHIO_STACKS_DIR = $pistarchio_dir + "/stacks" $env.PISTARCHIO_LIBRARY_DIR = $pistarchio_dir + "/library" $env.PISTARCHIO_VENDOR_DESTINATION_DIR = ($pistarchio_dir + "/../clients") | path expand +overlay use ~/Programming/Pionative/quickstart/.venv/bin/activate.nu diff --git a/mut/vis/visrc.lua b/mut/vis/visrc.lua new file mode 100644 index 0000000..e7f9e94 --- /dev/null +++ b/mut/vis/visrc.lua @@ -0,0 +1,31 @@ +-- load standard vis module, providing parts of the Lua API +require('vis') + +vis.events.subscribe(vis.events.INIT, function() + vis:command"set shell '/usr/bin/bash'" +end) + +vis.events.subscribe(vis.events.WIN_OPEN, function(win) +end) + +On branch master +Your branch is up to date with 'origin/master'. + +Changes not staged for commit: + (use "git add <file>..." to update what will be committed) + (use "git restore <file>..." to discard changes in working directory) + modified: justfile + modified: mut/aerospace/aerospace.toml + modified: mut/bin/pnsh-nvim + modified: mut/bin/xdg-open + modified: mut/neovim/lua/my/init.lua + modified: mut/nushell/config.nu + +Untracked files: + (use "git add <file>..." to include in what will be committed) + mut/carapace/specs/upctl.yaml + mut/vis/ + nohup.out + +no changes added to commit (use "git add" and/or "git commit -a") + |