Commit graph

229 commits

Author SHA1 Message Date
Chandler Swift
7fc13776f6
sam: Move channel 25.05 → nixos-unstable
This requires a corresponding home-manager move, above, and removes the requirement for a changed openconnect.
2026-02-03 09:53:03 -06:00
Chandler Swift
10bdad00d8
sam: Pin old spice-vdagent
25.11 and unstable are using spice-vdagent 0.23.0, which doesn't seem to
work for display resizing. (It's likely that it's just a config error,
but this appears to revert it for now. I'll probably try to report/fix
the bug upstream at some point now that I've identified it.)

For future reference, here's how I bisected the problem to this package:

I didn't want to have to deal with compiling the universe from source to
check each commit, so I started with the commits that nixos-unstable
once pointed to, which would have been built by Hydra and cached. I used
`npc` for this:

    git clone git@github.com:samestep/npc
    NPC_REV=main NIX_BIN=`which nix` GIT_BIN=`which git` cargo build --release
    ~/projects/npc/target/release/npc fetch  # I wasn't able to find a way around this
    ~/projects/npc/target/release/npc bisect start nixos-unstable
    ~/projects/npc/target/release/npc bisect bad nixos-unstable # currently broken
    ~/projects/npc/target/release/npc bisect good f02fddb8acef29a8b32f10a335d44828d7825b78 # formerly working

`npc` will then print out commit hashes for me to try, which I can
check out and run:

    git -C ~/projects/nixpkgs checkout b6a8526db03f735b89dd5ff348f53f752e7ddc8e
    sudo nixos-rebuild -I nixpkgs="/home/chandler/projects/nixpkgs" boot && reboot
    ~/projects/npc/target/release/npc bisect <good|bad> $(git -C ~/projects/nixpkgs rev-parse HEAD)

This process repeats until it identifies a good and bad commit:

    $ ~/projects/npc/target/release/npc bisect good $(git -C ~/projects/nixpkgs rev-parse HEAD)
    done bisecting nixos-unstable
    8913c168d1c56dc49a7718685968f38752171c3b is the first bad commit
    7df7ff7d8e00218376575f0acdcc5d66741351ee is the last good commit

Now, there's still a pretty big gap here, so I'll want to do some
further bisection!

    [chandler@sam:~/projects/nixpkgs]$ git rev-list --count 7df7ff7d..8913c168
    3099

    [chandler@sam:~/projects/nixpkgs]$ git diff --shortstat 7df7ff7d..8913c168
     3716 files changed, 45544 insertions(+), 38260 deletions(-)

Now I can do a regular `git bisect`:

    $ git -C ~/projects/nixpkgs bisect start
    $ git -C ~/projects/nixpkgs bisect good 7df7ff7d8e00218376575f0acdcc5d66741351ee
    $ git -C ~/projects/nixpkgs bisect bad 8913c168d1c56dc49a7718685968f38752171c3b
    $ # …
    $ git -C ~/projects/nixpkgs bisect bad
    1491cf86eb405b21e518f1a94763524de36ee661 is the first bad commit
    commit 1491cf86eb405b21e518f1a94763524de36ee661 (HEAD)
    Author: R. RyanTM <ryantm-bot@ryantm.com>
    Date:   Tue Sep 23 12:31:00 2025 +0000

        spice-vdagent: 0.22.1 -> 0.23.0

     pkgs/by-name/sp/spice-vdagent/package.nix | 4 ++--
     1 file changed, 2 insertions(+), 2 deletions(-)

For this, I removed basically all packages, so I wouldn't have to
rebuild e.g. chromium from source! I did end up rebuilding the kernel
once, which took a while; most of the bisect steps didn't actually make
any changes so the whole process was pretty fast.
2026-02-03 09:52:58 -06:00
Chandler Swift
d5647dff3a
sam: Upgrade GIMP to 3.0 2026-01-28 09:52:52 -06:00
132257fb73
bert: Fix bible.chandlerswift.com path 2025-12-28 22:50:10 -06:00
873f552d8b
bert: Add in dynamic svsindustries.org server 2025-12-28 22:50:10 -06:00
6ece0febe7
bert: Remove Factorio version pin (2.0.55→2.0.72) 2025-12-28 22:50:10 -06:00
a59df88a44
bert: Fix bible.chandlerswift.com link 2025-12-28 22:50:10 -06:00
9acc79ce8a
oscar: Install solvespace, recommended by Eric 2025-12-28 22:50:10 -06:00
0ae0946f7a
oscar: Switch llama-cpp out for Vulkan extensions
This results in a substantial speedup. Before:

    [ Prompt: 2.9 t/s | Generation: 2.5 t/s ]

After (I haven't figured out what the story is with variable speeds,
these are three successive messages of increasing length in the same
conversation):

    [ Prompt: 95.7 t/s | Generation: 11.7 t/s ]
    [ Prompt: 2866.0 t/s | Generation: 13.4 t/s ]
    [ Prompt: 133.1 t/s | Generation: 14.0 t/s ]
    [ Prompt: 188.3 t/s | Generation: 13.6 t/s ]

(benchmarks on Framework 13 AMD 7640U)
2025-12-28 22:50:10 -06:00
36df179501
Set allowDiscards to enable NVMe TRIM 2025-12-28 22:50:10 -06:00
8685dece56
bert: Unpin immich 2025-12-28 22:50:10 -06:00
4859a250fd
bert: Add Minecraft server to firewall 2025-12-28 22:50:10 -06:00
Chandler Swift
ff4f0a88fa
sam: Mount UTM host share
This requires that I explicitly specify `chandler`'s UID and GID.
2025-12-22 13:10:03 -06:00
Chandler Swift
3f464bd791
sam: Add openconnect 2025-12-22 13:10:03 -06:00
Chandler Swift
c9ce1b7c19
sam: Install azure-cli resource-graph extension 2025-12-22 13:10:03 -06:00
Chandler Swift
80dc37f30e
sam: Set git help.autoCorrect=prompt 2025-12-22 13:10:03 -06:00
ca2773f9d9
Replace deprecated --fast with --no-reexec 2025-12-17 19:01:50 -06:00
e04375baaa
oscar: Install supersonic 2025-12-17 17:57:05 -06:00
a76cac96bf
Use correct hash for updated bible package 2025-12-09 22:37:09 -06:00
5c8963d3a5
Upgrade to Minecraft 1.21.11 2025-12-09 22:36:52 -06:00
78c7ec0ce4
bert: Update navidrome to 0.59.0 2025-12-06 19:18:15 -06:00
c8b512ed4c
oscar: Add musicbrainz plugin to beets
This used to be in core but got moved to a plugin earlier this year:

https://github.com/beetbox/beets/pull/5748

This was released as part of Beets 2.4.0, which I've finally upgrade to:

https://docs.beets.io/en/latest/changelog.html#september-13-2025

> [MusicBrainz Plugin](https://docs.beets.io/en/latest/plugins/musicbrainz.html):
> The MusicBrainz autotagger has been moved to a separate plugin. The
> default [plugins](https://docs.beets.io/en/latest/reference/config.html#plugins-config)
> includes `musicbrainz`, but if you’ve customized your `plugins` list
> in your configuration, you’ll need to explicitly add `musicbrainz` to
> continue using this functionality. Configuration option
> [`enabled`](https://docs.beets.io/en/latest/plugins/musicbrainz.html#conf-enabled)
> has thus been deprecated.
> [#2686](https://github.com/beetbox/beets/issues/2686)
> [#4605](https://github.com/beetbox/beets/issues/4605)
2025-10-22 19:47:14 -05:00
974a0eee76
oscar: Install delve (go debugger) 2025-10-13 19:39:13 -05:00
9c5ca2efe5
bert: Upgrade Immich to 2.0(.1) -- stable! 2025-10-05 20:46:27 -05:00
85e5dfd84b
bert: Add svsindustries.org fileserver
Co-Authored-By: Eric Villnow <eric@vill.now>
2025-09-24 20:27:34 -05:00
53947efb99
bert: Add Eric user 2025-09-19 22:35:02 -05:00
e6ba9b74b2
oscar: Install tenacity (audacity fork) 2025-09-17 11:17:55 -05:00
c524715bd6
bert: Update Minecraft to 1.21.8
Requested-By: Eric
2025-09-14 23:28:58 -05:00
7227864883
bert: Add Jeff user 2025-09-07 23:12:53 -05:00
99526a4ea2
oscar: Pin kernel to 6.12.43 LTS 🙄 2025-09-04 22:10:01 -05:00
0cadf87550
bert: Add Käthe user 2025-09-01 17:42:12 -05:00
6bfcf64e98
bert: sharontrahan.com: Serve hosted files not redirects 2025-09-01 17:40:22 -05:00
8acf2b2b4e
oscar: Migrate ollama to llama-cpp
Here's what I previously had downloaded with ollama:

    NAME                ID            SIZE    MODIFIED
    deepseek-r1:latest  6995872bfe4c  5.2 GB  8 weeks ago
    deepseek-r1:70b     0c1615a8ca32  42 GB   7 months ago
    phi4:latest         ac896e5b8b34  9.1 GB  7 months ago
    llama3.3:latest     a6eb4748fd29  42 GB   8 months ago
    llama3.2:latest     a80c4f17acd5  2.0 GB  8 months ago
2025-08-31 15:49:18 -05:00
2e8929c532
oscar: Upgrade gimp to 3.x 2025-08-31 15:13:20 -05:00
9726c1c716
bert: Implement natural sort for Caddy browse template
This can go away if upstream decides to implement/merge a fix:

https://github.com/caddyserver/caddy/issues/7226

This is mostly useful for the Newsletter downloads page:

https://stjohnscccc.org/downloads/Newsletters/

Requested-By: Mom
2025-08-31 15:12:45 -05:00
6b28bf6dd7
bert: stjohnscccc.org: Add Nemitz scholarship redirect 2025-08-31 15:12:45 -05:00
b5570f41c0
oscar: Remove Factorio version pin 2025-08-31 15:12:39 -05:00
98acc3644c
bert: Upgrade Navidrome to 0.57.0 2025-07-23 13:59:12 -05:00
d69b4cf8ab
bert: Add bible.chandlerswift.com 2025-07-23 13:59:08 -05:00
Chandler Swift
fba42c5f18
sam: Install kubectl 2025-07-15 17:22:37 -05:00
Chandler Swift
f908b10435
sam: Fix includeIf trailing slash
This isn't a new issue; not even to me!

https://news.ycombinator.com/item?id=38946967

> chandlerswift on Jan 11, 2024 | on: Conditional Git Configuration
>
> I'd attempted to configure this some time back, but never gotten it
> working, and this was the kick in the pants I needed to finally get
> it working!
>
> In case anyone is stuck in the same way that I was, the trailing
> slash at the end (which I had previously omitted, not realizing) is
> necessary for this to work. The docs[0] mention this, but I'd managed
> to repeatedly miss it:
>
> > If the pattern ends with /, * will be automatically added. For
> > example, the pattern foo/ becomes foo/*. In other words, it matches
> > "foo" and everything inside, recursively.
>
> [0]: https://git-scm.com/docs/git-config#Documentation/git-config...

:doh:
2025-07-15 17:08:20 -05:00
Chandler Swift
d49871079f
sam: Install azure-cli with devops extension
The commented extensions had been installed at one point in the past,
but it's unclear if they're actually things I use, so left out for now.
2025-07-15 16:44:51 -05:00
Chandler Swift
5814eaa5f1
sam: Install hyperfine 2025-07-15 16:39:34 -05:00
Chandler Swift
30264133f8
sam: Use correct key for machine-config 2025-07-11 14:30:49 -05:00
Chandler Swift
c0795d3c25
sam: Install extra applications
Mostly copied from oscar's config.
2025-07-11 14:29:26 -05:00
Chandler Swift
5e7347ad26
sam: Install github cli (gh) 2025-07-11 13:09:55 -05:00
Chandler Swift
a3ac063e28
sam: Add additional opts from old gitconfig 2025-07-10 20:08:44 -05:00
Chandler Swift
c6b1107a78
sam: Use vue key for vue git repos 2025-07-10 20:08:44 -05:00
Chandler Swift
31f95124c9
sam: Conditionally configure git email 2025-07-10 14:24:48 -05:00
Chandler Swift
5105087d65
sam: Disable sudo password requirement 2025-07-10 14:23:27 -05:00