From ffef7811e157dead16f57f062b2a01e555e908f3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 8 Jun 2026 00:34:11 +0200 Subject: [PATCH] laksjdlakjd --- profiles/base/ccache/default.nix | 2 +- profiles/base/default.nix | 2 +- profiles/known-hosts/hosts.toml | 2 +- users/pbsds/home/profiles/desktop/ghostty/ghosty.config | 1 + users/pbsds/home/profiles/minimal/bashrc.d/destore.sh | 2 +- users/pbsds/home/profiles/minimal/ssh.nix | 4 ++++ 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/profiles/base/ccache/default.nix b/profiles/base/ccache/default.nix index 4a13654..b2387f8 100644 --- a/profiles/base/ccache/default.nix +++ b/profiles/base/ccache/default.nix @@ -49,7 +49,7 @@ }; # based on https://github.com/NixOS/nixpkgs/blob/d89fc19e405cb2d55ce7cc114356846a0ee5e956/nixos/modules/programs/ccache.nix#L49-L67 - security.wrappers.nix-sccache = + security.wrappers."nix-sccache" = let cfg = config.programs.ccache; in diff --git a/profiles/base/default.nix b/profiles/base/default.nix index b0c2b63..c2a8df8 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -7,7 +7,7 @@ ./../../secrets ./binary-caches.nix ./nix.nix - # ./lix.nix + # ./lix.nix # too slow eval... ./locale-no.nix ./upgrade-diff.nix ./vm-variant.nix diff --git a/profiles/known-hosts/hosts.toml b/profiles/known-hosts/hosts.toml index e2f9f1d..0839454 100644 --- a/profiles/known-hosts/hosts.toml +++ b/profiles/known-hosts/hosts.toml @@ -78,7 +78,7 @@ ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH03MEINNnjBvtmvN2QsC ["garp.tail9aac63.ts.net"] # gtx 3060 ti aliases = [ "garp.pbsds.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] -buildMachine.maxJobs = 2 # 8 threads 64GB +# buildMachine.maxJobs = 2 # 8 threads 64GB buildMachine.speedFactor = 4 # i7-6700 buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache buildMachine.protocol = "ssh-ng" diff --git a/users/pbsds/home/profiles/desktop/ghostty/ghosty.config b/users/pbsds/home/profiles/desktop/ghostty/ghosty.config index fa28a93..7b60b83 100644 --- a/users/pbsds/home/profiles/desktop/ghostty/ghosty.config +++ b/users/pbsds/home/profiles/desktop/ghostty/ghosty.config @@ -25,6 +25,7 @@ confirm-close-surface = false clipboard-paste-protection = false clipboard-paste-bracketed-safe = true # even if this is now default of on gnome, keep the behaviour for ghostty +# https://github.com/ghostty-org/ghostty/pull/12443 copy-on-select = true # 50MB, default is 10MB. The buffer is preallocated scrollback-limit = 50000000 diff --git a/users/pbsds/home/profiles/minimal/bashrc.d/destore.sh b/users/pbsds/home/profiles/minimal/bashrc.d/destore.sh index 9b4102a..5c3eb47 100644 --- a/users/pbsds/home/profiles/minimal/bashrc.d/destore.sh +++ b/users/pbsds/home/profiles/minimal/bashrc.d/destore.sh @@ -1,7 +1,7 @@ destore() { for dst in "$@"; do local MAYBESUDO="" - if test ! -w "$(dirname $(realpath --no-symlinks $dst))" ; then + if test ! -w "$(dirname "$(realpath --no-symlinks $dst)")" ; then MAYBESUDO="sudo" sudo true || { echo >&2 "ERROR: could not destore '$dst' due to lack of sudo" diff --git a/users/pbsds/home/profiles/minimal/ssh.nix b/users/pbsds/home/profiles/minimal/ssh.nix index 32a5874..eb732e2 100644 --- a/users/pbsds/home/profiles/minimal/ssh.nix +++ b/users/pbsds/home/profiles/minimal/ssh.nix @@ -1,4 +1,5 @@ { config, lib, pkgs, ... }: +lib.mkMerge [ { home.shellAliases.tssh = "ssh -t"; @@ -40,6 +41,8 @@ controlPersist = "no"; }; programs.ssh.includes = [ "~/.ssh/config.d/*" ]; +} +{ programs.ssh.matchBlocks = { "*".serverAliveInterval = 10; "*".serverAliveCountMax = 3; @@ -185,3 +188,4 @@ }; } +]