From 68f8d35da86af936d36f244f5c8fa12d4a881240 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 16 Sep 2024 09:10:54 -0400 Subject: [PATCH 1/7] add convenience xbps php update script --- dot_local/bin/executable_xxupdatephp | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 dot_local/bin/executable_xxupdatephp diff --git a/dot_local/bin/executable_xxupdatephp b/dot_local/bin/executable_xxupdatephp new file mode 100644 index 0000000..a7e4919 --- /dev/null +++ b/dot_local/bin/executable_xxupdatephp @@ -0,0 +1,4 @@ +#!/bin/bash +xxautobump php8.{1,2,3}{-{apcu,ast,igbinary,imagick,mongodb,redis},} composer8.{1,2,3} +git add . +xbump : From ff7a4fdbcdb6a5cc47b7685a00fcfadd0d734c6d Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 24 Sep 2024 08:48:51 -0400 Subject: [PATCH 2/7] drop broken adb alias --- dot_config/xsettingsd/xsettingsd.conf | 5 +++-- dot_config/zsh/dot_zshrc | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dot_config/xsettingsd/xsettingsd.conf b/dot_config/xsettingsd/xsettingsd.conf index 99516d8..ae2ea1b 100644 --- a/dot_config/xsettingsd/xsettingsd.conf +++ b/dot_config/xsettingsd/xsettingsd.conf @@ -1,3 +1,4 @@ +Net/SoundThemeName "ocean" Gdk/UnscaledDPI 98304 Gdk/WindowScalingFactor 1 Gtk/ButtonImages 1 @@ -7,8 +8,8 @@ Gtk/DecorationLayout "icon:minimize,maximize,close" Gtk/EnableAnimations 1 Gtk/FontName "Noto Sans, 10" Gtk/MenuImages 1 -Gtk/PrimaryButtonWarpsSlider 0 +Gtk/PrimaryButtonWarpsSlider 1 Gtk/ToolbarStyle 3 Net/IconThemeName "breeze-dark" -Net/ThemeName "Breeze" +Net/ThemeName "Breeze-Dark" diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 6bf015a..b93b76b 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -33,7 +33,6 @@ zstyle ':vcs_info:*' formats ' %F{green}%b' PROMPT='%F{yellow}%n@%m %F{white}%1~%(?.. %?) $ ' RPROMPT='%f$vcs_info_msg_0_ ' -alias adb='HOME="$XDG_DATA_HOME"/android adb' alias boinctui='boinctui --boinchost=localhost' alias bt='bluetoothctl' alias c='clear' From 1324e357e9efddbf8d21c71c1b0b9d705540edcb Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 26 Sep 2024 09:19:56 -0400 Subject: [PATCH 3/7] add idea vim plugin config --- dot_ideavimrc | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 dot_ideavimrc diff --git a/dot_ideavimrc b/dot_ideavimrc new file mode 100644 index 0000000..79df6ae --- /dev/null +++ b/dot_ideavimrc @@ -0,0 +1,36 @@ +" .ideavimrc is a configuration file for IdeaVim plugin. It uses +" the same commands as the original .vimrc configuration. +" You can find a list of commands here: https://jb.gg/h38q75 +" Find more examples here: https://jb.gg/share-ideavimrc + + +"" -- Suggested options -- +" Show a few lines of context around the cursor. Note that this makes the +" text scroll if you mouse-click near the start or end of the window. +set scrolloff=5 + +" Do incremental searching. +set incsearch + +" Don't use Ex mode, use Q for formatting. +map Q gq + +" --- Enable IdeaVim plugins https://jb.gg/ideavim-plugins + +" Highlight copied text +Plug 'machakann/vim-highlightedyank' +" Commentary plugin +Plug 'tpope/vim-commentary' + + +"" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t +"" Map \r to the Reformat Code action +"map \r (ReformatCode) + +"" Map d to start debug +"map d (Debug) + +"" Map \b to toggle the breakpoint on the current line +"map \b (ToggleLineBreakpoint) + +set clipboard+=unnamedplus \ No newline at end of file From 72310b3b0a0764c696215411d6e8741b2e091e44 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 26 Sep 2024 09:40:20 -0400 Subject: [PATCH 4/7] nvim: untrack generated code --- dot_config/nvim/plugin/packer_compiled.lua | 119 --------------------- 1 file changed, 119 deletions(-) delete mode 100644 dot_config/nvim/plugin/packer_compiled.lua diff --git a/dot_config/nvim/plugin/packer_compiled.lua b/dot_config/nvim/plugin/packer_compiled.lua deleted file mode 100644 index 51f3640..0000000 --- a/dot_config/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,119 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ["coc.nvim"] = { - loaded = true, - path = "/home/joel/.local/share/nvim/site/pack/packer/start/coc.nvim", - url = "https://github.com/neoclide/coc.nvim" - }, - ["gruvbox.nvim"] = { - loaded = true, - path = "/home/joel/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", - url = "https://github.com/ellisonleao/gruvbox.nvim" - }, - ["indent-blankline.nvim"] = { - loaded = true, - path = "/home/joel/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", - url = "https://github.com/lukas-reineke/indent-blankline.nvim" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/joel/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/joel/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - } -} - -time([[Defining packer_plugins]], false) - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end From d8585942018431d1402b23ede633235208eef9d8 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 18 Oct 2024 13:36:43 -0400 Subject: [PATCH 5/7] drop GPG from keychain --- dot_config/zsh/dot_zshrc | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index b93b76b..8a34cee 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -48,14 +48,29 @@ alias vim='nvim' alias wake_circadian='ssh epoch wol a8:a1:59:11:06:f1' alias xrm='sudo xbps-remove' -# GPG setup (and SSH) +ssh-add ~/.ssh/id_rsa +# SSH setup +# I finally figured out how to export my id_rsa from GPG using +# https://superuser.com/a/1681454 (copied/summarized here to avoid link rot): +# 0. Run `gpg -K --with-keygrip` and note the desired keygrip (probably the one +# with [A] for auth). +# 1. Run `gpgsm --gen-key -o tempcert`: +# a. Select "Existing Key". +# b. Enter the keygrip from step 0. +# c. Select "(1) sign, encrypt". This and following steps don't really apply +# for our use case, but we need to do it to make the tool happy. +# d. Enter some valid X.509 subject, e.g. "C=US". +# e. Press enter for rest of fields. +# f. "y" to create self-signed certificate. +# g. "y" to proceed with creation. +# 2. `gpgsm --import tempcert` and `gpgsm -K` to get the (new) keyid. +# 3. `gpgsm --export-secret-key-p8 -a -o id_rsa $keyid` +# 4. (optional) `rm tempcert`, probably don't want that sitting around. +# 5. (optional) Trim the phony metadata we gave to gpgsm that is prepended to +# the exported PEM cert (id_rsa). if command -v keychain >/dev/null; then alias keychain="keychain --nolock --absolute --dir $XDG_RUNTIME_DIR" - eval "$(keychain --quick --eval --agents gpg D7F966B85D985743C76A17AC5A9572AE7B2E7E1C)" -fi -if command -v gpgconf >/dev/null; then - SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" - export SSH_AUTH_SOCK + eval "$(keychain --quick --eval)" fi ### End user configuration From acfb9ff9c015586d057e044a800b0870d11d06fe Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 18 Oct 2024 13:36:55 -0400 Subject: [PATCH 6/7] git: autoSetupRemote = true --- dot_config/git/config | 1 + 1 file changed, 1 insertion(+) diff --git a/dot_config/git/config b/dot_config/git/config index 0ca973e..c973050 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -5,6 +5,7 @@ ui = auto [push] default = current + autoSetupRemote = true [filesystem "N/A|13.0.2|/dev/sda2"] timestampResolution = 10000 nanoseconds minRacyThreshold = 6379 microseconds From 31a49da77992a24d652fd2651d9b93f6afc04f37 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 18 Oct 2024 14:00:03 -0400 Subject: [PATCH 7/7] add code search thing from HN --- dot_config/nvim/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index d2ac12b..c8f7484 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -37,6 +37,9 @@ vim.keymap.set('i', '', function() return '' end, { expr=true }) +-- Code search? https://news.ycombinator.com/item?id=41739452 +vim.keymap.set('n', 'gv', 'vlua vim.lsp.buf.definition()', opts) + -- Tab stuff vim.opt.shiftwidth = 2 vim.opt.softtabstop = 2