arch-packages: Update package list

clipboard support just seems to be completely flaky right now. Add
previous settings but instead of tmux specific commands use wayland
clipboard tools.

This should make it work everywhere. One downside of this setting is
we go back to polluting system clipboard every time & does not really
matter if we copy to + or * register. Both will result in a call to
wl-copy.

alacritty/.config/alacritty/alacritty.yml

@@ -73,7 +73,7 @@ font:
     style: Bold Italic
 
   # Point size of the font
-  size: 18.0
+  size: 20.0
 
   # Offset is the extra space around each character. offset.y can be thought of
   # as modifying the linespacing, and offset.x as modifying the letter spacing.
@@ -268,16 +268,26 @@ hints:
   #   - MoveViModeCursor
   #       Move the vi mode cursor to the beginning of the hint.
   enabled:
-   - regex: "(magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\
-             [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+"
+   - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\
+           [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+"
      command: xdg-open
-     post_processing: true
+     post_processing: false
      mouse:
-       enabled: true
+       enabled: false
        mods: None
      binding:
        key: U
        mods: Control|Shift
+   - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\
+           [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+"
+     action: Copy
+     post_processing: false
+     mouse:
+       enabled: false
+       mods: None
+     binding:
+       key: E
+       mods: Control|Shift
 
 selection:
   semantic_escape_chars: ",│`|:\"' ()[]{}<>"
@@ -325,10 +335,12 @@ live_config_reload: true
 #
 # You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
 # Entries in shell.args are passed unmodified as arguments to the shell.
-# shell:
-#   program: /usr/bin/fish
-#   args:
-#     - --command=tmux
+shell:
+  program: tmux
+  args:
+    - attach
+    - -t
+    - scratch
 
 debug:
   # Should display the render timer

arch-packages/pkglist.txt

@@ -1,6 +1,6 @@
 accountsservice
 adwaita-icon-theme
-alacritty
+alacritty-git
 alsa-firmware
 alsa-plugins
 alsa-utils
@@ -98,6 +98,7 @@ file-roller
 findutils
 firefox
 fish
+flatpak
 flex
 fnm-bin
 foot
@@ -224,6 +225,7 @@ mesa-demos
 meson
 minicom
 minio
+mirage
 mkinitcpio
 mkinitcpio-busybox
 mkinitcpio-nfs-utils
@@ -338,6 +340,7 @@ rsync
 rust-bindgen
 rustup
 s-nail
+sccache
 sdparm
 sed
 sg3_utils

fish/.config/fish/functions/gl.fish

@@ -12,7 +12,7 @@ function gl --description 'Git browse commits'
     git log --color=always --format='%C(auto)%h%d %s %C(green)%C(bold)%cr% C(blue)%an' $argv | fzf --exact --no-sort --reverse --tiebreak=index --no-multi --ansi \
         --preview="$view_commit" \
         --header="ENTER to view, CTRL-Y to copy hash, CTRL-O to open on GitHub, CTRL-X to checkout, CTRL-C to exit, CTRL-S to cherry-pick" \
-        --bind "enter:execute:$view_commit_nvim | nvim -R -" \
+        --bind "enter:execute:$view_commit_nvim | bat -ldiff --pager 'less -R'" \
         --bind "ctrl-y:execute:$copy_commit_hash" \
         --bind "ctrl-x:execute:$git_checkout" \
         --bind "ctrl-o:execute:$github_open" \

foot/.config/foot/foot.ini

@@ -2,7 +2,6 @@
 
 term        = foot-extra
 login-shell = no
-shell       = tmux attach -t scratch
 
 font                          = monospace:style=Regular:size=13
 font-bold                     = monospace:style=Bold:size=13

gdb/.gdbinit.d/init

@@ -5,11 +5,12 @@ set auto-load safe-path /
 set auto-load python-scripts on
 set auto-load local-gdbinit
 set pagination off
-set logging on
+set logging enabled on
 set logging overwrite on
 set mi-async on
 set non-stop off
 add-auto-load-safe-path ~/GitSources/gstreamer/.gdbinit ~/.gdbinit.d/scripts
 set auto-load python-scripts on
+set debuginfod enabled on
 
 alias -a it = info threads

git/.gitconfig

@@ -41,6 +41,9 @@
 [mergetool]
 	prompt = false
 	keepBackup = false
+	hideResolved = false
+[mergetool "nvimdiff1"]
+	hideResolved = true
 [pager]
 	difftool = true
 [pull]

nvim/.config/nvim/after/ftplugin/diff.lua

@@ -1,4 +1,4 @@
-vim.bo.spell = false
+vim.wo.spell = false
 
 vim.keymap.set('n', '[c', "?^@@<CR>", { noremap=true, silent=true, buffer=0 })
 vim.keymap.set('n', ']c', "/^@@<CR>", { noremap=true, silent=true, buffer=0 })

nvim/.config/nvim/after/plugin/gitlinker.lua

@@ -2,6 +2,7 @@ require"gitlinker".setup({
   callbacks = {
     ["gitlab.freedesktop.org"] = require"gitlinker.hosts".get_gitlab_type_url,
     ["gitlab.gnome.org"]       = require"gitlinker.hosts".get_gitlab_type_url,
+    ["code.videolan.org"]      = require"gitlinker.hosts".get_gitlab_type_url,
   },
   mappings = "<Leader>gu"
 })

nvim/.config/nvim/init.lua

@@ -72,6 +72,20 @@ vim.g.matchup_surround_enabled     = 1
 -- textobj-word-column
 vim.g.textobj_wordcolumn_no_default_key_mappings = 1
 
+-- See :help clipboard and https://github.com/neovim/neovim/issues/14545
+vim.g.clipboard = {
+  name = "clipboard",
+  copy = {
+    ["+"] = "wl-copy",
+    ["*"] = "wl-copy"
+  },
+  paste = {
+    ["+"] = "wl-paste",
+    ["*"] = "wl-paste"
+  },
+  cache_enabled = true
+}
+
 -- No default mappings for tmux navigator
 vim.g.tmux_navigator_no_mappings    = 1
 -- Write the current buffer, but only if changed before navigating from Vim to tmux pane

nvim/.config/nvim/lua/plugins.lua

@@ -25,7 +25,6 @@ local init = function ()
   use 'lewis6991/gitsigns.nvim'
   use 'tpope/vim-fugitive'
   use 'https://github.com/SanchayanMaity/gitlinker.nvim'
-  use 'whiteinge/diffconflicts'
   -- Boost vim command line mode
   use 'vim-utils/vim-husk'
   -- Quickfix

sway/.config/sway/config

@@ -1,8 +1,8 @@
 set $mod Mod4
 set $prev bracketleft
 set $next bracketright
-set $term foot
-set $alt_term alacritty
+set $term alacritty
+set $alt_term foot
 set $menu fuzzel
 set $screenshot grim ~/Pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
 set $screenclip slurp | grim -g - ~/Pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png