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

+18

.chezmoi.toml.tmpl

···

       1
       1
       +
       [data]

     

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

     

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

     

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

     

       5
       5
       +
       

     

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

     

       7
       7
       +
       opDir = "/opt/1Password"

     

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

     

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

     

       10
       10
       +
       {{- end }}

     

       11
       11
       +
       

     

       12
       12
       +
       [data.git]

     

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

     

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

     

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

     

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

     

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

     

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

+4

.chezmoiexternal.toml

···

       1
       1
       +
       [".var/app/io.mpv.Mpv/config/mpv/scripts/autocrop.lua"]

     

       2
       2
       +
           type = "file"

     

       3
       3
       +
           url = "https://raw.githubusercontent.com/mpv-player/mpv/refs/tags/v0.39.0/TOOLS/lua/autocrop.lua"

     

       4
       4
       +
           checksum.sha256 = "40cc44b69ff1a8feabd6132ade0054e595fa9ea5e07f175d2dd99b22543fb683"

+26

.chezmoiignore

···

       1
       1
       +
       {{ if ne .machineType "personal" -}}

     

       2
       2
       +
       # Exclude restic files

     

       3
       3
       +
       .config/restic/

     

       4
       4
       +
       .config/systemd/user/restic-backup.service

     

       5
       5
       +
       .config/systemd/user/restic-backup.timer

     

       6
       6
       +
       .config/fish/functions/restic-chert.fish

     

       7
       7
       +
       .config/fish/functions/restic-pulsar.fish

     

       8
       8
       +
       .config/fish/functions/restic-slate.fish

     

       9
       9
       +
       

     

       10
       10
       +
       # Exlude mpv files

     

       11
       11
       +
       .var/app/io.mpv.Mpv/config/mpv/scripts/autocrop.lua

     

       12
       12
       +
       

     

       13
       13
       +
       # Ignore Bubblewrap scripts

     

       14
       14
       +
       .local/bin/bwrap-preset-renpy

     

       15
       15
       +
       .local/share/nautilus/scripts/Run in Bubblewrap (Ren'Py)

     

       16
       16
       +
       {{ end -}}

     

       17
       17
       +
       

     

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

     

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

     

       20
       20
       +
       .config/systemd/

     

       21
       21
       +
       .local/share/nautilus/

     

       22
       22
       +
       .var/app/

     

       23
       23
       +
       {{- end }}

     

       24
       24
       +
       

     

       25
       25
       +
       # Ignore docs

     

       26
       26
       +
       README.md

+37

README.md

···

       1
       1
       +
       # Avery's dotfiles

     

       2
       2
       +
       My dotfiles, organized using chezmoi.

     

       3
       3
       +
       

     

       4
       4
       +
       # Installation

     

       5
       5
       +
       1. Install Homebrew and chezmoi

     

       6
       6
       +
       ```fish

     

       7
       7
       +
       /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"

     

       8
       8
       +
       eval (/home/linuxbrew/.linuxbrew/bin/brew shellenv)

     

       9
       9
       +
       brew install chezmoi

     

       10
       10
       +
       ```

     

       11
       11
       +
       

     

       12
       12
       +
       2. Create the chezmoi config at `~/.config/chezmoi/chezmoi.toml`

     

       13
       13
       +
       ```toml

     

       14
       14
       +
       [data]

     

       15
       15
       +
       machineType = "personal|work"

     

       16
       16
       +
       

     

       17
       17
       +
       [data.git]

     

       18
       18
       +
       name = ""

     

       19
       19
       +
       email = ""

     

       20
       20
       +
       sshSigningKeyOpId = ""

     

       21
       21
       +
       

     

       22
       22
       +
       [data.restic.chert]

     

       23
       23
       +
       baseOpId = ""

     

       24
       24
       +
       

     

       25
       25
       +
       [data.restic.pulsar]

     

       26
       26
       +
       baseOpId = ""

     

       27
       27
       +
       

     

       28
       28
       +
       [data.restic.slate]

     

       29
       29
       +
       baseOpId = ""

     

       30
       30
       +
       ```

     

       31
       31
       +
       

     

       32
       32
       +
       3. Initialize the repository

     

       33
       33
       +
       ```sh

     

       34
       34
       +
       chezmoi init https://tangled.sh/@bladee.bsky.social/dotfiles

     

       35
       35
       +
       fish -c "chezmoi apply"

     

       36
       36
       +
       fish -c "chezmoi apply"

     

       37
       37
       +
       ```

+57

dot_config/git/config.tmpl

···

       1
       1
       +
       [user]

     

       2
       2
       +
           name = {{ .git.name }}

     

       3
       3
       +
           email = {{ .git.email }}

     

       4
       4
       +
           signingKey = {{ onepasswordRead (printf "%s/public key" .git.sshSigningKeyOpId) }}

     

       5
       5
       +
       

     

       6
       6
       +
       [core]

     

       7
       7
       +
           autocrlf = input

     

       8
       8
       +
       

     

       9
       9
       +
       [init]

     

       10
       10
       +
           defaultBranch = main

     

       11
       11
       +
       

     

       12
       12
       +
       [commit]

     

       13
       13
       +
           gpgsign = true

     

       14
       14
       +
           verbose = true

     

       15
       15
       +
       

     

       16
       16
       +
       [pull]

     

       17
       17
       +
           ff = only

     

       18
       18
       +
       

     

       19
       19
       +
       [merge]

     

       20
       20
       +
           conflictStyle = zdiff3

     

       21
       21
       +
       

     

       22
       22
       +
       [rebase]

     

       23
       23
       +
           autoSquash = true

     

       24
       24
       +
       

     

       25
       25
       +
       [push]

     

       26
       26
       +
           default = current

     

       27
       27
       +
       

     

       28
       28
       +
       [diff]

     

       29
       29
       +
           algorithm = histogram

     

       30
       30
       +
           colorMoved = default

     

       31
       31
       +
       

     

       32
       32
       +
       [transfer]

     

       33
       33
       +
           fsckObjects = true

     

       34
       34
       +
       

     

       35
       35
       +
       [fetch]

     

       36
       36
       +
           fsckObjects = true

     

       37
       37
       +
       

     

       38
       38
       +
       [receive]

     

       39
       39
       +
           fsckObjects = true

     

       40
       40
       +
       

     

       41
       41
       +
       [branch]

     

       42
       42
       +
           sort = -committerdate

     

       43
       43
       +
       

     

       44
       44
       +
       [tag]

     

       45
       45
       +
           sort = taggerdate

     

       46
       46
       +
       

     

       47
       47
       +
       [credential]

     

       48
       48
       +
       	helper = libsecret

     

       49
       49
       +
       	helper = oauth

     

       50
       50
       +
       	helper = cache --timeout=3600

     

       51
       51
       +
       

     

       52
       52
       +
       [gpg]

     

       53
       53
       +
           format = ssh

     

       54
       54
       +
       

     

       55
       55
       +
       [gpg "ssh"]

     

       56
       56
       +
           program = {{ joinPath .opDir "op-ssh-sign" }}

     

       57
       57
       +
           allowedSignersFile = {{ joinPath .chezmoi.homeDir ".config/git/allowed_signers" }}

+116

dot_config/homebrew/Brewfile.tmpl

···

       1
       1
       +
       # Packages to install on all machines.

     

       2
       2
       +
       brew "aria2"

     

       3
       3
       +
       brew "atuin"

     

       4
       4
       +
       brew "bat"

     

       5
       5
       +
       brew "chezmoi"

     

       6
       6
       +
       brew "curl"

     

       7
       7
       +
       brew "dua-cli"

     

       8
       8
       +
       brew "fd"

     

       9
       9
       +
       brew "ffmpeg"

     

       10
       10
       +
       brew "gcc"

     

       11
       11
       +
       brew "git"

     

       12
       12
       +
       brew "helix"

     

       13
       13
       +
       brew "htop"

     

       14
       14
       +
       brew "jj"

     

       15
       15
       +
       brew "just"

     

       16
       16
       +
       brew "lnav"

     

       17
       17
       +
       brew "ollama"

     

       18
       18
       +
       brew "python@3.14"

     

       19
       19
       +
       brew "ripgrep"

     

       20
       20
       +
       brew "rustup"

     

       21
       21
       +
       brew "scrcpy"

     

       22
       22
       +
       brew "uv"

     

       23
       23
       +
       brew "wget"

     

       24
       24
       +
       

     

       25
       25
       +
       

     

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

     

       27
       27
       +
       # Packages to install on Linux machines.

     

       28
       28
       +
       brew "git-credential-libsecret"

     

       29
       29
       +
       brew "git-credential-oauth"

     

       30
       30
       +
       # TODO: How to specify flatpak file?

     

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

     

       32
       32
       +
       flatpak "com.calibre_ebook.calibre"

     

       33
       33
       +
       flatpak "com.discordapp.Discord"

     

       34
       34
       +
       flatpak "com.fastmail.Fastmail"

     

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

     

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

     

       37
       37
       +
       flatpak "com.google.Chrome"

     

       38
       38
       +
       flatpak "com.mattjakeman.ExtensionManager"

     

       39
       39
       +
       flatpak "com.obsproject.Studio"

     

       40
       40
       +
       flatpak "com.plexamp.Plexamp"

     

       41
       41
       +
       flatpak "com.todoist.Todoist"

     

       42
       42
       +
       flatpak "com.valvesoftware.Steam"

     

       43
       43
       +
       flatpak "com.valvesoftware.SteamLink"

     

       44
       44
       +
       flatpak "com.visualstudio.code"

     

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

     

       46
       46
       +
       flatpak "io.mpv.Mpv"

     

       47
       47
       +
       flatpak "net.nokyan.Resources"

     

       48
       48
       +
       flatpak "org.audacityteam.Audacity"

     

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

     

       50
       50
       +
       flatpak "org.cockpit_project.CockpitClient"

     

       51
       51
       +
       flatpak "org.darktable.Darktable"

     

       52
       52
       +
       flatpak "org.freac.freac"

     

       53
       53
       +
       flatpak "org.gimp.GIMP"

     

       54
       54
       +
       flatpak "org.gnome.Boxes"

     

       55
       55
       +
       flatpak "org.gnome.Calculator"

     

       56
       56
       +
       flatpak "org.gnome.Decibels"

     

       57
       57
       +
       flatpak "org.gnome.Loupe"

     

       58
       58
       +
       flatpak "org.gnome.Papers"

     

       59
       59
       +
       flatpak "org.gnome.Showtime"

     

       60
       60
       +
       flatpak "org.gnome.SimpleScan"

     

       61
       61
       +
       flatpak "org.gnome.Snapshot"

     

       62
       62
       +
       flatpak "org.gnome.SoundRecorder"

     

       63
       63
       +
       flatpak "org.gnome.TextEditor"

     

       64
       64
       +
       flatpak "org.gnome.Weather"

     

       65
       65
       +
       flatpak "org.gnome.clocks"

     

       66
       66
       +
       flatpak "org.libreoffice.LibreOffice"

     

       67
       67
       +
       flatpak "org.musicbrainz.Picard"

     

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

     

       69
       69
       +
       flatpak "org.wireshark.Wireshark"

     

       70
       70
       +
       flatpak "tv.plex.PlexDesktop"

     

       71
       71
       +
       {{ end -}}

     

       72
       72
       +
       

     

       73
       73
       +
       

     

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

     

       75
       75
       +
       # Packages to install on macOS machines.

     

       76
       76
       +
       brew "cocoapods"

     

       77
       77
       +
       brew "coreutils"

     

       78
       78
       +
       brew "fish"

     

       79
       79
       +
       brew "lima"

     

       80
       80
       +
       brew "openssh"

     

       81
       81
       +
       brew "podman"

     

       82
       82
       +
       cask "1password"

     

       83
       83
       +
       cask "1password-cli"

     

       84
       84
       +
       cask "android-platform-tools"

     

       85
       85
       +
       cask "imhex"

     

       86
       86
       +
       cask "insomnia"

     

       87
       87
       +
       cask "jetbrains-toolbox"

     

       88
       88
       +
       cask "mitmproxy"

     

       89
       89
       +
       cask "notion"

     

       90
       90
       +
       cask "todoist-app"

     

       91
       91
       +
       cask "utm"

     

       92
       92
       +
       cask "visual-studio-code"

     

       93
       93
       +
       cask "wine-stable"

     

       94
       94
       +
       cask "wireshark-app"

     

       95
       95
       +
       cask "zed"

     

       96
       96
       +
       

     

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

     

       98
       98
       +
       cask "picoscope"

     

       99
       99
       +
       {{ end -}}

     

       100
       100
       +
       {{ end -}}

     

       101
       101
       +
       

     

       102
       102
       +
       

     

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

     

       104
       104
       +
       # Packages to install on personal machines.

     

       105
       105
       +
       brew "cdrtools"

     

       106
       106
       +
       brew "gallery-dl"

     

       107
       107
       +
       brew "gemini-cli"

     

       108
       108
       +
       brew "restic"

     

       109
       109
       +
       brew "yt-dlp"

     

       110
       110
       +
       {{ end -}}

     

       111
       111
       +
       

     

       112
       112
       +
       

     

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

     

       114
       114
       +
       # Packages to install on work machines.

     

       115
       115
       +
       brew "firebase-cli"

     

       116
       116
       +
       {{ end -}}

+45

dot_config/lnav/formats/installed/logcat_log.json

···

       1
       1
       +
       {

     

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

     

       3
       3
       +
         "logcat_log": {

     

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

     

       5
       5
       +
           "regex": {

     

       6
       6
       +
             "threadtime": {

     

       7
       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
       8
       +
             }

     

       9
       9
       +
           },

     

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

     

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

     

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

     

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

     

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

     

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

     

       16
       16
       +
           "level": {

     

       17
       17
       +
             "fatal": "F",

     

       18
       18
       +
             "error": "E",

     

       19
       19
       +
             "warning": "W",

     

       20
       20
       +
             "info": "I",

     

       21
       21
       +
             "debug": "D",

     

       22
       22
       +
             "trace": "V"

     

       23
       23
       +
           },

     

       24
       24
       +
           "value": {

     

       25
       25
       +
             "log_pid": {

     

       26
       26
       +
               "kind": "integer",

     

       27
       27
       +
               "identifier": false

     

       28
       28
       +
             },

     

       29
       29
       +
             "log_tid": {

     

       30
       30
       +
               "kind": "integer",

     

       31
       31
       +
               "identifier": false

     

       32
       32
       +
             },

     

       33
       33
       +
             "log_tag": {

     

       34
       34
       +
               "kind": "string",

     

       35
       35
       +
               "identifier": true

     

       36
       36
       +
             }

     

       37
       37
       +
           },

     

       38
       38
       +
           "sample": [

     

       39
       39
       +
             {

     

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

     

       41
       41
       +
               "level": "error"

     

       42
       42
       +
             }

     

       43
       43
       +
           ]

     

       44
       44
       +
         }

     

       45
       45
       +
       }

+74 -35

dot_config/private_fish/config.fish.tmpl

···

       1
       1
       -
       {{ $brewPath := lookPath "brew" }}

     

       2
       2
       -
       {{ if $brewPath -}}

     

       1
       1
       +
       #

     

       3
       2
        
       # Set up Homebrew.

     

       4
       4
       -
       set -x HOMEBREW_NO_INSTALL_CLEANUP 1

     

       5
       5
       -
       set -x HOMEBREW_NO_ANALYTICS 1

     

       6
       6
       -
       eval ({{ $brewPath | quote }} shellenv)

     

       7
       7
       -
       {{ end -}}

     

       3
       3
       +
       #

     

       4
       4
       +
       {{ $brewPath := lookPath "brew" -}}

     

       5
       5
       +
       if test -x {{ $brewPath | quote }}

     

       6
       6
       +
           set -x HOMEBREW_NO_ANALYTICS 1

     

       7
       7
       +
           set -x HOMEBREW_NO_AUTO_UPDATE 1

     

       8
       8
       +
           set -x HOMEBREW_NO_ENV_HINTS 1

     

       9
       9
       +
           set -x HOMEBREW_NO_INSTALL_CLEANUP 1

     

       10
       10
       +
           set -x HOMEBREW_NO_INSTALL_UPGRADE 1

     

       11
       11
       +
           set -x HOMEBREW_NO_UPDATE_REPORT_NEW 1

     

       12
       12
       +
           eval ({{ $brewPath | quote }} shellenv)

     

       13
       13
       +
       end

     

       8
       14
        
       

     

       9
       9
       -
       # Add directories to path.

     

       15
       15
       +
       #

     

       16
       16
       +
       # Add directories to PATH.

     

       17
       17
       +
       #

     

       10
       18
        
       fish_add_path --global {{ joinPath .chezmoi.homeDir ".cargo/bin" | quote }}

     

       11
       19
        
       fish_add_path --global {{ joinPath .chezmoi.homeDir ".local/bin" | quote }}

     

       12
       20
        
       

     

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

     

       22
       22
       +
       #

     

       13
       23
        
       # Set XDG data directories.

     

       24
       24
       +
       #

     

       14
       25
        
       set -x XDG_CACHE_HOME {{ joinPath .chezmoi.homeDir ".cache" | quote }}

     

       15
       26
        
       set -x XDG_CONFIG_HOME {{ joinPath .chezmoi.homeDir ".config" | quote }}

     

       16
       27
        
       set -x XDG_DATA_HOME {{ joinPath .chezmoi.homeDir ".local/share" | quote }}

     

       17
       28
        
       set -x XDG_STATE_HOME {{ joinPath .chezmoi.homeDir ".local/state" | quote }}

     

       29
       29
       +
       {{- end }}

     

       18
       30
        
       

     

       19
       19
       -
       {{ $editorName := .editor | default "vi" -}}

     

       20
       20
       -
       {{ $editorPath := lookPath $editorName -}}

     

       21
       21
       -
       {{ if $editorPath -}}

     

       22
       22
       -
       set -x EDITOR {{ $editorPath | quote }}

     

       23
       23
       -
       {{ end -}}

     

       31
       31
       +
       #

     

       32
       32
       +
       # Set editor.

     

       33
       33
       +
       #

     

       34
       34
       +
       {{ $editorName := .editor -}}

     

       35
       35
       +
       if command --query {{ $editorName | quote }}

     

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

     

       37
       37
       +
       end

     

       38
       38
       +
       

     

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

     

       40
       40
       +
       #

     

       41
       41
       +
       # Set Ollama host to chert.

     

       42
       42
       +
       #

     

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

     

       44
       44
       +
       {{- end}}

     

       45
       45
       +
       

     

       46
       46
       +
       #

     

       47
       47
       +
       # Configure bat.

     

       48
       48
       +
       #

     

       49
       49
       +
       if command --query bat

     

       50
       50
       +
           alias cat bat

     

       51
       51
       +
           set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"

     

       52
       52
       +
           set -x MANROFFOPT "-c"

     

       53
       53
       +
           set -x BAT_PAGER "less -FIKMFRS"

     

       54
       54
       +
       end

     

       24
       55
        
       

     

       25
       25
       -
       {{ $batPath := lookPath "bat" }}

     

       26
       26
       -
       {{ if $batPath -}}

     

       27
       27
       -
       # Configure 'bat'.

     

       28
       28
       -
       alias cat bat

     

       29
       29
       -
       set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"

     

       30
       30
       -
       set -x MANROFFOPT "-c"

     

       31
       31
       -
       set -x BAT_PAGER "less -FIKMFRS"

     

       32
       32
       -
       {{ end -}}

     

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

     

       57
       57
       +
       #

     

       58
       58
       +
       # Configure systemd.

     

       59
       59
       +
       #

     

       60
       60
       +
       set -x SYSTEMD_LESS "FIKMRS"

     

       61
       61
       +
       {{- end }}

     

       33
       62
        
       

     

       34
       34
       -
       # Set default less options.

     

       35
       35
       -
       set -x SYSTEMD_LESS FIKMRS

     

       63
       63
       +
       #

     

       64
       64
       +
       # Enable Jujutsu completions.

     

       65
       65
       +
       #

     

       66
       66
       +
       if command --query jj

     

       67
       67
       +
           COMPLETE=fish jj | source

     

       68
       68
       +
       end

     

       36
       69
        
       

     

       37
       37
       -
       {{ $jjPath := lookPath "jj" }}

     

       38
       38
       -
       {{ if $jjPath -}}

     

       39
       39
       -
       # Enable JJ completions.

     

       40
       40
       -
       COMPLETE=fish {{ $jjPath | quote }} | source

     

       41
       41
       -
       {{ end -}}

     

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

     

       71
       71
       +
       #

     

       72
       72
       +
       # Replace 'rm' with 'ts'.

     

       73
       73
       +
       #

     

       74
       74
       +
       if command --query gio

     

       75
       75
       +
           alias ts "gio trash"

     

       76
       76
       +
           function rm

     

       77
       77
       +
               echo "'rm' is disabled. use 'ts' to move items to trash, or 'command rm' to use rm."

     

       78
       78
       +
               return 1

     

       79
       79
       +
           end

     

       80
       80
       +
       end

     

       81
       81
       +
       {{- end }}

     

       42
       82
        
       

     

       43
       43
       -
       {{ $gioPath := lookPath "gio" }}

     

       44
       44
       -
       {{ if $gioPath -}}

     

       45
       45
       -
       # Disable rm if the trash is enabled.

     

       46
       46
       -
       alias ts "{{ $gioPath }} trash"

     

       47
       47
       -
       function rm

     

       48
       48
       -
           echo "'rm' is disabled. use 'ts' to move items to trash, or 'command rm' to use rm."

     

       49
       49
       -
           return 1

     

       83
       83
       +
       if status --is-interactive

     

       84
       84
       +
           #

     

       85
       85
       +
           # Enable atuin.

     

       86
       86
       +
           #

     

       87
       87
       +
           if command --query atuin

     

       88
       88
       +
               atuin init fish | source

     

       89
       89
       +
           end

     

       50
       90
        
       end

     

       51
       51
       -
       {{ end -}}

+20 -13

dot_config/private_fish/functions/clip.fish

···

       1
       1
        
       function clip

     

       2
       2
       -
           if test $XDG_SESSION_TYPE = x11

     

       3
       3
       -
               if ! command --query xclip

     

       4
       4
       -
                   echo -e "Error: `xclip` must be installed to copy on an X11 session"

     

       5
       5
       -
                   return 1

     

       6
       6
       -
               end

     

       7
       7
       -
       

     

       8
       8
       -
               command xclip -selection c

     

       9
       9
       -
           else if test $XDG_SESSION_TYPE = wayland

     

       10
       10
       -
               if ! command --query wl-copy

     

       11
       11
       -
                   echo -e "Error: `wl-clipboard` must be installed to copy on a Wayland session"

     

       2
       2
       +
           if test (uname -s) = Darwin

     

       3
       3
       +
               command pbcopy

     

       4
       4
       +
           else if test (uname -s) = Linux

     

       5
       5
       +
               if test $XDG_SESSION_TYPE = x11

     

       6
       6
       +
                   if ! command --query xclip

     

       7
       7
       +
                       echo -e "Error: `xclip` must be installed to copy on an X11 session"

     

       8
       8
       +
                       return 1

     

       9
       9
       +
                   end

     

       10
       10
       +
           

     

       11
       11
       +
                   command xclip -selection c

     

       12
       12
       +
               else if test $XDG_SESSION_TYPE = wayland

     

       13
       13
       +
                   if ! command --query wl-copy

     

       14
       14
       +
                       echo -e "Error: `wl-clipboard` must be installed to copy on a Wayland session"

     

       15
       15
       +
                       return 1

     

       16
       16
       +
                   end

     

       17
       17
       +
           

     

       18
       18
       +
                   command wl-copy

     

       19
       19
       +
               else

     

       20
       20
       +
                   echo -e "Error: Unknown session type `$XDG_SESSION_TYPE`"

     

       12
       21
        
                   return 1

     

       13
       22
        
               end

     

       14
       14
       -
       

     

       15
       15
       -
               command wl-copy

     

       16
       23
        
           else

     

       17
       17
       -
               echo -e "Error: Unknown session type `$XDG_SESSION_TYPE`"

     

       24
       24
       +
               echo -e "Error: Unsupported operating system `$(uname -s)`"

     

       18
       25
        
               return 1

     

       19
       26
        
           end

     

       20
       27
        
       end

-3

dot_config/private_fish/functions/edit.fish

···

       1
       1
       -
       function edit

     

       2
       2
       -
           flatpak run --file-forwarding org.gnome.TextEditor @@ $argv @@

     

       3
       3
       -
       end

-3

dot_config/private_fish/functions/fish_greeting.fish

···

       1
       1
       -
       function fish_greeting

     

       2
       2
       -
           systemctl --user list-units --quiet --state=failed

     

       3
       3
       -
       end

+5

dot_config/private_fish/functions/fish_greeting.fish.tmpl

···

       1
       1
       +
       function fish_greeting

     

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

     

       3
       3
       +
           systemctl --user list-units --quiet --state=failed

     

       4
       4
       +
           {{- end }}

     

       5
       5
       +
       end

+24

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

···

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

     

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

     

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

     

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

     

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

     

       6
       6
       +
       changed file names after completion."

     

       7
       7
       +
       

     

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

     

       9
       9
       +
           #     -p ProtectSystem=strict \

     

       10
       10
       +
           #     -p ProtectHome=read-only \

     

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

     

       12
       12
       +
           #     -p PrivateTmp=yes \

     

       13
       13
       +
           #     -p NoNewPrivileges=yes \

     

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

     

       15
       15
       +
       

     

       16
       16
       +
           bwrap \

     

       17
       17
       +
               --ro-bind / / \

     

       18
       18
       +
               --dev /dev \

     

       19
       19
       +
               --proc /proc \

     

       20
       20
       +
               --tmpfs /tmp \

     

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

     

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

     

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

     

       24
       24
       +
       end

+8

dot_config/private_fish/functions/restic-chert.fish.tmpl

···

       1
       1
       +
       function restic-chert --wraps=restic

     

       2
       2
       +
           set -x RESTIC_REPOSITORY {{ printf "%s/%s" .restic.chert.baseOpId "restic repository" | quote }}

     

       3
       3
       +
           set -x RESTIC_PASSWORD {{ printf "%s/%s" .restic.chert.baseOpId "restic password" | quote }}

     

       4
       4
       +
           set -x AWS_ACCESS_KEY_ID {{ printf "%s/%s" .restic.chert.baseOpId "access key id" | quote }}

     

       5
       5
       +
           set -x AWS_SECRET_ACCESS_KEY {{ printf "%s/%s" .restic.chert.baseOpId "secret access key" | quote }}

     

       6
       6
       +
       

     

       7
       7
       +
           command op run -- restic $argv

     

       8
       8
       +
       end

+8

dot_config/private_fish/functions/restic-pulsar.fish.tmpl

···

       1
       1
       +
       function restic-pulsar --wraps=restic

     

       2
       2
       +
           set -x RESTIC_REPOSITORY {{ printf "%s/%s" .restic.pulsar.baseOpId "restic repository" | quote }}

     

       3
       3
       +
           set -x RESTIC_PASSWORD {{ printf "%s/%s" .restic.pulsar.baseOpId "restic password" | quote }}

     

       4
       4
       +
           set -x AWS_ACCESS_KEY_ID {{ printf "%s/%s" .restic.pulsar.baseOpId "access key id" | quote }}

     

       5
       5
       +
           set -x AWS_SECRET_ACCESS_KEY {{ printf "%s/%s" .restic.pulsar.baseOpId "secret access key" | quote }}

     

       6
       6
       +
       

     

       7
       7
       +
           command op run -- restic $argv

     

       8
       8
       +
       end

+8

dot_config/private_fish/functions/restic-slate.fish.tmpl

···

       1
       1
       +
       function restic-slate --wraps=restic

     

       2
       2
       +
           set -x RESTIC_REPOSITORY {{ printf "%s/%s" .restic.slate.baseOpId "restic repository" | quote }}

     

       3
       3
       +
           set -x RESTIC_PASSWORD {{ printf "%s/%s" .restic.slate.baseOpId "restic password" | quote }}

     

       4
       4
       +
           set -x AWS_ACCESS_KEY_ID {{ printf "%s/%s" .restic.slate.baseOpId "access key id" | quote }}

     

       5
       5
       +
           set -x AWS_SECRET_ACCESS_KEY {{ printf "%s/%s" .restic.slate.baseOpId "secret access key" | quote }}

     

       6
       6
       +
       

     

       7
       7
       +
           command op run -- restic $argv

     

       8
       8
       +
       end

+26

dot_config/restic/excludes.conf

···

       1
       1
       +
       $HOME/.1password/

     

       2
       2
       +
       $HOME/.android/

     

       3
       3
       +
       $HOME/.BitwigStudio/

     

       4
       4
       +
       $HOME/.cache/

     

       5
       5
       +
       $HOME/.gradle/

     

       6
       6
       +
       $HOME/.java/

     

       7
       7
       +
       $HOME/.local/share/

     

       8
       8
       +
       $HOME/.local/state/

     

       9
       9
       +
       $HOME/.jdks/

     

       10
       10
       +
       $HOME/.pki/

     

       11
       11
       +
       $HOME/.skiko/

     

       12
       12
       +
       $HOME/.vscode/

     

       13
       13
       +
       

     

       14
       14
       +
       $HOME/Downloads/

     

       15
       15
       +
       $HOME/Dropbox/

     

       16
       16
       +
       $HOME/Google Drive/

     

       17
       17
       +
       $HOME/Music/

     

       18
       18
       +
       $HOME/Videos/

     

       19
       19
       +
       

     

       20
       20
       +
       $HOME/.var/app/**/cache/

     

       21
       21
       +
       $HOME/.var/app/**/.cache/

     

       22
       22
       +
       $HOME/.var/app/**/data/

     

       23
       23
       +
       $HOME/.var/app/**/.local/share/

     

       24
       24
       +
       

     

       25
       25
       +
       **/mkosi.cache/

     

       26
       26
       +
       **/mkosi.output/

+15

dot_config/restic/private_backup.conf.tmpl

···

       1
       1
       +
       RESTIC_REPOSITORY={{ onepasswordRead (printf "%s/%s" .restic.slate.baseOpId "restic repository") | quote }}

     

       2
       2
       +
       RESTIC_PASSWORD={{ onepasswordRead (printf "%s/%s" .restic.slate.baseOpId "restic password") | quote }}

     

       3
       3
       +
       

     

       4
       4
       +
       AWS_ACCESS_KEY_ID={{ onepasswordRead (printf "%s/%s" .restic.slate.baseOpId "access key id")| quote }}

     

       5
       5
       +
       AWS_SECRET_ACCESS_KEY={{ onepasswordRead (printf "%s/%s" .restic.slate.baseOpId "secret access key") | quote }}

     

       6
       6
       +
       

     

       7
       7
       +
       BACKUP_PATHS={{ .chezmoi.homeDir | quote }}

     

       8
       8
       +
       BACKUP_TAGS=Automatic

     

       9
       9
       +
       

     

       10
       10
       +
       UPLOAD_LIMIT=5000

     

       11
       11
       +
       

     

       12
       12
       +
       RETENTION_DAYS=7

     

       13
       13
       +
       RETENTION_WEEKS=4

     

       14
       14
       +
       RETENTION_MONTHS=12

     

       15
       15
       +
       RETENTION_YEARS=unlimited

+14

dot_config/systemd/user/1password.service.tmpl

···

       1
       1
       +
       [Unit]

     

       2
       2
       +
       Description=Password manager

     

       3
       3
       +
       After=graphical-session.target

     

       4
       4
       +
       PartOf=graphical-session.target

     

       5
       5
       +
       

     

       6
       6
       +
       [Service]

     

       7
       7
       +
       Type=exec

     

       8
       8
       +
       ExitType=cgroup

     

       9
       9
       +
       ExecStart={{ joinPath .opDir "1password" }} --silent

     

       10
       10
       +
       Restart=always

     

       11
       11
       +
       Slice=app.slice

     

       12
       12
       +
       

     

       13
       13
       +
       [Install]

     

       14
       14
       +
       WantedBy=graphical-session.target

+1

dot_config/systemd/user/graphical-session.target.wants/symlink_1password.service

···

       1
       1
       +
       ../1password.service

+16

dot_config/systemd/user/restic-backup.service.tmpl

···

       1
       1
       +
       [Unit]

     

       2
       2
       +
       Description=Backup home directory

     

       3
       3
       +
       After=network-online.target

     

       4
       4
       +
       Wants=network-online.target

     

       5
       5
       +
       

     

       6
       6
       +
       [Service]

     

       7
       7
       +
       Type=oneshot

     

       8
       8
       +
       Environment=XDG_CACHE_HOME=%T

     

       9
       9
       +
       EnvironmentFile=%h/.config/restic/backup.conf

     

       10
       10
       +
       {{ $resticPath := lookPath "restic" -}}

     

       11
       11
       +
       ExecStart={{ $resticPath }} backup --verbose --limit-upload "$UPLOAD_LIMIT" --exclude-file %h/.config/restic/excludes.conf --exclude-caches --tag "$BACKUP_TAGS" $BACKUP_PATHS

     

       12
       12
       +
       ExecStartPost={{ $resticPath }} forget --verbose --tag "$BACKUP_TAGS" --keep-daily "$RETENTION_DAYS" --keep-weekly "$RETENTION_WEEKS" --keep-monthly "$RETENTION_MONTHS" --keep-yearly "$RETENTION_YEARS"

     

       13
       13
       +
       ExecStopPost={{ $resticPath }} unlock --remove-all

     

       14
       14
       +
       TimeoutStopSec=2m

     

       15
       15
       +
       SendSIGKILL=false

     

       16
       16
       +
       SuccessExitStatus=3

+10

dot_config/systemd/user/restic-backup.timer

···

       1
       1
       +
       [Unit]

     

       2
       2
       +
       Description=Schedule a backup of the home directory

     

       3
       3
       +
       

     

       4
       4
       +
       [Timer]

     

       5
       5
       +
       OnCalendar=daily

     

       6
       6
       +
       Persistent=true

     

       7
       7
       +
       AccuracySec=30m

     

       8
       8
       +
       

     

       9
       9
       +
       [Install]

     

       10
       10
       +
       WantedBy=timers.target

+1

dot_config/systemd/user/timers.target.wants/symlink_restic-backup.timer

···

       1
       1
       +
       ../restic-backup.timer

+8

dot_config/zed/keymap.json

···

       1
       1
       +
       [

     

       2
       2
       +
         {

     

       3
       3
       +
           "context": "Editor",

     

       4
       4
       +
           "bindings": {

     

       5
       5
       +
             "ctrl-d": "editor::DeleteLine"

     

       6
       6
       +
           }

     

       7
       7
       +
         }

     

       8
       8
       +
       ]

+22

dot_config/zed/private_settings.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "theme": "Ayu Dark",

     

       3
       3
       +
         "assistant": {

     

       4
       4
       +
           "default_model": {

     

       5
       5
       +
             "provider": "google",

     

       6
       6
       +
             "model": "gemini-2.5-pro-preview-03-25"

     

       7
       7
       +
           },

     

       8
       8
       +
           "version": "2"

     

       9
       9
       +
         },

     

       10
       10
       +
         "buffer_font_size": 14,

     

       11
       11
       +
         "buffer_font_family": "Intel One Mono",

     

       12
       12
       +
         "wrap_guides": [80, 120],

     

       13
       13
       +
         "features": {

     

       14
       14
       +
           "edit_prediction_provider": "none"

     

       15
       15
       +
         },

     

       16
       16
       +
         "format_on_save": "off",

     

       17
       17
       +
         "autosave": {

     

       18
       18
       +
           "after_delay": {

     

       19
       19
       +
             "milliseconds": 100

     

       20
       20
       +
           }

     

       21
       21
       +
         }

     

       22
       22
       +
       }

