diff --git a/bashrc_arch b/bashrc_arch index 0012fe1..b403786 100644 --- a/bashrc_arch +++ b/bashrc_arch @@ -4,12 +4,6 @@ case $- in *) return ;; esac -# if [[ ! $TERM =~ linux ]]; then -# if [[ $TERM =~ tmux ]]; then -# source ~/.local/share/blesh/ble.sh --noattach -# fi -# fi - # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options HISTCONTROL=ignoreboth @@ -25,6 +19,13 @@ HISTFILESIZE=2000 # update the values of LINES and COLUMNS. shopt -s checkwinsize +# Set autocomplete +bind 'set show-all-if-ambiguous on' +bind 'TAB:menu-complete' + +# Set auto cd +shopt -s autocd + # make less more friendly for non-text input files, see lesspipe(1) [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" @@ -45,6 +46,7 @@ alias ls="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions" alias lsa="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions -a" alias lss="eza -1 -l --icons=auto --git-repos --git -h -g --total-size -o --no-permissions -a" + if [[ ! $TERM =~ linux ]]; then # if [[ $TERM =~ tmux ]]; then source ~/.fzf.bash diff --git a/config/nvim/init.lua b/config/nvim/init.lua index aabefcd..0d92fa4 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -338,6 +338,7 @@ require("lazy").setup({ dependencies = { "echasnovski/mini.icons" }, opts = { "fzf-tmux", + fzf_opts = { ["--tmux"] = "center,80%,80%" }, fzf_colors = { true, -- inherit fzf colors that aren't specified below from -- the auto-generated theme similar to `fzf_colors=true` @@ -363,6 +364,17 @@ require("lazy").setup({ }, }, + { + "NeogitOrg/neogit", + dependencies = { + "nvim-lua/plenary.nvim", -- required + "sindrets/diffview.nvim", -- optional - Diff integration + + -- Only one of these is needed. + "ibhagwan/fzf-lua", -- optional + }, + }, + -- GUI ------------------------------------------------------ { "mrjones2014/smart-splits.nvim", @@ -529,8 +541,9 @@ vim.keymap.set("n", "", ":tabNext", { desc = "Next tab", silent = true vim.keymap.set("n", "", ":write", { desc = "Save", silent = true }) vim.keymap.set("n", "", ":quit", { desc = "Quit", silent = true }) vim.keymap.set("n", "e", ":e .", { desc = "File explorer", silent = true }) -vim.keymap.set("n", "f", ":FzfLua files", { desc = "Find file", silent = true }) -vim.keymap.set("n", "F", ":FzfLua files cwd=~/", { desc = "Find file", silent = true }) -vim.keymap.set("n", "b", ":FzfLua buffers", { desc = "Find file", silent = true }) -vim.keymap.set("n", "d", ":FzfLua lsp_document_diagnostics", { desc = "find file", silent = true }) -vim.keymap.set("n", "o", ":FzfLua oldfiles", { desc = "find file", silent = true }) +vim.keymap.set("n", "f", ":FzfLua files", { desc = "Find file in cwd", silent = true }) +vim.keymap.set("n", "F", ":FzfLua files cwd=~/", { desc = "Find file in root", silent = true }) +vim.keymap.set("n", "b", ":FzfLua buffers", { desc = "Buffers", silent = true }) +vim.keymap.set("n", "d", ":FzfLua lsp_document_diagnostics", { desc = "Diagnostics", silent = true }) +vim.keymap.set("n", "o", ":FzfLua oldfiles", { desc = "Old file", silent = true }) +vim.keymap.set("n", "g", ":FzfLua git_status", { desc = "Git status", silent = true }) diff --git a/config/waybar/config b/config/waybar/config index 11562e4..792ec8b 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -63,7 +63,7 @@ "clock": { "interval": 10, - "format": "{:%A - %B %d %Y - %R}", + "format": "{:%A - %d %B %Y - %R}", }, "cpu": { diff --git a/tmux.conf b/tmux.conf index 431e3b0..32ed406 100644 --- a/tmux.conf +++ b/tmux.conf @@ -59,16 +59,12 @@ set-option -g set-clipboard on set -g status-interval 2 set -g status-bg "#303030" set -g status-fg "#c6c6c6" -set -g status-left '' +set -g status-left '#[bg=#87afd7,fg=#000000] #{session_name} ' set -g status-right '#[fg=#87afd7,bg=#303030]#[fg=#c6c6c6,bg=#303030] #{pane_current_path} #[bg=#87afd7,fg=#000000] %d-%b-%Y %H:%M ' - -# Use normal and bright monochrome colors to show a tab line on the left. set -g status-justify left set-window-option -g window-status-separator '' -set-window-option -g window-status-format '#[bg=#303030,fg=#c6c6c6] #I ' -set-window-option -g window-status-current-format '#[bg=#87afd7,fg=#000000] #I ' - -# Switching panes should change the foreground color but not border colors. +set-window-option -g window-status-format '#[bg=#303030,fg=#555555] #I ' +set-window-option -g window-status-current-format '#[bg=#303030,fg=#c6c6c6] #I ' set -g window-style 'bg=default,fg=#c6c6c6' set -g window-active-style 'bg=default,fg=#c6c6c6' set -g pane-border-style 'bg=#262626,fg=#000000'