From 8ffca7f6b514f8407d34d051672a9405ec1e355e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Sun, 7 Apr 2024 20:56:15 +0200 Subject: [PATCH 1/4] replace /home/something with /home/user --- .config/zsh/.zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index d2d70e6..95f68ea 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -233,7 +233,8 @@ function o () { function run_waypipe() { SSH_SESSION_ID=$RANDOM - SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t $1 env REMOTE_PATH=\"$(pwd)\" SSH_SESSION_ID=$SSH_SESSION_ID "zsh --login" + REMOTE_PATH=$(echo $(pwd) | sed "s|/home/[a-z]*|\$HOME|g") + SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t $1 env REMOTE_PATH=\"$REMOTE_PATH\" SSH_SESSION_ID=$SSH_SESSION_ID "zsh --login" } alias mallorea="run_waypipe mallorea" From 972d2dee1181d0e12c9069353c3a1acab3bfd32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Wed, 10 Apr 2024 13:17:49 +0200 Subject: [PATCH 2/4] Start work on using oil.nvim for navigation --- .config/nvim/lua/plugins/oil.lua | 13 +++++++++++-- .config/zsh/.zshrc | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.config/nvim/lua/plugins/oil.lua b/.config/nvim/lua/plugins/oil.lua index 4f13f72..98b2367 100644 --- a/.config/nvim/lua/plugins/oil.lua +++ b/.config/nvim/lua/plugins/oil.lua @@ -1,10 +1,20 @@ +local function store_select() + require("oil").select({}, function() + local f = io.open("/tmp/oil_dir", "w") + if f then + f:write(require("oil").get_current_dir()) + f:close() + end + end) +end + return { 'stevearc/oil.nvim', dependencies = { "nvim-tree/nvim-web-devicons" }, lazy = true, opts = { keymaps = { ["g?"] = "actions.show_help", - [""] = "actions.select", + [""] = store_select, ["v"] = "actions.select_vsplit", ["s"] = "actions.select_split", ["p"] = "actions.preview", @@ -16,7 +26,6 @@ return { ["~"] = "actions.tcd", ["g."] = "actions.toggle_hidden", }, - -- Set to false to disable all of the above keymaps use_default_keymaps = false, } } diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 95f68ea..7713fd5 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -262,6 +262,7 @@ alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts" alias xbindkeys="xbindkeys -f $XDG_CONFIG_HOME/xbindkeys/config" alias python=python3 alias r=". ranger" +alias v="vim . && cd \"\$(cat /tmp/oil_dir)\"" alias cpr="rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1" alias mvr="rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 --remove-source-files" alias rg="rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'" From 2f01eaf9f9c7afa0fee7f5a47dfe2f4c71d07f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Wed, 10 Apr 2024 13:35:52 +0200 Subject: [PATCH 3/4] Better enumeration of fzy directories --- .config/zsh/.zshrc | 54 ++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 7713fd5..cd5f82f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -112,24 +112,40 @@ function zvm_after_init() { fi if [ ! -f $FZY_CACHE ]; then PATHS="" - if [ -d ~/.dotfiles ]; then - PATHS="$PATHS\n~/.dotfiles" - PATHS="$PATHS\n$(fd . ~/.dotfiles -t d -d 2)" - fi - if [ -d ~/Workspace ]; then - PATHS="$PATHS\n$(fd . ~/Workspace -t d -d 8)" - fi - if [ -d ~/Containers ]; then - PATHS="$PATHS\n$(fd . ~/Containers -t d -d 2)" - fi - if [ -d ~/Storage/Shared ]; then - PATHS="$PATHS\n/home/server/Storage/Shared" - PATHS="$PATHS\n$(fd . ~/Storage/Shared -t d -d 2)" - fi - if [ -d ~/Storage/Thomas ]; then - PATHS="$PATHS\n/home/server/Storage/Thomas" - PATHS="$PATHS\n$(fd . ~/Storage/Thomas -t d -d 5)" - fi + + for i in \ + ~/.config/waybar \ + ~/.config/xmodmap \ + ~/.config/zsh \ + ~/.config/tmux \ + ~/.config/vim \ + ~/.config/qtile \ + ~/.config/rofi \ + ~/.config/scripts \ + ~/.config/nvim \ + ~/.config/picom \ + ~/.config/polybar \ + ~/.config/awesome \ + ~/.config/dunst \ + ~/.config/firefox \ + ~/.config/git \ + ~/.config/gitui \ + ~/.config/helix \ + ~/.config/hypr \ + ~/.config/i3 \ + ~/.config/kitty \ + ~/.config/mpv \ + ~/.config/alacritty \ + ~/Workspace \ + ~/Containers \ + ~/Storage/Shared \ + ~/Storage/Thomas; do + + if [ -d $i ]; then + PATHS="$PATHS\n$i/" + PATHS="$PATHS\n$(fd . $i -t d -d 5)" + fi + done echo -e $PATHS > $FZY_CACHE fi cd_to "$(cat $FZY_CACHE | fzy -l 20)" @@ -257,7 +273,7 @@ alias ll='ls -lhat' alias clip="xsel --clipboard" alias compress="tar --use-compress-program=lbzip2 -cvf" alias vim="nvim" -alias dotfiles='/usr/bin/git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME"' +alias dot='/usr/bin/git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME"' alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts" alias xbindkeys="xbindkeys -f $XDG_CONFIG_HOME/xbindkeys/config" alias python=python3 From d2bf13d6f6348e83ca2167a735dabda2b3afcb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Wed, 10 Apr 2024 13:46:15 +0200 Subject: [PATCH 4/4] Also call save_dir when opening parent --- .config/nvim/lua/plugins/oil.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.config/nvim/lua/plugins/oil.lua b/.config/nvim/lua/plugins/oil.lua index 98b2367..8d8e4ef 100644 --- a/.config/nvim/lua/plugins/oil.lua +++ b/.config/nvim/lua/plugins/oil.lua @@ -1,11 +1,12 @@ -local function store_select() - require("oil").select({}, function() +local function save_dir() + local dir = require("oil").get_current_dir() + if dir ~= nil then local f = io.open("/tmp/oil_dir", "w") if f then - f:write(require("oil").get_current_dir()) + f:write(dir) f:close() end - end) + end end return { @@ -14,13 +15,13 @@ return { opts = { keymaps = { ["g?"] = "actions.show_help", - [""] = store_select, + [""] = function() require("oil").select({}, save_dir) end, ["v"] = "actions.select_vsplit", ["s"] = "actions.select_split", ["p"] = "actions.preview", [""] = "actions.close", ["r"] = "actions.refresh", - ["-"] = "actions.parent", + ["-"] = function() require("oil").open(); save_dir() end, ["_"] = "actions.open_cwd", ["`"] = "actions.cd", ["~"] = "actions.tcd",