comparing d51a1e19b3b45ed854fe0fe0ea6bdd504dac4d1a and main on bladee.bsky.social/dotfiles

+18

.chezmoi.toml.tmpl

···

       1
       +
       [data]

     

       2
       +
       {{ $machineTypeChoices := list "personal" "work" -}}

     

       3
       +
       {{ $machineType := promptChoiceOnce . "machineType" "Machine type" $machineTypeChoices -}}

     

       4
       +
       machineType = {{ $machineType | quote }}

     

       5
       +
       

     

       6
       +
       {{- if eq .chezmoi.os "linux" }}

     

       7
       +
       opDir = "/opt/1Password"

     

       8
       +
       {{ else if eq .chezmoi.os "darwin" }}

     

       9
       +
       opDir = "/Applications/1Password.app/Contents/MacOS"

     

       10
       +
       {{- end }}

     

       11
       +
       

     

       12
       +
       [data.git]

     

       13
       +
       {{ $gitName := promptStringOnce . "git.name" "Git name" -}}

     

       14
       +
       name = {{ $gitName | quote }}

     

       15
       +
       {{ $gitEmail := promptStringOnce . "git.email" "Git email" -}}

     

       16
       +
       email = {{ $gitEmail | quote }}

     

       17
       +
       {{ $sshSigningKeyOpId := promptStringOnce . "git.sshSigningKeyOpId" "1Password ID for SSH signing key (e.g. op://Private/abcd)" -}}

     

       18
       +
       sshSigningKeyOpId = {{ trimAll "\"" $sshSigningKeyOpId | quote }}

-18

.chezmoidata/packages.yaml

···

       1
       -
       packages:

     

       2
       -
         linux:

     

       3
       -
           brew:

     

       4
       -
             - atuin

     

       5
       -
             - bat

     

       6
       -
             - chezmoi

     

       7
       -
             - fd

     

       8
       -
             - gcc

     

       9
       -
             - git

     

       10
       -
             - git-credential-libsecret

     

       11
       -
             - git-credential-oauth

     

       12
       -
             - helix

     

       13
       -
             - htop

     

       14
       -
             - jj

     

       15
       -
             - restic

     

       16
       -
             - ripgrep

     

       17
       -
             - rustup

     

       18
       -
             - uv

-1

.chezmoidata.toml

···

       1
        
       editor = "hx"

     

       2
       -
       opDir = "/opt/1Password"

···

       1
        
       editor = "hx"

     

       0

+1 -1

.chezmoiignore

···

       16
        
       {{ end -}}

     

       17
        
       

     

       18
        
       # Ignore Linux-specific files on non-Linux systems.

     

       19
       -
       {{- if eq .chezmoi.os "linux" }}

     

       20
        
       .config/systemd/

     

       21
        
       .local/share/nautilus/

     

       22
        
       .var/app/

···

       16
        
       {{ end -}}

     

       17
        
       

     

       18
        
       # Ignore Linux-specific files on non-Linux systems.

     

       19
       +
       {{- if ne .chezmoi.os "linux" }}

     

       20
        
       .config/systemd/

     

       21
        
       .local/share/nautilus/

     

       22
        
       .var/app/

+116

dot_config/homebrew/Brewfile.tmpl

