chore(flakes): update Flake lockfile and configs

- Updated multiple Flake lockfile entries to the latest revisions for improved consistency with upstream changes.
- Removed redundant `sshKey` fields from builder configurations in `nixbuild.nix`.
- Added `Nix` path initialization for fish shell SSH sessions and refactored mouse bindings in `default.nix`.
This commit is contained in:
Harald Hoyer 2025-11-13 11:36:46 +01:00
parent 3f6c1df78c
commit cd86d39ec1
3 changed files with 67 additions and 75 deletions

98
flake.lock generated
View file

@ -19,16 +19,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753461463, "lastModified": 1761551821,
"narHash": "sha256-kGc7pRH0diLzKmOHsEFA8sZ9NJpgT+tqxAMsuqNd5Po=", "narHash": "sha256-N3Zj73TAxclhLGgADbPVwcVrhYIBKUgAxjfQuOXre6s=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "4d14be89e99a45181c18e96a5f19a5b43343cc0f", "rev": "8f6719274133c5bcc24c058c5a6bcbb3b0cd48b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "4.5.13", "ref": "4.6.19",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756649772, "lastModified": 1761825061,
"narHash": "sha256-YesaX4RhgNmB0tNBNMgHnW/CV+7o1jrHcpH60Z9KMgg=", "narHash": "sha256-AeRQZKr8+1XQer+WmbwtQaQBy05UDgeNNE7YZjNLuS0=",
"owner": "k3d3", "owner": "k3d3",
"repo": "claude-desktop-linux-flake", "repo": "claude-desktop-linux-flake",
"rev": "bbf9abf395d0ec607a55dd9ddef1efee57883827", "rev": "791cd93cfe216ad06ab740f0fdc142119b1d6ec2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749744770, "lastModified": 1762912391,
"narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754971456, "lastModified": 1762276996,
"narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,11 +225,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754487366, "lastModified": 1760948891,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +370,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757808926, "lastModified": 1758463745,
"narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,11 +403,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755176765, "lastModified": 1763029535,
"narHash": "sha256-jOBxOiAkYxF1B4kcB2Bb0yK7T0Rhi8TZH+uE9/1cZLc=", "narHash": "sha256-cpvUWuX4U4fUo6VfECVMEd3iTDWfCiUF17Z6z0NzSKI=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "ccd9fd14dc4b5615a027c5b342381939d2a47531", "rev": "05aac09b912fe81b5b2ba83fc03a3c1a8c9749a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -419,11 +419,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755174160, "lastModified": 1763027420,
"narHash": "sha256-0aZ2c++eF2HkGLcu4HtmjokzEhskbH5b23ENUWUVTcg=", "narHash": "sha256-7/pKvDh2egiqr12l4gmWyJ5gC2mVg8pIhYORJ4XwDZU=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "fe9a06826f4e7b88f4856488fe7fc172e5e61d34", "rev": "a298c82d42310ec70d22b51cb0c2d7fcb846771b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +464,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1748710831, "lastModified": 1758834834,
"narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +488,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1755115677, "lastModified": 1762622004,
"narHash": "sha256-98Ad2F5w1xW94KymQiBohNBYpFqMa0K28v9S1SzyTY8=", "narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=",
"owner": "NotAShelf", "owner": "NotAShelf",
"repo": "nvf", "repo": "nvf",
"rev": "c5dc7192496a1fad38134e54f8b4fca8ac51a9fe", "rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -506,11 +506,11 @@
"brew-src": "brew-src" "brew-src": "brew-src"
}, },
"locked": { "locked": {
"lastModified": 1754250993, "lastModified": 1761927470,
"narHash": "sha256-MEin+qoQKtFC1b0f4tnQ+Z82BQWSCgh6Ef7rpmH9gig=", "narHash": "sha256-KsFDGRGD8j1R6TvJ4HkebKsh3HXLY0XazanLrhO3wqE=",
"owner": "zhaofengli-wip", "owner": "zhaofengli-wip",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "314d057294e79bc2596972126b84c6f9f144499a", "rev": "3cae36b3a17b09a66435291619dce8cf2c4728ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +521,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1757103352, "lastModified": 1762847253,
"narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -585,11 +585,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1757941119, "lastModified": 1762756533,
"narHash": "sha256-TssJZFzMRYdWgpHySzKv4YQg6DUv5SDENiWbVgNTo0M=", "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ff837017c3b82bd3671932599a119d7bc672ff0", "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -674,11 +674,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755139244, "lastModified": 1763001554,
"narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", "narHash": "sha256-wsfhRTuxu6f06RMmP4JWcq3wWRlmYtQaJZ6b3f+EJ94=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", "rev": "315d97eb753cee8e1aa039a5e622b84d32a454bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -741,11 +741,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1763023272,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-TCVNCn/GcKhwm+WlSJEZEPW4ISQdU9ICIU3lTiOLBYc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "b80c966e70fa0615352c9596315678df1de75801",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +801,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1762844143,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,15 +1,16 @@
{ pkgs {
, config pkgs,
, ... config,
...
}: }:
{ {
home = { home = {
username = "harald"; username = "harald";
homeDirectory = "/Users/${config.home.username}"; homeDirectory = "/Users/${config.home.username}";
stateVersion = "23.11"; # Please read the comment before changing. stateVersion = "23.11"; # Please read the comment before changing.
sessionPath = [ # sessionPath = [
"$HOME/Library/Application Support/JetBrains/Toolbox/scripts/" # "$HOME/Library/Application Support/JetBrains/Toolbox/scripts/"
]; # ];
}; };
metacfg = { metacfg = {
@ -40,7 +41,10 @@
selection.save_to_clipboard = true; selection.save_to_clipboard = true;
mouse.bindings = [ mouse.bindings = [
{ mouse = "Middle"; action = "Paste"; } {
mouse = "Middle";
action = "Paste";
}
]; ];
# Color theme ported from iTerm 2 Smoooooth # Color theme ported from iTerm 2 Smoooooth

View file

@ -11,7 +11,6 @@ with lib.metacfg;
maxJobs = 4; maxJobs = 4;
speedFactor = 3; speedFactor = 3;
sshUser = "harald"; sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
} }
{ {
hostName = "rialo"; hostName = "rialo";
@ -19,7 +18,6 @@ with lib.metacfg;
maxJobs = 4; maxJobs = 4;
speedFactor = 3; speedFactor = 3;
sshUser = "harald"; sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
} }
{ {
hostName = "sgx"; hostName = "sgx";
@ -27,23 +25,6 @@ with lib.metacfg;
maxJobs = 4; maxJobs = 4;
speedFactor = 1; speedFactor = 1;
sshUser = "harald"; sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "sgx";
system = "x86_64-linux";
maxJobs = 4;
speedFactor = 1;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "sgx";
system = "x86_64-linux";
maxJobs = 4;
speedFactor = 1;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
} }
]; ];
@ -57,4 +38,11 @@ with lib.metacfg;
builders-use-substitutes = true; builders-use-substitutes = true;
}; };
# Ensure Nix is in PATH for SSH sessions
programs.fish.shellInit = ''
if [ -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]; then
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
fi
'';
} }