diff options
Diffstat (limited to '')
-rwxr-xr-x | .bashrc | 13 | ||||
-rw-r--r-- | .config/nvim/lua/keybinds.lua | 52 | ||||
-rwxr-xr-x | .profile | 24 |
3 files changed, 39 insertions, 50 deletions
@@ -16,7 +16,10 @@ then return fi -. "$HOME"/.profile +if [ -f "$HOME"/.profile ] +then + . "$HOME"/.profile +fi alias cls="clear" BAT="$(which bat 2> /dev/null || which batcat 2> /dev/null)" @@ -32,7 +35,11 @@ alias codium="flatpak run com.vscodium.codium --no-sandbox --enable-features=Use alias mpv="$(which mpv 2> /dev/null || echo "flatpak run io.mpv.Mpv")" alias tmux="tmux -2" -. /usr/share/bash-completion/bash_completion +if [ -f "/usr/share/bash-completion/bash_completion" ] +then + . /usr/share/bash-completion/bash_completion +fi + for f in "$HOME"/.local/share/bash-completion/* do . "$f" @@ -41,7 +48,7 @@ done GPG_TTY="$(tty)" export GPG_TTY -if [ -n "$(which starship)" ] +if [ -n "$(which starship 2> /dev/null)" ] then eval "$(starship init bash)" fi diff --git a/.config/nvim/lua/keybinds.lua b/.config/nvim/lua/keybinds.lua index bc36772..6094a61 100644 --- a/.config/nvim/lua/keybinds.lua +++ b/.config/nvim/lua/keybinds.lua @@ -64,30 +64,30 @@ vim.keymap.set({ "t" }, "<ESC>", "<C-\\><C-n>") vim.opt.whichwrap = "<,>,h,l,[,]" -wk.register({ - ["<CR>"] = "Quick Action"; - ["K"] = "Hover"; - ["D"] = "Definition"; - ["S"] = "Symbols"; - ["F"] = "Format"; - ["f"] = "Find files"; - ["<TAB>"] = "Show buffers"; - [","] = "Show errors"; - ["["] = "Open folds"; - ["]"] = "Close folds"; - ["r"] = "Rename"; - ["n"] = "Show file tree"; - ["m"] = "Toggle Minimap"; - ["b"] = "Blame line"; - ["h"] = "Preview hunk"; - ["d"] = "Show diagnostics"; - ["t"] = "Open terminal"; - ["s"] = "Save file"; - ["q"] = "Quit"; - ["R"] = "Show References"; - ["J"] = "Signature help"; - ["U"] = "Undo tree"; - ["N"] = "Next tab"; - ["P"] = "Previous tab"; - ["L"] = "Toggle plain mode"; +wk.add({ + { "<leader>,", desc = "Show errors" }, + { "<leader><CR>", desc = "Quick Action" }, + { "<leader><TAB>", desc = "Show buffers" }, + { "<leader>D", desc = "Definition" }, + { "<leader>F", desc = "Format" }, + { "<leader>J", desc = "Signature help" }, + { "<leader>K", desc = "Hover" }, + { "<leader>L", desc = "Toggle plain mode" }, + { "<leader>N", desc = "Next tab" }, + { "<leader>P", desc = "Previous tab" }, + { "<leader>R", desc = "Show References" }, + { "<leader>S", desc = "Symbols" }, + { "<leader>U", desc = "Undo tree" }, + { "<leader>[", desc = "Open folds" }, + { "<leader>]", desc = "Close folds" }, + { "<leader>b", desc = "Blame line" }, + { "<leader>d", desc = "Show diagnostics" }, + { "<leader>f", desc = "Find files" }, + { "<leader>h", desc = "Preview hunk" }, + { "<leader>m", desc = "Toggle Minimap" }, + { "<leader>n", desc = "Show file tree" }, + { "<leader>q", desc = "Quit" }, + { "<leader>r", desc = "Rename" }, + { "<leader>s", desc = "Save file" }, + { "<leader>t", desc = "Open terminal" }, }, { prefix = "<leader>" }); @@ -41,6 +41,7 @@ XDG_CACHE_DIR="$HOME/.cache" GOPATH="$XDG_CACHE_DIR/go" PNPM_HOME="$HOME/.local/share/pnpm" MANPAGER="nvim +Man!" +SVDIR="$HOME/.config/service" export DENO_INSTALL export DENO_NO_UPDATE_CHECK @@ -52,6 +53,7 @@ export XDG_CONFIG_HOME export XDG_CACHE_DIR export GOPATH export PNPM_HOME +export SVDIR export GOPROXY export EDITOR @@ -60,26 +62,6 @@ export BAT_THEME export TERMINAL export MANPAGER -SWAY_PROCESSES="$(pgrep sway)" - -# Sway specific -if [ -n "$SWAY_PROCESSES" ] -then - SDL_VIDEODRIVER="wayland" - _JAVA_AWT_WM_NONREPARENTING=1 - QT_QPA_PLATFORM="wayland" - XDG_CURRENT_DESKTOP="sway" - XDG_SESSION_DESKTOP="sway" - XDG_SESSION_TYPE="wayland" - - export SDL_VIDEODRIVER - export _JAVA_AWT_WM_NONREPARENTING - export QT_QPA_PLATFORM - export XDG_CURRENT_DESKTOP - export XDG_SESSION_DESKTOP - export XDG_SESSION_TYPE -fi - PATH="$PNPM_HOME:\ $GOPATH/bin:\ $DENO_INSTALL/bin:\ @@ -90,7 +72,7 @@ $HOME/.luarocks/bin:\ $HOME/.dotnet/tools:\ $PATH" -if [ -n "$(which gem)" ] +if [ -n "$(which gem 2> /dev/null)" ] then GEM_HOME="$(gem env user_gemhome)" export GEM_HOME |