From 988fd01ab7e272918625e37fd6fe77b34c9224a2 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 2 Oct 2024 09:57:37 +0200 Subject: [PATCH 1/9] bash: update work profile (merge ubuntu with main) --- dotfiles/.bashrc | 24 +++++++++++++++++++++--- dotfiles/.environ | 2 ++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 52dc78b..21f7765 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)" 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 From 0c5298af845a4f8721cfc5fecd7d55ea4700c9cb Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Wed, 2 Oct 2024 11:12:15 +0200 Subject: [PATCH 2/9] 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 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/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 8c71d70a46cd410b21d4b4ae7d62b14095788474 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Mon, 14 Oct 2024 08:57:01 +0200 Subject: [PATCH 3/9] 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 2f95351..857e36e 100644 --- a/dotfiles/.config/alacritty/alacritty.toml +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -13,7 +13,7 @@ style = "Block" TERM = "alacritty" [font] -size = 11 +size = 10 [font.bold] family = "monospace" From 2844c29a9c645b59d199b6a0f55f34edcb0f05cf Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Tue, 22 Oct 2024 20:37:15 +0200 Subject: [PATCH 4/9] sway: fix screenshot capture --- dotfiles/.config/sway/config.d/90-bindings.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotfiles/.config/sway/config.d/90-bindings.conf b/dotfiles/.config/sway/config.d/90-bindings.conf index 2f16926..a38c706 100644 --- a/dotfiles/.config/sway/config.d/90-bindings.conf +++ b/dotfiles/.config/sway/config.d/90-bindings.conf @@ -122,9 +122,9 @@ bindsym $mod+z exec swaylock -c 000000 # Take full screen screenshot with PrtScr -bindsym Print exec grim -t png "~/screenshot-$(date +%Y-%m-%d-%H%M%S).png" +bindsym Print exec grim -t png ~/screenshot-$(date +%Y-%m-%d-%H%M%S).png # Take area screenshot with Shift+PrtScr -bindsym Shift+Print exec grim -g "$(slurp)" "~/screenshot-$(date +%Y-%m-%d-%H%M%S).png" +bindsym Shift+Print exec grim -g "$(slurp)" ~/screenshot-$(date +%Y-%m-%d-%H%M%S).png # # Resizing containers: From 9259e7b2ba2425e22aa0882b97a32696d07eedc9 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sat, 2 Nov 2024 12:37:30 +0100 Subject: [PATCH 5/9] Update alacritty - config format --- dotfiles/.config/alacritty/alacritty.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dotfiles/.config/alacritty/alacritty.toml b/dotfiles/.config/alacritty/alacritty.toml index 2f95351..acf2d4c 100644 --- a/dotfiles/.config/alacritty/alacritty.toml +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -1,9 +1,9 @@ -live_config_reload = true -working_directory = "None" - +[general] import = [ "~/.config/alacritty/light.toml" ] +live_config_reload = true +working_directory = "None" [cursor] thickness = 0.2 @@ -414,7 +414,7 @@ history = 100000 save_to_clipboard = true semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" -[shell] +[terminal.shell] program = "/bin/bash" [window] From b48b531d3d535ba1b2ef564d12df350f0e2cc0ef Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sun, 3 Nov 2024 16:00:31 +0100 Subject: [PATCH 6/9] Swith to rustaceanvim and set up Rust debugging --- dotfiles/.config/nvim/lua/lsp.lua | 86 ++++++++++++--------- dotfiles/.config/nvim/lua/plugins/dap.lua | 87 ++++++++++++++++++++++ dotfiles/.config/nvim/lua/plugins/init.lua | 22 +++++- 3 files changed, 155 insertions(+), 40 deletions(-) create mode 100644 dotfiles/.config/nvim/lua/plugins/dap.lua diff --git a/dotfiles/.config/nvim/lua/lsp.lua b/dotfiles/.config/nvim/lua/lsp.lua index 5f337ea..2dde945 100644 --- a/dotfiles/.config/nvim/lua/lsp.lua +++ b/dotfiles/.config/nvim/lua/lsp.lua @@ -19,7 +19,6 @@ local common_on_attach = function(client, bufnr) end, }) end - -- Use vim's default coloring. client.server_capabilities.semanticTokensProvider = nil for _, group in ipairs(vim.fn.getcompletion("@lsp", "highlight")) do @@ -27,13 +26,61 @@ local common_on_attach = function(client, bufnr) end end +-- LSP diagnostics. +vim.lsp.handlers["textDocument/publishDiagnostics"] = + vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { + virtual_text = false, + underline = true, + signs = true, + update_in_insert = false + }) + +-- Setup rust outside of lspconfig. +vim.g.rustaceanvim = function() + return { + -- Plugin configuration. + tools = { + }, + -- LSP configuration. + server = { + on_attach = function(client, bufnr) + common_on_attach(client, bufnr) + end, + default_settings = { + -- rust-analyzer language server configuration + ['rust-analyzer'] = { + imports = { + granularity = { + group = "module", + }, + prefix = "self", + }, + cargo = { + buildScripts = { + enable = true, + }, + }, + procMacro = { + enable = true + }, + checkOnSave = { + command = "clippy", + }, + }, + }, + -- DAP configuration. + dap = { + }, + } + } +end + local nvim_lsp = require('lspconfig') local capabilities = vim.lsp.protocol.make_client_capabilities() -- LSPs local servers = { "clangd", - "gleam", "lua_ls", "ocamllsp", "pyright", @@ -45,32 +92,6 @@ for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { capabilities = capabilities, on_attach = common_on_attach } end -nvim_lsp.rust_analyzer.setup({ - on_attach = common_on_attach, - capabilities = capabilities, - settings = { - ["rust-analyzer"] = { - imports = { - granularity = { - group = "module", - }, - prefix = "self", - }, - cargo = { - buildScripts = { - enable = true, - }, - }, - procMacro = { - enable = true - }, - checkOnSave = { - command = "clippy", - }, - } - } -}) - nvim_lsp.ruff.setup({ on_attach = function (client) common_on_attach(client) @@ -84,12 +105,3 @@ nvim_lsp.ruff.setup({ } }, }) - --- LSP diagnostics. -vim.lsp.handlers["textDocument/publishDiagnostics"] = - vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = false, - underline = true, - signs = true, - update_in_insert = false - }) diff --git a/dotfiles/.config/nvim/lua/plugins/dap.lua b/dotfiles/.config/nvim/lua/plugins/dap.lua new file mode 100644 index 0000000..de6ae2f --- /dev/null +++ b/dotfiles/.config/nvim/lua/plugins/dap.lua @@ -0,0 +1,87 @@ +local dap, dapui = require('dap'), require('dapui') + +-- Open dapui once dap starts. +dapui.setup() +dap.listeners.before.attach.dapui_config = function() + dapui.open() +end +dap.listeners.before.launch.dapui_config = function() + dapui.open() +end +dap.listeners.before.event_terminated.dapui_config = function() + dapui.close() +end +dap.listeners.before.event_exited.dapui_config = function() + dapui.close() +end + +-- Keybindings used in probably all editors/IDEs. +vim.keymap.set('n', '', dap.continue) +vim.keymap.set('n', '', dap.step_over) +vim.keymap.set('n', '', dap.step_into) +vim.keymap.set('n', '', dap.step_out) +-- Breakpoints. +vim.keymap.set('n', 'b', dap.toggle_breakpoint) +vim.keymap.set('n', 'B', dap.set_breakpoint) +vim.keymap.set('n', 'lp', function() dap.set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end) +-- Repl, run and dap-ui bindings. +vim.keymap.set('n', 'dr', dap.repl.open) +vim.keymap.set('n', 'dl', dap.run_last) +vim.keymap.set({'n', 'v'}, 'dh', function() require('dap.ui.widgets').hover() end) +vim.keymap.set({'n', 'v'}, 'dp', function() require('dap.ui.widgets').preview() end) +vim.keymap.set('n', 'df', function() local widgets = require('dap.ui.widgets') widgets.centered_float(widgets.frames) end) +vim.keymap.set('n', 'ds', function() local widgets = require('dap.ui.widgets') widgets.centered_float(widgets.scopes) end) + +-- Set up lldb (LLVM debugger) +-- Install archlinux: sudo pacman -S lldb +-- Install ubuntu: sudo apt +dap.adapters.lldb = { + type = 'server', + port = "${port}", + executable = { + command = '/usr/bin/lldb-dap', + args = { "--port", "${port}" }, + }, +} + +-- Custom debuggable build runs (on top of rust-analyzer debuggables). +local ExecTypes = { + TEST = "cargo build --tests -q --message-format=json", + BIN = "cargo build -q --message-format=json" +} +local function runBuild(type) + local lines = vim.fn.systemlist(type) + local output = table.concat(lines, "\n") + local filename = output:match('^.*"executable":"(.*)",.*\n.*,"success":true}$') + + if filename == nil then + return error("failed to build cargo project") + end + + return filename +end +-- Custom debuggable configurations. +dap.configurations.rust = { + { + name = "Debug Test", + type = "lldb", + request = "launch", + program = function () + return runBuild(ExecTypes.TEST) + end, + cwd = "${workspaceFolder}", + stopOnEntry = false, + showDisassembly = "never" + }, + { + name = "Debug Bin", + type = "lldb", + request = "launch", + program = function () + return runBuild(ExecTypes.BIN) + end, + cwd = "${workspaceFolder}", + stopOnEntry = false, + showDisassembly = "never" + } +} diff --git a/dotfiles/.config/nvim/lua/plugins/init.lua b/dotfiles/.config/nvim/lua/plugins/init.lua index 61e0a61..94e4584 100644 --- a/dotfiles/.config/nvim/lua/plugins/init.lua +++ b/dotfiles/.config/nvim/lua/plugins/init.lua @@ -38,14 +38,29 @@ require('packer').startup(function() -- LSP and related use { 'neovim/nvim-lspconfig' } use { 'aznhe21/actions-preview.nvim' } - use { 'folke/trouble.nvim' } -- lsp diagnostics + use { 'folke/trouble.nvim' } -- diagnostics - -- Plugins to extend builtin language support + -- Plugins to extend builtin lsp use { 'cespare/vim-toml' } use { 'gleam-lang/gleam.vim' } - use { 'rust-lang/rust.vim' } use { 'folke/neodev.nvim' } use { 'hashivim/vim-terraform' } + use { + 'mrcjkb/rustaceanvim', + requires = { + 'mfussenegger/nvim-dap' + } + } + + -- Debugging + use { 'mfussenegger/nvim-dap' } + use { + "rcarriga/nvim-dap-ui", + requires = { + "mfussenegger/nvim-dap", + "nvim-neotest/nvim-nio", + } + } -- Git use { @@ -70,6 +85,7 @@ end) require('plugins.catppuccin') require('plugins.cmp') +require('plugins.dap') require('plugins.gitsigns') require('plugins.luasnip_config') require('plugins.neogit') From 7dfe2ca68b7f055ea7fba839fda779b8e81b4a15 Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sun, 3 Nov 2024 19:53:47 +0100 Subject: [PATCH 7/9] change breakpoint icon --- dotfiles/.config/nvim/lua/plugins/dap.lua | 2 ++ dotfiles/.config/nvim/lua/plugins/init.lua | 1 + 2 files changed, 3 insertions(+) diff --git a/dotfiles/.config/nvim/lua/plugins/dap.lua b/dotfiles/.config/nvim/lua/plugins/dap.lua index de6ae2f..4414638 100644 --- a/dotfiles/.config/nvim/lua/plugins/dap.lua +++ b/dotfiles/.config/nvim/lua/plugins/dap.lua @@ -32,6 +32,8 @@ vim.keymap.set({'n', 'v'}, 'dp', function() require('dap.ui.widgets').pr vim.keymap.set('n', 'df', function() local widgets = require('dap.ui.widgets') widgets.centered_float(widgets.frames) end) vim.keymap.set('n', 'ds', function() local widgets = require('dap.ui.widgets') widgets.centered_float(widgets.scopes) end) +vim.fn.sign_define('DapBreakpoint', {text='󰬪', texthl='', linehl='', numhl=''}) + -- Set up lldb (LLVM debugger) -- Install archlinux: sudo pacman -S lldb -- Install ubuntu: sudo apt diff --git a/dotfiles/.config/nvim/lua/plugins/init.lua b/dotfiles/.config/nvim/lua/plugins/init.lua index 94e4584..cb6ca9d 100644 --- a/dotfiles/.config/nvim/lua/plugins/init.lua +++ b/dotfiles/.config/nvim/lua/plugins/init.lua @@ -3,6 +3,7 @@ require('plugins.packer_setup') require('packer').startup(function() -- Packer can manage itself as an optional plugin use { 'wbthomason/packer.nvim', opt = true } + use { 'glepnir/nerdicons.nvim', cmd = 'NerdIcons', config = function() require('nerdicons').setup({}) end } -- Fuzzy finder use { From a06e856332587a34c27e7a0d5198ba91c856ab5a Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Sun, 17 Nov 2024 00:07:23 +0100 Subject: [PATCH 8/9] nvim: python dap wip --- dotfiles/.config/nvim/lua/plugins/dap.lua | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dotfiles/.config/nvim/lua/plugins/dap.lua b/dotfiles/.config/nvim/lua/plugins/dap.lua index 4414638..cf4f022 100644 --- a/dotfiles/.config/nvim/lua/plugins/dap.lua +++ b/dotfiles/.config/nvim/lua/plugins/dap.lua @@ -87,3 +87,34 @@ 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; + }, +} From 92781385aebb005871409dfa89ca2d6fb686216b Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Tue, 3 Dec 2024 01:47:00 +0100 Subject: [PATCH 9/9] Reconfigure mako, colors and timeouts --- dotfiles/.config/mako/config | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dotfiles/.config/mako/config b/dotfiles/.config/mako/config index a32fc19..a19fc01 100644 --- a/dotfiles/.config/mako/config +++ b/dotfiles/.config/mako/config @@ -1,6 +1,6 @@ sort=-time -default-timeout=0 -ignore-timeout=0 +default-timeout=5000 +ignore-timeout=1 height=200 width=400 @@ -17,16 +17,14 @@ border-radius=10 background-color=#eff1f5E0 text-color=#4c4f69 -border-color=#40a02b progress-color=over #ccd0da [urgency=low] border-color=#c1ca8c -[urgency=high] -border-color=#fe040b -background-color=#ffe1e5 +[urgency=normal] +border-color=#a1bacc [urgency=critical] border-color=#fe040b -background-color=#ffe1e5 +default-timeout=0