Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@
forge-triage.url = "github:Mic92/forge-triage";
forge-triage.inputs.nixpkgs.follows = "nixpkgs";

punchcard.url = "github:pinpox/punchcard";
# TODO: switch back to pinpox/punchcard once
# https://github.com/pinpox/punchcard/pull/9 is merged
punchcard.url = "github:Mic92/punchcard/lazy-oidc";
punchcard.inputs.nixpkgs.follows = "nixpkgs";

herdr-eternal.url = "github:Mic92/herdr-eternal";
Expand Down
21 changes: 3 additions & 18 deletions home-manager/modules/ai.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,17 @@ let
micsSkillsPkgs = inputs.mics-skills.packages.${pkgs.stdenv.hostPlatform.system};
nixbot-cli = inputs.nixbot.packages.${pkgs.stdenv.hostPlatform.system}.nixbot-cli;

# herdr 0.7.5 drops kitty-protocol printable keys (#1746) and shifted prefix
# keybindings drop out of prefix mode (#1870); build master commit on Linux
# until the next release.
# On Darwin llm-agents ships the prebuilt release binary, so the source
# patch can only be applied on Linux.
herdrPackage =
if pkgs.stdenv.isDarwin then
aiTools.herdr
else
aiTools.herdr.overrideAttrs (old: rec {
version = "0.7.5-unstable-2026-07-29";
src = pkgs.fetchFromGitHub {
owner = "ogulcancelik";
repo = "herdr";
rev = "73d92004f50d3f5fafe64e0f9b7fddbcf4d99965";
hash = "sha256-SeBkJePTxcFhXzFgGiSXMlAY359bgf5aTgmywZJhuoM=";
};
aiTools.herdr.overrideAttrs (old: {
# remote.ssh_command config option; proposed upstream via discussion #1780.
patches = (old.patches or [ ]) ++ [
./herdr/0001-remote-make-ssh-transport-program-configurable.patch
];
cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
inherit src;
name = "herdr-${version}-vendor";
hash = "sha256-Ja7fKsLWwCi6oy6zANltlFncbDVK+kgOhpr+bJtZyzg=";
};
# versionCheckHook compares against the pre-release Cargo version.
doInstallCheck = false;
});
in
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6d5109ec08467913a4e53fa3c1d8752705f0504d Mon Sep 17 00:00:00 2001
From 7f65636f020511fe6f1781f58bb8feab11e7e63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 26 Jul 2026 10:43:42 +0200
Subject: [PATCH] remote: make ssh transport program configurable
Expand Down Expand Up @@ -28,10 +28,10 @@ Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/config/model.rs b/src/config/model.rs
index 9fbca3a..a9a6a26 100644
index e56ac08..1d471f3 100644
--- a/src/config/model.rs
+++ b/src/config/model.rs
@@ -866,12 +866,16 @@ pub struct RemoteConfig {
@@ -878,12 +878,16 @@ pub struct RemoteConfig {
/// Add keepalive fallbacks and private connection reuse for `herdr --remote`.
/// Set false to run plain ssh unchanged. Default: true.
pub manage_ssh_config: bool,
Expand All @@ -49,10 +49,10 @@ index 9fbca3a..a9a6a26 100644
}
}
diff --git a/src/main.rs b/src/main.rs
index a73423b..2e6f94c 100644
index 27c1d92..0227cd2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -386,6 +386,9 @@ const DEFAULT_CONFIG: &str = r##"# herdr configuration
@@ -395,6 +395,9 @@ const DEFAULT_CONFIG: &str = r##"# herdr configuration
# Set false to run plain ssh against your ssh config unchanged — this does not
# force keepalive or multiplexing off, it only stops herdr from adding its own.
# manage_ssh_config = true
Expand Down Expand Up @@ -196,5 +196,5 @@ index 6fe927c..55a0764 100644
fn remote_install_stream_command_avoids_shell_c_wrapper() {
let command = remote_install_stream_command("/home/a b/.local/bin/herdr.tmp.123");
--
2.54.0
2.55.0

6 changes: 3 additions & 3 deletions home/.claude/CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@

## Running programs

- CRITICAL: ALWAYS use the `queue` skill for ANY command that might take
longer than 10 seconds (nix build, merge-when-green, test runs, make,
ninja, cargo) to avoid tool timeouts.
- CRITICAL: ALWAYS use the `queue` skill for ANY command that might take longer
than 10 seconds (nix build, merge-when-green, test runs, make, ninja, cargo)
to avoid tool timeouts.

## Search

Expand Down
6 changes: 0 additions & 6 deletions machines/turingmachine/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
pkgs,
lib,
config,
self,
Expand All @@ -24,7 +23,6 @@
./modules/postgresql.nix
../../nixosModules/tum-vpn
./modules/toggle-keyboard
./modules/sunshine.nix
./modules/ghaf-hardware.nix
./modules/ghaf-facter.nix

Expand Down Expand Up @@ -54,10 +52,6 @@

nixpkgs.pkgs = self.inputs.nixpkgs.legacyPackages.x86_64-linux;

environment.systemPackages = with pkgs; [
sunshine
];

services.rustdesk-client.users = [ "joerg" ];

hardware.saleae-logic.enable = true;
Expand Down
1 change: 0 additions & 1 deletion machines/turingmachine/modules/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
environment.systemPackages = with pkgs; [
cntr
ntfs3g
sunshine
];
}
39 changes: 0 additions & 39 deletions machines/turingmachine/modules/sunshine.nix

This file was deleted.

Loading
Loading