From c2099170a7fe97fb8156974924ec8ebb95627d8c Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Mon, 8 Dec 2025 10:53:37 +0100 Subject: [PATCH 01/13] remove rofi screen offsets --- dotfiles/.config/rofi/config.rasi | 2 -- 1 file changed, 2 deletions(-) diff --git a/dotfiles/.config/rofi/config.rasi b/dotfiles/.config/rofi/config.rasi index 163853f..ec4110a 100644 --- a/dotfiles/.config/rofi/config.rasi +++ b/dotfiles/.config/rofi/config.rasi @@ -6,8 +6,6 @@ configuration { /* modes: "combi,drun,run,ssh,filebrowser";*/ font: "mono 12"; location: 0; - yoffset: -150; - xoffset: 1920; fixed-num-lines: true; show-icons: true; terminal: "alacritty"; From 4d296eba2a8fbe157a938986c37bfdbd1f22c5cc Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 2 Oct 2024 09:57:37 +0200 Subject: [PATCH 02/13] bash: update work profile (merge ubuntu with main) --- dotfiles/.bashrc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 1266427..a25b16f 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -23,16 +23,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="${Blue}\d \A ${Off}${Yellow}\u@\h: ${Off}\w ${Green}\$(parse_branch git)${BRed}\$(parse_branch fossil)${Off}\n-$ " -# more is less +# 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%' # Use gpg-agent as ssh agent (and get a nice graphical prompt). unset SSH_AGENT_PID From bd2db8dcf7daf1e74b8cec144880ba50ed3af852 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 2 Oct 2024 11:12:15 +0200 Subject: [PATCH 03/13] change paths and config values for work host - sway: use wlp* for waybar wifi interfaces - containers: set home path - gpg: use pinentry-gnome3 - git: change global user.email --- dotfiles/.config/containers/storage.conf | 2 +- dotfiles/.config/git/config | 2 +- dotfiles/.config/waybar/config | 2 +- dotfiles/.gnupg/gpg-agent.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 473ce5b..fd9087a 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/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/.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 From 1d6d7238d06166473c175f8ac6fca9e675e50a1d Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Mon, 14 Oct 2024 08:57:01 +0200 Subject: [PATCH 04/13] alacritty: decrease font on big screen --- dotfiles/.config/alacritty/alacritty.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/.config/alacritty/alacritty.toml b/dotfiles/.config/alacritty/alacritty.toml index 00aacb7..1b87d6f 100644 --- a/dotfiles/.config/alacritty/alacritty.toml +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -6,7 +6,7 @@ style = "Block" TERM = "alacritty" [font] -size = 11 +size = 10 [font.bold] family = "monospace" From 02ad955e9ce0cd8b819dfd48b9031aad910f8476 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Mon, 4 Nov 2024 08:53:45 +0100 Subject: [PATCH 05/13] Revert "Update alacritty - config format" This reverts commit 9259e7b2ba2425e22aa0882b97a32696d07eedc9. --- dotfiles/.config/alacritty/alacritty.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/.config/alacritty/alacritty.toml b/dotfiles/.config/alacritty/alacritty.toml index 1b87d6f..bbffd9d 100644 --- a/dotfiles/.config/alacritty/alacritty.toml +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -407,7 +407,7 @@ history = 100000 save_to_clipboard = true semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" -[terminal.shell] +[shell] program = "/bin/bash" [window] From 7a64c68df7c5962980ef709496fe0bc9e8d07e64 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Mon, 16 Dec 2024 08:49:03 +0100 Subject: [PATCH 06/13] Rofi reconfig --- dotfiles/.config/nvim/lua/plugins/dap.lua | 2 +- dotfiles/.config/rofi/config.rasi | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dotfiles/.config/nvim/lua/plugins/dap.lua b/dotfiles/.config/nvim/lua/plugins/dap.lua index cf4f022..87743d1 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}" }, }, } diff --git a/dotfiles/.config/rofi/config.rasi b/dotfiles/.config/rofi/config.rasi index ec4110a..84265b0 100644 --- a/dotfiles/.config/rofi/config.rasi +++ b/dotfiles/.config/rofi/config.rasi @@ -3,7 +3,7 @@ @theme "sidebar" configuration { -/* modes: "combi,drun,run,ssh,filebrowser";*/ + modes: "combi,drun,run,ssh,filebrowser"; font: "mono 12"; location: 0; fixed-num-lines: true; @@ -19,7 +19,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;*/ @@ -36,7 +36,6 @@ configuration { /* parse-known-hosts: true;*/ combi-modes: "drun,run,ssh,filebrowser"; matching: "fuzzy"; - /* tokenize: true;*/ /* m: "-5";*/ /* filter: ;*/ @@ -75,3 +74,7 @@ configuration { sorting-method: "name"; } } +window { + transparency: "real"; + width: 1000px; +} From 407e8af5381a71943baa8fb55e89090f69ba3639 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 26 Sep 2025 16:43:24 +0200 Subject: [PATCH 07/13] Add entity operator completion and tiup, remove cal alias --- dotfiles/.bash_aliases | 1 - dotfiles/.bashrc | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 a25b16f..99f52c6 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -57,3 +57,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 From b1e61391c40a7180c1b2e4054085e77f7a4bfa26 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Mon, 8 Dec 2025 11:53:36 +0100 Subject: [PATCH 08/13] update alacitty config --- dotfiles/.config/alacritty/alacritty.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dotfiles/.config/alacritty/alacritty.toml b/dotfiles/.config/alacritty/alacritty.toml index bbffd9d..84a87e5 100644 --- a/dotfiles/.config/alacritty/alacritty.toml +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -6,7 +6,7 @@ style = "Block" TERM = "alacritty" [font] -size = 10 +size = 11 [font.bold] family = "monospace" @@ -407,9 +407,6 @@ history = 100000 save_to_clipboard = true semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" -[shell] -program = "/bin/bash" - [window] decorations = "full" dynamic_padding = false From 6109fcdb486a55c52fe47f17f063468e3ae20353 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 19 Dec 2025 14:44:05 +0100 Subject: [PATCH 09/13] Add kube config to environ --- dotfiles/.environ | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/.environ b/dotfiles/.environ index 342b53d..f2707d3 100644 --- a/dotfiles/.environ +++ b/dotfiles/.environ @@ -14,3 +14,4 @@ export PYTHONDONTWRITEBYTECODE=1 export PYTHONUSERBASE=$HOME/.env/python export TZ="Europe/Belgrade" export FZF_DEFAULT_OPTS='--border=horizontal --info=inline --no-reverse --height=50%' +export KUBE_CONFIG_PATH=$HOME/.kube/config From 63472d5b51a8c11c3bd8ddf9e29bdf5bd9c83af7 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 19 Dec 2025 14:44:31 +0100 Subject: [PATCH 10/13] Remove redundant bashrc config --- dotfiles/.bashrc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 99f52c6..a25b16f 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -57,7 +57,3 @@ 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 From e8c79d69e1f34bcbb29271a6dd24c8f4ed42d62a Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 19 Dec 2025 14:49:07 +0100 Subject: [PATCH 11/13] New keyboard settings --- dotfiles/.config/sway/config.d/10-variables.conf | 2 +- dotfiles/.config/sway/config.d/30-input.conf | 7 +++++++ dotfiles/.config/sway/config.d/90-bindings.conf | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dotfiles/.config/sway/config.d/10-variables.conf b/dotfiles/.config/sway/config.d/10-variables.conf index e23c3d8..9dd3486 100644 --- a/dotfiles/.config/sway/config.d/10-variables.conf +++ b/dotfiles/.config/sway/config.d/10-variables.conf @@ -1,7 +1,7 @@ ### Variables # # Logo key. Use Mod1 for Alt. -set $mod Mod4 +set $mod Mod1 # Home row direction keys, like vim set $left h set $down j diff --git a/dotfiles/.config/sway/config.d/30-input.conf b/dotfiles/.config/sway/config.d/30-input.conf index 80b2c95..bb593f4 100644 --- a/dotfiles/.config/sway/config.d/30-input.conf +++ b/dotfiles/.config/sway/config.d/30-input.conf @@ -17,6 +17,13 @@ input 1:1:AT_Translated_Set_2_keyboard { xkb_options "grp:caps_toggle" } +input "6127:24704:Lite-On_Tech_Lenovo_USB_Travel_Keyboard_with_Ultra_Nav" { + scroll_method on_button_down + + xkb_layout "us,mk" + xkb_options "grp:caps_toggle"' +} + # Pulse Audio controls bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% #increase sound volume bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5% #decrease sound volume diff --git a/dotfiles/.config/sway/config.d/90-bindings.conf b/dotfiles/.config/sway/config.d/90-bindings.conf index 424f277..f2a7ef6 100644 --- a/dotfiles/.config/sway/config.d/90-bindings.conf +++ b/dotfiles/.config/sway/config.d/90-bindings.conf @@ -52,7 +52,7 @@ bindsym $mod+Shift+Right move right # # Workspaces: -# +#/home/vladanpopovic/.config/sway/config.d/10-variables.conf # switch to workspace bindsym $mod+1 workspace 1 bindsym $mod+2 workspace 2 From 0bae1471b2023fbf36b8f14051c5cc88b31470a0 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 19 Dec 2025 14:49:31 +0100 Subject: [PATCH 12/13] Add ruff lsp server to nvim --- dotfiles/.config/nvim/after/lsp/ruff.lua | 6 ++++++ dotfiles/.config/nvim/lua/lsp.lua | 1 + 2 files changed, 7 insertions(+) create mode 100644 dotfiles/.config/nvim/after/lsp/ruff.lua diff --git a/dotfiles/.config/nvim/after/lsp/ruff.lua b/dotfiles/.config/nvim/after/lsp/ruff.lua new file mode 100644 index 0000000..2549b4d --- /dev/null +++ b/dotfiles/.config/nvim/after/lsp/ruff.lua @@ -0,0 +1,6 @@ +-- ~/.config/nvim/after/lsp/ruff.lua +return { + cmd = { "ruff", "server" }, + filetypes = { "python" }, + root_dir = vim.fs.root(0, { ".git/", "pyproject.toml" }), +} diff --git a/dotfiles/.config/nvim/lua/lsp.lua b/dotfiles/.config/nvim/lua/lsp.lua index 4c7851f..7352a80 100644 --- a/dotfiles/.config/nvim/lua/lsp.lua +++ b/dotfiles/.config/nvim/lua/lsp.lua @@ -67,6 +67,7 @@ end local capabilities = vim.lsp.protocol.make_client_capabilities() vim.lsp.enable('ty') +vim.lsp.enable('ruff') local servers = { "clangd", From 715651ffa8e9b619bd84faa57920483b90ea8458 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Fri, 19 Dec 2025 15:05:51 +0100 Subject: [PATCH 13/13] Fix scroll on new keyboard --- dotfiles/.config/sway/config.d/30-input.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dotfiles/.config/sway/config.d/30-input.conf b/dotfiles/.config/sway/config.d/30-input.conf index bb593f4..f18a68c 100644 --- a/dotfiles/.config/sway/config.d/30-input.conf +++ b/dotfiles/.config/sway/config.d/30-input.conf @@ -18,11 +18,12 @@ input 1:1:AT_Translated_Set_2_keyboard { } input "6127:24704:Lite-On_Tech_Lenovo_USB_Travel_Keyboard_with_Ultra_Nav" { - scroll_method on_button_down - xkb_layout "us,mk" xkb_options "grp:caps_toggle"' } +input "6127:24704:Lite-On_Tech_Lenovo_USB_Travel_Keyboard_with_Ultra_Nav_Mouse" { + scroll_method on_button_down +} # Pulse Audio controls bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% #increase sound volume