···

       1
       +
       # Packages to install on all machines.

     

       2
       +
       brew "aria2"

     

       3
       +
       brew "atuin"

     

       4
       +
       brew "bat"

     

       5
       +
       brew "chezmoi"

     

       6
       +
       brew "curl"

     

       7
       +
       brew "dua-cli"

     

       8
       +
       brew "fd"

     

       9
       +
       brew "ffmpeg"

     

       10
       +
       brew "gcc"

     

       11
       +
       brew "git"

     

       12
       +
       brew "helix"

     

       13
       +
       brew "htop"

     

       14
       +
       brew "jj"

     

       15
       +
       brew "just"

     

       16
       +
       brew "lnav"

     

       17
       +
       brew "ollama"

     

       18
       +
       brew "python@3.14"

     

       19
       +
       brew "ripgrep"

     

       20
       +
       brew "rustup"

     

       21
       +
       brew "scrcpy"

     

       22
       +
       brew "uv"

     

       23
       +
       brew "wget"

     

       24
       +
       

     

       25
       +
       

     

       26
       +
       {{ if eq .chezmoi.os "linux" -}}

     

       27
       +
       # Packages to install on Linux machines.

     

       28
       +
       brew "git-credential-libsecret"

     

       29
       +
       brew "git-credential-oauth"

     

       30
       +
       # TODO: How to specify flatpak file?

     

       31
       +
       # flatpak "com.bitwig.BitwigStudio", remote: "bitwigstudio-origin"

     

       32
       +
       flatpak "com.calibre_ebook.calibre"

     

       33
       +
       flatpak "com.discordapp.Discord"

     

       34
       +
       flatpak "com.fastmail.Fastmail"

     

       35
       +
       flatpak "com.github.johnfactotum.Foliate"

     

       36
       +
       flatpak "com.github.tchx84.Flatseal"

     

       37
       +
       flatpak "com.google.Chrome"

     

       38
       +
       flatpak "com.mattjakeman.ExtensionManager"

     

       39
       +
       flatpak "com.obsproject.Studio"

     

       40
       +
       flatpak "com.plexamp.Plexamp"

     

       41
       +
       flatpak "com.todoist.Todoist"

     

       42
       +
       flatpak "com.valvesoftware.Steam"

     

       43
       +
       flatpak "com.valvesoftware.SteamLink"

     

       44
       +
       flatpak "com.visualstudio.code"

     

       45
       +
       flatpak "io.github.nozwock.Packet"

     

       46
       +
       flatpak "io.mpv.Mpv"

     

       47
       +
       flatpak "net.nokyan.Resources"

     

       48
       +
       flatpak "org.audacityteam.Audacity"

     

       49
       +
       flatpak "org.bunkus.mkvtoolnix-gui"

     

       50
       +
       flatpak "org.cockpit_project.CockpitClient"

     

       51
       +
       flatpak "org.darktable.Darktable"

     

       52
       +
       flatpak "org.freac.freac"

     

       53
       +
       flatpak "org.gimp.GIMP"

     

       54
       +
       flatpak "org.gnome.Boxes"

     

       55
       +
       flatpak "org.gnome.Calculator"

     

       56
       +
       flatpak "org.gnome.Decibels"

     

       57
       +
       flatpak "org.gnome.Loupe"

     

       58
       +
       flatpak "org.gnome.Papers"

     

       59
       +
       flatpak "org.gnome.Showtime"

     

       60
       +
       flatpak "org.gnome.SimpleScan"

     

       61
       +
       flatpak "org.gnome.Snapshot"

     

       62
       +
       flatpak "org.gnome.SoundRecorder"

     

       63
       +
       flatpak "org.gnome.TextEditor"

     

       64
       +
       flatpak "org.gnome.Weather"

     

       65
       +
       flatpak "org.gnome.clocks"

     

       66
       +
       flatpak "org.libreoffice.LibreOffice"

     

       67
       +
       flatpak "org.musicbrainz.Picard"

     

       68
       +
       flatpak "org.torproject.torbrowser-launcher"

     

       69
       +
       flatpak "org.wireshark.Wireshark"

     

       70
       +
       flatpak "tv.plex.PlexDesktop"

     

       71
       +
       {{ end -}}

     

       72
       +
       

     

       73
       +
       

     

       74
       +
       {{ if eq .chezmoi.os "darwin" -}}

     

       75
       +
       # Packages to install on macOS machines.

     

       76
       +
       brew "cocoapods"

     

       77
       +
       brew "coreutils"

     

       78
       +
       brew "fish"

     

       79
       +
       brew "lima"

     

       80
       +
       brew "openssh"

     

       81
       +
       brew "podman"

     

       82
       +
       cask "1password"

     

       83
       +
       cask "1password-cli"

     

       84
       +
       cask "android-platform-tools"

     

       85
       +
       cask "imhex"

     

       86
       +
       cask "insomnia"

     

       87
       +
       cask "jetbrains-toolbox"

     

       88
       +
       cask "mitmproxy"

     

       89
       +
       cask "notion"

     

       90
       +
       cask "todoist-app"

     

       91
       +
       cask "utm"

     

       92
       +
       cask "visual-studio-code"

     

       93
       +
       cask "wine-stable"

     

       94
       +
       cask "wireshark-app"

     

       95
       +
       cask "zed"

     

       96
       +
       

     

       97
       +
       {{ if eq .machineType "work" }}

     

       98
       +
       cask "picoscope"

     

       99
       +
       {{ end -}}

     

       100
       +
       {{ end -}}

     

       101
       +
       

     

       102
       +
       

     

       103
       +
       {{ if eq .machineType "personal" -}}

     

       104
       +
       # Packages to install on personal machines.

     

       105
       +
       brew "cdrtools"

     

       106
       +
       brew "gallery-dl"

     

       107
       +
       brew "gemini-cli"

     

       108
       +
       brew "restic"

     

       109
       +
       brew "yt-dlp"

     

       110
       +
       {{ end -}}

     

       111
       +
       

     

       112
       +
       

     

       113
       +
       {{ if eq .machineType "work" -}}

     

       114
       +
       # Packages to install on work machines.

     

       115
       +
       brew "firebase-cli"

     

       116
       +
       {{ end -}}

+45

dot_config/lnav/formats/installed/logcat_log.json

