diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/.config/nvim/lua/keymaps.lua index b63a4c3..bc4a619 100644 --- a/nvim/.config/nvim/lua/keymaps.lua +++ b/nvim/.config/nvim/lua/keymaps.lua @@ -15,6 +15,26 @@ end keymap("n", "f", ":Pick files") keymap("n", "g", ":Pick grep_live") +vim.keymap.set('n', 'p', function() + local root = vim.fn.expand("~/programming") + local items = vim.fn.globpath(root, '*', false, true) + local dirs = {} + for _, p in ipairs(items) do + if vim.fn.isdirectory(p) == 1 then table.insert(dirs, p) end + end + if #dirs == 0 then + vim.notify('No directories in ' .. root, vim.log.levels.INFO) + return + end + vim.ui.select(dirs, { prompt = 'Pick dir:' }, function(choice) + if not choice then return end + vim.cmd('cd ' .. vim.fn.fnameescape(choice)) + vim.notify('cd -> ' .. choice, vim.log.levels.INFO) + end) +end) + + + keymap("n", "lf", vim.lsp.buf.format) keymap({ "n", "t" }, "", function() diff --git a/xinitrc/.xinitrc b/xinitrc/.xinitrc index 265390f..d68bdf0 100755 --- a/xinitrc/.xinitrc +++ b/xinitrc/.xinitrc @@ -1,4 +1,8 @@ #!/bin/sh export _JAVA_AWT_WM_NONREPARENTING=1 -. $HOME/.zprofile + +if [ -f "$HOME/.zprofile" ]; then + . "$HOME/.zprofile" +fi + exec dbus-launch --exit-with-session oxwm diff --git a/zsh/.zprofile b/zsh/.zprofile new file mode 100644 index 0000000..c91675f --- /dev/null +++ b/zsh/.zprofile @@ -0,0 +1,21 @@ +export PATH="$HOME/.local/bin:$PATH" +export PATH="$HOME/.cargo/bin:$PATH" + +export XDG_DOWNLOAD_DIR="$HOME/downloads" +export XDG_PROJECTS_DIR="$HOME/programming" + +export XDG_DESKTOP_DIR="$HOME/.local/desktop" +export XDG_DOCUMENTS_DIR="$HOME/documents" +export XDG_MUSIC_DIR="$HOME/media" +export XDG_PICTURES_DIR="$HOME/media" +export XDG_PUBLICSHARE_DIR="$HOME/media" +export XDG_TEMPLATES_DIR="$HOME/media" +export XDG_VIDEOS_DIR="$HOME/media" + +export EDITOR=nvim +export SUDO_EDITOR=nvim + +export GOPATH="$HOME/.local/go" + +export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/opt/bin:$HOME/.cargo/bin:$PATH" +export LD_LIBRARY_PATH="$HOME/opt/lib:${LD_LIBRARY_PATH:-}" diff --git a/zsh/.zshrc b/zsh/.zshrc index fe5ba2f..401cec6 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,24 +1,5 @@ export TERM=xterm-256color -export XDG_DOWNLOAD_DIR="$HOME/downloads" -export XDG_PROJECTS_DIR="$HOME/programming" - -export XDG_DESKTOP_DIR="$HOME" -export XDG_DOCUMENTS_DIR="$HOME/documents" -export XDG_MUSIC_DIR="$HOME/media" -export XDG_PICTURES_DIR="$HOME/media" -export XDG_PUBLICSHARE_DIR="$HOME/media" -export XDG_TEMPLATES_DIR="$HOME/media" -export XDG_VIDEOS_DIR="$HOME/media" - -export EDITOR=nvim -export SUDO_EDITOR=nvim - -export GOPATH="$HOME/.local/go" - -export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/opt/bin:$HOME/.cargo/bin:$PATH" -export LD_LIBRARY_PATH="$HOME/opt/lib:${LD_LIBRARY_PATH:-}" - ZAP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zap" [ -f "$ZAP_DIR/zap.zsh" ] && source "$ZAP_DIR/zap.zsh" @@ -56,7 +37,11 @@ setopt MENU_COMPLETE setopt NOMATCH unsetopt BEEP -autoload -Uz compinit colors bashcompinit +autoload -Uz compinit +autoload -Uz colors +autoload -Uz bashcompinit + +zmodload zsh/complist zmodload zsh/complist zstyle ':completion:*' menu yes select