From 769dc917b5a8795393674416c3e21fed78b0a034 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 30 Apr 2025 00:29:08 +0100 Subject: [PATCH 01/48] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f317339..39bf5fb 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { From 18c9a5d62820a64b328911562de7a44cac861198 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 30 Apr 2025 23:34:17 +0100 Subject: [PATCH 02/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 39bf5fb..f8e132e 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745891836, - "narHash": "sha256-UJpwh09VKotfAoZRz6NNYZ1mepbhlkvYuoUSnMdUXCs=", + "lastModified": 1745978191, + "narHash": "sha256-DC9GhExyUbJKbBMgs+YA4fuUzOqUPuA6pR0mDI3MELk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "7387c46187fb2bbeb8bd1c94368a666e7bbd60c6", + "rev": "72da67da783674ef82032f4d5bcf686a7ccd8776", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { From 3aa4557971cb011ae2aa2b7bcfe5be9e6b9cf7e8 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 1 May 2025 21:48:06 +0100 Subject: [PATCH 03/48] add c# support to hx --- home-manager/development/helix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/development/helix.nix b/home-manager/development/helix.nix index 748eb2e..abda039 100644 --- a/home-manager/development/helix.nix +++ b/home-manager/development/helix.nix @@ -28,6 +28,8 @@ with lib; nixd nixpkgs-fmt biome + omnisharp-roslyn + netcoredbg ] ++ (with nodePackages;[ vscode-langservers-extracted typescript-language-server From 82cbe88da20a15773894b2c3abe038cfafa7b992 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 3 May 2025 00:34:26 +0100 Subject: [PATCH 04/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f8e132e..e019273 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745978191, - "narHash": "sha256-DC9GhExyUbJKbBMgs+YA4fuUzOqUPuA6pR0mDI3MELk=", + "lastModified": 1746151051, + "narHash": "sha256-zdPTKcfvZ/mL9urzbJuQVbsIJTNIKVmI9QEimb7xIAM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "72da67da783674ef82032f4d5bcf686a7ccd8776", + "rev": "31e24801a4d8eabd8c500237af732ca2ab305326", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745921652, - "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", + "rev": "bf3287dac860542719fe7554e21e686108716879", "type": "github" }, "original": { From e8ee2672c9c4ced80fb7a240d0e75c921cb2fbf6 Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 4 May 2025 00:49:09 +0100 Subject: [PATCH 05/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e019273..3960d25 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746151051, - "narHash": "sha256-zdPTKcfvZ/mL9urzbJuQVbsIJTNIKVmI9QEimb7xIAM=", + "lastModified": 1746237288, + "narHash": "sha256-WQtv6pHrqM74ziWX0mNAAea6MyTfM/4zAcBjNyGCHLE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "31e24801a4d8eabd8c500237af732ca2ab305326", + "rev": "4e52024534f1059a470fa64c654553097139802f", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { From 9c35d324b96792deca6ce4a5f0ebf8ab4f51a66c Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 5 May 2025 00:29:27 +0100 Subject: [PATCH 06/48] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3960d25..058f7f2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1745812220, - "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", + "lastModified": 1746390295, + "narHash": "sha256-TAfIbY/OWEn/3Kvq6L0NkN3AaMoIo2FPQLLj/W3+cI4=", "owner": "nix-community", "repo": "disko", - "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", + "rev": "7b636423586635985f91bd2f0f0cb0511c340627", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746237288, - "narHash": "sha256-WQtv6pHrqM74ziWX0mNAAea6MyTfM/4zAcBjNyGCHLE=", + "lastModified": 1746362215, + "narHash": "sha256-f1N9rw5GiQZjUuAd14z2yml9IPt16v+RrteLEYyCMvo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4e52024534f1059a470fa64c654553097139802f", + "rev": "5809c8500215e5a46ca2e3469daff8f2c0a80665", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746341346, + "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "lastModified": 1746301764, + "narHash": "sha256-5odz+NZszRya//Zd0P8h+sIwOnV35qJi+73f4I+iv1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bf3287dac860542719fe7554e21e686108716879", + "rev": "537ee98218704e21ea465251de512ab6bbb9012e", "type": "github" }, "original": { From f83178aa066184d440181a031fa4d6e93f4d2406 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 6 May 2025 23:52:38 +0100 Subject: [PATCH 07/48] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 058f7f2..327e291 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746390295, - "narHash": "sha256-TAfIbY/OWEn/3Kvq6L0NkN3AaMoIo2FPQLLj/W3+cI4=", + "lastModified": 1746411114, + "narHash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=", "owner": "nix-community", "repo": "disko", - "rev": "7b636423586635985f91bd2f0f0cb0511c340627", + "rev": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746362215, - "narHash": "sha256-f1N9rw5GiQZjUuAd14z2yml9IPt16v+RrteLEYyCMvo=", + "lastModified": 1746496684, + "narHash": "sha256-LwlZHnH65CZQUF9xAtKan4gHvZDVFf8qYfm7EmuVEHw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "5809c8500215e5a46ca2e3469daff8f2c0a80665", + "rev": "4511026b2fd29242372ea3936e2193062bf18705", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746341346, - "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", + "lastModified": 1746468201, + "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", + "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746301764, - "narHash": "sha256-5odz+NZszRya//Zd0P8h+sIwOnV35qJi+73f4I+iv1M=", + "lastModified": 1746422338, + "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "537ee98218704e21ea465251de512ab6bbb9012e", + "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "type": "github" }, "original": { From 8f5e6d6c107992b6836c21cf0f9f4632f2cad0d3 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 8 May 2025 00:26:42 +0100 Subject: [PATCH 08/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 327e291..fc7d3dd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746411114, - "narHash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=", + "lastModified": 1746638861, + "narHash": "sha256-fmphHNrbydmLECpXp2q9egb2IsqIjzvPboGkndGOye0=", "owner": "nix-community", "repo": "disko", - "rev": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3", + "rev": "78d6a1365cde90a479edc9ff7ea5dbd8b2e0cfb8", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746496684, - "narHash": "sha256-LwlZHnH65CZQUF9xAtKan4gHvZDVFf8qYfm7EmuVEHw=", + "lastModified": 1746583118, + "narHash": "sha256-ZZxKOjzztBd+NVbEUPPpw+GtObhNfMZHF9YNEN8wVoY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4511026b2fd29242372ea3936e2193062bf18705", + "rev": "5ce9c4adcc0098d86b6823fcb7926b4776d53e49", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746468201, - "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", + "lastModified": 1746621361, + "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", + "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746422338, - "narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { From ee264ae42db8b04104b8cf8fa0df56342feff1be Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 10 May 2025 01:52:06 +0100 Subject: [PATCH 09/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index fc7d3dd..b04c5f8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746638861, - "narHash": "sha256-fmphHNrbydmLECpXp2q9egb2IsqIjzvPboGkndGOye0=", + "lastModified": 1746729224, + "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "owner": "nix-community", "repo": "disko", - "rev": "78d6a1365cde90a479edc9ff7ea5dbd8b2e0cfb8", + "rev": "85555d27ded84604ad6657ecca255a03fd878607", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746583118, - "narHash": "sha256-ZZxKOjzztBd+NVbEUPPpw+GtObhNfMZHF9YNEN8wVoY=", + "lastModified": 1746755975, + "narHash": "sha256-4YQ/jq1vZrjngu0DDJmYaJW7Jh4IEPiHvrLvlBkvWmk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "5ce9c4adcc0098d86b6823fcb7926b4776d53e49", + "rev": "6e320439558ef494b83d6407b0c6f2218e47522a", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746621361, - "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", + "lastModified": 1746814339, + "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", + "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { From 3221c78b23ad4bfd16f452da947f14a1a8a459a1 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 12 May 2025 00:59:34 +0100 Subject: [PATCH 10/48] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b04c5f8..d856a88 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746755975, - "narHash": "sha256-4YQ/jq1vZrjngu0DDJmYaJW7Jh4IEPiHvrLvlBkvWmk=", + "lastModified": 1746929084, + "narHash": "sha256-G7Du6yZFcFHVGi4/epAfpLjtCq3t0S9A8rf08LQduG0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6e320439558ef494b83d6407b0c6f2218e47522a", + "rev": "90edb17263298c481f39d333fa2c887409f53f59", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1746810718, + "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", "type": "github" }, "original": { From 6046f90c812b83c4baecbc26743a9b3c9403e538 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 13 May 2025 00:22:48 +0100 Subject: [PATCH 11/48] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d856a88..dc5ee3b 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746814339, - "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", + "lastModified": 1747083103, + "narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", + "rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746810718, - "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { From 340a2ab92f02401eb59b2219b8ff2111cd32081a Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 14 May 2025 00:26:34 +0100 Subject: [PATCH 12/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index dc5ee3b..cb1c2b6 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746929084, - "narHash": "sha256-G7Du6yZFcFHVGi4/epAfpLjtCq3t0S9A8rf08LQduG0=", + "lastModified": 1747101711, + "narHash": "sha256-VJ6NkQAIXvNr+THN6TlNqlSY3lB1hv/o4yvfG82sHQI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "90edb17263298c481f39d333fa2c887409f53f59", + "rev": "1830b606ba0a839ab60f8465c23613620e9982de", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747083103, - "narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { From 72cbcd555194ad5814e3d8b491f2d1b1ce2cf905 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 14 May 2025 16:09:26 +0100 Subject: [PATCH 13/48] enable wireshark; add retry on systemd service; --- configuration/modules/gaming.nix | 3 --- devices/tuxedo/configuration.nix | 5 ++++- devices/tuxedo/home.nix | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index 86b25a7..e389497 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -14,8 +14,5 @@ }; programs.gamemode.enable = true; programs.gamescope.enable = true; - - # ensure users who need access to this have `cdrom` as `extraGroups` - # Wait for https://github.com/NixOS/nixpkgs/pull/397358 to be in stable to reenable programs.cdemu.enable = true; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 9d94750..de52e87 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -43,12 +43,15 @@ hardware.tuxedo-drivers.enable = true; programs.nix-ld.enable = true; + programs.wireshark = { + enable = true; + }; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.worble = { initialPassword = "password"; isNormalUser = true; - extraGroups = [ "wheel" "gamemode" "docker" "cdrom" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" "gamemode" "docker" "cdrom" "wireshark" ]; # Enable ‘sudo’ for the user. linger = true; }; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 51f9afc..9ae69e7 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -113,6 +113,8 @@ Unit = { Description = "rclone-media /mnt/HDD1/Videos/"; After = [ "network.target" "mnt-HDD1.mount" ]; + # Maybe? https://unix.stackexchange.com/questions/281650/systemd-unit-requiresmountsfor-vs-conditionpathisdirectory + # RequiresMountsFor = "/mnt/HDD1/Videos/"; }; Install = { @@ -120,6 +122,8 @@ }; Service = { + RestartSec = 10; + Restart = "on-failure"; Type = "exec"; ExecStart = "${pkgs.writeShellApplication { name = "rclone-media"; From 3466a8aba09c29dee098869c67117051d3b85a17 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 15 May 2025 00:08:52 +0100 Subject: [PATCH 14/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index cb1c2b6..c1912c9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746729224, - "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", + "lastModified": 1747226316, + "narHash": "sha256-INBPqK9ogSvw5Q9HJ5H7KI83v6Jc3goAnXN3b2F+eMU=", "owner": "nix-community", "repo": "disko", - "rev": "85555d27ded84604ad6657ecca255a03fd878607", + "rev": "490c0d6bd151e33caa5b2cf0ae37758234e947f6", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747101711, - "narHash": "sha256-VJ6NkQAIXvNr+THN6TlNqlSY3lB1hv/o4yvfG82sHQI=", + "lastModified": 1747188026, + "narHash": "sha256-NjiJ2Bce5F7dn+6ZGCenzIjem2+Ei4SDF78x2wHVlOY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1830b606ba0a839ab60f8465c23613620e9982de", + "rev": "083675f78e7de80e9fec1f621b8a508e58327131", "type": "github" }, "original": { From 218f8fa0e7aa692371019abefd8dd4138c00069a Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 16 May 2025 23:04:41 +0100 Subject: [PATCH 15/48] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c1912c9..9f916a1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1747226316, - "narHash": "sha256-INBPqK9ogSvw5Q9HJ5H7KI83v6Jc3goAnXN3b2F+eMU=", + "lastModified": 1747274630, + "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", "owner": "nix-community", "repo": "disko", - "rev": "490c0d6bd151e33caa5b2cf0ae37758234e947f6", + "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1747331121, + "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747188026, - "narHash": "sha256-NjiJ2Bce5F7dn+6ZGCenzIjem2+Ei4SDF78x2wHVlOY=", + "lastModified": 1747383427, + "narHash": "sha256-l7NPb4CiGfBS5VEwIsqThLlGrTRysxb+BMOgBJkizTk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "083675f78e7de80e9fec1f621b8a508e58327131", + "rev": "84fa86a820a365b12d7bbae3556ad737f7091af3", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747209494, + "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "5d736263df906c5da72ab0f372427814de2f52f8", "type": "github" }, "original": { From 32355dd7eec876211351d4e5cd98b5c550905b81 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 19 May 2025 22:17:31 +0100 Subject: [PATCH 16/48] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9f916a1..3e143bf 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1747274630, - "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "lastModified": 1747621015, + "narHash": "sha256-j0fo1rNxZvmFLMaE945UrbLJZAHTlQmq0/QMgOP4GTs=", "owner": "nix-community", "repo": "disko", - "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "rev": "cec44d77d9dacf0c91d3d51aff128fefabce06ee", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1747331121, - "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747383427, - "narHash": "sha256-l7NPb4CiGfBS5VEwIsqThLlGrTRysxb+BMOgBJkizTk=", + "lastModified": 1747620192, + "narHash": "sha256-CHaDJ6loOPA61gs6gXxybjRHEzakVbBaX8fcLFXYIAA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "84fa86a820a365b12d7bbae3556ad737f7091af3", + "rev": "bbf31d3238d455910c2187a671b164861611704e", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1747684167, + "narHash": "sha256-l6jbonaboCBlB8lCjBkrqgh2zEnvt6F3f4dOU/8CLd4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", + "lastModified": 1747485343, + "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", "type": "github" }, "original": { From aa9a9df476df23aab89e99dfcf5aff1e865e0ea8 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 20 May 2025 23:37:43 +0100 Subject: [PATCH 17/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3e143bf..3fd962f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1747621015, - "narHash": "sha256-j0fo1rNxZvmFLMaE945UrbLJZAHTlQmq0/QMgOP4GTs=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "cec44d77d9dacf0c91d3d51aff128fefabce06ee", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747620192, - "narHash": "sha256-CHaDJ6loOPA61gs6gXxybjRHEzakVbBaX8fcLFXYIAA=", + "lastModified": 1747706401, + "narHash": "sha256-GbNsCBxX2zMMckvlY7SPgUkxL9IaVT49p/gbdwqvyuE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bbf31d3238d455910c2187a671b164861611704e", + "rev": "d096058275e83be4133081e53dcd53e029a5ad80", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747684167, - "narHash": "sha256-l6jbonaboCBlB8lCjBkrqgh2zEnvt6F3f4dOU/8CLd4=", + "lastModified": 1747723695, + "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9", + "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1747676747, + "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", "type": "github" }, "original": { From ce675dd168ee5be6ca4110d41a87effb6b26bbad Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 21 May 2025 21:07:25 +0100 Subject: [PATCH 18/48] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3fd962f..b6863b5 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747706401, - "narHash": "sha256-GbNsCBxX2zMMckvlY7SPgUkxL9IaVT49p/gbdwqvyuE=", + "lastModified": 1747792810, + "narHash": "sha256-manhegvHyeFIEI9+IMp0L/OxeDvk1O2qdb+KjMnkM78=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "d096058275e83be4133081e53dcd53e029a5ad80", + "rev": "fb28e3221f0c052e94d956f44bbbc88ff4a8bbec", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1744139528, - "narHash": "sha256-ABIcmxzf8399pJzXqHzShXtzw7iC+zxjhOxp/qS0fQk=", + "lastModified": 1747781514, + "narHash": "sha256-ULo6jIIw9rwhSFqtHhJFjUCIBEX6J3cQM++qibgY6mU=", "owner": "numtide", "repo": "system-manager", - "rev": "803322102ed51f29c250d4bff2973625adc4a521", + "rev": "64ca98a15b5ac0485bcf2b5a07d12526b62f3029", "type": "github" }, "original": { From f34bf9c853a46d79f70482f331963994c76b1254 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 22 May 2025 10:29:57 +0100 Subject: [PATCH 19/48] update flake.lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index b6863b5..6af113a 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747792810, - "narHash": "sha256-manhegvHyeFIEI9+IMp0L/OxeDvk1O2qdb+KjMnkM78=", + "lastModified": 1747879218, + "narHash": "sha256-xyd0FxKNoHYTh7TDXbosZJvyiUrLJtU6Whv7Mytikh8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "fb28e3221f0c052e94d956f44bbbc88ff4a8bbec", + "rev": "c051e6137e9744cb559ff83084c6cb3d21044ab3", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -148,16 +148,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747676747, - "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", + "lastModified": 1747825515, + "narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", + "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1747781514, - "narHash": "sha256-ULo6jIIw9rwhSFqtHhJFjUCIBEX6J3cQM++qibgY6mU=", + "lastModified": 1747903970, + "narHash": "sha256-PFpAdjeBLpoY7v1v0GUeFuBWhEOiA187l0b2lmg117A=", "owner": "numtide", "repo": "system-manager", - "rev": "64ca98a15b5ac0485bcf2b5a07d12526b62f3029", + "rev": "94f1c8d9c562e96358dddddb8e276ba8ac16c9ae", "type": "github" }, "original": { From 64eae63335815fdfb3c146a2ca7dae82e44bc33f Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 22 May 2025 10:33:26 +0100 Subject: [PATCH 20/48] update flake.lock --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 6af113a..259e3ea 100644 --- a/flake.lock +++ b/flake.lock @@ -45,16 +45,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } From 95608f2bfabcd288206a51d6a1af1137e48531df Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 22 May 2025 15:18:30 +0100 Subject: [PATCH 21/48] add pipewire auto gain control block; update to 25.05; add wireshark gui; ryubing->stable; nerd-fonts new packaging; godot-mono->stable; update vscode --- configuration/base.nix | 24 +++++ devices/tuxedo/configuration.nix | 5 +- flake.nix | 12 ++- home-manager/base/fonts.nix | 2 +- home-manager/base/terminal.nix | 3 +- home-manager/development/games.nix | 20 ++-- home-manager/development/vscode.nix | 144 ++++++++++++++-------------- home-manager/gaming.nix | 4 +- 8 files changed, 123 insertions(+), 91 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index c3b2826..6adae77 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -51,6 +51,30 @@ services.pipewire = { enable = true; pulse.enable = true; + extraConfig.pipewire-pulse = { + "10-prevent-agc" = { + "pulse.rules" = [ + { + matches = [ + { "application.process.binary" = "chrome"; } + { "application.process.binary" = "Discord"; } + { "application.process.binary" = "teams"; } + { "application.process.binary" = "electron"; } + { "application.process.binary" = "skypeforlinux"; } + { "application.process.binary" = "telegram-desktop"; } + { "application.process.binary" = "vivaldi"; } + { "application.process.binary" = "chromium"; } + { "application.process.binary" = "zoom"; } + ]; + actions = { + quirks = [ + "block-source-volume" + ]; + }; + } + ]; + }; + }; }; services.fstrim.enable = true; diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index de52e87..eed5e4b 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = @@ -42,9 +42,10 @@ hardware.tuxedo-drivers.enable = true; - programs.nix-ld.enable = true; programs.wireshark = { enable = true; + package = pkgs.wireshark; + dumpcap.enable = true; }; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/flake.nix b/flake.nix index d377ddf..a8a895a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,21 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11?shallow=1"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1"; - nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions?shallow=1"; + # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] home-manager = { - url = "github:nix-community/home-manager/release-24.11?shallow=1"; + url = "github:nix-community/home-manager/release-25.05?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1"; disko = { url = "github:nix-community/disko?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions?shallow=1"; + system-manager = { url = "github:numtide/system-manager?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/base/fonts.nix b/home-manager/base/fonts.nix index ab2385c..4d10e48 100644 --- a/home-manager/base/fonts.nix +++ b/home-manager/base/fonts.nix @@ -5,7 +5,7 @@ liberation_ttf ubuntu-sans ubuntu-sans-mono - (nerdfonts.override { fonts = [ "SpaceMono" ]; }) + nerd-fonts.space-mono ]; fonts.fontconfig = { diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index d5e13f2..fe78aae 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -24,7 +24,7 @@ with lib; config = { home.packages = with pkgs;[ blesh - (nerdfonts.override { fonts = [ "SpaceMono" ]; }) + nerd-fonts.space-mono ]; programs = { @@ -95,6 +95,7 @@ with lib; enableBashIntegration = true; settings = { theme = "dracula"; + show_startup_tips = false; }; }; diff --git a/home-manager/development/games.nix b/home-manager/development/games.nix index 425a69a..f6273fc 100644 --- a/home-manager/development/games.nix +++ b/home-manager/development/games.nix @@ -1,17 +1,17 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { home.packages = with pkgs;[ jetbrains.rider # Remove when https://github.com/NixOS/nixpkgs/issues/393332 resolved (likely when 25.05 is out) - # godot-mono - (symlinkJoin { - name = "godot-mono"; - paths = [ inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".godot-mono ]; - buildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/godot4-mono --set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 - ''; - }) + godot-mono + # (symlinkJoin { + # name = "godot-mono"; + # paths = [ inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".godot-mono ]; + # buildInputs = [ makeWrapper ]; + # postBuild = '' + # wrapProgram $out/bin/godot4-mono --set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 + # ''; + # }) ]; } diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 8f70bb8..f9332cc 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -6,86 +6,88 @@ let in { home.packages = with pkgs;[ - (nerdfonts.override { fonts = [ "SpaceMono" ]; }) + nerd-fonts.space-mono ]; programs = { vscode = { enable = true; - package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".vscodium; + package = pkgs.vscodium; mutableExtensionsDir = false; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - extensions = with openvsx;[ - biomejs.biome - mkhl.direnv - dracula-theme.theme-dracula - dbaeumer.vscode-eslint - eamodio.gitlens - pkief.material-icon-theme - jnoortheen.nix-ide - esbenp.prettier-vscode - humao.rest-client - loriscro.super - mads-hartmann.bash-ide-vscode - foxundermoon.shell-format - dart-code.flutter - ms-vscode.wasm-wasi-core - rust-lang.rust-analyzer - tamasfe.even-better-toml - mikestead.dotenv - ] ++ [ vscode-marketplace.bradlc.vscode-tailwindcss ]; - userSettings = with pkgs;{ - "workbench.iconTheme" = "material-icon-theme"; - "window.titleBarStyle" = "custom"; - "workbench.colorTheme" = "Dracula Theme"; - "explorer.compactFolders" = false; - "chat.commandCenter.enabled" = false; + profiles.default = { + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + extensions = (with openvsx;[ + biomejs.biome + mkhl.direnv + dracula-theme.theme-dracula + dbaeumer.vscode-eslint + eamodio.gitlens + pkief.material-icon-theme + jnoortheen.nix-ide + esbenp.prettier-vscode + humao.rest-client + loriscro.super + mads-hartmann.bash-ide-vscode + foxundermoon.shell-format + dart-code.flutter + ms-vscode.wasm-wasi-core + rust-lang.rust-analyzer + tamasfe.even-better-toml + mikestead.dotenv + ]) ++ (with vscode-marketplace;[ bradlc.vscode-tailwindcss ]); + userSettings = with pkgs;{ + "workbench.iconTheme" = "material-icon-theme"; + "window.titleBarStyle" = "custom"; + "workbench.colorTheme" = "Dracula Theme"; + "explorer.compactFolders" = false; + "chat.commandCenter.enabled" = false; - "editor.fontFamily" = "'SpaceMono Nerd Font', 'monospace', monospace"; - "editor.fontSize" = 16; - "editor.formatOnSave" = true; - "editor.codeActionsOnSave" = { - "source.organizeImports" = "always"; - }; - - "files.autoSave" = "onWindowChange"; - - "[typescript]" = { - "editor.defaultFormatter" = "biomejs.biome"; - }; - "[javascript]" = { - "editor.defaultFormatter" = "biomejs.biome"; - }; - "[javascriptreact]" = { - "editor.defaultFormatter" = "biomejs.biome"; - }; - "[typescriptreact]" = { - "editor.defaultFormatter" = "biomejs.biome"; - }; - "[json]" = { - "editor.defaultFormatter" = "biomejs.biome"; - }; - "[jsonc]" = { - "editor.defaultFormatter" = "biomejs.biome"; - }; - "biome.lsp.bin" = "${biome}/bin/biome"; - "biome.requireConfigFile" = true; - - "typescript.preferences.preferTypeOnlyAutoImports" = true; - - "nix.enableLanguageServer" = true; # Enable LSP. - "nix.serverPath" = "${nixd}/bin/nixd"; # The path to the LSP server executable. - "nix.serverSettings" = { - nixd = { - formatting.command = [ "${nixpkgs-fmt}/bin/nixpkgs-fmt" ]; + "editor.fontFamily" = "'SpaceMono Nerd Font', 'monospace', monospace"; + "editor.fontSize" = 16; + "editor.formatOnSave" = true; + "editor.codeActionsOnSave" = { + "source.organizeImports" = "always"; }; + + "files.autoSave" = "onWindowChange"; + + "[typescript]" = { + "editor.defaultFormatter" = "biomejs.biome"; + }; + "[javascript]" = { + "editor.defaultFormatter" = "biomejs.biome"; + }; + "[javascriptreact]" = { + "editor.defaultFormatter" = "biomejs.biome"; + }; + "[typescriptreact]" = { + "editor.defaultFormatter" = "biomejs.biome"; + }; + "[json]" = { + "editor.defaultFormatter" = "biomejs.biome"; + }; + "[jsonc]" = { + "editor.defaultFormatter" = "biomejs.biome"; + }; + "biome.lsp.bin" = "${biome}/bin/biome"; + "biome.requireConfigFile" = true; + + "typescript.preferences.preferTypeOnlyAutoImports" = true; + + "nix.enableLanguageServer" = true; # Enable LSP. + "nix.serverPath" = "${nixd}/bin/nixd"; # The path to the LSP server executable. + "nix.serverSettings" = { + nixd = { + formatting.command = [ "${nixpkgs-fmt}/bin/nixpkgs-fmt" ]; + }; + }; + + "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck"; + "shellformat.path" = "${shfmt}/bin/shfmt"; + + "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ]; }; - - "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck"; - "shellformat.path" = "${shfmt}/bin/shfmt"; - - "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ]; }; }; }; diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index a3eaae4..5f1e868 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -1,10 +1,10 @@ -{ inputs, pkgs, ... }: +{ pkgs, ... }: { home.packages = with pkgs;[ steamguard-cli bottles - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryubing + ryubing mgba scanmem heroic From fc60f584cf64ff9931c3e0e364abfb104abf9f48 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 22 May 2025 15:18:52 +0100 Subject: [PATCH 22/48] remove unused godot code --- home-manager/development/games.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/home-manager/development/games.nix b/home-manager/development/games.nix index f6273fc..b3dace4 100644 --- a/home-manager/development/games.nix +++ b/home-manager/development/games.nix @@ -3,15 +3,6 @@ { home.packages = with pkgs;[ jetbrains.rider - # Remove when https://github.com/NixOS/nixpkgs/issues/393332 resolved (likely when 25.05 is out) godot-mono - # (symlinkJoin { - # name = "godot-mono"; - # paths = [ inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".godot-mono ]; - # buildInputs = [ makeWrapper ]; - # postBuild = '' - # wrapProgram $out/bin/godot4-mono --set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 - # ''; - # }) ]; } From 7da24cbbfb7301db645fb706538913b390853ae8 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 22 May 2025 22:19:43 +0100 Subject: [PATCH 23/48] enable gamescope --- configuration/modules/gaming.nix | 5 +++-- home-manager/gaming.nix | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index e389497..6aeef16 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -8,11 +8,12 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - #gamescopeSession.enable = true; + gamescopeSession.enable = true; protontricks.enable = true; extraCompatPackages = [ pkgs.proton-ge-bin ]; }; programs.gamemode.enable = true; programs.gamescope.enable = true; - programs.cdemu.enable = true; + + programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work } diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index 5f1e868..2ad766c 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -7,6 +7,10 @@ ryubing mgba scanmem - heroic + (heroic.override { + extraPkgs = pkgs: [ + pkgs.gamescope + ]; + }) ]; } From 73325a848c3a79461f415fd279050d92be4f705e Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 26 May 2025 21:32:46 +0100 Subject: [PATCH 24/48] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 259e3ea..1c7678b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747879218, - "narHash": "sha256-xyd0FxKNoHYTh7TDXbosZJvyiUrLJtU6Whv7Mytikh8=", + "lastModified": 1748225039, + "narHash": "sha256-Lvl26mCEatC5akRHywuXkYM6ZKc7R5T9m6u7rBPtNQw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c051e6137e9744cb559ff83084c6cb3d21044ab3", + "rev": "cde730cb9dc2759104d7c8c27cb36d73189be1e2", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747825515, - "narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1747903970, - "narHash": "sha256-PFpAdjeBLpoY7v1v0GUeFuBWhEOiA187l0b2lmg117A=", + "lastModified": 1748252092, + "narHash": "sha256-6nL55wvV7SthEXaXDiQo8xxkxQLAVcNBU21YJ7GJLm8=", "owner": "numtide", "repo": "system-manager", - "rev": "94f1c8d9c562e96358dddddb8e276ba8ac16c9ae", + "rev": "c6850451ef769fd03d0ad5474f928b916aa23775", "type": "github" }, "original": { From 57901ae14e632bd1df733776faedb3cf151067a1 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 27 May 2025 23:24:06 +0100 Subject: [PATCH 25/48] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1c7678b..0bb11b9 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748225039, - "narHash": "sha256-Lvl26mCEatC5akRHywuXkYM6ZKc7R5T9m6u7rBPtNQw=", + "lastModified": 1748311254, + "narHash": "sha256-Xw7OtjL2y7m9rjbYAX1xluevyWY+fvjdFFM4MfiVk5Y=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "cde730cb9dc2759104d7c8c27cb36d73189be1e2", + "rev": "0e0e608563707c9ee3919b3d1cab83beef984ad7", "type": "github" }, "original": { From a04a6b81f121c4ce29e55960b424ef3c45f371e5 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 28 May 2025 17:26:04 +0100 Subject: [PATCH 26/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0bb11b9..a9b574c 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748311254, - "narHash": "sha256-Xw7OtjL2y7m9rjbYAX1xluevyWY+fvjdFFM4MfiVk5Y=", + "lastModified": 1748397853, + "narHash": "sha256-tudGoP5caIJ5TzkV6wnsmUk7Spx21oWMKpkmPbjRNZc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0e0e608563707c9ee3919b3d1cab83beef984ad7", + "rev": "ac4fc8eb9a1ee5eeb3c0a30f57652e4c5428d3a5", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { From 7767ff77ba919a3f5c54ddc0fdfde4b706b2e017 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 28 May 2025 17:44:07 +0100 Subject: [PATCH 27/48] fix emoji on firefox; use unstable joplin --- configuration/base/fonts.nix | 15 +++++++++------ flake.nix | 4 ++-- home-manager/base.nix | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/configuration/base/fonts.nix b/configuration/base/fonts.nix index 70a7003..7b599f4 100644 --- a/configuration/base/fonts.nix +++ b/configuration/base/fonts.nix @@ -1,12 +1,15 @@ { pkgs, ... }: { - fonts.enableDefaultPackages = true; - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk-sans - noto-fonts-cjk-serif - ]; + fonts = { + enableDefaultPackages = true; + fontconfig.useEmbeddedBitmaps = true; + packages = with pkgs; [ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + ]; + }; # Select internationalisation properties. i18n = { diff --git a/flake.nix b/flake.nix index a8a895a..a26382f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; - # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] + home-manager = { url = "github:nix-community/home-manager/release-25.05?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/base.nix b/home-manager/base.nix index 7ead140..ac8d987 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, inputs, ... }: { imports = [ @@ -13,7 +13,7 @@ keepassxc qbittorrent libreoffice-qt - joplin-desktop + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop # comms teamspeak_client From 0e6929eeed9bd081a3e0a069e2250fd24f58f4d8 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 28 May 2025 23:13:45 +0100 Subject: [PATCH 28/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a9b574c..697fe88 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1748226808, - "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", + "lastModified": 1748455876, + "narHash": "sha256-4n9uDN54LSgN7WVEzj2r0nBthV5m0uFi9BgiD0dfS54=", "owner": "nix-community", "repo": "home-manager", - "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", + "rev": "529d2aac542a42c57d4b765501ace564b07e3d99", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748162331, - "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { From ae21fe1426971c3ad86b192ebb418db8bc9ed048 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 29 May 2025 23:21:44 +0100 Subject: [PATCH 29/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 697fe88..08c7f91 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1748455876, - "narHash": "sha256-4n9uDN54LSgN7WVEzj2r0nBthV5m0uFi9BgiD0dfS54=", + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", "owner": "nix-community", "repo": "home-manager", - "rev": "529d2aac542a42c57d4b765501ace564b07e3d99", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748397853, - "narHash": "sha256-tudGoP5caIJ5TzkV6wnsmUk7Spx21oWMKpkmPbjRNZc=", + "lastModified": 1748551665, + "narHash": "sha256-FvDJCi1j918d7ta12I0O+Q3DtxsJJqUExBfNBr2N7pY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ac4fc8eb9a1ee5eeb3c0a30f57652e4c5428d3a5", + "rev": "b6d2ce6c8141ad582cdc254c0187c304019636d3", "type": "github" }, "original": { From f9e672cb8fae64cbe008dbb448d048b645f94808 Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 30 May 2025 10:50:34 +0100 Subject: [PATCH 30/48] remove tux since its broken for now; remove unneeded vscode exts; use initextraa instead of bashrc --- devices/tuxedo/configuration.nix | 2 +- home-manager/base/terminal.nix | 2 +- home-manager/development/vscode.nix | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index eed5e4b..43fe757 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -40,7 +40,7 @@ ]; }; - hardware.tuxedo-drivers.enable = true; + # hardware.tuxedo-drivers.enable = true; programs.wireshark = { enable = true; diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index fe78aae..c9f8d02 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -30,7 +30,7 @@ with lib; programs = { bash = { enable = true; - bashrcExtra = '' + initExtra = '' source $(blesh-share)/ble.sh bleopt canvas_winch_action=redraw-prev ''; diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index f9332cc..4f2473c 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -22,15 +22,12 @@ in mkhl.direnv dracula-theme.theme-dracula dbaeumer.vscode-eslint - eamodio.gitlens pkief.material-icon-theme jnoortheen.nix-ide esbenp.prettier-vscode - humao.rest-client loriscro.super mads-hartmann.bash-ide-vscode foxundermoon.shell-format - dart-code.flutter ms-vscode.wasm-wasi-core rust-lang.rust-analyzer tamasfe.even-better-toml From c1ad79003dd7325e8faf699bc7ac40978644f50c Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 30 May 2025 23:46:51 +0100 Subject: [PATCH 31/48] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 08c7f91..c1ca3f0 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1748487945, - "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", + "lastModified": 1748627093, + "narHash": "sha256-1hFy+bZRZoYb7RaUXsW+9YFtjjFrQpschd8qZpy9org=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", + "rev": "afe9ce8b2014fa1230ade38bf07156cdcef63658", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748551665, - "narHash": "sha256-FvDJCi1j918d7ta12I0O+Q3DtxsJJqUExBfNBr2N7pY=", + "lastModified": 1748570411, + "narHash": "sha256-OU1Jzg0y2t6VfISh2wiXx4elwx8iV++KKStmaQLceXc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b6d2ce6c8141ad582cdc254c0187c304019636d3", + "rev": "fbaeabcfec7ac4e583461c923f360b6da7836f16", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748302896, - "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { From f72b5ef8a84fd3d01257803f1a258c3d823a6ad0 Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 1 Jun 2025 21:38:43 +0100 Subject: [PATCH 32/48] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c1ca3f0..543c992 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1748627093, - "narHash": "sha256-1hFy+bZRZoYb7RaUXsW+9YFtjjFrQpschd8qZpy9org=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "afe9ce8b2014fa1230ade38bf07156cdcef63658", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748570411, - "narHash": "sha256-OU1Jzg0y2t6VfISh2wiXx4elwx8iV++KKStmaQLceXc=", + "lastModified": 1748744745, + "narHash": "sha256-kcj58eYic+yLX/KjtHEOmn6lVnCRwL1IfRGnb8aHprE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "fbaeabcfec7ac4e583461c923f360b6da7836f16", + "rev": "c008ed9dd78efdeda5e9d5bb835c785e600791f6", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { From 2b1fa4df5b3e2d3ee1d1b124d425b0e5ac00c204 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 2 Jun 2025 13:26:56 +0100 Subject: [PATCH 33/48] add fish --- configuration/base.nix | 4 ++++ devices/tuxedo/home.nix | 1 + home-manager/base/terminal.nix | 18 ++++++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index 6adae77..5efebfc 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -91,11 +91,15 @@ }; services.flatpak.enable = true; + programs.bash.blesh.enable = true; + programs.fish.enable = true; + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ # utils + uutils-coreutils-noprefix vim curl inetutils diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 9ae69e7..cce3ee0 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -79,6 +79,7 @@ gpu-api = "vulkan"; hwdec = "vulkan"; screenshot-directory = "/mnt/HDD1/Pictures/"; + # screenshot-directory = "~/Pictures/"; screenshot-template = "%F/%F_snapshot_%P"; glsl-shaders = "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; }; diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index c9f8d02..3647874 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -31,8 +31,20 @@ with lib; bash = { enable = true; initExtra = '' - source $(blesh-share)/ble.sh - bleopt canvas_winch_action=redraw-prev + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + # source $(blesh-share)/ble.sh + # bleopt canvas_winch_action=redraw-prev + ''; + }; + + fish = { + enable = true; + interactiveShellInit = '' + set fish_greeting # Disable greeting ''; }; @@ -93,6 +105,7 @@ with lib; zellij = { enable = true; enableBashIntegration = true; + enableFishIntegration = true; settings = { theme = "dracula"; show_startup_tips = false; @@ -120,6 +133,7 @@ with lib; eza = { enable = true; enableBashIntegration = true; + enableFishIntegration = true; git = true; extraOptions = [ "--color=auto" From 2c1dfb7eb8e4117cb318d89eaab40cf4d7ebebd4 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 2 Jun 2025 13:27:49 +0100 Subject: [PATCH 34/48] remove manual blesh in favor of bash.blesh.enable --- home-manager/base/terminal.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index 3647874..9e59f09 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -23,7 +23,6 @@ with lib; config = { home.packages = with pkgs;[ - blesh nerd-fonts.space-mono ]; @@ -36,8 +35,6 @@ with lib; shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" exec ${pkgs.fish}/bin/fish $LOGIN_OPTION fi - # source $(blesh-share)/ble.sh - # bleopt canvas_winch_action=redraw-prev ''; }; From 5159cf50c96f0c72e110d13c1f6a290ea0a60aaf Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 2 Jun 2025 14:03:19 +0100 Subject: [PATCH 35/48] add shell command to fix nix when it gets in a tizz; add nix-index so fish no longer throws a wobbly when you call a commaand that doesnt exist; remove shell format since bash ide can now use it; add packages for gamescope to steam --- configuration/modules/gaming.nix | 14 ++++++++++++++ devices/starlite/configuration.nix | 3 +++ devices/tuxedo/configuration.nix | 4 +++- fix-nix.sh | 3 +++ flake.lock | 21 +++++++++++++++++++++ flake.nix | 12 ++++++++++-- home-manager/development/vscode.nix | 3 +-- 7 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 fix-nix.sh diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index 6aeef16..f0e15eb 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -11,6 +11,20 @@ gamescopeSession.enable = true; protontricks.enable = true; extraCompatPackages = [ pkgs.proton-ge-bin ]; + package = pkgs.steam.override { + extraPkgs = pkgs': with pkgs'; [ + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib # Provides libstdc++.so.6 + libkrb5 + keyutils + ]; + }; }; programs.gamemode.enable = true; programs.gamescope.enable = true; diff --git a/devices/starlite/configuration.nix b/devices/starlite/configuration.nix index b2889f3..7742eda 100644 --- a/devices/starlite/configuration.nix +++ b/devices/starlite/configuration.nix @@ -29,6 +29,9 @@ home-manager.useGlobalPkgs = true; home-manager = { extraSpecialArgs = { inherit inputs; }; + sharedModules = [ + inputs.nix-index-database.hmModules.nix-index + ]; users = { "worble" = import ./home.nix; }; diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 43fe757..c15bf34 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -59,7 +59,9 @@ home-manager = { useGlobalPkgs = true; extraSpecialArgs = { inherit inputs; }; - sharedModules = [ ]; + sharedModules = [ + inputs.nix-index-database.hmModules.nix-index + ]; users = { "worble" = import ./home.nix; }; diff --git a/fix-nix.sh b/fix-nix.sh new file mode 100644 index 0000000..95ca8de --- /dev/null +++ b/fix-nix.sh @@ -0,0 +1,3 @@ +# Occasionally the nix store can get into a tizz and all updates will fail +# This should fix that +sudo nix-store --repair --verify --check-contents diff --git a/flake.lock b/flake.lock index 543c992..3596249 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748751003, + "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nix-system-graphics": { "inputs": { "nixpkgs": [ @@ -166,6 +186,7 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", + "nix-index-database": "nix-index-database", "nix-system-graphics": "nix-system-graphics", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index a26382f..ef3aaa1 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-index-database = { + url = "github:nix-community/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master?shallow=1"; disko = { url = "github:nix-community/disko?shallow=1"; @@ -26,7 +31,7 @@ }; }; - outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, ... }@inputs: + outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -51,7 +56,10 @@ packages.${system}.homeConfigurations.deck = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { inherit inputs; }; - modules = [ ./devices/deck/home.nix ]; + modules = [ + nix-index-database.hmModules.nix-index + ./devices/deck/home.nix + ]; }; systemConfigs.deck = system-manager.lib.makeSystemConfig { modules = [ diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 4f2473c..2d2f5b1 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -27,7 +27,6 @@ in esbenp.prettier-vscode loriscro.super mads-hartmann.bash-ide-vscode - foxundermoon.shell-format ms-vscode.wasm-wasi-core rust-lang.rust-analyzer tamasfe.even-better-toml @@ -81,7 +80,7 @@ in }; "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck"; - "shellformat.path" = "${shfmt}/bin/shfmt"; + "bashIde.shfmt.path" = "${shfmt}/bin/shfmt"; "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ]; }; From 347cc444b9aa5d035390699d8331d551ec581fc7 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 3 Jun 2025 00:17:04 +0100 Subject: [PATCH 36/48] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3596249..b494776 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1748832438, + "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748744745, - "narHash": "sha256-kcj58eYic+yLX/KjtHEOmn6lVnCRwL1IfRGnb8aHprE=", + "lastModified": 1748830010, + "narHash": "sha256-ogPMNqKzT1gXoP7MsmKzxZPaK+oytbj4h7AlW9HZJ/M=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c008ed9dd78efdeda5e9d5bb835c785e600791f6", + "rev": "bb2066fbf770f0385864a9005c88e40533ffce1d", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748437600, - "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { From 7acbaa0a6d72e2ed3b10c23c4f14dd4c527a3dfc Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 3 Jun 2025 14:12:14 +0100 Subject: [PATCH 37/48] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b494776..e3c7e36 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748830010, - "narHash": "sha256-ogPMNqKzT1gXoP7MsmKzxZPaK+oytbj4h7AlW9HZJ/M=", + "lastModified": 1748916419, + "narHash": "sha256-xeIzrAq+HNCp6Tx+lNfoty4D3zzfqSgQGgeTHXb2zGk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bb2066fbf770f0385864a9005c88e40533ffce1d", + "rev": "1599b5b404e6bbdaf088f4c8872954146f8a19bb", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748708770, - "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", + "lastModified": 1748889542, + "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a59eb7800787c926045d51b70982ae285faa2346", + "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", "type": "github" }, "original": { From 55a3afc085e1e6ca2bf3577c8d0180ed6a9df12f Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 4 Jun 2025 23:31:12 +0100 Subject: [PATCH 38/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e3c7e36..9821c12 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748916419, - "narHash": "sha256-xeIzrAq+HNCp6Tx+lNfoty4D3zzfqSgQGgeTHXb2zGk=", + "lastModified": 1749002682, + "narHash": "sha256-v9K6RyPF/+4r/YJhjEH8y07VWE6Vj7Vl88E/K5m/uJ0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1599b5b404e6bbdaf088f4c8872954146f8a19bb", + "rev": "46eb9c16d8ccfedf8bc648be03f9b2993fe3c994", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748942041, - "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", + "lastModified": 1749056381, + "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", + "rev": "029bd66faa180e11262dd1bc2732254c33415f52", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748889542, - "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { From 60b79b65b5eb4969e696c7c26935ab8e58f6c7e7 Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 6 Jun 2025 00:17:28 +0100 Subject: [PATCH 39/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9821c12..60965c8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1748832438, - "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", + "lastModified": 1749147380, + "narHash": "sha256-UvCI5f1qD9l1fCQkoG/kJI0yNjDQIiJaN7gkve8fmII=", "owner": "nix-community", "repo": "disko", - "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", + "rev": "d74db625a5cf3f46cf8fa545d6ef10bd3463ea07", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749002682, - "narHash": "sha256-v9K6RyPF/+4r/YJhjEH8y07VWE6Vj7Vl88E/K5m/uJ0=", + "lastModified": 1749088964, + "narHash": "sha256-l0nq/gnL6x+hBPuzNEBLFotPzwGyqUcPiwcmGcRyW0A=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "46eb9c16d8ccfedf8bc648be03f9b2993fe3c994", + "rev": "665c9161807e8885ee41391ac3c8cbf9f2d123cd", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749024892, - "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", + "lastModified": 1749086602, + "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", + "rev": "4792576cb003c994bd7cc1edada3129def20b27d", "type": "github" }, "original": { From e192b9401d780bb5f1b581f99d9353fd5a9324c6 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 7 Jun 2025 00:40:41 +0100 Subject: [PATCH 40/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 60965c8..0e866f4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1749147380, - "narHash": "sha256-UvCI5f1qD9l1fCQkoG/kJI0yNjDQIiJaN7gkve8fmII=", + "lastModified": 1749200714, + "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", "owner": "nix-community", "repo": "disko", - "rev": "d74db625a5cf3f46cf8fa545d6ef10bd3463ea07", + "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749088964, - "narHash": "sha256-l0nq/gnL6x+hBPuzNEBLFotPzwGyqUcPiwcmGcRyW0A=", + "lastModified": 1749175351, + "narHash": "sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "665c9161807e8885ee41391ac3c8cbf9f2d123cd", + "rev": "832bd4f14d5a64df323b456132c33c572e7f0c75", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749056381, - "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "029bd66faa180e11262dd1bc2732254c33415f52", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { From c2472925bf6b47ae768ad153c87b6d7a29fac80c Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 8 Jun 2025 00:09:59 +0100 Subject: [PATCH 41/48] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0e866f4..f58d491 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749175351, - "narHash": "sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok=", + "lastModified": 1749261690, + "narHash": "sha256-cx/BC96wW+29joUehjHeERqEPxohHlMmPwYXXVORPZk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "832bd4f14d5a64df323b456132c33c572e7f0c75", + "rev": "5af3052a092b3b097f243d70a66b0484e000b423", "type": "github" }, "original": { From 9fed42aba13911efc44f4a7e5d16c5b86f6b3dd4 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 9 Jun 2025 22:39:16 +0100 Subject: [PATCH 42/48] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f58d491..651ea21 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1749200714, - "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", + "lastModified": 1749436314, + "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", "owner": "nix-community", "repo": "disko", - "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", + "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1748751003, - "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", + "lastModified": 1749355504, + "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", + "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749261690, - "narHash": "sha256-cx/BC96wW+29joUehjHeERqEPxohHlMmPwYXXVORPZk=", + "lastModified": 1749434933, + "narHash": "sha256-2udCN6acwM4catZDyh5d7pc6UEMB+UHZ48JH7505pTk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "5af3052a092b3b097f243d70a66b0484e000b423", + "rev": "cad31acd5498943c472f21795b27550df647f00b", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", + "lastModified": 1749237914, + "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", "type": "github" }, "original": { From 56467e6f40a629b78d17354cc534dc187d8e57f9 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 10 Jun 2025 23:28:00 +0100 Subject: [PATCH 43/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 651ea21..52871af 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749434933, - "narHash": "sha256-2udCN6acwM4catZDyh5d7pc6UEMB+UHZ48JH7505pTk=", + "lastModified": 1749521131, + "narHash": "sha256-ezZ15tLA2L+rmtn39dKLFW/UM2xlksC61V12blulpjE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "cad31acd5498943c472f21795b27550df647f00b", + "rev": "299b2aa650d32310153746135b6a84a6c4de9c21", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749237914, - "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", + "lastModified": 1749494155, + "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", + "rev": "88331c17ba434359491e8d5889cce872464052c2", "type": "github" }, "original": { From 730bfc0d28b6f33c2f17d98cdcacc14c566aa5fb Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 12 Jun 2025 23:41:23 +0100 Subject: [PATCH 44/48] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 52871af..045268b 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749521131, - "narHash": "sha256-ezZ15tLA2L+rmtn39dKLFW/UM2xlksC61V12blulpjE=", + "lastModified": 1749693852, + "narHash": "sha256-ERtalZOvXvhb/ZWrjOGgUVkULUZ197n//cnJz436G6M=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "299b2aa650d32310153746135b6a84a6c4de9c21", + "rev": "8219bf5f17f590d277ec7054b657b1370c7b7fc0", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749494155, - "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88331c17ba434359491e8d5889cce872464052c2", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { From 5a63b14c5be4ffca1c11df5fb54a8796937dd21e Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 16 Jun 2025 00:06:24 +0100 Subject: [PATCH 45/48] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 045268b..85a35fb 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1749355504, - "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", + "lastModified": 1749960154, + "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", + "rev": "424a40050cdc5f494ec45e46462d288f08c64475", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749693852, - "narHash": "sha256-ERtalZOvXvhb/ZWrjOGgUVkULUZ197n//cnJz436G6M=", + "lastModified": 1749953646, + "narHash": "sha256-NwuPVQfAbrq46nAtjz9MIQ3XLK6f9OLzgY8hJlQKS/8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "8219bf5f17f590d277ec7054b657b1370c7b7fc0", + "rev": "459503794a816b2d9038fc0c9181805acf45bafb", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1749832440, + "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "db030f62a449568345372bd62ed8c5be4824fa49", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1749857119, + "narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", "type": "github" }, "original": { From 6981f2cee254d8a553a7a2e4a5e29611bfc00459 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 16 Jun 2025 22:34:22 +0100 Subject: [PATCH 46/48] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 85a35fb..c42a6dc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1749436314, - "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", + "lastModified": 1750040002, + "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "owner": "nix-community", "repo": "disko", - "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", + "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749953646, - "narHash": "sha256-NwuPVQfAbrq46nAtjz9MIQ3XLK6f9OLzgY8hJlQKS/8=", + "lastModified": 1750039657, + "narHash": "sha256-Vrh5PDskpJ2kEumHbncffZxWQGr2pK88oTOFtBUWG74=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "459503794a816b2d9038fc0c9181805acf45bafb", + "rev": "54ce2a0e930383535c632aad39b22205fa430be0", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749832440, - "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "db030f62a449568345372bd62ed8c5be4824fa49", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749857119, - "narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=", + "lastModified": 1750005367, + "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98", + "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", "type": "github" }, "original": { From 55c0df89fd633a6477b17207607b897cde8a2b36 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 17 Jun 2025 19:20:29 +0100 Subject: [PATCH 47/48] make nix index shallow readd distrobox add ts6-client setup vscode for python --- configuration/modules/gaming.nix | 10 ++++++++-- devices/tuxedo/configuration.nix | 16 ++++++++++++++++ devices/tuxedo/home.nix | 4 +++- flake.nix | 2 +- home-manager/base.nix | 2 -- home-manager/base/fonts.nix | 2 +- home-manager/development/vscode.nix | 8 +++++++- 7 files changed, 36 insertions(+), 8 deletions(-) diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index f0e15eb..f5a2326 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -4,6 +4,14 @@ hardware.graphics.enable32Bit = true; # For 32 bit applications hardware.steam-hardware.enable = true; + programs.gamemode.enable = true; + programs.gamescope = { + enable = true; + # capSysNice = true; + # args = [ + # "-H 1080" + # ]; + }; programs.steam = { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play @@ -26,8 +34,6 @@ ]; }; }; - programs.gamemode.enable = true; - programs.gamescope.enable = true; programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index c15bf34..99f27d9 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -20,6 +20,18 @@ networking.hostName = "tuxedo"; # Define your hostname. + # one day i will fix the fullscreen issue + # https://community.frame.work/t/fullscreen-games-freeze-on-plasma-6-with-dgpu/61088/9 + # https://community.frame.work/t/bug-psa-gpu-bug-causes-crashes-on-kde-plasma/58133/4 + # https://www.reddit.com/r/archlinux/comments/1gzy0xd/amdgpu_regression_on_kernel_612_choppy/ + # https://forum.manjaro.org/t/unstable-update-october-2024-edition/168715/44 + boot.kernelParams = [ + # "amdgpu.dcdebugmask=0x410" + # or amdgpu.dcdebugmask=0x010 + # or amdgpu.dcdebugmask=0x400 + # or both amdgpu.dcdebugmask=0x410 + ]; + boot.extraModprobeConfig = '' options iwlwifi 11n_disable=8 power_save=0 options iwlmvm power_scheme=1 @@ -48,6 +60,10 @@ dumpcap.enable = true; }; + environment.systemPackages = with pkgs;[ + distrobox + ]; + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.worble = { initialPassword = "password"; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index cce3ee0..77af4dc 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -29,6 +29,7 @@ # comms teams-for-linux + teamspeak6-client # media jellyfin-media-player @@ -76,7 +77,8 @@ config = { profile = "gpu-hq"; vo = "gpu-next"; - gpu-api = "vulkan"; + gpu-api = "opengl"; + gpu-context = "wayland"; hwdec = "vulkan"; screenshot-directory = "/mnt/HDD1/Pictures/"; # screenshot-directory = "~/Pictures/"; diff --git a/flake.nix b/flake.nix index ef3aaa1..cfd95ad 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; nix-index-database = { - url = "github:nix-community/nix-index-database"; + url = "github:nix-community/nix-index-database?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/base.nix b/home-manager/base.nix index ac8d987..8605803 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -56,8 +56,6 @@ } ); config = { - video-sync = "display-resample"; - interpolation = "yes"; screenshot-directory = "~/Pictures/"; screenshot-template = "%F/%F_snapshot_%P"; }; diff --git a/home-manager/base/fonts.nix b/home-manager/base/fonts.nix index 4d10e48..243d3ba 100644 --- a/home-manager/base/fonts.nix +++ b/home-manager/base/fonts.nix @@ -2,10 +2,10 @@ { home.packages = with pkgs;[ - liberation_ttf ubuntu-sans ubuntu-sans-mono nerd-fonts.space-mono + corefonts ]; fonts.fontconfig = { diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 2d2f5b1..b58146f 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -31,6 +31,9 @@ in rust-lang.rust-analyzer tamasfe.even-better-toml mikestead.dotenv + ms-python.python + ms-python.debugpy + charliermarsh.ruff ]) ++ (with vscode-marketplace;[ bradlc.vscode-tailwindcss ]); userSettings = with pkgs;{ "workbench.iconTheme" = "material-icon-theme"; @@ -38,6 +41,9 @@ in "workbench.colorTheme" = "Dracula Theme"; "explorer.compactFolders" = false; "chat.commandCenter.enabled" = false; + "terminal.integrated.automationProfile.linux" = { + "path" = "/bin/sh"; + }; "editor.fontFamily" = "'SpaceMono Nerd Font', 'monospace', monospace"; "editor.fontSize" = 16; @@ -67,7 +73,7 @@ in "editor.defaultFormatter" = "biomejs.biome"; }; "biome.lsp.bin" = "${biome}/bin/biome"; - "biome.requireConfigFile" = true; + #"biome.requireConfigFile" = true; "typescript.preferences.preferTypeOnlyAutoImports" = true; From ed349bd4e6f56043a44e9d1cf136e47bfd30f99b Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 19 Jun 2025 22:36:42 +0100 Subject: [PATCH 48/48] yazi: manager -> mgr helix: add ruff for python --- home-manager/base/terminal.nix | 2 +- home-manager/development/helix.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index 9e59f09..8d62e79 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -143,7 +143,7 @@ with lib; yazi = { enable = true; settings = { - manager = { + mgr = { sort_by = "natural"; show_hidden = true; }; diff --git a/home-manager/development/helix.nix b/home-manager/development/helix.nix index abda039..eb62fba 100644 --- a/home-manager/development/helix.nix +++ b/home-manager/development/helix.nix @@ -30,6 +30,7 @@ with lib; biome omnisharp-roslyn netcoredbg + ruff ] ++ (with nodePackages;[ vscode-langservers-extracted typescript-language-server