diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index a602010..339d660 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -4,7 +4,6 @@ alias myip="curl http://ip.ie.mk/get" alias ls="ls --color" alias grep="grep --color" alias virsh="virsh --connect qemu:///system" -alias cal="cal -m" alias genpasswd="strings /dev/urandom | tr -cd '12345!@#$%qwertQWERTasdfgASDFGzxcvbZXCVB' | head -c 32; echo" alias du="dust -r" alias jsonpp="python -m json.tool" diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 52dc78b..7fbcf42 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -15,13 +15,31 @@ shopt -s histappend [[ -f $HOME/.bash_colors ]] && source "$HOME/.bash_colors" [[ -f $HOME/.bash_functions ]] && source "$HOME/.bash_functions" +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi +while read -r completion ; do source "$completion" ; done < <(find $HOME/.bash_completion/*) + # Save working dir on every prompt. export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"; pwd > $HOME/.cwd' -export PS1="${Yellow}\d \A ${Off}${Green}\u@\h: ${Off}\w ${Red}\$(parse_branch git)${BRed}\$(parse_branch fossil)${Off}\n-$ " +export PS1="${Red}\d \A ${Blue}\u@\h: ${Off}\w ${BGreen}\$(parse_branch git)${BPurple}\$(parse_branch fossil)${Off}\n-$ " + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize # Use fzf if installed. -hash fzf 2>/dev/null && eval "$(fzf --bash)" -export FZF_DEFAULT_OPTS='--border=horizontal --info=inline --no-reverse --height=50%' +export FZF_DEFAULT_OPTS='--border=horizontal --info=inline --no-reverse --height=30%' [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" @@ -37,3 +55,7 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then fi export GPG_TTY=$(tty) gpg-connect-agent updatestartuptty /bye >/dev/null + +source '/home/vladanpopovic/.bash_completions/entity-operator.sh' + +export PATH=/home/vladanpopovic/.tiup/bin:$PATH diff --git a/dotfiles/.config/alacritty/alacritty.toml b/dotfiles/.config/alacritty/alacritty.toml index acf2d4c..857e36e 100644 --- a/dotfiles/.config/alacritty/alacritty.toml +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -1,9 +1,9 @@ -[general] +live_config_reload = true +working_directory = "None" + import = [ "~/.config/alacritty/light.toml" ] -live_config_reload = true -working_directory = "None" [cursor] thickness = 0.2 @@ -13,7 +13,7 @@ style = "Block" TERM = "alacritty" [font] -size = 11 +size = 10 [font.bold] family = "monospace" @@ -414,7 +414,7 @@ history = 100000 save_to_clipboard = true semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" -[terminal.shell] +[shell] program = "/bin/bash" [window] diff --git a/dotfiles/.config/containers/storage.conf b/dotfiles/.config/containers/storage.conf index 3fc7f79..fbed9d1 100644 --- a/dotfiles/.config/containers/storage.conf +++ b/dotfiles/.config/containers/storage.conf @@ -1,4 +1,4 @@ [storage] driver = "overlay" runroot = "/run/user/1000" - graphroot = "/home/vladan/.local/share/containers/storage" + graphroot = "/home/vladanpopovic/.local/share/containers/storage" diff --git a/dotfiles/.config/git/config b/dotfiles/.config/git/config index c5a5d27..217cdd7 100644 --- a/dotfiles/.config/git/config +++ b/dotfiles/.config/git/config @@ -1,5 +1,5 @@ [user] - email = vladanovic@gmail.com + email = vladan.popovic@hm.com name = Vladan Popovic [core] excludesfile = /home/vladan/.config/git/ignore diff --git a/dotfiles/.config/mako/config b/dotfiles/.config/mako/config index a19fc01..a32fc19 100644 --- a/dotfiles/.config/mako/config +++ b/dotfiles/.config/mako/config @@ -1,6 +1,6 @@ sort=-time -default-timeout=5000 -ignore-timeout=1 +default-timeout=0 +ignore-timeout=0 height=200 width=400 @@ -17,14 +17,16 @@ border-radius=10 background-color=#eff1f5E0 text-color=#4c4f69 +border-color=#40a02b progress-color=over #ccd0da [urgency=low] border-color=#c1ca8c -[urgency=normal] -border-color=#a1bacc +[urgency=high] +border-color=#fe040b +background-color=#ffe1e5 [urgency=critical] border-color=#fe040b -default-timeout=0 +background-color=#ffe1e5 diff --git a/dotfiles/.config/nvim/lua/plugins/dap.lua b/dotfiles/.config/nvim/lua/plugins/dap.lua index cf4f022..c7f2604 100644 --- a/dotfiles/.config/nvim/lua/plugins/dap.lua +++ b/dotfiles/.config/nvim/lua/plugins/dap.lua @@ -41,7 +41,7 @@ dap.adapters.lldb = { type = 'server', port = "${port}", executable = { - command = '/usr/bin/lldb-dap', + command = '/usr/bin/lldb-dap-18', args = { "--port", "${port}" }, }, } @@ -87,34 +87,3 @@ dap.configurations.rust = { showDisassembly = "never" } } - --- Set up debugpy via uv -dap.adapters.python = { - type = 'server', - port = "${port}", - host = "127.0.0.1", - executable = { - command = "uvx", - args = { - "debugpy", - "--listen", - "127.0.0.1:${port}", - "--wait-for-client", - }, - }, - options = { - source_filetype = 'python', - }, -} - -dap.configurations.python = { - { - type = 'python'; - request = 'launch'; - name = "Launch file"; - program = "${file}"; - pythonPath = function() - return "${workspaceFolder}/.venv/bin/python" - end; - }, -} diff --git a/dotfiles/.config/rofi/config.rasi b/dotfiles/.config/rofi/config.rasi index 163853f..94c72e2 100644 --- a/dotfiles/.config/rofi/config.rasi +++ b/dotfiles/.config/rofi/config.rasi @@ -3,11 +3,11 @@ @theme "sidebar" configuration { -/* modes: "combi,drun,run,ssh,filebrowser";*/ + modes: "combi,drun,run,ssh,filebrowser"; font: "mono 12"; location: 0; - yoffset: -150; - xoffset: 1920; + yoffset: 0; + xoffset: 0; fixed-num-lines: true; show-icons: true; terminal: "alacritty"; @@ -21,7 +21,7 @@ configuration { icon-theme: "Papyrus"; /* drun-match-fields: "name,generic,exec,categories,keywords";*/ /* drun-categories: ;*/ -/* drun-show-actions: false;*/ + drun-show-actions: true; /* drun-display-format: "{name} [({generic})]";*/ /* drun-url-launcher: "xdg-open";*/ /* disable-history: false;*/ @@ -38,7 +38,6 @@ configuration { /* parse-known-hosts: true;*/ combi-modes: "drun,run,ssh,filebrowser"; matching: "fuzzy"; - /* tokenize: true;*/ /* m: "-5";*/ /* filter: ;*/ @@ -77,3 +76,7 @@ configuration { sorting-method: "name"; } } +window { + transparency: "real"; + width: 1000px; +} diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config index 207aefd..b0cdc8d 100644 --- a/dotfiles/.config/waybar/config +++ b/dotfiles/.config/waybar/config @@ -21,7 +21,7 @@ }, "network": { "tooltip": false, - "interface": "wlp3s0*", + "interface": "wlp*", "format-wifi": " {essid} ({signalStrength}%)", "format-ethernet": "{ifname}: {ipaddr}/{cidr}", "format-linked": "{ifname} (No IP)", diff --git a/dotfiles/.environ b/dotfiles/.environ index 24ba281..bd645bc 100644 --- a/dotfiles/.environ +++ b/dotfiles/.environ @@ -20,3 +20,5 @@ add_path() case :$PATH: in *:$1:*) ;; *) PATH=$1:$PATH;; esac add_path $HOME/.local/bin add_path $PYTHONUSERBASE/bin add_path $HOME/.cargo/bin +add_path $HOME/.kubectl-plugins:$PATH +add_path $PATH:/opt/gradle/gradle-8.8/bin diff --git a/dotfiles/.gnupg/gpg-agent.conf b/dotfiles/.gnupg/gpg-agent.conf index 4277e89..bba5ea9 100644 --- a/dotfiles/.gnupg/gpg-agent.conf +++ b/dotfiles/.gnupg/gpg-agent.conf @@ -1,5 +1,5 @@ default-cache-ttl 3600 -pinentry-program /usr/bin/pinentry-qt5 +pinentry-program /usr/bin/pinentry-gnome3 max-cache-ttl 72000 default-cache-ttl 72000 max-cache-ttl-ssh 72000