···

       1
       +
       {

     

       2
       +
         "$schema": "https://lnav.org/schemas/format-v1.schema.json",

     

       3
       +
         "logcat_log": {

     

       4
       +
           "title": "Android logcat logs",

     

       5
       +
           "regex": {

     

       6
       +
             "threadtime": {

     

       7
       +
               "pattern": "^(?<timestamp>\\d{2}-\\d{2}\\s\\d{2}:\\d{2}:\\d{2}\\.\\d{3})\\s+(?<log_pid>\\d+)\\s+(?<log_tid>\\d+)\\s+(?<level>[A-Z])\\s+(?<log_tag>\\S+)\\s*:\\s*(?<body>.*)$"

     

       8
       +
             }

     

       9
       +
           },

     

       10
       +
           "timestamp-field": "timestamp",

     

       11
       +
           "timestamp-format": [ "%m-%d %H:%M:%S.%L" ],

     

       12
       +
           "ordered-by-time": false,

     

       13
       +
           "level-field": "level",

     

       14
       +
           "body-field": "body",

     

       15
       +
           "opid-field": "tag",

     

       16
       +
           "level": {

     

       17
       +
             "fatal": "F",

     

       18
       +
             "error": "E",

     

       19
       +
             "warning": "W",

     

       20
       +
             "info": "I",

     

       21
       +
             "debug": "D",

     

       22
       +
             "trace": "V"

     

       23
       +
           },

     

       24
       +
           "value": {

     

       25
       +
             "log_pid": {

     

       26
       +
               "kind": "integer",

     

       27
       +
               "identifier": false

     

       28
       +
             },

     

       29
       +
             "log_tid": {

     

       30
       +
               "kind": "integer",

     

       31
       +
               "identifier": false

     

       32
       +
             },

     

       33
       +
             "log_tag": {

     

       34
       +
               "kind": "string",

     

       35
       +
               "identifier": true

     

       36
       +
             }

     

       37
       +
           },

     

       38
       +
           "sample": [

     

       39
       +
             {

     

       40
       +
               "line": "07-06 11:25:07.996  1583  2720 E fpc_fingerprint_hal: do_key_monitor open failed with error -2",

     

       41
       +
               "level": "error"

     

       42
       +
             }

     

       43
       +
           ]

     

       44
       +
         }

     

       45
       +
       }

dot_config/private_fish/config.fish.tmpl

···

       36
        
           set -x EDITOR {{ $editorName | quote }}

     

       37
        
       end

     

       38
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       39
        
       #

     

       40
        
       # Configure bat.

     

       41
        
       #

···

       36
        
           set -x EDITOR {{ $editorName | quote }}

     

       37
        
       end

     

       38
        
       

     

       39
       +
       {{ if eq .machineType "personal" -}}

     

       40
       +
       #

     

       41
       +
       # Set Ollama host to chert.

     

       42
       +
       #

     

       43
       +
       set -x OLLAMA_HOST "https://chert.caracal-economy.ts.net:11906"

     

       44
       +
       {{- end}}

     

       45
       +
       

     

       46
        
       #

     

       47
        
       # Configure bat.

     

       48
        
       #

+24

dot_config/private_fish/functions/gemini-cleanup-album.fish

···

       1
       +
       function gemini-cleanup-album --description "Clean up album files." --wraps "gemini"

     

       2
       +
           set prompt "Rename all .lrc files to match their corresponding .flac files \

     

       3
       +
       exactly. Do not rename the audio files. If there are multiple cover images, \

     

       4
       +
       delete all but highest quality image, then rename it to cover.ext, where ext is \

     

       5
       +
       the extension for the image type (i.e., jpg, png). Return a summary of all \

     

       6
       +
       changed file names after completion."

     

       7
       +
       

     

       8
       +
           # systemd-run --user --scope \

     

       9
       +
           #     -p ProtectSystem=strict \

     

       10
       +
           #     -p ProtectHome=read-only \

     

       11
       +
           #     -p ReadWritePaths="$PWD" \

     

       12
       +
           #     -p PrivateTmp=yes \

     

       13
       +
           #     -p NoNewPrivileges=yes \

     

       14
       +
           #     gemini --model gemini-2.5-flash --allowed-tools list_directory,run_shell_command "$prompt" $argv

     

       15
       +
       

     

       16
       +
           bwrap \

     

       17
       +
               --ro-bind / / \

     

       18
       +
               --dev /dev \

     

       19
       +
               --proc /proc \

     

       20
       +
               --tmpfs /tmp \

     

       21
       +
               --bind "$PWD" "$PWD" \

     

       22
       +
               --bind "$HOME/.gemini" "$HOME/.gemini"  \

     

       23
       +
               gemini --model gemini-2.5-flash --allowed-tools list_directory,run_shell_command "$prompt" $argv

     

       24
       +
       end

run_onchange_after_brew-bundle.sh.tmpl

···

       1
       +
       #!/usr/bin/bash

     

       2
       +
       

     

       3
       +
       # Brewfile hash: {{ includeTemplate "dot_config/homebrew/Brewfile.tmpl" . | sha256sum }}

     

       4
       +
       brew bundle install --global --no-upgrade

-9

run_onchange_linux-install-packages.sh.tmpl

···

       1
       -
       {{ if eq .chezmoi.os "linux" -}}

     

       2
       -
       #!/usr/bin/bash

     

       3
       -
       

     

       4
       -
       brew bundle --file=/dev/stdin <<EOF

     

       5
       -
       {{ range .packages.linux.brew -}}

     

       6
       -
       brew {{ . | quote }}

     

       7
       -
       {{ end -}}

     

       8
       -
       EOF

     

       9
       -
       {{ end -}}

Compare changes