From 52d33c12041f2d8c9b542d8a02dcbe58d884ae03 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 19 Jun 2025 23:27:55 +0100 Subject: [PATCH 01/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c42a6dc..03395fa 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750039657, - "narHash": "sha256-Vrh5PDskpJ2kEumHbncffZxWQGr2pK88oTOFtBUWG74=", + "lastModified": 1750298804, + "narHash": "sha256-GEp1QwoQ7qQPYuOm5cGb3f5FZSlVwbw86KUrHlLbI2E=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "54ce2a0e930383535c632aad39b22205fa430be0", + "rev": "7b962ab252cecf0b88ae621e1986899e20a4ead3", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750005367, - "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { From 7b4c789caed53d20e33cabf6f5d22695d709a3f5 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 21 Jun 2025 00:43:28 +0100 Subject: [PATCH 02/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 03395fa..c6e24a3 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750298804, - "narHash": "sha256-GEp1QwoQ7qQPYuOm5cGb3f5FZSlVwbw86KUrHlLbI2E=", + "lastModified": 1750385101, + "narHash": "sha256-pA8Bl/FUg3gRUHmre+VCx0MNRXshaneTevnr19BAGfY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "7b962ab252cecf0b88ae621e1986899e20a4ead3", + "rev": "9631817b593f6e2a0f1a9de667ad26fbc5edb085", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { From a1f96ee51dd9da255eb73ffe7b53ffb46cb5528a Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 23 Jun 2025 00:25:29 +0100 Subject: [PATCH 03/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c6e24a3..aac7d2c 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1749960154, - "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", + "lastModified": 1750565152, + "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "424a40050cdc5f494ec45e46462d288f08c64475", + "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750385101, - "narHash": "sha256-pA8Bl/FUg3gRUHmre+VCx0MNRXshaneTevnr19BAGfY=", + "lastModified": 1750558411, + "narHash": "sha256-ENMzkSGVi2b1tZMz6ATO46Rcohlk8aI19b5Q90otiWg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "9631817b593f6e2a0f1a9de667ad26fbc5edb085", + "rev": "76127affd6507320a13b63fcc6bc76dcd4b2fe57", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { From fe9531c73281e247048c12ad91b2d09c1a67b9ef Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 23 Jun 2025 23:51:20 +0100 Subject: [PATCH 04/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index aac7d2c..017e687 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1750680230, + "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750558411, - "narHash": "sha256-ENMzkSGVi2b1tZMz6ATO46Rcohlk8aI19b5Q90otiWg=", + "lastModified": 1750644735, + "narHash": "sha256-v60mh5/3l7nccMPrkOJGCIBf6WLdqrI526sulErDQUA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "76127affd6507320a13b63fcc6bc76dcd4b2fe57", + "rev": "fff42f3f56ba2149323dba6066f8c527656e6079", "type": "github" }, "original": { From 72ae66c403b5e9c6974ff5f3b21964e98e0e9be2 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 26 Jun 2025 00:20:31 +0100 Subject: [PATCH 05/58] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 017e687..a4d8dca 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750644735, - "narHash": "sha256-v60mh5/3l7nccMPrkOJGCIBf6WLdqrI526sulErDQUA=", + "lastModified": 1750817194, + "narHash": "sha256-9CCF4ANxZUXHwz74SeGQkFi4OYnm0BD2I3GeQvxMKPM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "fff42f3f56ba2149323dba6066f8c527656e6079", + "rev": "fc01ad517af163c76d4493c5959fc5c44244a97f", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750741721, + "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "4b1164c3215f018c4442463a27689d973cffd750", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750400657, - "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { From e5503bbf5875c558f76b3fefaa840b07ee83d7c3 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 30 Jun 2025 00:26:28 +0100 Subject: [PATCH 06/58] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a4d8dca..5ac5732 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1750680230, - "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1750565152, - "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750817194, - "narHash": "sha256-9CCF4ANxZUXHwz74SeGQkFi4OYnm0BD2I3GeQvxMKPM=", + "lastModified": 1751163387, + "narHash": "sha256-DbEJL/mglbCqTa6s1I8H3Vmrl5roDI0tj7Blx4Js5Do=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "fc01ad517af163c76d4493c5959fc5c44244a97f", + "rev": "edb6831ba2ff1b6ff93bec29060e33d6d6cff3cd", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750741721, - "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4b1164c3215f018c4442463a27689d973cffd750", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1750969886, + "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "type": "github" }, "original": { From 761000913ad9bed1672d1d66e61711566a11642f Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 1 Jul 2025 00:23:51 +0100 Subject: [PATCH 07/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5ac5732..5255977 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751163387, - "narHash": "sha256-DbEJL/mglbCqTa6s1I8H3Vmrl5roDI0tj7Blx4Js5Do=", + "lastModified": 1751249431, + "narHash": "sha256-fhbbYA8ve/DCBM0ozJ8omntguPDoZtjZL43Dnoi/tmU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "edb6831ba2ff1b6ff93bec29060e33d6d6cff3cd", + "rev": "bc160bf9280cef49434dcfabe035bf4ae10783b8", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { From 617cf08fc8bf4a2b935cf05c2c4a9fbddddea7e4 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 3 Jul 2025 23:59:28 +0100 Subject: [PATCH 08/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5255977..aca9fb8 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", + "lastModified": 1751468302, + "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", "owner": "nix-community", "repo": "home-manager", - "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", + "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751249431, - "narHash": "sha256-fhbbYA8ve/DCBM0ozJ8omntguPDoZtjZL43Dnoi/tmU=", + "lastModified": 1751422033, + "narHash": "sha256-R6ZonDO1yldt3KUDi+u8irXo09+EjisiqK4s7Je46B4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bc160bf9280cef49434dcfabe035bf4ae10783b8", + "rev": "e3a859385648ba529eacc2efe61d529eef6f5485", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750837715, - "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { From 4c06e1811323ae0f457bd4919848b016742633e1 Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 6 Jul 2025 00:03:18 +0100 Subject: [PATCH 09/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index aca9fb8..f35b500 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1750903843, - "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", + "lastModified": 1751607816, + "narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", "owner": "nix-community", "repo": "disko", - "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", + "rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751422033, - "narHash": "sha256-R6ZonDO1yldt3KUDi+u8irXo09+EjisiqK4s7Je46B4=", + "lastModified": 1751681058, + "narHash": "sha256-b9JMD1j+zqGbrWSobXq4icjOm5tdoy7dWBLSe6WTCSE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e3a859385648ba529eacc2efe61d529eef6f5485", + "rev": "0cadf3b87cce52af29c3cc98be8ee81b3c05f2c1", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751582995, + "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", "type": "github" }, "original": { From 27b3ec6a46e6966ef813c52d7f77ec04af9e774e Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 10 Jul 2025 00:14:07 +0100 Subject: [PATCH 10/58] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index f35b500..a27cff3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1751607816, - "narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", + "lastModified": 1751854533, + "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", "owner": "nix-community", "repo": "disko", - "rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", + "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1751468302, - "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", + "lastModified": 1751810233, + "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", + "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1751170039, - "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9c932ae632d6b5150515e5749b198c175d8565db", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751681058, - "narHash": "sha256-b9JMD1j+zqGbrWSobXq4icjOm5tdoy7dWBLSe6WTCSE=", + "lastModified": 1752026977, + "narHash": "sha256-Rfd90Ghp/Z1B1xwi01YGvahwqQ7Y/kIu1sqzo8O1Myc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0cadf3b87cce52af29c3cc98be8ee81b3c05f2c1", + "rev": "6b1fe15b18ed4170da1e24746717639f992b9cb7", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751637120, - "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751582995, - "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { From 0dec323af56f25d1507492ff58cf88da33ef4d68 Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 11 Jul 2025 23:31:39 +0100 Subject: [PATCH 11/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a27cff3..a7e8da3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1751854533, - "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", + "lastModified": 1752113600, + "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", "owner": "nix-community", "repo": "disko", - "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", + "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1751810233, - "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", + "lastModified": 1752208517, + "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", + "rev": "c6a01e54af81b381695db796a43360bf6db5702f", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752026977, - "narHash": "sha256-Rfd90Ghp/Z1B1xwi01YGvahwqQ7Y/kIu1sqzo8O1Myc=", + "lastModified": 1752200230, + "narHash": "sha256-WqqWjRX4qZYqO/cgvU/ZEzJBQqHBi17OEVv2kt05WiU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6b1fe15b18ed4170da1e24746717639f992b9cb7", + "rev": "3c866dfb70d282247452742098d315b97df713d2", "type": "github" }, "original": { From 2fbd529e59a2cb6f0f41d423f01629e1d48b2117 Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 13 Jul 2025 00:12:00 +0100 Subject: [PATCH 12/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a7e8da3..0280931 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1751774635, - "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", + "lastModified": 1752346111, + "narHash": "sha256-SVxCIYnbED0rNYSpm3QQoOhqxYRp1GuE9FkyM5Y2afs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "85686025ba6d18df31cc651a91d5adef63378978", + "rev": "deff7a9a0aa98a08d8c7839fe2658199ce9828f8", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752200230, - "narHash": "sha256-WqqWjRX4qZYqO/cgvU/ZEzJBQqHBi17OEVv2kt05WiU=", + "lastModified": 1752286423, + "narHash": "sha256-5a4+w/P9cr5l8YOypiwNrAIOyhLYA9x9Va1mqKkvwRs=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "3c866dfb70d282247452742098d315b97df713d2", + "rev": "f942441f13f5dbd29e4bd5596b2c2ba346c4940e", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751943650, - "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", + "lastModified": 1752162966, + "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", "type": "github" }, "original": { From c08da164acd3e09541bf9907cb7bab11afaade0a Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 14 Jul 2025 23:27:27 +0100 Subject: [PATCH 13/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0280931..497d0b6 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1752208517, - "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", + "lastModified": 1752527596, + "narHash": "sha256-kn620ocx9JmmWKBN4X+kTbsQg/nv2HBxceDf2zV08VM=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6a01e54af81b381695db796a43360bf6db5702f", + "rev": "8597e85e2ce33e6a6f1df99cc56cdf7680cb22e0", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1752346111, - "narHash": "sha256-SVxCIYnbED0rNYSpm3QQoOhqxYRp1GuE9FkyM5Y2afs=", + "lastModified": 1752441837, + "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "deff7a9a0aa98a08d8c7839fe2658199ce9828f8", + "rev": "839e02dece5845be3a322e507a79712b73a96ba2", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752286423, - "narHash": "sha256-5a4+w/P9cr5l8YOypiwNrAIOyhLYA9x9Va1mqKkvwRs=", + "lastModified": 1752459325, + "narHash": "sha256-46TgjdxT02a4nFd9HCXCf8kK5ZSH7r9gYROLtc8zVOg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f942441f13f5dbd29e4bd5596b2c2ba346c4940e", + "rev": "61c2e99ebd586f463a6c0ebe3d931e74883b163d", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752162966, - "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", + "lastModified": 1752308619, + "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", + "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", "type": "github" }, "original": { From b9e7e22ddd171a195cccd166839271cefc431424 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 15 Jul 2025 09:58:45 +0100 Subject: [PATCH 14/58] lots of changes yes im bad i should commit more often sue me --- configuration/base/kde.nix | 8 +++-- configuration/base/nix-settings.nix | 10 +++--- configuration/modules/virtualisation.nix | 20 +++++++---- devices/starlite/configuration.nix | 2 +- devices/tuxedo/configuration.nix | 19 ++++++++--- devices/tuxedo/home.nix | 17 +++++----- flake.nix | 2 +- home-manager/base.nix | 12 +++++-- home-manager/base/terminal.nix | 1 + home-manager/development/dotnet.nix | 2 +- home-manager/firefox/firefox-profile.nix | 2 ++ home-manager/streamlink.nix | 42 ++++++++++++++++++++++++ 12 files changed, 106 insertions(+), 31 deletions(-) create mode 100644 home-manager/streamlink.nix diff --git a/configuration/base/kde.nix b/configuration/base/kde.nix index 23e3fea..b24df5d 100644 --- a/configuration/base/kde.nix +++ b/configuration/base/kde.nix @@ -31,11 +31,15 @@ in # For cursor in steam? xdg.icons.fallbackCursorThemes = [ "breeze_cursors" ]; + programs.partition-manager.enable = true; + environment.systemPackages = with pkgs; - [ maliit-keyboard ] ++ (with kdePackages; [ + [ + maliit-keyboard + exfatprogs + ] ++ (with kdePackages; [ sddm-kcm plasma-disks - partitionmanager filelight ffmpegthumbs kcalc diff --git a/configuration/base/nix-settings.nix b/configuration/base/nix-settings.nix index 06109e6..5e9a8e2 100644 --- a/configuration/base/nix-settings.nix +++ b/configuration/base/nix-settings.nix @@ -7,10 +7,10 @@ nix.gc.automatic = true; nix.gc.options = "--delete-older-than 7d"; - # programs.nix-ld = { - # enable = true; - # # libraries = pkgs.steam-run.fhsenv.args.multiPkgs pkgs; - # libraries = pkgs.appimageTools.defaultFhsEnvArgs.targetPkgs pkgs; - # }; + programs.nix-ld = { + enable = true; + # libraries = pkgs.steam-run.fhsenv.args.multiPkgs pkgs; + # libraries = pkgs.appimageTools.defaultFhsEnvArgs.targetPkgs pkgs; + }; } diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 1439198..9f29dce 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -8,18 +8,26 @@ }; libvirtd = { enable = true; - qemu.vhostUserPackages = [ pkgs.virtiofsd ]; + qemu = { + vhostUserPackages = [ pkgs.virtiofsd ]; + ovmf.enable = true; + }; + }; + podman = { + enable = true; + dockerSocket.enable = true; + dockerCompat = true; }; # remember to add the necessary users to the docker group - docker = { - enable = true; - storageDriver = "btrfs"; - }; + # docker = { + # enable = true; + # storageDriver = "btrfs"; + # }; # waydroid = { # enable = true; # }; }; programs.virt-manager.enable = true; - # environment.systemPackages = with pkgs;[ podman-compose ]; + environment.systemPackages = with pkgs;[ podman-compose ]; } diff --git a/devices/starlite/configuration.nix b/devices/starlite/configuration.nix index 7742eda..1c1dc7e 100644 --- a/devices/starlite/configuration.nix +++ b/devices/starlite/configuration.nix @@ -30,7 +30,7 @@ home-manager = { extraSpecialArgs = { inherit inputs; }; sharedModules = [ - inputs.nix-index-database.hmModules.nix-index + inputs.nix-index-database.homeModules.nix-index ]; users = { "worble" = import ./home.nix; diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 99f27d9..ec6c412 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -39,10 +39,21 @@ services.hardware.openrgb.enable = true; - fileSystems."/mnt/HDD1" = { - #device = "/dev/disk/by-uuid/35763dc3-c736-4714-ade7-40bf49ad50dd"; + # fileSystems."/mnt/HDD1" = { + # fsType = "ext4"; + # label = "HDD1"; + # options = [ + # # If you don't have this options attribute, it'll default to "defaults" + # # boot options for fstab. Search up fstab mount options you can use + # "users" # Allows any user to mount and unmount + # "nofail" # Prevent system from failing if this drive doesn't mount + # "exec" # Permit execution of binaries and other executable files + # ]; + # }; + + fileSystems."/mnt/HDD2" = { fsType = "ext4"; - label = "HDD1"; + label = "HDD2"; options = [ # If you don't have this options attribute, it'll default to "defaults" # boot options for fstab. Search up fstab mount options you can use @@ -76,7 +87,7 @@ useGlobalPkgs = true; extraSpecialArgs = { inherit inputs; }; sharedModules = [ - inputs.nix-index-database.hmModules.nix-index + inputs.nix-index-database.homeModules.nix-index ]; users = { "worble" = import ./home.nix; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 77af4dc..161117d 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -5,6 +5,7 @@ ../../home-manager/base.nix ../../home-manager/development/all.nix ../../home-manager/gaming.nix + ../../home-manager/streamlink.nix ]; terminal.nixUpdateLocation = "/home/worble/Projects/nixos#tuxedo"; @@ -45,6 +46,8 @@ dbeaver-bin ruffle popsicle + # for headset tune + headsetcontrol ]; home.file = { @@ -73,16 +76,14 @@ }; mpv = { - enable = true; config = { profile = "gpu-hq"; vo = "gpu-next"; gpu-api = "opengl"; gpu-context = "wayland"; hwdec = "vulkan"; - screenshot-directory = "/mnt/HDD1/Pictures/"; + screenshot-directory = "/mnt/HDD2/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"; }; extraInput = '' @@ -114,10 +115,10 @@ services = { rclone-media = { Unit = { - Description = "rclone-media /mnt/HDD1/Videos/"; - After = [ "network.target" "mnt-HDD1.mount" ]; + Description = "rclone-media /mnt/HDD2/Videos/"; + After = [ "network.target" "mnt-HDD2.mount" ]; # Maybe? https://unix.stackexchange.com/questions/281650/systemd-unit-requiresmountsfor-vs-conditionpathisdirectory - # RequiresMountsFor = "/mnt/HDD1/Videos/"; + # RequiresMountsFor = "/mnt/HDD2/Videos/"; }; Install = { @@ -134,7 +135,7 @@ runtimeInputs = [ pkgs.inotify-tools pkgs.libnotify pkgs.rclone ]; text = '' function rclonecopy { file=$1 - changed_rel=''${file#"/mnt/HDD1/Videos"} + changed_rel=''${file#"/mnt/HDD2/Videos"} notify-send -a "rclone-media" "rclone for $file triggered" if rclone copyto "$file" media:"media-7gM2gcrxRjXqfj$changed_rel" ; then notify-send -a "rclone-media" "rclone complete for $file" @@ -146,7 +147,7 @@ text = '' inotifywait -mr \ --format '%w%f' \ -e close_write \ - /mnt/HDD1/Videos/ | + /mnt/HDD2/Videos/ | while read -r file; do rclonecopy "$file" done diff --git a/flake.nix b/flake.nix index cfd95ad..f72bfb4 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ inherit pkgs; extraSpecialArgs = { inherit inputs; }; modules = [ - nix-index-database.hmModules.nix-index + nix-index-database.homeModules.nix-index ./devices/deck/home.nix ]; }; diff --git a/home-manager/base.nix b/home-manager/base.nix index 8605803..d75fd3b 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -41,7 +41,7 @@ package = pkgs.brave; }; - mpv = lib.mkDefault { + mpv = { enable = true; package = ( pkgs.mpv-unwrapped.wrapper { @@ -56,8 +56,14 @@ } ); config = { - screenshot-directory = "~/Pictures/"; - screenshot-template = "%F/%F_snapshot_%P"; + screenshot-directory = lib.mkDefault "~/Pictures/"; + screenshot-template = lib.mkDefault "%F/%F_snapshot_%P"; + sub-ass-use-video-data = lib.mkDefault "aspect-ratio"; + }; + scriptOpts = { + uosc = { + time_precision = 2; + }; }; }; }; diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index 8d62e79..5338929 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -106,6 +106,7 @@ with lib; settings = { theme = "dracula"; show_startup_tips = false; + default_mode = "locked"; }; }; diff --git a/home-manager/development/dotnet.nix b/home-manager/development/dotnet.nix index 195453c..03ea64b 100644 --- a/home-manager/development/dotnet.nix +++ b/home-manager/development/dotnet.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { home.packages = with pkgs;[ diff --git a/home-manager/firefox/firefox-profile.nix b/home-manager/firefox/firefox-profile.nix index 0c9b1ea..1b91e66 100644 --- a/home-manager/firefox/firefox-profile.nix +++ b/home-manager/firefox/firefox-profile.nix @@ -55,6 +55,8 @@ "media.hardwaremediakeys.enabled" = false; # restore tabs on startup "browser.startup.page" = 3; + # do not trim http + "browser.urlbar.trimURLs" = false; /* Arkenfox Begin */ diff --git a/home-manager/streamlink.nix b/home-manager/streamlink.nix new file mode 100644 index 0000000..99427de --- /dev/null +++ b/home-manager/streamlink.nix @@ -0,0 +1,42 @@ +{ pkgs, lib, ... }: + +let + proxies = [ + "https://eu.luminous.dev" # (Europe) + "https://eu2.luminous.dev" # (Europe 2) + "https://as.luminous.dev" # (Asia) + "https://lb-eu.cdn-perfprod.com" # (Europe) + "https://lb-eu2.cdn-perfprod.com" # (Europe 2) + "https://lb-eu4.cdn-perfprod.com" # (Europe 4) + "https://lb-eu5.cdn-perfprod.com" # (Europe 5) + "https://lb-eu3.cdn-perfprod.com" # (Europe 3, using Russia-only proxies) + "https://lb-na.cdn-perfprod.com" # (NA) + "https://lb-as.cdn-perfprod.com" # (Asia) + "https://lb-sa.cdn-perfprod.com" # (SA) + ]; +in +{ + programs.streamlink = { + enable = true; + settings = { + player = "${pkgs.mpv}/bin/mpv"; + player-args = "--cache 2048"; + player-no-close = true; + twitch-low-latency = true; + twitch-disable-ads = true; + default-stream = "best"; + }; + plugins = { + # It is important this is called "twitch" and overwrites the default plugin + twitch = { + settings = { + twitch-proxy-playlist = lib.concatStringsSep "," proxies; + }; + src = builtins.readFile (pkgs.fetchurl { + url = "https://github.com/2bc4/streamlink-ttvlol/releases/download/7.0.0-20241105/twitch.py"; + hash = "sha256-WbxLNkxG64BlnfI/RwY5N0bqEkO/D6u14nYMyTuveN8="; + }); + }; + }; + }; +} From 823386169980942bb09f5764a4dc58410f89d3b7 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 19 Jul 2025 15:22:52 +0200 Subject: [PATCH 15/58] enable chrony as default nts provider; use automatic timezond for timezone; --- configuration/base.nix | 10 +++++++--- devices/tuxedo/home.nix | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index 5efebfc..6bba185 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -35,9 +35,6 @@ wifi.powersave = false; }; - # Set your time zone. - time.timeZone = "Europe/London"; - # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; @@ -84,6 +81,13 @@ package = pkgs.mullvad-vpn; }; + # Set your time zone. + # time.timeZone = "Europe/London"; + services.automatic-timezoned.enable = true; + services.chrony = { + enable = true; + }; + services.fwupd.enable = true; services.geoclue2 = { enable = true; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 161117d..44ae5a4 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -82,8 +82,8 @@ gpu-api = "opengl"; gpu-context = "wayland"; hwdec = "vulkan"; - screenshot-directory = "/mnt/HDD2/Pictures/"; - # screenshot-directory = "~/Pictures/"; + # screenshot-directory = "/mnt/HDD2/Pictures/"; + screenshot-directory = "~/Pictures/"; 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"; }; extraInput = '' From d8538369ef4a50a49a8dba63bc140dfffa3e2e61 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 19 Jul 2025 15:28:17 +0200 Subject: [PATCH 16/58] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 497d0b6..b6e54f7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1752718651, + "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1752527596, - "narHash": "sha256-kn620ocx9JmmWKBN4X+kTbsQg/nv2HBxceDf2zV08VM=", + "lastModified": 1752780124, + "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8597e85e2ce33e6a6f1df99cc56cdf7680cb22e0", + "rev": "c718918222bdb104397762dea67e6b397a7927fe", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752459325, - "narHash": "sha256-46TgjdxT02a4nFd9HCXCf8kK5ZSH7r9gYROLtc8zVOg=", + "lastModified": 1752890945, + "narHash": "sha256-gl+t06pZuUqg7Z9YUP1FeGSkJOZ39+ZZUhNvk+GeSG4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "61c2e99ebd586f463a6c0ebe3d931e74883b163d", + "rev": "c3938b6402946ff1c4837db266448cf158f41a66", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752308619, - "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "nixos", "repo": "nixpkgs", - "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { From bd5507a366d61227358fbdc96bc51670fb337d4e Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 22 Jul 2025 23:56:53 +0200 Subject: [PATCH 17/58] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b6e54f7..0cd9099 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752718651, - "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1752780124, - "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", + "lastModified": 1753198507, + "narHash": "sha256-NCG6izg+B3zsCwcT6+ssiWT3Y202jhOqGL/zh6fofa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c718918222bdb104397762dea67e6b397a7927fe", + "rev": "fce051eaf881220843401df545a1444ab676520c", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1752441837, - "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", + "lastModified": 1752985182, + "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "839e02dece5845be3a322e507a79712b73a96ba2", + "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752890945, - "narHash": "sha256-gl+t06pZuUqg7Z9YUP1FeGSkJOZ39+ZZUhNvk+GeSG4=", + "lastModified": 1753150460, + "narHash": "sha256-q2dkvuIfEb5fWBF6TJePJbcP1hqxARAUddfPGVGvD38=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c3938b6402946ff1c4837db266448cf158f41a66", + "rev": "d13827556415f4050b510e9cfb9873c1ce9aaec4", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1753115646, + "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "92c2e04a475523e723c67ef872d8037379073681", "type": "github" }, "original": { From b7ada15fb9ae473c9bbc4e61bdd4a8f5a3da78f1 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 26 Jul 2025 01:02:02 +0200 Subject: [PATCH 18/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0cd9099..3185de5 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1753198507, - "narHash": "sha256-NCG6izg+B3zsCwcT6+ssiWT3Y202jhOqGL/zh6fofa4=", + "lastModified": 1753479839, + "narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fce051eaf881220843401df545a1444ab676520c", + "rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753150460, - "narHash": "sha256-q2dkvuIfEb5fWBF6TJePJbcP1hqxARAUddfPGVGvD38=", + "lastModified": 1753409666, + "narHash": "sha256-bFjln7BkIGOlLHeUzUxfEho2GnrIrQE6O59plpvPiYY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "d13827556415f4050b510e9cfb9873c1ce9aaec4", + "rev": "38a251b6e95659b12dfb3b9fdc237d1ba2ac3786", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { From 7a16c9dc40163e48005aa6fa2b6ef289557320a7 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 28 Jul 2025 00:12:45 +0200 Subject: [PATCH 19/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3185de5..d1f1ede 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1753479839, - "narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1752985182, - "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", + "lastModified": 1753589988, + "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", + "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753409666, - "narHash": "sha256-bFjln7BkIGOlLHeUzUxfEho2GnrIrQE6O59plpvPiYY=", + "lastModified": 1753583367, + "narHash": "sha256-+Z1eK1sBYSvov0H7gDuzfzgaDwPooua7/mR+4+Rknic=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "38a251b6e95659b12dfb3b9fdc237d1ba2ac3786", + "rev": "31098def05408701198875774e6951985186cf81", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { From 7d0c3d275114914748972e325e72e1d3a7f65fcc Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 30 Jul 2025 22:36:23 +0100 Subject: [PATCH 20/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d1f1ede..05c73a5 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753583367, - "narHash": "sha256-+Z1eK1sBYSvov0H7gDuzfzgaDwPooua7/mR+4+Rknic=", + "lastModified": 1753841813, + "narHash": "sha256-5CBUIFcresOD4B4RiBa2vvP1k8xLGXV6xYJQxLf4lrg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "31098def05408701198875774e6951985186cf81", + "rev": "6a81bf879352bdcb9a04badc390d6218f85a50bb", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { From c2dd8138aae6983057c2a2f0753599e5e3150a84 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 31 Jul 2025 14:52:13 +0100 Subject: [PATCH 21/58] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 05c73a5..1ead0a9 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753841813, - "narHash": "sha256-5CBUIFcresOD4B4RiBa2vvP1k8xLGXV6xYJQxLf4lrg=", + "lastModified": 1753928221, + "narHash": "sha256-Na6JjalzCBQx5aiZMa0QYuFU9T0FOuWSKbHnslXWln4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6a81bf879352bdcb9a04badc390d6218f85a50bb", + "rev": "1d907938c3f488949c3365afcbbd325e2ce85ee9", "type": "github" }, "original": { From 36264583b2501e30c8aa6f389f1caa4506057bf4 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 31 Jul 2025 23:43:10 +0100 Subject: [PATCH 22/58] update flake.lock --- flake.lock | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/flake.lock b/flake.lock index 1ead0a9..abccd9f 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,27 @@ "type": "github" } }, + "lsfg-vk-flake": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1753938292, + "narHash": "sha256-akeUWgvIIi163s/femzvTOuqqOiOB/8US5ioHsNqhYY=", + "owner": "pabloaul", + "repo": "lsfg-vk-flake", + "rev": "081cd66b1369188777ea146a759d35e99ea6b031", + "type": "github" + }, + "original": { + "owner": "pabloaul", + "ref": "main", + "repo": "lsfg-vk-flake", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -186,6 +207,7 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", + "lsfg-vk-flake": "lsfg-vk-flake", "nix-index-database": "nix-index-database", "nix-system-graphics": "nix-system-graphics", "nix-vscode-extensions": "nix-vscode-extensions", From e4b45eeb4acfb7f6d0792aa36bdcaddd83af2916 Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 1 Aug 2025 09:55:42 +0100 Subject: [PATCH 23/58] add lsfg; use programs gpu screen recorder; remove unused programs; biome lsp is way out of date; --- devices/tuxedo/configuration.nix | 13 +++++++++++++ devices/tuxedo/home.nix | 14 +++++--------- flake.nix | 8 +++++++- home-manager/base.nix | 5 ++++- home-manager/development/vscode.nix | 2 +- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index ec6c412..4034120 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -39,6 +39,11 @@ services.hardware.openrgb.enable = true; + services.lsfg-vk = { + enable = true; + ui.enable = true; # installs gui for configuring lsfg-vk + }; + # fileSystems."/mnt/HDD1" = { # fsType = "ext4"; # label = "HDD1"; @@ -71,8 +76,16 @@ dumpcap.enable = true; }; + programs.gpu-screen-recorder.enable = true; # For promptless recording on both CLI and GUI + + # programs.obs-studio = { + # enable = true; + # enableVirtualCamera = true; + # }; + environment.systemPackages = with pkgs;[ distrobox + gpu-screen-recorder-gtk ]; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 44ae5a4..0838ecb 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -35,17 +35,14 @@ # media jellyfin-media-player haruna - fooyin - strawberry - mpc-qt # misc electrum - gpu-screen-recorder-gtk syncthing dbeaver-bin ruffle popsicle + # for headset tune headsetcontrol ]; @@ -79,11 +76,10 @@ config = { profile = "gpu-hq"; vo = "gpu-next"; - gpu-api = "opengl"; - gpu-context = "wayland"; - hwdec = "vulkan"; - # screenshot-directory = "/mnt/HDD2/Pictures/"; - screenshot-directory = "~/Pictures/"; + gpu-api = "auto"; + gpu-context = "auto"; + hwdec = "auto"; + screenshot-directory = "/mnt/HDD2/Pictures/"; 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"; }; extraInput = '' diff --git a/flake.nix b/flake.nix index f72bfb4..d90dbec 100644 --- a/flake.nix +++ b/flake.nix @@ -29,9 +29,14 @@ url = "github:soupglasses/nix-system-graphics?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; + + lsfg-vk-flake = { + url = "github:pabloaul/lsfg-vk-flake/main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, ... }@inputs: + outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, lsfg-vk-flake, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -44,6 +49,7 @@ specialArgs = { inherit inputs; }; modules = [ ./devices/tuxedo/configuration.nix + lsfg-vk-flake.nixosModules.default ]; }; nixosConfigurations.starlite = nixpkgs.lib.nixosSystem { diff --git a/home-manager/base.nix b/home-manager/base.nix index d75fd3b..de79ea8 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -18,6 +18,9 @@ # comms teamspeak_client vesktop + + # media + strawberry ]; # set breeze as default cursor @@ -62,7 +65,7 @@ }; scriptOpts = { uosc = { - time_precision = 2; + time_precision = 3; }; }; }; diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index b58146f..2c8b862 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -72,7 +72,7 @@ in "[jsonc]" = { "editor.defaultFormatter" = "biomejs.biome"; }; - "biome.lsp.bin" = "${biome}/bin/biome"; + # "biome.lsp.bin" = "${biome}/bin/biome"; #"biome.requireConfigFile" = true; "typescript.preferences.preferTypeOnlyAutoImports" = true; From 074962e7a989ee70fcd16de0c1d47adaf7ed95bf Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 1 Aug 2025 10:12:30 +0100 Subject: [PATCH 24/58] move mpv to own folder; remove unneccessary wayland support override --- home-manager/base.nix | 27 +-------------------------- home-manager/base/mpv.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 home-manager/base/mpv.nix diff --git a/home-manager/base.nix b/home-manager/base.nix index de79ea8..a292a17 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -4,6 +4,7 @@ imports = [ ./base/fonts.nix ./base/terminal.nix + ./base/mpv.nix ./firefox/firefox.nix ]; @@ -43,31 +44,5 @@ enable = true; package = pkgs.brave; }; - - mpv = { - enable = true; - package = ( - pkgs.mpv-unwrapped.wrapper { - scripts = with pkgs.mpvScripts; [ - uosc - sponsorblock - ]; - - mpv = pkgs.mpv-unwrapped.override { - waylandSupport = true; - }; - } - ); - config = { - screenshot-directory = lib.mkDefault "~/Pictures/"; - screenshot-template = lib.mkDefault "%F/%F_snapshot_%P"; - sub-ass-use-video-data = lib.mkDefault "aspect-ratio"; - }; - scriptOpts = { - uosc = { - time_precision = 3; - }; - }; - }; }; } diff --git a/home-manager/base/mpv.nix b/home-manager/base/mpv.nix new file mode 100644 index 0000000..488a83e --- /dev/null +++ b/home-manager/base/mpv.nix @@ -0,0 +1,29 @@ +{ pkgs, lib, ... }: + +{ + programs = { + mpv = { + enable = true; + package = ( + pkgs.mpv-unwrapped.wrapper { + scripts = with pkgs.mpvScripts; [ + uosc + sponsorblock + ]; + } + ); + + config = { + screenshot-directory = lib.mkDefault "~/Pictures/"; + screenshot-template = lib.mkDefault "%F/%F_snapshot_%P"; + sub-ass-use-video-data = lib.mkDefault "aspect-ratio"; + }; + + scriptOpts = { + uosc = { + time_precision = 3; + }; + }; + }; + }; +} From 3b557449c96487afc71e4084cee2face972e6652 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 2 Aug 2025 00:58:38 +0100 Subject: [PATCH 25/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index abccd9f..07f8e36 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753928221, - "narHash": "sha256-Na6JjalzCBQx5aiZMa0QYuFU9T0FOuWSKbHnslXWln4=", + "lastModified": 1754015654, + "narHash": "sha256-tirCA/d4v/+yyjsNHbK0mEtxfeG3SxjhTPsV9SUrb/s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1d907938c3f488949c3365afcbbd325e2ce85ee9", + "rev": "65b437a31a09ef31d882d34f28e4dbf446165ca1", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "94def634a20494ee057c76998843c015909d6311", "type": "github" }, "original": { From c5d34c86b825379c2ce6e5bd8de2669830bbbf50 Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 3 Aug 2025 01:00:07 +0100 Subject: [PATCH 26/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 07f8e36..b39165e 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754015654, - "narHash": "sha256-tirCA/d4v/+yyjsNHbK0mEtxfeG3SxjhTPsV9SUrb/s=", + "lastModified": 1754100706, + "narHash": "sha256-ctRwk+Fjl/jxN+J6GjD9pYmnyHvgR2ub04q1pXeaAho=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "65b437a31a09ef31d882d34f28e4dbf446165ca1", + "rev": "1656ec240ab8de9f78eba6f38c5ae5f0d5c6d936", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1748252092, - "narHash": "sha256-6nL55wvV7SthEXaXDiQo8xxkxQLAVcNBU21YJ7GJLm8=", + "lastModified": 1754135474, + "narHash": "sha256-tZ8SXR80gcy8lqa1DD6/CNH9oQ1kOFw/cJihcn5/1M0=", "owner": "numtide", "repo": "system-manager", - "rev": "c6850451ef769fd03d0ad5474f928b916aa23775", + "rev": "7865b4a207e46afa5c2e264de550730f8e281176", "type": "github" }, "original": { From 19fa7c2fc16608ffaec59dff60c7032622ce09cc Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 5 Aug 2025 01:20:59 +0200 Subject: [PATCH 27/58] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b39165e..17f99da 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1753589988, - "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", + "lastModified": 1754195341, + "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", + "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754100706, - "narHash": "sha256-ctRwk+Fjl/jxN+J6GjD9pYmnyHvgR2ub04q1pXeaAho=", + "lastModified": 1754274643, + "narHash": "sha256-oRCVBguUg7qmxh2O8srQTe7Ep/oo9OLWD5ZF05DNJNw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1656ec240ab8de9f78eba6f38c5ae5f0d5c6d936", + "rev": "2d94006f8b95e70d8d8f4ca9d0ed8cfaad617049", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754316476, + "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "type": "github" }, "original": { From e230dea138ecb580832825a7dd8b73078f8b277d Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 5 Aug 2025 23:23:44 +0100 Subject: [PATCH 28/58] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 17f99da..42a452e 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754274643, - "narHash": "sha256-oRCVBguUg7qmxh2O8srQTe7Ep/oo9OLWD5ZF05DNJNw=", + "lastModified": 1754360356, + "narHash": "sha256-xQjfwhx2vjWsRVp/rwZFPLfp+AtVS6pLybZ86Y3qFcM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2d94006f8b95e70d8d8f4ca9d0ed8cfaad617049", + "rev": "3f70879e7d44ea4463ce2d66ea57c4f7206d5f18", "type": "github" }, "original": { From ab7b90bcb23aa731343b26058471c4a4fc50668b Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 8 Aug 2025 02:06:56 +0100 Subject: [PATCH 29/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 42a452e..705c93a 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754360356, - "narHash": "sha256-xQjfwhx2vjWsRVp/rwZFPLfp+AtVS6pLybZ86Y3qFcM=", + "lastModified": 1754533101, + "narHash": "sha256-N9mbCFOyVZlaDKnJvVjAs4gsT2v+5VGdC9HfAaQPRfg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "3f70879e7d44ea4463ce2d66ea57c4f7206d5f18", + "rev": "4ed9caa20949c32af9dc3955f8073ef1fc4d11c3", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754316476, - "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { From 03e1cf00a14c66311cb9bc46ff3536e143e2413e Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 9 Aug 2025 01:16:47 +0100 Subject: [PATCH 30/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 705c93a..24736b5 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754533101, - "narHash": "sha256-N9mbCFOyVZlaDKnJvVjAs4gsT2v+5VGdC9HfAaQPRfg=", + "lastModified": 1754619535, + "narHash": "sha256-ECkw2gCPyG7I5MPlz19TgYtzG9XhtJY6vwfJjswyIbI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4ed9caa20949c32af9dc3955f8073ef1fc4d11c3", + "rev": "05bdb0f31407f61a882f7512e1e0bf6179fd1d15", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1754563854, + "narHash": "sha256-YzNTExe3kMY9lYs23mZR7jsVHe5TWnpwNrsPOpFs/b8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "e728d7ae4bb6394bbd19eec52b7358526a44c414", "type": "github" }, "original": { From 4e6e74b2f8870d9a7648ab49f0e1a47c65de6529 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 12 Aug 2025 00:57:53 +0100 Subject: [PATCH 31/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 24736b5..8115e26 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1754195341, - "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", + "lastModified": 1754800038, + "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562", + "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754619535, - "narHash": "sha256-ECkw2gCPyG7I5MPlz19TgYtzG9XhtJY6vwfJjswyIbI=", + "lastModified": 1754878625, + "narHash": "sha256-lSPOfzl8u0MQ2MhHmyQ2aTmRx6Jm8fcI9s44iIxjNL8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "05bdb0f31407f61a882f7512e1e0bf6179fd1d15", + "rev": "0f2ca2371a5b84d35791ac99073bb5b2ed45456f", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754563854, - "narHash": "sha256-YzNTExe3kMY9lYs23mZR7jsVHe5TWnpwNrsPOpFs/b8=", + "lastModified": 1754767907, + "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e728d7ae4bb6394bbd19eec52b7358526a44c414", + "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "type": "github" }, "original": { From d6d6603df61c5dfbe12782f3c9d687a5daebf6df Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 13 Aug 2025 23:04:41 +0100 Subject: [PATCH 32/58] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 8115e26..baa9c35 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1754971456, + "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754878625, - "narHash": "sha256-lSPOfzl8u0MQ2MhHmyQ2aTmRx6Jm8fcI9s44iIxjNL8=", + "lastModified": 1754964325, + "narHash": "sha256-WrG74DTCE0phrOtusqkYOrQKK4DXurgW0vPnisZpw/Q=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0f2ca2371a5b84d35791ac99073bb5b2ed45456f", + "rev": "84da801eb3f23ea34ec96ee38df74504444e9b1d", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1754937576, + "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1754135474, - "narHash": "sha256-tZ8SXR80gcy8lqa1DD6/CNH9oQ1kOFw/cJihcn5/1M0=", + "lastModified": 1754995070, + "narHash": "sha256-QU/J5SK3C5Z7tc546bMlH00gZYuWk5m3sZOqLfhuqAI=", "owner": "numtide", "repo": "system-manager", - "rev": "7865b4a207e46afa5c2e264de550730f8e281176", + "rev": "c3689ad206950aedc4bc287f1f8cbaec9aeacaff", "type": "github" }, "original": { From beac80516d23f1b74274e1d53f96c25c10962bdd Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 15 Aug 2025 00:26:00 +0100 Subject: [PATCH 33/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index baa9c35..699ce4e 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754964325, - "narHash": "sha256-WrG74DTCE0phrOtusqkYOrQKK4DXurgW0vPnisZpw/Q=", + "lastModified": 1755137362, + "narHash": "sha256-3e/S+Q9InEZ+W1YxjrfjkuVz49IsF2vJZx7Id22RCkY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "84da801eb3f23ea34ec96ee38df74504444e9b1d", + "rev": "547b299dd5b8ddccf948ff6728d7ec547eee4e02", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1755078291, + "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", "type": "github" }, "original": { From 6ecc69eb2e821ecff3471558bf03c31c1928f661 Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 15 Aug 2025 23:16:57 +0100 Subject: [PATCH 34/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 699ce4e..69965e2 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755137362, - "narHash": "sha256-3e/S+Q9InEZ+W1YxjrfjkuVz49IsF2vJZx7Id22RCkY=", + "lastModified": 1755223768, + "narHash": "sha256-IvGJwwEELdsc3toUO3PSQxveQDBw0xCAcXtYFYS2ky8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "547b299dd5b8ddccf948ff6728d7ec547eee4e02", + "rev": "545c9c87e71fbb19682abfd8d8168584ffd07d3f", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { From 20d5a43dd7fbbcc0c86f84fae20ef284e1885062 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 20 Aug 2025 23:17:35 +0100 Subject: [PATCH 35/58] update flake.lock --- flake.lock | 64 ++++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 69965e2..00c247e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1754971456, - "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", + "lastModified": 1755519972, + "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", "owner": "nix-community", "repo": "disko", - "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", + "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", "type": "github" }, "original": { @@ -59,27 +59,6 @@ "type": "github" } }, - "lsfg-vk-flake": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753938292, - "narHash": "sha256-akeUWgvIIi163s/femzvTOuqqOiOB/8US5ioHsNqhYY=", - "owner": "pabloaul", - "repo": "lsfg-vk-flake", - "rev": "081cd66b1369188777ea146a759d35e99ea6b031", - "type": "github" - }, - "original": { - "owner": "pabloaul", - "ref": "main", - "repo": "lsfg-vk-flake", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -87,11 +66,11 @@ ] }, "locked": { - "lastModified": 1754800038, - "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", + "lastModified": 1755404379, + "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", + "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", "type": "github" }, "original": { @@ -126,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755223768, - "narHash": "sha256-IvGJwwEELdsc3toUO3PSQxveQDBw0xCAcXtYFYS2ky8=", + "lastModified": 1755655217, + "narHash": "sha256-S6Eaz7L+0Iyh/LyipHNk7+QSReFj8xbZAr4g+G5Pf0Q=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "545c9c87e71fbb19682abfd8d8168584ffd07d3f", + "rev": "283b5d15f1b1bfa5e745b9a90793b49fbd6239b0", "type": "github" }, "original": { @@ -141,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -173,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -189,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755078291, - "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", + "lastModified": 1755593991, + "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", + "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", "type": "github" }, "original": { @@ -207,7 +186,6 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", - "lsfg-vk-flake": "lsfg-vk-flake", "nix-index-database": "nix-index-database", "nix-system-graphics": "nix-system-graphics", "nix-vscode-extensions": "nix-vscode-extensions", @@ -224,11 +202,11 @@ ] }, "locked": { - "lastModified": 1754995070, - "narHash": "sha256-QU/J5SK3C5Z7tc546bMlH00gZYuWk5m3sZOqLfhuqAI=", + "lastModified": 1755723377, + "narHash": "sha256-K+EtoaNQOvHDpGeBI3wp5wRgdc8lA+uweO/8s9s79VA=", "owner": "numtide", "repo": "system-manager", - "rev": "c3689ad206950aedc4bc287f1f8cbaec9aeacaff", + "rev": "c64d185d2c82e6ee1629e8223b8c407940777df1", "type": "github" }, "original": { From cd1aac83b2a3744a52d65fe50f7da642b9e671ea Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 23 Aug 2025 00:40:05 +0100 Subject: [PATCH 36/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 00c247e..fae55ce 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755655217, - "narHash": "sha256-S6Eaz7L+0Iyh/LyipHNk7+QSReFj8xbZAr4g+G5Pf0Q=", + "lastModified": 1755827962, + "narHash": "sha256-qY4UcgSy60Urcwp+fdWCasueERzZo5foMVMwIVEEzts=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "283b5d15f1b1bfa5e745b9a90793b49fbd6239b0", + "rev": "55b18afeadde679c876620d9dbc7e01a4f4dbb77", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755593991, - "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", + "lastModified": 1755704039, + "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", + "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1755723377, - "narHash": "sha256-K+EtoaNQOvHDpGeBI3wp5wRgdc8lA+uweO/8s9s79VA=", + "lastModified": 1755728642, + "narHash": "sha256-sZZiMh39kdOjh86ob/X1qXTC5j8iY5/In70rmYQjyxw=", "owner": "numtide", "repo": "system-manager", - "rev": "c64d185d2c82e6ee1629e8223b8c407940777df1", + "rev": "3219a927e180f52112088d02e8d000017e63a943", "type": "github" }, "original": { From dd4ca5a69edcf11b30391ce783790343a8e89023 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 23 Aug 2025 14:51:32 +0100 Subject: [PATCH 37/58] lots of updates; playing with wine --- configuration/base.nix | 6 ++++ configuration/modules/virtualisation.nix | 2 +- devices/tuxedo/configuration.nix | 8 ++--- flake.nix | 8 +---- home-manager/base.nix | 6 ++-- home-manager/base/mpv.nix | 3 +- home-manager/base/terminal.nix | 6 ++++ home-manager/development/dotnet.nix | 2 +- home-manager/development/vscode.nix | 6 +++- home-manager/gaming.nix | 40 +++++++++++++++++++++--- 10 files changed, 64 insertions(+), 23 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index 6bba185..ffb30e2 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -107,7 +107,13 @@ vim curl inetutils + dig + rar + zstd + xz + p7zip + libva-utils smartmontools appimage-run diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 9f29dce..73aff8f 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -28,6 +28,6 @@ # }; }; programs.virt-manager.enable = true; - environment.systemPackages = with pkgs;[ podman-compose ]; + environment.systemPackages = with pkgs;[ podman-compose podman-tui podman-desktop ]; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 4034120..a0a792c 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -39,11 +39,6 @@ services.hardware.openrgb.enable = true; - services.lsfg-vk = { - enable = true; - ui.enable = true; # installs gui for configuring lsfg-vk - }; - # fileSystems."/mnt/HDD1" = { # fsType = "ext4"; # label = "HDD1"; @@ -86,6 +81,9 @@ environment.systemPackages = with pkgs;[ distrobox gpu-screen-recorder-gtk + + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui ]; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/flake.nix b/flake.nix index d90dbec..f72bfb4 100644 --- a/flake.nix +++ b/flake.nix @@ -29,14 +29,9 @@ url = "github:soupglasses/nix-system-graphics?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; - - lsfg-vk-flake = { - url = "github:pabloaul/lsfg-vk-flake/main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, lsfg-vk-flake, ... }@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 { @@ -49,7 +44,6 @@ specialArgs = { inherit inputs; }; modules = [ ./devices/tuxedo/configuration.nix - lsfg-vk-flake.nixosModules.default ]; }; nixosConfigurations.starlite = nixpkgs.lib.nixosSystem { diff --git a/home-manager/base.nix b/home-manager/base.nix index a292a17..26d88eb 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, inputs, ... }: +{ pkgs, ... }: { imports = [ @@ -14,11 +14,11 @@ keepassxc qbittorrent libreoffice-qt - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop + joplin-desktop # comms teamspeak_client - vesktop + discord # media strawberry diff --git a/home-manager/base/mpv.nix b/home-manager/base/mpv.nix index 488a83e..2d9e581 100644 --- a/home-manager/base/mpv.nix +++ b/home-manager/base/mpv.nix @@ -10,9 +10,10 @@ uosc sponsorblock ]; + + mpv = pkgs.mpv-unwrapped; } ); - config = { screenshot-directory = lib.mkDefault "~/Pictures/"; screenshot-template = lib.mkDefault "%F/%F_snapshot_%P"; diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index 5338929..b436520 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -45,6 +45,12 @@ with lib; ''; }; + nix-index = { + enable = true; + enableBashIntegration = true; + enableFishIntegration = true; + }; + git = { enable = true; delta.enable = true; diff --git a/home-manager/development/dotnet.nix b/home-manager/development/dotnet.nix index 03ea64b..195453c 100644 --- a/home-manager/development/dotnet.nix +++ b/home-manager/development/dotnet.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { home.packages = with pkgs;[ diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 2c8b862..38a99db 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -34,7 +34,9 @@ in ms-python.python ms-python.debugpy charliermarsh.ruff - ]) ++ (with vscode-marketplace;[ bradlc.vscode-tailwindcss ]); + ]) ++ (with vscode-marketplace;[ + bradlc.vscode-tailwindcss + ]); userSettings = with pkgs;{ "workbench.iconTheme" = "material-icon-theme"; "window.titleBarStyle" = "custom"; @@ -89,6 +91,8 @@ in "bashIde.shfmt.path" = "${shfmt}/bin/shfmt"; "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ]; + + "tailwindCSS.classFunctions" = [ "cva" "cx" ]; }; }; }; diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index 2ad766c..2b8b25d 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -1,16 +1,48 @@ { pkgs, ... }: { + xdg.dataFile."proton/proton-ge" = { + source = pkgs.proton-ge-bin; + }; + home.packages = with pkgs;[ - steamguard-cli + # Wine / Proton + wineWowPackages.staging + winetricks bottles - ryubing - mgba - scanmem (heroic.override { extraPkgs = pkgs: [ pkgs.gamescope ]; }) + (umu-launcher.override { + extraPkgs = pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + gst-vaapi + gamescope + ]; + }) + + # Steam + steamguard-cli + + # Emulators + ryubing + mgba + + # Cheat engine + scanmem ]; + + # programs.lutris = { + # enable = true; + # extraPackages = with pkgs; [ mangohud winetricks gamescope gamemode umu-launcher ]; + # protonPackages = [ pkgs.proton-ge-bin ]; + # winePackages = [ pkgs.wineWowPackages.staging ]; + # }; } From e7233faed1f98fe956d250e9c38a58ba000ec030 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 25 Aug 2025 02:31:50 +0100 Subject: [PATCH 38/58] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index fae55ce..e8c6450 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1755776884, - "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1756008611, + "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "52dec1cb33a614accb9e01307e17816be974d24d", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755827962, - "narHash": "sha256-qY4UcgSy60Urcwp+fdWCasueERzZo5foMVMwIVEEzts=", + "lastModified": 1756001386, + "narHash": "sha256-QGyQ4kbltilt4Jg6LxaVqwyc7OxAjaDAtdusIW7uL/s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "55b18afeadde679c876620d9dbc7e01a4f4dbb77", + "rev": "b9fcd22d7cf5bb1cf75e32fc7ecb5df6156ec504", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1755728642, - "narHash": "sha256-sZZiMh39kdOjh86ob/X1qXTC5j8iY5/In70rmYQjyxw=", + "lastModified": 1755952126, + "narHash": "sha256-tr+ixcXQ9Bv22fpE/oqZsf20mBoQqNubaSrPc7HRIpg=", "owner": "numtide", "repo": "system-manager", - "rev": "3219a927e180f52112088d02e8d000017e63a943", + "rev": "dc7ba44d144039f214f3f5c6786da7d84d231308", "type": "github" }, "original": { From 41dc3f81123a112d385f084db382919db6f81563 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 28 Aug 2025 00:12:14 +0100 Subject: [PATCH 39/58] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index e8c6450..3c380da 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1755519972, - "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", + "lastModified": 1756115622, + "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", "owner": "nix-community", "repo": "disko", - "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", + "rev": "bafad29f89e83b2d861b493aa23034ea16595560", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1756245065, + "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "54b2879ce622d44415e727905925e21b8f833a98", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756001386, - "narHash": "sha256-QGyQ4kbltilt4Jg6LxaVqwyc7OxAjaDAtdusIW7uL/s=", + "lastModified": 1756259830, + "narHash": "sha256-Xe9BcrvCc9uw7mcMQC8sFPPp5+eY521ovorHSbB/uzg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b9fcd22d7cf5bb1cf75e32fc7ecb5df6156ec504", + "rev": "77b0a9f94092ac2a262c750a56b32d6e296f4a1f", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1756217674, + "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1755952126, - "narHash": "sha256-tr+ixcXQ9Bv22fpE/oqZsf20mBoQqNubaSrPc7HRIpg=", + "lastModified": 1756281415, + "narHash": "sha256-CjpoVwpJJ+DOZilPrDpZ5S3V+B1Y0calaHxTp2xMvGs=", "owner": "numtide", "repo": "system-manager", - "rev": "dc7ba44d144039f214f3f5c6786da7d84d231308", + "rev": "e271eedac9a24678ca6cfc61677837422bf474e0", "type": "github" }, "original": { From edd7dbccfa71b83c3155432dc1c53b6b63cf0c2c Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 31 Aug 2025 00:18:58 +0100 Subject: [PATCH 40/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3c380da..8809629 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756259830, - "narHash": "sha256-Xe9BcrvCc9uw7mcMQC8sFPPp5+eY521ovorHSbB/uzg=", + "lastModified": 1756518656, + "narHash": "sha256-VbvUhczCF4Rk41qMWxY3kGY/+8nwQceTrbNluSSFi6g=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "77b0a9f94092ac2a262c750a56b32d6e296f4a1f", + "rev": "e48e3609ac3a57db88c6465ceae15966c4a94160", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756217674, - "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", + "lastModified": 1756469547, + "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", + "rev": "41d292bfc37309790f70f4c120b79280ce40af16", "type": "github" }, "original": { From 03efdeddc506eaff30c543c3181ef0a8d2d4b819 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 2 Sep 2025 23:05:24 +0100 Subject: [PATCH 41/58] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8809629..0bfa23a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1756115622, - "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", + "lastModified": 1756733629, + "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", "owner": "nix-community", "repo": "disko", - "rev": "bafad29f89e83b2d861b493aa23034ea16595560", + "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1756245065, - "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "54b2879ce622d44415e727905925e21b8f833a98", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1756008611, - "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", + "lastModified": 1756612744, + "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "52dec1cb33a614accb9e01307e17816be974d24d", + "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756518656, - "narHash": "sha256-VbvUhczCF4Rk41qMWxY3kGY/+8nwQceTrbNluSSFi6g=", + "lastModified": 1756778240, + "narHash": "sha256-fEN9e5eTYTYiLWDgIm0LpfBZ/IKEmP+BvmDtg2HeHUY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e48e3609ac3a57db88c6465ceae15966c4a94160", + "rev": "88023dda65dbb10c52aa03b39a0426024ad8e543", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1756750488, + "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756469547, - "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", + "lastModified": 1756754095, + "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41d292bfc37309790f70f4c120b79280ce40af16", + "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", "type": "github" }, "original": { From 190c58639f08dd11c0408cd6125cc68de211fbbf Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 4 Sep 2025 17:10:42 +0100 Subject: [PATCH 42/58] use zramswap instead of file; use sudo-rs; remove discover; readd docker compose; remove redundant comments (I cant believe fullscreen finally works and i didnt even change anything); joplin desktop needs unstable; --- configuration/base.nix | 11 +++++++---- configuration/base/kde.nix | 1 + configuration/modules/virtualisation.nix | 2 +- devices/tuxedo/configuration.nix | 24 ------------------------ home-manager/base.nix | 4 ++-- home-manager/gaming.nix | 5 ----- 6 files changed, 11 insertions(+), 36 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index ffb30e2..38e8f2d 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -17,15 +17,18 @@ boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_latest; - swapDevices = [{ - device = "/var/lib/swapfile"; - size = 16 * 1024; - }]; + # swapDevices = [{ + # device = "/var/lib/swapfile"; + # size = 16 * 1024; # 16 GB + # }]; + zramSwap.enable = true; # Creates a zram block device and uses it as a swap device hardware.bluetooth.enable = true; hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; + security.sudo-rs.enable = true; + # networking.hostName = "nixos"; # Define your hostname. # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/configuration/base/kde.nix b/configuration/base/kde.nix index b24df5d..6d1e1ce 100644 --- a/configuration/base/kde.nix +++ b/configuration/base/kde.nix @@ -27,6 +27,7 @@ in }; }; services.desktopManager.plasma6.enable = true; + environment.plasma6.excludePackages = [ pkgs.kdePackages.discover ]; # For cursor in steam? xdg.icons.fallbackCursorThemes = [ "breeze_cursors" ]; diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 73aff8f..6fdff50 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -28,6 +28,6 @@ # }; }; programs.virt-manager.enable = true; - environment.systemPackages = with pkgs;[ podman-compose podman-tui podman-desktop ]; + environment.systemPackages = with pkgs;[ docker-compose podman-compose podman-tui podman-desktop ]; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index a0a792c..33d0e14 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -20,18 +20,6 @@ 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 @@ -39,18 +27,6 @@ services.hardware.openrgb.enable = true; - # fileSystems."/mnt/HDD1" = { - # fsType = "ext4"; - # label = "HDD1"; - # options = [ - # # If you don't have this options attribute, it'll default to "defaults" - # # boot options for fstab. Search up fstab mount options you can use - # "users" # Allows any user to mount and unmount - # "nofail" # Prevent system from failing if this drive doesn't mount - # "exec" # Permit execution of binaries and other executable files - # ]; - # }; - fileSystems."/mnt/HDD2" = { fsType = "ext4"; label = "HDD2"; diff --git a/home-manager/base.nix b/home-manager/base.nix index 26d88eb..662b95e 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { imports = [ @@ -14,7 +14,7 @@ keepassxc qbittorrent libreoffice-qt - joplin-desktop + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop # comms teamspeak_client diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index 2b8b25d..b7554f7 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -1,10 +1,6 @@ { pkgs, ... }: { - xdg.dataFile."proton/proton-ge" = { - source = pkgs.proton-ge-bin; - }; - home.packages = with pkgs;[ # Wine / Proton wineWowPackages.staging @@ -24,7 +20,6 @@ gst-plugins-ugly gst-libav gst-vaapi - gamescope ]; }) From 8b472eae6378c87d87ad842343edc466a5873f61 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 6 Sep 2025 23:20:17 +0100 Subject: [PATCH 43/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0bfa23a..e272e8d 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756778240, - "narHash": "sha256-fEN9e5eTYTYiLWDgIm0LpfBZ/IKEmP+BvmDtg2HeHUY=", + "lastModified": 1757123429, + "narHash": "sha256-wjWN/Ct1/MDJNJYYTkGc4J97lriBBXUdSAAkQjP+FJk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "88023dda65dbb10c52aa03b39a0426024ad8e543", + "rev": "ade86861202d58da01fd7131d85a971d358e21c8", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756750488, - "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756754095, - "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", + "lastModified": 1757020766, + "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", + "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", "type": "github" }, "original": { From a3073c089536eb0e44b1bc3a4a24d40510c8e291 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 8 Sep 2025 00:30:28 +0100 Subject: [PATCH 44/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e272e8d..cd40b7d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1756733629, - "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", + "lastModified": 1757255839, + "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=", "owner": "nix-community", "repo": "disko", - "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", + "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1756612744, - "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", + "lastModified": 1757218147, + "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", + "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757123429, - "narHash": "sha256-wjWN/Ct1/MDJNJYYTkGc4J97lriBBXUdSAAkQjP+FJk=", + "lastModified": 1757210357, + "narHash": "sha256-bg36ANsd4jVmTMYhYpRoYoNh+9Z6d6VMJm8iKI2xBYQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ade86861202d58da01fd7131d85a971d358e21c8", + "rev": "34a2ba2ce0129dc06db7e1b9a5a4d3441f24b4a7", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { From a60c7b8ca5ddcf396442d3d41f3e5b73e962d9e6 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 9 Sep 2025 23:11:36 +0100 Subject: [PATCH 45/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index cd40b7d..98cf49a 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757210357, - "narHash": "sha256-bg36ANsd4jVmTMYhYpRoYoNh+9Z6d6VMJm8iKI2xBYQ=", + "lastModified": 1757382875, + "narHash": "sha256-CYxpRGfY0ruvw6cd+J7wLWb0F4ZU9UlphCOXayNSTJg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "34a2ba2ce0129dc06db7e1b9a5a4d3441f24b4a7", + "rev": "45c6b00334077e372fde29a8a92f3ba5a9130d43", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757020766, - "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { From a8480384e7c5bca8fde089a7dc99f4c344d19c82 Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 10 Sep 2025 23:14:41 +0100 Subject: [PATCH 46/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 98cf49a..1148573 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1757255839, - "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757382875, - "narHash": "sha256-CYxpRGfY0ruvw6cd+J7wLWb0F4ZU9UlphCOXayNSTJg=", + "lastModified": 1757469080, + "narHash": "sha256-nBBLIfu1ugSFRLtOpOt7OkQTrUMOjH0hzCcfDAQF3Yc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "45c6b00334077e372fde29a8a92f3ba5a9130d43", + "rev": "34d1884d25d6eb93cf1c3434e04407f2b88c9dea", "type": "github" }, "original": { From d3bf4cce17dd4009ba7aa51d1a47a2553d2711d7 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 11 Sep 2025 21:07:47 +0100 Subject: [PATCH 47/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1148573..3292e87 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757469080, - "narHash": "sha256-nBBLIfu1ugSFRLtOpOt7OkQTrUMOjH0hzCcfDAQF3Yc=", + "lastModified": 1757555750, + "narHash": "sha256-32Tgm1H4NKhFKfGtW2Iy8X7P9TjKJ4JGGd9b+mCycE0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "34d1884d25d6eb93cf1c3434e04407f2b88c9dea", + "rev": "5eaf56d3a39239b3690fd057bda981bb202a6e04", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757347588, - "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757408970, - "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", + "lastModified": 1757545623, + "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", + "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", "type": "github" }, "original": { From 226188b26306b54f0cbe3a149cbddf8fb69b9db4 Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 12 Sep 2025 23:14:58 +0100 Subject: [PATCH 48/58] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3292e87..2534063 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757555750, - "narHash": "sha256-32Tgm1H4NKhFKfGtW2Iy8X7P9TjKJ4JGGd9b+mCycE0=", + "lastModified": 1757701823, + "narHash": "sha256-BawqTE8Hf8NJI5g0/vzMGcqFXXjYZkdz00DjsWrNUm4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "5eaf56d3a39239b3690fd057bda981bb202a6e04", + "rev": "e2147d6840365c062114c0eae2438283897eaafb", "type": "github" }, "original": { From 3fe1471c0ff0341dbe1d2ac770c397f6ad6194c6 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 16 Sep 2025 23:11:45 +0100 Subject: [PATCH 49/58] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2534063..43339f4 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1757218147, - "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757701823, - "narHash": "sha256-BawqTE8Hf8NJI5g0/vzMGcqFXXjYZkdz00DjsWrNUm4=", + "lastModified": 1757987448, + "narHash": "sha256-ltDT7EIfLHV42p99HnDfDviC8jN7tcOed1qsLEFypl8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e2147d6840365c062114c0eae2438283897eaafb", + "rev": "e496568b0e69d9d54c8cfef96ed1370952ad9786", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { From 49bca53aa74f1a76a7b5a5e8f902a48da95b3eac Mon Sep 17 00:00:00 2001 From: worble Date: Wed, 17 Sep 2025 23:58:51 +0100 Subject: [PATCH 50/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 43339f4..119e4af 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757987448, - "narHash": "sha256-ltDT7EIfLHV42p99HnDfDviC8jN7tcOed1qsLEFypl8=", + "lastModified": 1758073856, + "narHash": "sha256-o13f4LtQnjSrViwSY5Nk5kwLL7ZSzqCdJNBFlisLW68=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e496568b0e69d9d54c8cfef96ed1370952ad9786", + "rev": "4f7718392a369fad610c36d792d26386166f67e3", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1758070117, + "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", "type": "github" }, "original": { From 0a9037abaaa210ff503bffd225b8a19c3f29ed27 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 18 Sep 2025 23:47:14 +0100 Subject: [PATCH 51/58] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 119e4af..5042864 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1758160037, + "narHash": "sha256-fXelTdjdILspZ1IUU9aICB1+PXwSFiF8j+7ujwo1VpQ=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "4f554162fff88e77655073d352eec0cea71103a2", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758073856, - "narHash": "sha256-o13f4LtQnjSrViwSY5Nk5kwLL7ZSzqCdJNBFlisLW68=", + "lastModified": 1758160305, + "narHash": "sha256-WAV5JU2X2JdgoLLIpNPJIFXRWSbgMVY3v7KastJ3ejg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4f7718392a369fad610c36d792d26386166f67e3", + "rev": "74b143dcd49a8dc121902fa37d34d3c04592d6f2", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { From 93cee2d49a3ed562b68a4ebefcbaa1358d2bfa7f Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 19 Sep 2025 23:19:43 +0100 Subject: [PATCH 52/58] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 5042864..9621c20 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1758160037, - "narHash": "sha256-fXelTdjdILspZ1IUU9aICB1+PXwSFiF8j+7ujwo1VpQ=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "4f554162fff88e77655073d352eec0cea71103a2", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1757808926, - "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", + "lastModified": 1758313341, + "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", + "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758160305, - "narHash": "sha256-WAV5JU2X2JdgoLLIpNPJIFXRWSbgMVY3v7KastJ3ejg=", + "lastModified": 1758246789, + "narHash": "sha256-8u8Q6mwiYnk6OjCKzKLEUFGImbvc3GWV0H7vOGBA6W4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "74b143dcd49a8dc121902fa37d34d3c04592d6f2", + "rev": "acb6a0343d3bd8ad35de56cc91935b709a822fe9", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758070117, - "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", + "lastModified": 1758216857, + "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", + "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", "type": "github" }, "original": { From ac5216413e71bc903228caa6f740938f037763c7 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 20 Sep 2025 21:12:50 +0100 Subject: [PATCH 53/58] back to docker; add npmrc for not executing scripts; update hx script; --- configuration/modules/virtualisation.nix | 24 +++++++++------ devices/tuxedo/configuration.nix | 9 +++++- devices/tuxedo/home.nix | 2 +- home-manager/base.nix | 11 +++++-- home-manager/development/helix.nix | 37 +++++++++++++++--------- 5 files changed, 57 insertions(+), 26 deletions(-) diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 6fdff50..b8950c7 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -13,21 +13,27 @@ ovmf.enable = true; }; }; - podman = { - enable = true; - dockerSocket.enable = true; - dockerCompat = true; - }; - # remember to add the necessary users to the docker group - # docker = { + # podman = { # enable = true; - # storageDriver = "btrfs"; + # dockerSocket.enable = true; + # dockerCompat = true; + # defaultNetwork.settings.dns_enabled = true; # }; + # remember to add the necessary users to the docker group + docker = { + enable = true; + storageDriver = "btrfs"; + }; # waydroid = { # enable = true; # }; }; programs.virt-manager.enable = true; - environment.systemPackages = with pkgs;[ docker-compose podman-compose podman-tui podman-desktop ]; + # environment.systemPackages = with pkgs;[ + # docker-compose + # # podman-compose + # podman-tui + # podman-desktop + # ]; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 33d0e14..45168e0 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -66,7 +66,14 @@ users.users.worble = { initialPassword = "password"; isNormalUser = true; - extraGroups = [ "wheel" "gamemode" "docker" "cdrom" "wireshark" ]; # Enable ‘sudo’ for the user. + extraGroups = [ + "wheel" + "gamemode" + "docker" + "podman" + "cdrom" + "wireshark" + ]; # Enable ‘sudo’ for the user. linger = true; }; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 0838ecb..e30e258 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -79,7 +79,7 @@ gpu-api = "auto"; gpu-context = "auto"; hwdec = "auto"; - screenshot-directory = "/mnt/HDD2/Pictures/"; + # screenshot-directory = "/mnt/HDD2/Pictures/"; 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"; }; extraInput = '' diff --git a/home-manager/base.nix b/home-manager/base.nix index 662b95e..b5c7183 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, inputs, lib, ... }: { imports = [ @@ -24,9 +24,16 @@ strawberry ]; - # set breeze as default cursor + # set breeze as default cursor + # For cursor in steam? home.file.".icons/default".source = "${pkgs.kdePackages.breeze}/share/icons/breeze_cursors"; + home.file.".npmrc".text = lib.generators.toINIWithGlobalSection { } { + globalSection = { + ignore-scripts = "true"; + }; + }; + home.sessionVariables = { NIXOS_OZONE_WL = "1"; }; diff --git a/home-manager/development/helix.nix b/home-manager/development/helix.nix index eb62fba..e4e7985 100644 --- a/home-manager/development/helix.nix +++ b/home-manager/development/helix.nix @@ -21,30 +21,41 @@ with lib; } (mkIf config.helix.fullInstall { extraPackages = with pkgs;[ - marksman - shfmt - bash-language-server - superhtml + #nix nixd nixpkgs-fmt - biome + + #dotnet omnisharp-roslyn netcoredbg + + # rust + rustfmt + clippy + rust-analyzer + lldb + + #python ruff + + # shell + shfmt + bash-language-server + fish-lsp + + # misc + hyprls + marksman + + # web + superhtml + biome ] ++ (with nodePackages;[ vscode-langservers-extracted typescript-language-server ]); languages = { language = [ - { - name = "nix"; - language-servers = [ "nixd" "nil" ]; - } - { - name = "html"; - language-servers = [ "superhtml" "vscode-html-language-server" ]; - } { name = "bash"; formatter = { command = "shfmt"; }; From 7adcf7baa514be15442b45ea8f2bbbc37438ab51 Mon Sep 17 00:00:00 2001 From: worble Date: Sun, 21 Sep 2025 00:08:49 +0100 Subject: [PATCH 54/58] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 9621c20..f893cc2 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758246789, - "narHash": "sha256-8u8Q6mwiYnk6OjCKzKLEUFGImbvc3GWV0H7vOGBA6W4=", + "lastModified": 1758332913, + "narHash": "sha256-/wqd/u/5HS6RnI+73YxjIpb/4cRMAL4rHPlbe6e/ReE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "acb6a0343d3bd8ad35de56cc91935b709a822fe9", + "rev": "b5d08cee3a983228fe5040c11e475a724a6d447b", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { From 3d037d2dbdf4fe4ae7d58161362a768f97da96b9 Mon Sep 17 00:00:00 2001 From: worble Date: Mon, 22 Sep 2025 23:34:19 +0100 Subject: [PATCH 55/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f893cc2..33ad7d9 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1758313341, - "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1757822619, - "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", + "lastModified": 1758427679, + "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", + "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758332913, - "narHash": "sha256-/wqd/u/5HS6RnI+73YxjIpb/4cRMAL4rHPlbe6e/ReE=", + "lastModified": 1758506415, + "narHash": "sha256-nM3vIhN+dRm37VsaDLtnvYrTSJ44RxetY3rzJVT9Z7c=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b5d08cee3a983228fe5040c11e475a724a6d447b", + "rev": "d7cdbfe6c5f85827da2e10bc0c093e2808c341ec", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758216857, - "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", + "lastModified": 1758346548, + "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", + "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "type": "github" }, "original": { From 00b67e55bc91f604da4dd5659ebeb0a5c1ee1b2c Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 23 Sep 2025 23:11:19 +0100 Subject: [PATCH 56/58] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 33ad7d9..7fc5735 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758506415, - "narHash": "sha256-nM3vIhN+dRm37VsaDLtnvYrTSJ44RxetY3rzJVT9Z7c=", + "lastModified": 1758592317, + "narHash": "sha256-31arEzuPl+IPWYJuuXem43KN/6AnOeUe8m57hNeMmT8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "d7cdbfe6c5f85827da2e10bc0c093e2808c341ec", + "rev": "2e150825271a4e9d5e4f826911c476be43c799cf", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758346548, - "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { From db9826339f836c37ea5ae8a1e4655fd761334a13 Mon Sep 17 00:00:00 2001 From: worble Date: Thu, 25 Sep 2025 00:01:53 +0100 Subject: [PATCH 57/58] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7fc5735..52b5161 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758592317, - "narHash": "sha256-31arEzuPl+IPWYJuuXem43KN/6AnOeUe8m57hNeMmT8=", + "lastModified": 1758678836, + "narHash": "sha256-ewDKEXcKYF7L+EGVa+8E1nxK1pdwVrCHcj5UhuGA8V0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2e150825271a4e9d5e4f826911c476be43c799cf", + "rev": "5007786714b3573b37cf3b8c4a33e2ddce86960d", "type": "github" }, "original": { From 6a45fca8d56ac03ab658ad418fab1636bd63a998 Mon Sep 17 00:00:00 2001 From: worble Date: Fri, 26 Sep 2025 11:49:00 +0100 Subject: [PATCH 58/58] refactor and modularize base.nix futher; use default.nix when possible --- configuration/base/default.nix | 13 ++ configuration/base/location-time.nix | 14 +++ configuration/base/networking.nix | 26 ++++ configuration/base/pipewire.nix | 35 ++++++ configuration/base/programs.nix | 37 ++++++ configuration/{base.nix => default.nix} | 118 +----------------- devices/deck/home.nix | 2 +- devices/starlite/configuration.nix | 2 +- devices/starlite/home.nix | 2 +- devices/tuxedo/configuration.nix | 2 +- devices/tuxedo/home.nix | 6 +- home-manager/base/default.nix | 9 ++ home-manager/{base.nix => default.nix} | 6 +- .../development/{all.nix => default.nix} | 6 +- .../firefox/{firefox.nix => default.nix} | 0 15 files changed, 152 insertions(+), 126 deletions(-) create mode 100644 configuration/base/default.nix create mode 100644 configuration/base/location-time.nix create mode 100644 configuration/base/networking.nix create mode 100644 configuration/base/pipewire.nix create mode 100644 configuration/base/programs.nix rename configuration/{base.nix => default.nix} (50%) create mode 100644 home-manager/base/default.nix rename home-manager/{base.nix => default.nix} (91%) rename home-manager/development/{all.nix => default.nix} (100%) rename home-manager/firefox/{firefox.nix => default.nix} (100%) diff --git a/configuration/base/default.nix b/configuration/base/default.nix new file mode 100644 index 0000000..a86057f --- /dev/null +++ b/configuration/base/default.nix @@ -0,0 +1,13 @@ +{ ... }: + +{ + imports = [ + ./fonts.nix + ./kde.nix + ./location-time.nix + ./networking.nix + ./nix-settings.nix + ./pipewire.nix + ./programs.nix + ]; +} diff --git a/configuration/base/location-time.nix b/configuration/base/location-time.nix new file mode 100644 index 0000000..1fa22cf --- /dev/null +++ b/configuration/base/location-time.nix @@ -0,0 +1,14 @@ +{ ... }: + +{ + # Set your time zone. + # time.timeZone = "Europe/London"; + services.automatic-timezoned.enable = true; + services.chrony = { + enable = true; + }; + services.geoclue2 = { + enable = true; + geoProviderUrl = "https://api.beacondb.net/v1/geolocate"; + }; +} diff --git a/configuration/base/networking.nix b/configuration/base/networking.nix new file mode 100644 index 0000000..5afe702 --- /dev/null +++ b/configuration/base/networking.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: + +{ + # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager = { + # Easiest to use and most distros use this by default. + enable = true; + wifi.powersave = false; + }; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + services.mullvad-vpn = { + enable = true; + package = pkgs.mullvad-vpn; + }; + + # services.resolved.enable = true; +} diff --git a/configuration/base/pipewire.nix b/configuration/base/pipewire.nix new file mode 100644 index 0000000..ed0f3bf --- /dev/null +++ b/configuration/base/pipewire.nix @@ -0,0 +1,35 @@ +{ ... }: + +{ + # Enable sound. + # hardware.pulseaudio.enable = true; + # OR + 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" + ]; + }; + } + ]; + }; + }; + }; +} diff --git a/configuration/base/programs.nix b/configuration/base/programs.nix new file mode 100644 index 0000000..b76d6a3 --- /dev/null +++ b/configuration/base/programs.nix @@ -0,0 +1,37 @@ +{ pkgs, ... }: + +{ + security.sudo-rs.enable = true; + services.fwupd.enable = true; + 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 + dig + + rar + zstd + xz + p7zip + + libva-utils + smartmontools + appimage-run + + # dicts + nuspell + hunspellDicts.en-gb-large + + # For cursor in steam? + xsettingsd + xorg.xrdb + ]; +} diff --git a/configuration/base.nix b/configuration/default.nix similarity index 50% rename from configuration/base.nix rename to configuration/default.nix index 38e8f2d..0c04f4a 100644 --- a/configuration/base.nix +++ b/configuration/default.nix @@ -5,130 +5,24 @@ { pkgs, ... }: { - imports = - [ - ./base/nix-settings.nix - ./base/fonts.nix - ./base/kde.nix - ]; + imports = [ ./base ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_latest; + hardware.bluetooth.enable = true; + hardware.enableRedistributableFirmware = true; + hardware.enableAllFirmware = true; + + # Disks / Swap / etc # swapDevices = [{ # device = "/var/lib/swapfile"; # size = 16 * 1024; # 16 GB # }]; zramSwap.enable = true; # Creates a zram block device and uses it as a swap device - - hardware.bluetooth.enable = true; - hardware.enableRedistributableFirmware = true; - hardware.enableAllFirmware = true; - - security.sudo-rs.enable = true; - - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager = { - # Easiest to use and most distros use this by default. - enable = true; - wifi.powersave = false; - }; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # hardware.pulseaudio.enable = true; - # OR - 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; - # services.resolved.enable = true; - services.mullvad-vpn = { - enable = true; - package = pkgs.mullvad-vpn; - }; - - # Set your time zone. - # time.timeZone = "Europe/London"; - services.automatic-timezoned.enable = true; - services.chrony = { - enable = true; - }; - - services.fwupd.enable = true; - services.geoclue2 = { - enable = true; - geoProviderUrl = "https://api.beacondb.net/v1/geolocate"; - }; - 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 - dig - - rar - zstd - xz - p7zip - - libva-utils - smartmontools - appimage-run - - # dicts - nuspell - hunspellDicts.en-gb-large - - # For cursor in steam? - xsettingsd - xorg.xrdb - ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/devices/deck/home.nix b/devices/deck/home.nix index e6403b8..737b848 100644 --- a/devices/deck/home.nix +++ b/devices/deck/home.nix @@ -5,7 +5,7 @@ let in { imports = [ - ../../home-manager/base.nix + ../../home-manager ../../home-manager/gaming.nix ../../home-manager/development/vscode.nix ]; diff --git a/devices/starlite/configuration.nix b/devices/starlite/configuration.nix index 1c1dc7e..e3deaa3 100644 --- a/devices/starlite/configuration.nix +++ b/devices/starlite/configuration.nix @@ -7,7 +7,7 @@ { imports = [ - ../../configuration/base.nix + ../../configuration # Include the results of the hardware scan. ./hardware-configuration.nix inputs.disko.nixosModules.default diff --git a/devices/starlite/home.nix b/devices/starlite/home.nix index b90ffe5..583561a 100644 --- a/devices/starlite/home.nix +++ b/devices/starlite/home.nix @@ -2,7 +2,7 @@ { imports = [ - ../../home-manager/base.nix + ../../home-manager ../../home-manager/development/vscode.nix ]; diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 45168e0..e018bad 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -7,7 +7,7 @@ { imports = [ - ../../configuration/base.nix + ../../configuration # Include the results of the hardware scan. ./hardware-configuration.nix inputs.disko.nixosModules.default diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index e30e258..c3c0fc5 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -2,8 +2,8 @@ { imports = [ - ../../home-manager/base.nix - ../../home-manager/development/all.nix + ../../home-manager + ../../home-manager/development ../../home-manager/gaming.nix ../../home-manager/streamlink.nix ]; @@ -79,7 +79,7 @@ gpu-api = "auto"; gpu-context = "auto"; hwdec = "auto"; - # screenshot-directory = "/mnt/HDD2/Pictures/"; + screenshot-directory = "/mnt/HDD2/Pictures/"; 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"; }; extraInput = '' diff --git a/home-manager/base/default.nix b/home-manager/base/default.nix new file mode 100644 index 0000000..56ecafd --- /dev/null +++ b/home-manager/base/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + imports = [ + ./fonts.nix + ./mpv.nix + ./terminal.nix + ]; +} diff --git a/home-manager/base.nix b/home-manager/default.nix similarity index 91% rename from home-manager/base.nix rename to home-manager/default.nix index b5c7183..36b79e8 100644 --- a/home-manager/base.nix +++ b/home-manager/default.nix @@ -2,10 +2,8 @@ { imports = [ - ./base/fonts.nix - ./base/terminal.nix - ./base/mpv.nix - ./firefox/firefox.nix + ./base + ./firefox ]; home.packages = with pkgs;[ diff --git a/home-manager/development/all.nix b/home-manager/development/default.nix similarity index 100% rename from home-manager/development/all.nix rename to home-manager/development/default.nix index 7a20034..0796580 100644 --- a/home-manager/development/all.nix +++ b/home-manager/development/default.nix @@ -2,10 +2,10 @@ { imports = [ - ./vscode.nix - ./helix.nix ./dotnet.nix - ./sql.nix ./games.nix + ./helix.nix + ./sql.nix + ./vscode.nix ]; } diff --git a/home-manager/firefox/firefox.nix b/home-manager/firefox/default.nix similarity index 100% rename from home-manager/firefox/firefox.nix rename to home-manager/firefox/default.nix