+4

dot_var/app/io.mpv.Mpv/config/mpv/mpv.conf

···

       1
       1
       +
       vo=gpu-next

     

       2
       2
       +
       gpu-api=vulkan

     

       3
       3
       +
       hwdec=auto-safe

     

       4
       4
       +
       script-opts-append=autocrop-auto=no

+82

private_dot_local/bin/executable_bwrap-preset-renpy

···

       1
       1
       +
       #!/usr/bin/env sh

     

       2
       2
       +
       

     

       3
       3
       +
       # bwrap-preset-renpy

     

       4
       4
       +
       #

     

       5
       5
       +
       # Run an executable in a Bubblewrap sandbox set up for Ren'Py games. The saves

     

       6
       6
       +
       # directory will be in '$XDG_CONFIG_DIR/renpy' or '$HOME/.config/renpy' instead

     

       7
       7
       +
       # of the normal '$HOME/.renpy'.

     

       8
       8
       +
       

     

       9
       9
       +
       set -eu

     

       10
       10
       +
       

     

       11
       11
       +
       # Set script title for error messages.

     

       12
       12
       +
       SCRIPT_TITLE="Run in Bubblewrap (Ren'Py)"

     

       13
       13
       +
       

     

       14
       14
       +
       # Notify the user of an error and exit.

     

       15
       15
       +
       notify_and_exit () {

     

       16
       16
       +
           # Make sure enough arguments were given.

     

       17
       17
       +
           if [ "$#" -ne 2 ]; then

     

       18
       18
       +
               printf "Error: notify_and_exit() called with '%i' arguments\n" "$#"

     

       19
       19
       +
               exit 127

     

       20
       20
       +
           fi

     

       21
       21
       +
       

     

       22
       22
       +
           # Name the arguments.

     

       23
       23
       +
           error_msg="$1"

     

       24
       24
       +
           exit_code="$2"

     

       25
       25
       +
       

     

       26
       26
       +
           # Either print to stdout or send a notification.

     

       27
       27
       +
           if [ "$TERM" = "dumb" ]; then

     

       28
       28
       +
               notify-send --urgency=normal --icon=error "$SCRIPT_TITLE" "$error_msg"

     

       29
       29
       +
           else

     

       30
       30
       +
               printf "%s: %s\n" "$SCRIPT_TITLE" "$error_msg"

     

       31
       31
       +
           fi

     

       32
       32
       +
       

     

       33
       33
       +
           # Exit with the error code.

     

       34
       34
       +
           exit "$exit_code"

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       # Only one command can be run.

     

       38
       38
       +
       [ "$#" -ne 1 ] && notify_and_exit "Only one command can be run with this script" 1

     

       39
       39
       +
       

     

       40
       40
       +
       

     

       41
       41
       +
       # Make sure Bubblewrap is installed.

     

       42
       42
       +
       if ! command -v bwrap > /dev/null 2>&1; then

     

       43
       43
       +
           notify_and_exit "Could not find executable \`bwrap\`" 1

     

       44
       44
       +
       fi

     

       45
       45
       +
       

     

       46
       46
       +
       # Set the Ren'Py saves directory.

     

       47
       47
       +
       if [ ! -z "$\{XDG_CONFIG_HOME+x\}" ]; then

     

       48
       48
       +
           RENPY_SAVE_DIR="$XDG_CONFIG_HOME/renpy"

     

       49
       49
       +
       else

     

       50
       50
       +
           RENPY_SAVE_DIR="$HOME/.config/renpy"

     

       51
       51
       +
       fi

     

       52
       52
       +
       

     

       53
       53
       +
       # Create the Ren'Py saves directory if it doesn't exist.

     

       54
       54
       +
       [ ! -d "$RENPY_SAVE_DIR" ] && mkdir -p "$RENPY_SAVE_DIR"

     

       55
       55
       +
       

     

       56
       56
       +
       # Get the full path of the file.

     

       57
       57
       +
       executable=$(realpath "$1")

     

       58
       58
       +
       

     

       59
       59
       +
       # Get the directory the file is contained in so it can be mounted int the

     

       60
       60
       +
       # sandbox.

     

       61
       61
       +
       executable_dir=$(dirname "$executable")

     

       62
       62
       +
       

     

       63
       63
       +
       # Make sure the file is executable.

     

       64
       64
       +
       [ ! -x "$executable" ] && notify_and_exit "File \`$executable\` is not executable" 1

     

       65
       65
       +
       

     

       66
       66
       +
       # Run the specified command in Bubblewrap. Unshare all namespaces, and bind the

     

       67
       67
       +
       # working directory and Ren'Py saves directory.

     

       68
       68
       +
       exec bwrap \

     

       69
       69
       +
           --unshare-all \

     

       70
       70
       +
           --die-with-parent \

     

       71
       71
       +
           --new-session \

     

       72
       72
       +
           --unsetenv RENPY_PATH_TO_SAVES \

     

       73
       73
       +
           --ro-bind "/" "/" \

     

       74
       74
       +
           --dev "/dev" \

     

       75
       75
       +
           --dev-bind "/dev/dri" "/dev/dri" \

     

       76
       76
       +
           --proc "/proc" \

     

       77
       77
       +
           --tmpfs "$HOME" \

     

       78
       78
       +
           --bind "$XDG_CONFIG_HOME/MangoHud" "$XDG_CONFIG_HOME/MangoHud" \

     

       79
       79
       +
           --bind "$executable_dir" "$executable_dir" \

     

       80
       80
       +
           --bind "$RENPY_SAVE_DIR" "$HOME/.renpy" \

     

       81
       81
       +
           "$executable"

     

       82
       82
       +

+1

private_dot_local/private_share/nautilus/private_scripts/symlink_Run in Bubblewrap (Ren'Py)

···

       1
       1
       +
       ../../../bin/bwrap-preset-renpy

+2

private_dot_ssh/private_config.tmpl

···

       1
       1
       +
       Host *

     

       2
       2
       +
       	IdentityAgent {{ joinPath .chezmoi.homeDir ".1password/agent.sock" }}

+4

run_onchange_after_brew-bundle.sh.tmpl

···

       1
       1
       +
       #!/usr/bin/bash

     

       2
       2
       +
       

     

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

     

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

Compare changes