.gitignore

@@ -4,10 +4,8 @@
 .git/
 
 config.sh
-
-config/containers
 config/git/gitk
-config/iterm2
 config/zsh/.zcompcache
 config/zsh/.zcompdump
 config/zsh/.zsh_sessions
+config/iterm2

bin/lock

@@ -9,7 +9,11 @@ error() {
 [ -n "$1" ] || error "input file missing"
 [ -r "$1" ] || error "can't read input file"
 
+# shellcheck disable=SC2016 # I don't want $(tty) to be expanded
 printf '#!/bin/sh
-openssl enc -d -aes256 -pbkdf2 -base64 <<EOF
+GPG_TTY=$(tty)
+export GPG_TTY
+base64 -d <<EOF | gpg -d
 %s
-EOF' "$(openssl enc -aes256 -pbkdf2 -base64 -in "$1")"
+EOF
+'   "$(gpg -c --cipher-algo AES256 -o - -- "$1" | base64)"

config/git/config

@@ -20,7 +20,7 @@
 
 [pretty]
     basic = %C(auto)%h%d %s %C(8) %ad
-    name  = %C(auto)%h%d %s %C(2)%aN <%C(10)%aE%C(2)> %C(8) %ad
+    name  = %C(auto)%h%d %s %n%C(2)%aN <%C(10)%aE%C(2)> %C(8) %ad %n
 
 [core]
     excludesfile    = ~/.config/git/ignore

config/nvim/lua/fschauen/filetype.lua

@@ -2,23 +2,13 @@ local M = {}
 
 M.setup = function()
   vim.filetype.add {
-    -- 1. The file path/name is checked first.
-    filename = {
-      ["clang-format"] = "yaml",
-      editorconfig = "editorconfig",
-    },
-    -- 2. Patterns are checked second.
     pattern = {
       ["${HOME}/.ssh/config.d/.*"] = "sshconfig",
-
-      -- Files in my dotfiles repository.
-      [".*/config/zsh/.*"] = "zsh",
-      [".*/git/config"] = "gitconfig",
       [".*/ssh/config"] = "sshconfig",
-    },
-    -- 3. Finally, the extension is checked.
-    extension = {
-      gitconfig = "gitconfig",
+      [".*/git/config"] = "gitconfig",
+      [".*gitconfig"] = "gitconfig",
+      [".*/home/editorconfig"] = "editorconfig",
+      [".*config/zsh/.*"] = "zsh",
     },
   }
 end

config/nvim/lua/fschauen/plugins/telescope.lua

@@ -23,9 +23,6 @@ local pickers = setmetatable({
     no_ignore = true,
     no_ignore_parent = true,
   }),
-  all_man_pages = builtin_picker("man_pages", {
-    sections = { "ALL" },
-  }),
   colorscheme = builtin_picker("colorscheme", { enable_preview = true }),
   diagnostics = builtin_picker("diagnostics", { bufnr = 0 }),
   dotfiles = builtin_picker("find_files", { cwd = "~/.dotfiles", hidden = true }),
@@ -80,7 +77,7 @@ return {
     { lhs"k",  pickers.keymaps                "  Keymaps"              , desc = desc("[k]eymaps")                 },
     { lhs"K",  pickers.help_tags              "  Help tags"            , desc = desc("[K] help/documentation")    },
     { lhs"l",  pickers.loclist                "  Location list"        , desc = desc("[l]ocation List")           },
-    { lhs"m",  pickers.all_man_pages          "  Man pages"            , desc = desc("[m]an pages")               },
+    { lhs"m",  pickers.man_pages              "  Man pages"            , desc = desc("[m]an pages")               },
     --lhs"n"   used in vim-notify
     { lhs"o",  pickers.vim_options            "  Vim options"          , desc = desc("[o]ptions")                 },
     --lhs"p"

config/nvim/spell/en.utf-8.add

@@ -105,7 +105,3 @@ PRs
 Florian
 Kurzarbeit
 StateSmith
-Ardia
-Chromeleon
-eluent
-fluidics

config/zsh/.zshrc

@@ -1,8 +1,3 @@
-fs_setup_shell_options() {
-  setopt INTERACTIVE_COMMENTS # Allow comments in interactive use.
-  set -o noclobber
-}
-
 fs_setup_terminal() {
   # Make ctrl-q and ctrl-s available to terminal applications.
   stty start undef stop undef
@@ -543,7 +538,7 @@ fs_setup_local_config() {
 
 # Set up zsh for interactive use (options, prompt, aliases, etc.)
 fs_setup_zsh_interactive() {
-  fs_setup_shell_options
+  setopt INTERACTIVE_COMMENTS # Allow comments in interactive use.
   fs_setup_terminal
   fs_setup_aliases
   fs_setup_completion

home/clang-format

@@ -1,18 +1,18 @@
-BasedOnStyle: Google
-
 AccessModifierOffset: -4
-AlignAfterOpenBracket: BlockIndent
+AlignArrayOfStructures: Right
+AlignConsecutiveAssignments: true
 AlignConsecutiveBitFields: true
 AlignConsecutiveMacros: true
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
+BasedOnStyle: Google
 BinPackArguments: false
 BinPackParameters: false
 # BreakBeforeBinaryOperators: NonAssignment  # TODO: enable on clang-format v20
 BreakBeforeBraces: WebKit
-# BreakBinaryOperations: OnePerLine  # TODO:  enable on clang-format v20
+BreakBinaryOperations: OnePerLine
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ContinuationIndentWidth: 8