From 2625fa133cb6fb2c5535c37090d171e98c410121 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 14 May 2024 13:27:46 +0200 Subject: [PATCH 01/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/062ca2a9370a27a35c524dc82d540e6e9824b652?narHash=sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0%3D' (2024-05-11) → 'github:NixOS/nixpkgs/2057814051972fa1453ddfb0d98badbea9b83c06?narHash=sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk%3D' (2024-05-12) • Updated input 'nixpkgs-update': 'github:ryantm/nixpkgs-update/f368b504aa1d766c835c3a89ec24e86077a97272?narHash=sha256-mgjwvt9hzjGBisOx4Sn9V0Im4XEnld288F6KtmNhyM0%3D' (2024-05-01) → 'github:ryantm/nixpkgs-update/4e1df89d081c96429f257d125f4c7ab02adffd47?narHash=sha256-WapL4RmvX%2BFaRtJvhbtCDGGzefn8wam%2ByO0hnf4l9%2Bs%3D' (2024-05-14) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 9516ab0..19dab71 100644 --- a/flake.lock +++ b/flake.lock @@ -288,11 +288,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1714534265, - "narHash": "sha256-mgjwvt9hzjGBisOx4Sn9V0Im4XEnld288F6KtmNhyM0=", + "lastModified": 1715679428, + "narHash": "sha256-WapL4RmvX+FaRtJvhbtCDGGzefn8wam+yO0hnf4l9+s=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "f368b504aa1d766c835c3a89ec24e86077a97272", + "rev": "4e1df89d081c96429f257d125f4c7ab02adffd47", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { From 2780424eea8429a61ab32d4ee7a997b366ddf3af Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 15 May 2024 14:03:12 +0200 Subject: [PATCH 02/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-alien': 'github:thiagokokada/nix-alien/db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5?narHash=sha256-6X0H56qGmN/LoEdcBcwm3%2BapHLEe7r4caO719q1/KMI%3D' (2024-04-15) → 'github:thiagokokada/nix-alien/ea6ebda03c5537eebbb93af57ca6f2c2979981be?narHash=sha256-2hAydsdMk6QmDar%2B16ryyn%2BpVksxudwC5vRiatJbysM%3D' (2024-05-15) • Updated input 'nix-alien/nix-index-database': 'github:nix-community/nix-index-database/93aed67288be60c9ef6133ba2f8de128f4ef265c?narHash=sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ%3D' (2024-04-14) → 'github:nix-community/nix-index-database/f9027322f48b427da23746aa359a6510dfcd0228?narHash=sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU%3D' (2024-05-12) • Updated input 'nix-alien/nix-index-database/nixpkgs': 'github:nixos/nixpkgs/1042fd8b148a9105f3c0aca3a6177fd1d9360ba5?narHash=sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw%3D' (2024-04-10) → 'github:nixos/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714?narHash=sha256-doPgfj%2B7FFe9rfzWo1siAV2mVCasW%2BBh8I1cToAXEE4%3D' (2024-05-09) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 19dab71..a1a6c14 100644 --- a/flake.lock +++ b/flake.lock @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1713164845, - "narHash": "sha256-6X0H56qGmN/LoEdcBcwm3+apHLEe7r4caO719q1/KMI=", + "lastModified": 1715754082, + "narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5", + "rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1713067146, - "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { From 0e3bc609548823660f6e3a3b06493c65b6212e2c Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 16 May 2024 13:35:38 +0200 Subject: [PATCH 03/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2057814051972fa1453ddfb0d98badbea9b83c06?narHash=sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk%3D' (2024-05-12) → 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5?narHash=sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg%3D' (2024-05-15) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a1a6c14..c81947a 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { From 44325cf0849922d36475f93cc29ef0ef07da9d8c Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 17 May 2024 18:28:16 +0200 Subject: [PATCH 04/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/44677a1c96810a8e8c4ffaeaad10c842402647c1?narHash=sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4%3D' (2024-05-12) → 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d?narHash=sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ%2BNqp%2Bi58O46LI%3D' (2024-05-17) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c81947a..5fe82b1 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { From bcb2e56d9a86c1cf137d68f2296a8fa17f30e12d Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sat, 18 May 2024 01:55:48 +0200 Subject: [PATCH 05/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/44677a1c96810a8e8c4ffaeaad10c842402647c1' (2024-05-12) → 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17) • Updated input 'nix-alien': 'github:thiagokokada/nix-alien/db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5' (2024-04-15) → 'github:thiagokokada/nix-alien/ea6ebda03c5537eebbb93af57ca6f2c2979981be' (2024-05-15) • Updated input 'nix-alien/nix-index-database': 'github:nix-community/nix-index-database/93aed67288be60c9ef6133ba2f8de128f4ef265c' (2024-04-14) → 'github:nix-community/nix-index-database/f9027322f48b427da23746aa359a6510dfcd0228' (2024-05-12) • Updated input 'nix-alien/nix-index-database/nixpkgs': 'github:nixos/nixpkgs/1042fd8b148a9105f3c0aca3a6177fd1d9360ba5' (2024-04-10) → 'github:nixos/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714' (2024-05-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2057814051972fa1453ddfb0d98badbea9b83c06' (2024-05-12) → 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 19dab71..5fe82b1 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1713164845, - "narHash": "sha256-6X0H56qGmN/LoEdcBcwm3+apHLEe7r4caO719q1/KMI=", + "lastModified": 1715754082, + "narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5", + "rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1713067146, - "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { From 3644f9353c3631f8cc7cd34517dfa6f66d3f428b Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sat, 18 May 2024 14:24:03 +0200 Subject: [PATCH 06/11] fix nix env availability --- home-manager/modules/packages.nix | 1 + home-manager/programs/topgrade.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 23744c0..fe19cfa 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -18,6 +18,7 @@ in home.packages = with pkgs; [ + pkgs.nixVersions.latest # because remotely invoked updates are fun ;) up htop rustc diff --git a/home-manager/programs/topgrade.nix b/home-manager/programs/topgrade.nix index c496e07..03d1fd1 100644 --- a/home-manager/programs/topgrade.nix +++ b/home-manager/programs/topgrade.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: let configPath = if config.machine.isGeneric then @@ -22,7 +22,7 @@ in { firmware = { upgrade = true; }; pre_commands = { flakeUpgrade = - "cd ${configPath} && nix flake update --commit-lock-file --verbose --repair"; + "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair"; }; }; }; From 299df4379bbc930bcc33396a66101c02f7e257ed Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 21 May 2024 13:52:04 +0200 Subject: [PATCH 07/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/f9027322f48b427da23746aa359a6510dfcd0228?narHash=sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU%3D' (2024-05-12) → 'github:nix-community/nix-index-database/e0638db3db43b582512a7de8c0f8363a162842b9?narHash=sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI%3D' (2024-05-20) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5?narHash=sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg%3D' (2024-05-15) → 'github:NixOS/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1?narHash=sha256-sowPU%2BtLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM%3D' (2024-05-19) • Updated input 'suyu': 'github:Noodlez1232/suyu-flake/b3904f149f124bc485e1cb61b4e824ed9ec5c7e7?narHash=sha256-7dvQhBvf8IGL2djRtVeWFLqo%2BAK7cvYxyj8PDJ/qvh0%3D' (2024-04-25) → 'github:Noodlez1232/suyu-flake/4cde0c1ba0f3aff06bf0b6883efbc62e9e7df957?narHash=sha256-OyZ/h%2BfPErK8RRjloV4P0SqPYO7zXDUWa3tDkTJBJhs%3D' (2024-05-21) • Updated input 'suyu/nixpkgs': 'github:NixOS/nixpkgs/1e1dc66fe68972a76679644a5577828b6a7e8be4?narHash=sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo%3D' (2024-04-22) → 'github:NixOS/nixpkgs/5a5ac83292c7842072318f57d68a48474f8bd34d?narHash=sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE%3D' (2024-05-20) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5fe82b1..7420656 100644 --- a/flake.lock +++ b/flake.lock @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1715483403, - "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", + "lastModified": 1716170277, + "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9027322f48b427da23746aa359a6510dfcd0228", + "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1713805509, - "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", + "lastModified": 1716190602, + "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", + "rev": "5a5ac83292c7842072318f57d68a48474f8bd34d", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1714016451, - "narHash": "sha256-7dvQhBvf8IGL2djRtVeWFLqo+AK7cvYxyj8PDJ/qvh0=", + "lastModified": 1716253103, + "narHash": "sha256-OyZ/h+fPErK8RRjloV4P0SqPYO7zXDUWa3tDkTJBJhs=", "owner": "Noodlez1232", "repo": "suyu-flake", - "rev": "b3904f149f124bc485e1cb61b4e824ed9ec5c7e7", + "rev": "4cde0c1ba0f3aff06bf0b6883efbc62e9e7df957", "type": "github" }, "original": { From 1b8925a3f9a0dc2ded86b3355fa3d4861b0fa609 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 22 May 2024 16:37:50 +0200 Subject: [PATCH 08/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1?narHash=sha256-sowPU%2BtLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM%3D' (2024-05-19) → 'github:NixOS/nixpkgs/3eaeaeb6b1e08a016380c279f8846e0bd8808916?narHash=sha256-pU9ViBVE3XYb70xZx%2BjK6SEVphvt7xMTbm6yDIF4xPs%3D' (2024-05-21) • Updated input 'nixpkgs-update': 'github:ryantm/nixpkgs-update/4e1df89d081c96429f257d125f4c7ab02adffd47?narHash=sha256-WapL4RmvX%2BFaRtJvhbtCDGGzefn8wam%2ByO0hnf4l9%2Bs%3D' (2024-05-14) → 'github:ryantm/nixpkgs-update/3e25ce4c5f54e790bf757ac2f17915fc8ec4fc1d?narHash=sha256-aTwS8rp0vaDOIgirVNfYNr8swW/yG8AtOxbBoFpdD9U%3D' (2024-05-22) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 7420656..f0282fd 100644 --- a/flake.lock +++ b/flake.lock @@ -288,11 +288,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715679428, - "narHash": "sha256-WapL4RmvX+FaRtJvhbtCDGGzefn8wam+yO0hnf4l9+s=", + "lastModified": 1716350738, + "narHash": "sha256-aTwS8rp0vaDOIgirVNfYNr8swW/yG8AtOxbBoFpdD9U=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "4e1df89d081c96429f257d125f4c7ab02adffd47", + "rev": "3e25ce4c5f54e790bf757ac2f17915fc8ec4fc1d", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { From b2d0f91bae5cdcb67b9d25a983211f017b1edbf0 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 23 May 2024 23:04:10 +0200 Subject: [PATCH 09/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d?narHash=sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ%2BNqp%2Bi58O46LI%3D' (2024-05-17) → 'github:nix-community/home-manager/850cb322046ef1a268449cf1ceda5fd24d930b05?narHash=sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo%3D' (2024-05-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3eaeaeb6b1e08a016380c279f8846e0bd8808916?narHash=sha256-pU9ViBVE3XYb70xZx%2BjK6SEVphvt7xMTbm6yDIF4xPs%3D' (2024-05-21) → 'github:NixOS/nixpkgs/5710852ba686cc1fd0d3b8e22b3117d43ba374c2?narHash=sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y%2BVBUeU%3D' (2024-05-21) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f0282fd..77cd29f 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { From 5da37d8133d6f5e8574f317ef908d5dfa08ff8e3 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 28 May 2024 12:55:58 +0200 Subject: [PATCH 10/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dagger': 'github:dagger/nix/561a09f4c8b0eadf291f072b2e35498d9e33cdb9?narHash=sha256-j4k51vcfTCgEPElhB%2B/4fL8MA05HhC%2BvZvUh1eQYzc0%3D' (2024-05-09) → 'github:dagger/nix/9e26b2f73eebf9e3b9fbc1a31c378ccb2daf84cd?narHash=sha256-n1UnQ7RbJwDAUX1fq4%2BhUNVVIWDlZKvAsUp/muSkV3g%3D' (2024-05-28) • Updated input 'home-manager': 'github:nix-community/home-manager/850cb322046ef1a268449cf1ceda5fd24d930b05?narHash=sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo%3D' (2024-05-23) → 'github:nix-community/home-manager/10c7c219b7dae5795fb67f465a0d86cbe29f25fa?narHash=sha256-rjEswRV0o23eBBils8lJXyIGha%2Bl/VjV73IPg%2Bztxgk%3D' (2024-05-27) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/e0638db3db43b582512a7de8c0f8363a162842b9?narHash=sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI%3D' (2024-05-20) → 'github:nix-community/nix-index-database/ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac?narHash=sha256-Idcye44UW%2BEgjbjCoklf2IDF%2BXrehV6CVYvxR1omst4%3D' (2024-05-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5710852ba686cc1fd0d3b8e22b3117d43ba374c2?narHash=sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y%2BVBUeU%3D' (2024-05-21) → 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092?narHash=sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8%3D' (2024-05-24) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 77cd29f..6ab7162 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715270390, - "narHash": "sha256-j4k51vcfTCgEPElhB+/4fL8MA05HhC+vZvUh1eQYzc0=", + "lastModified": 1716892732, + "narHash": "sha256-n1UnQ7RbJwDAUX1fq4+hUNVVIWDlZKvAsUp/muSkV3g=", "owner": "dagger", "repo": "nix", - "rev": "561a09f4c8b0eadf291f072b2e35498d9e33cdb9", + "rev": "9e26b2f73eebf9e3b9fbc1a31c378ccb2daf84cd", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1716847642, + "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1716170277, - "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", + "lastModified": 1716772633, + "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", + "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { From 3bceb198a83c0a2a98511fffbc6a0880af5207ec Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 28 May 2024 14:38:22 +0200 Subject: [PATCH 11/11] reformat according to rfc standard --- configs/fedora/home.nix | 11 +- .../thilo-laptop/hardware-configuration.nix | 20 +- configs/thilo-laptop/home.nix | 8 +- configs/thilo-laptop/nixos.nix | 24 ++- configs/thilo-pc/hardware-configuration.nix | 21 +- configs/thilo-pc/home.nix | 20 +- configs/thilo-pc/nixos.nix | 9 +- flake.nix | 91 +++++---- home-manager/modules/machine.nix | 14 +- home-manager/modules/packages.nix | 181 ++++++++++-------- .../pkgs/docker-craft-cms-dev-env.nix | 9 +- home-manager/pkgs/extract.nix | 40 ++-- home-manager/pkgs/spx-gc.nix | 9 +- home-manager/programs/alacritty.nix | 10 +- home-manager/programs/atuin.nix | 4 +- home-manager/programs/bat.nix | 6 +- home-manager/programs/beets.nix | 4 +- home-manager/programs/chromium.nix | 8 +- home-manager/programs/command-not-found.nix | 6 +- home-manager/programs/git.nix | 20 +- home-manager/programs/go.nix | 6 +- home-manager/programs/hstr.nix | 6 +- home-manager/programs/mpv.nix | 6 +- home-manager/programs/neovim.nix | 4 +- home-manager/programs/starship.nix | 8 +- home-manager/programs/syncthing.nix | 6 +- home-manager/programs/thefuck.nix | 4 +- home-manager/programs/topgrade.nix | 27 ++- home-manager/programs/yt-dlp.nix | 7 +- home-manager/utils/nixGLWrap.nix | 25 ++- home-manager/wrappers/fedora.nix | 3 +- nix.nix | 5 +- nixos/builders.nix | 137 ++++++------- nixos/common.nix | 27 ++- 34 files changed, 480 insertions(+), 306 deletions(-) diff --git a/configs/fedora/home.nix b/configs/fedora/home.nix index 6789347..4298e5c 100644 --- a/configs/fedora/home.nix +++ b/configs/fedora/home.nix @@ -1,8 +1,15 @@ -{ pkgs, config, lib, inputs, ... }: +{ + pkgs, + config, + lib, + inputs, + ... +}: let nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; }; -in { +in +{ imports = [ ./../../home-manager/modules/machine.nix ]; machine = { diff --git a/configs/thilo-laptop/hardware-configuration.nix b/configs/thilo-laptop/hardware-configuration.nix index 33e37e6..d9441df 100644 --- a/configs/thilo-laptop/hardware-configuration.nix +++ b/configs/thilo-laptop/hardware-configuration.nix @@ -1,11 +1,21 @@ -{ config, lib, modulesPath, ... }: +{ + config, + lib, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { initrd = { - availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ]; + availableKernelModules = [ + "nvme" + "xhci_pci" + "usb_storage" + "sd_mod" + ]; kernelModules = [ ]; }; kernelModules = [ "kvm-amd" ]; @@ -17,8 +27,7 @@ fsType = "ext4"; }; - boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = - "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55"; + boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/877C-C918"; @@ -36,6 +45,5 @@ # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/configs/thilo-laptop/home.nix b/configs/thilo-laptop/home.nix index a5918fa..35d3481 100644 --- a/configs/thilo-laptop/home.nix +++ b/configs/thilo-laptop/home.nix @@ -4,7 +4,9 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { + inherit inputs; + }; users.thilo = { imports = [ ./../../home-manager/modules/machine.nix ]; @@ -16,7 +18,9 @@ isGraphical = true; }; - home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; }; + home.sessionVariables = { + LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; + }; }; }; } diff --git a/configs/thilo-laptop/nixos.nix b/configs/thilo-laptop/nixos.nix index 154f7f0..763cd2a 100644 --- a/configs/thilo-laptop/nixos.nix +++ b/configs/thilo-laptop/nixos.nix @@ -1,7 +1,8 @@ { pkgs, ... }: { - imports = [ # Include the results of the hardware scan. + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix ./../../nixos/common.nix ./../../nixos/builders.nix @@ -15,14 +16,19 @@ boot.plymouth.enable = true; # Setup keyfile - boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; + boot.initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; networking.hostName = "thilo-laptop"; # Define your hostname. # Configure console keymap console.keyMap = "de"; - environment.gnome.excludePackages = with pkgs; [ tracker tracker-miners ]; + environment.gnome.excludePackages = with pkgs; [ + tracker + tracker-miners + ]; hardware.bluetooth.enable = true; @@ -66,18 +72,16 @@ ]; }; - environment.systemPackages = with pkgs; [ brlaser brgenml1lpr ]; - - nixpkgs.config.permittedInsecurePackages = [ - "nix-2.16.2" + environment.systemPackages = with pkgs; [ + brlaser + brgenml1lpr ]; + nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ]; xdg.portal = { enable = true; - extraPortals = [ - pkgs.kdePackages.xdg-desktop-portal-kde - ]; + extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; }; system.stateVersion = "23.05"; diff --git a/configs/thilo-pc/hardware-configuration.nix b/configs/thilo-pc/hardware-configuration.nix index e7fd89b..f4e12a5 100644 --- a/configs/thilo-pc/hardware-configuration.nix +++ b/configs/thilo-pc/hardware-configuration.nix @@ -1,15 +1,27 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, modulesPath, ... }: +{ + config, + lib, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { initrd = { - availableKernelModules = - [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ]; + availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usbhid" + "uas" + "usb_storage" + "sd_mod" + ]; kernelModules = [ ]; }; kernelModules = [ "kvm-amd" ]; @@ -44,6 +56,5 @@ # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix index d1a0de9..e9ca8fe 100644 --- a/configs/thilo-pc/home.nix +++ b/configs/thilo-pc/home.nix @@ -4,7 +4,9 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { + inherit inputs; + }; users.thilo = { imports = [ ./../../home-manager/modules/machine.nix ]; @@ -16,13 +18,17 @@ isGraphical = true; }; -/* xsession.pointerCursor = { - name = "Bibata-Modern-Classic"; - package = pkgs.bibata-cursors; - size = 128; - }; */ + /* + xsession.pointerCursor = { + name = "Bibata-Modern-Classic"; + package = pkgs.bibata-cursors; + size = 128; + }; + */ - home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; }; + home.sessionVariables = { + LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; + }; home.packages = with pkgs; [ libsForQt5.discover ]; }; diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix index 2c340ac..fccf719 100644 --- a/configs/thilo-pc/nixos.nix +++ b/configs/thilo-pc/nixos.nix @@ -58,7 +58,10 @@ programs.nix-ld.enable = true; hardware.opengl = { - extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ]; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + ]; }; hardware.bluetooth.enable = true; @@ -86,9 +89,7 @@ ]; }; - nixpkgs.config.permittedInsecurePackages = [ - "nix-2.16.2" - ]; + nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ]; system.stateVersion = "23.05"; } diff --git a/flake.nix b/flake.nix index 7d3742d..db9460b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,12 @@ description = "Nixos config"; inputs = { - nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable"; }; - nixpkgs-update = { url = "github:ryantm/nixpkgs-update"; }; + nixpkgs = { + url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + nixpkgs-update = { + url = "github:ryantm/nixpkgs-update"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -31,21 +35,28 @@ }; nixConfig = { - substituters = [ - "https://cache.nixos.org" - "https://nix-community.cachix.org" - "https://nixpkgs-update.cachix.org" - "https://devenv.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8=" - "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" - ]; + substituters = [ + "https://cache.nixos.org" + "https://nix-community.cachix.org" + "https://nixpkgs-update.cachix.org" + "https://devenv.cachix.org" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8=" + "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" + ]; }; - outputs = { nixpkgs, home-manager, nixgl, w17, ... }@inputs: + outputs = + { + nixpkgs, + home-manager, + nixgl, + w17, + ... + }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -53,7 +64,8 @@ overlays = [ nixgl.overlay ]; allowUnfree = true; }; - in { + in + { nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -61,7 +73,9 @@ ./configs/thilo-pc/nixos.nix ./configs/thilo-pc/home.nix ]; - specialArgs = { inherit inputs; }; + specialArgs = { + inherit inputs; + }; }; nixosConfigurations.thilo-laptop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -70,28 +84,33 @@ ./configs/thilo-laptop/nixos.nix ./configs/thilo-laptop/home.nix ]; - specialArgs = { inherit inputs; }; + specialArgs = { + inherit inputs; + }; }; - homeConfigurations."thilo@thilo-pc" = - home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - inputs.nix-index-database.hmModules.nix-index - ./configs/fedora/home.nix - ]; - extraSpecialArgs = { inherit inputs nixgl; }; + homeConfigurations."thilo@thilo-pc" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + inputs.nix-index-database.hmModules.nix-index + ./configs/fedora/home.nix + ]; + extraSpecialArgs = { + inherit inputs nixgl; }; - homeConfigurations."thilo@thilo-laptop" = - home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ ./configs/fedora/home.nix ]; - extraSpecialArgs = { inherit inputs nixgl; }; + }; + homeConfigurations."thilo@thilo-laptop" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./configs/fedora/home.nix ]; + extraSpecialArgs = { + inherit inputs nixgl; }; - homeConfigurations."thilo@thilo-pc-win" = - home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ ./configs/wsl/home.nix ]; - extraSpecialArgs = { inherit inputs nixgl; }; + }; + homeConfigurations."thilo@thilo-pc-win" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./configs/wsl/home.nix ]; + extraSpecialArgs = { + inherit inputs nixgl; }; + }; }; } diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix index e6507a3..70c15ab 100644 --- a/home-manager/modules/machine.nix +++ b/home-manager/modules/machine.nix @@ -1,5 +1,11 @@ -{ lib, pkgs, config, ... }: -with lib; { +{ + lib, + pkgs, + config, + ... +}: +with lib; +{ imports = [ ./../programs/atuin.nix ./../programs/alacritty.nix @@ -80,8 +86,7 @@ with lib; { ''; ".ssh/config_source" = { source = ./../dotfiles/ssh-config; - onChange = - "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config"; + onChange = "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config"; }; ".gitignore".source = ./../dotfiles/.gitignore; ".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = '' @@ -131,4 +136,3 @@ with lib; { }; }; } - diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index fe19cfa..8f8f248 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -1,10 +1,15 @@ -{ config, pkgs, lib, inputs, ... }: +{ + config, + pkgs, + lib, + inputs, + ... +}: with lib; let nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; }; - electronFlags = - "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n"; + electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n"; in { config = { @@ -16,14 +21,15 @@ in }) ]; - home.packages = with pkgs; + home.packages = + with pkgs; [ pkgs.nixVersions.latest # because remotely invoked updates are fun ;) up htop rustc cargo - nixfmt + nixfmt-rfc-style nodejs bun deno @@ -40,12 +46,11 @@ in hub httpie manix - (pkgs.writeShellScriptBin "ssh-fix-permissions" - (builtins.readFile ./../scripts/ssh-fix-permissions.sh)) - (pkgs.writeShellScriptBin "yt-dlp-audio" - (builtins.readFile ./../scripts/yt-dlp-audio.sh)) - (pkgs.writeShellScriptBin "nix-shell-init" - (builtins.readFile ./../scripts/nix-shell-init.sh)) + (pkgs.writeShellScriptBin "ssh-fix-permissions" ( + builtins.readFile ./../scripts/ssh-fix-permissions.sh + )) + (pkgs.writeShellScriptBin "yt-dlp-audio" (builtins.readFile ./../scripts/yt-dlp-audio.sh)) + (pkgs.writeShellScriptBin "nix-shell-init" (builtins.readFile ./../scripts/nix-shell-init.sh)) (pkgs.writeShellScriptBin "http-server" '' ${pkgs.caddy}/bin/caddy file-server --listen :2345 '') @@ -72,84 +77,94 @@ in inputs.w17.packages.x86_64-linux.default aichat (pkgs.nerdfonts.override { - fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; + fonts = [ + "JetBrainsMono" + "FiraCode" + "FiraMono" + ]; }) nix-output-monitor nodePackages.pnpm npm-check-updates - ] ++ ( - if ( - !config.machine.isGeneric - ) then [ - toolbox - distrobox - ] else + ] + ++ ( + if (!config.machine.isGeneric) then + [ + toolbox + distrobox + ] + else [ ] - ) ++ ( - if ( - config.machine.isGraphical - ) then [ - (nixGL insomnia) - (nixGL comma) - ] else + ) + ++ ( + if (config.machine.isGraphical) then + [ + (nixGL insomnia) + (nixGL comma) + ] + else [ ] - ) ++ ( - if ( - config.machine.isGraphical && !config.machine.isGeneric - ) then [ - corefonts - vistafonts - jetbrains.webstorm - jetbrains.phpstorm - jetbrains.rust-rover - jetbrains.goland - element-desktop - ludusavi - dbeaver - onlyoffice-bin - spotify - vesktop - (lutris.override { - extraLibraries = _: [ gnome3.adwaita-icon-theme ]; - extraPkgs = _: [ - wineWowPackages.full - winetricks - gnome3.adwaita-icon-theme - ]; - }) - bottles - protontricks - heroic - (vscode.override { commandLineArgs = electronFlags; }) - quickemu - quickgui - trilium-desktop - anki - # inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager - jetbrains-toolbox - mumble - prusa-slicer - trayscale - gnome.gnome-disk-utility - inkscape - musescore - obsidian - syncthingtray - reaper - yabridge - inputs.suyu.packages.x86_64-linux.suyu - inputs.nix-alien.packages.x86_64-linux.nix-alien - kdePackages.kdenlive - audacity - ] else + ) + ++ ( + if (config.machine.isGraphical && !config.machine.isGeneric) then + [ + jetbrains.webstorm + jetbrains.phpstorm + jetbrains.rust-rover + jetbrains.goland + element-desktop + ludusavi + dbeaver + onlyoffice-bin + spotify + vesktop + (lutris.override { + extraLibraries = _: [ gnome3.adwaita-icon-theme ]; + extraPkgs = _: [ + wineWowPackages.full + winetricks + gnome3.adwaita-icon-theme + ]; + }) + bottles + protontricks + heroic + (vscode.override { commandLineArgs = electronFlags; }) + quickemu + quickgui + trilium-desktop + anki + # inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager + jetbrains-toolbox + mumble + prusa-slicer + trayscale + gnome.gnome-disk-utility + inkscape + musescore + obsidian + syncthingtray + reaper + yabridge + inputs.suyu.packages.x86_64-linux.suyu + inputs.nix-alien.packages.x86_64-linux.nix-alien + kdePackages.kdenlive + audacity + ] + else [ ] - ) ++ (if config.machine.isGnome then [ - gnomeExtensions.blur-my-shell - gnomeExtensions.dash-to-panel - gnomeExtensions.user-themes - gnomeExtensions.vitals - gnomeExtensions.custom-accent-colors - ] else - [ ]); + ) + ++ ( + if config.machine.isGnome then + [ + gnomeExtensions.blur-my-shell + gnomeExtensions.dash-to-panel + gnomeExtensions.user-themes + gnomeExtensions.vitals + gnomeExtensions.custom-accent-colors + ] + else + [ ] + ); }; } diff --git a/home-manager/pkgs/docker-craft-cms-dev-env.nix b/home-manager/pkgs/docker-craft-cms-dev-env.nix index 8a847f5..2726c5b 100644 --- a/home-manager/pkgs/docker-craft-cms-dev-env.nix +++ b/home-manager/pkgs/docker-craft-cms-dev-env.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "docker-craft-cms-dev-env"; @@ -17,8 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = - "Docker image for local development of sites based on Craft CMS"; + description = "Docker image for local development of sites based on Craft CMS"; homepage = "https://github.com/codemonauts/docker-craft-cms-dev-env"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/home-manager/pkgs/extract.nix b/home-manager/pkgs/extract.nix index 90b170b..5124313 100644 --- a/home-manager/pkgs/extract.nix +++ b/home-manager/pkgs/extract.nix @@ -1,24 +1,24 @@ { pkgs }: -/* SOURCE: https://ostechnix.com/a-bash-function-to-extract-file-archives-of-various-types/ */ +# SOURCE: https://ostechnix.com/a-bash-function-to-extract-file-archives-of-various-types/ pkgs.writeShellScriptBin "extract" '' -if [ -f $1 ] ; then - case $1 in - *.tar.bz2) ${pkgs.gnutar}/bin/tar xjf $1 ;; - *.tar.gz) ${pkgs.gnutar}/bin/tar $1 ;; - *.bz2) ${pkgs.bzip2}/bin/bunzip2 $1 ;; - *.rar) ${pkgs.rar}/bin/rar x $1 ;; - *.gz) ${pkgs.gzip}/bin/gunzip $1 ;; - *.tar) ${pkgs.gnutar}/bin/tar xf $1 ;; - *.tbz2) ${pkgs.gnutar}/bin/tar xjf $1 ;; - *.tgz) ${pkgs.gnutar}/bin/tar xzf $1 ;; - *.zip) ${pkgs.unzip}/bin/unzip $1 ;; - *.Z) ${pkgs.gzip}/bin/uncompress $1 ;; - *.7z) ${pkgs._7zz}/bin/7z x $1 ;; - *) echo "'$1' cannot be extracted via extract()" ;; - esac -else - echo "'$1' is not a valid file" -fi -'' \ No newline at end of file + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) ${pkgs.gnutar}/bin/tar xjf $1 ;; + *.tar.gz) ${pkgs.gnutar}/bin/tar $1 ;; + *.bz2) ${pkgs.bzip2}/bin/bunzip2 $1 ;; + *.rar) ${pkgs.rar}/bin/rar x $1 ;; + *.gz) ${pkgs.gzip}/bin/gunzip $1 ;; + *.tar) ${pkgs.gnutar}/bin/tar xf $1 ;; + *.tbz2) ${pkgs.gnutar}/bin/tar xjf $1 ;; + *.tgz) ${pkgs.gnutar}/bin/tar xzf $1 ;; + *.zip) ${pkgs.unzip}/bin/unzip $1 ;; + *.Z) ${pkgs.gzip}/bin/uncompress $1 ;; + *.7z) ${pkgs._7zz}/bin/7z x $1 ;; + *) echo "'$1' cannot be extracted via extract()" ;; + esac + else + echo "'$1' is not a valid file" + fi +'' diff --git a/home-manager/pkgs/spx-gc.nix b/home-manager/pkgs/spx-gc.nix index 0ac131d..b1eb9fa 100644 --- a/home-manager/pkgs/spx-gc.nix +++ b/home-manager/pkgs/spx-gc.nix @@ -1,4 +1,8 @@ -{ lib, buildNpmPackage, fetchFromGitHub }: +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: buildNpmPackage rec { pname = "spx-gc"; @@ -21,8 +25,7 @@ buildNpmPackage rec { ''; meta = with lib; { - description = - "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software"; + description = "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software"; homepage = "https://github.com/TuomoKu/SPX-GC#npminstall"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/home-manager/programs/alacritty.nix b/home-manager/programs/alacritty.nix index 64d4fcf..01e5308 100644 --- a/home-manager/programs/alacritty.nix +++ b/home-manager/programs/alacritty.nix @@ -1,8 +1,14 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; }; -in { +in +{ programs.alacritty = { enable = if config.machine.isGraphical then true else false; package = (nixGL pkgs.alacritty); diff --git a/home-manager/programs/atuin.nix b/home-manager/programs/atuin.nix index a97ccc4..5d4b476 100644 --- a/home-manager/programs/atuin.nix +++ b/home-manager/programs/atuin.nix @@ -1,3 +1,5 @@ { - programs.atuin = { enable = true; }; + programs.atuin = { + enable = true; + }; } diff --git a/home-manager/programs/bat.nix b/home-manager/programs/bat.nix index 7a2881c..4cb0b03 100644 --- a/home-manager/programs/bat.nix +++ b/home-manager/programs/bat.nix @@ -1 +1,5 @@ -{ programs.bat = { enable = true; }; } +{ + programs.bat = { + enable = true; + }; +} diff --git a/home-manager/programs/beets.nix b/home-manager/programs/beets.nix index a0717b8..83de934 100644 --- a/home-manager/programs/beets.nix +++ b/home-manager/programs/beets.nix @@ -12,7 +12,9 @@ duplicate_action = "ask"; default_action = "apply"; }; - badfiles = { check_on_import = "yes"; }; + badfiles = { + check_on_import = "yes"; + }; match = { max_rec = { track_length = "strong"; diff --git a/home-manager/programs/chromium.nix b/home-manager/programs/chromium.nix index 5a8f6d8..426b71d 100644 --- a/home-manager/programs/chromium.nix +++ b/home-manager/programs/chromium.nix @@ -20,7 +20,10 @@ let "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly ]; isEnabled = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false; - dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ]; + dictionaries = with pkgs.hunspellDictsChromium; [ + en_US + de_DE + ]; commandLineArgs = [ "--enable-wayland-ime" "--ignore-gpu-blocklist" @@ -30,7 +33,8 @@ let "--enable-features=WaylandWindowDecorations,VaapiVideoDecoder,VaapiVideoEncoder,VaapiVideoDecodeLinuxGL,WebRTCPipeWireCapturer" ]; extensions = map (eid: { id = eid; }) chromium_extension; -in { +in +{ programs.chromium = { inherit dictionaries commandLineArgs extensions; enable = isEnabled; diff --git a/home-manager/programs/command-not-found.nix b/home-manager/programs/command-not-found.nix index c668aef..96d79d9 100644 --- a/home-manager/programs/command-not-found.nix +++ b/home-manager/programs/command-not-found.nix @@ -1 +1,5 @@ -{ programs.command-not-found = { enable = false; }; } +{ + programs.command-not-found = { + enable = false; + }; +} diff --git a/home-manager/programs/git.nix b/home-manager/programs/git.nix index db4decc..02907c6 100644 --- a/home-manager/programs/git.nix +++ b/home-manager/programs/git.nix @@ -15,18 +15,28 @@ ui = true; pager = true; }; - log = { date = "short"; }; - rerere = { enabled = "1"; }; + log = { + date = "short"; + }; + rerere = { + enabled = "1"; + }; core = { whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol"; excludesfile = "~/.gitignore"; autocrlf = "input"; }; - apply = { whitespace = "nowarn"; }; - branch = { autosetuprebase = "always"; }; + apply = { + whitespace = "nowarn"; + }; + branch = { + autosetuprebase = "always"; + }; }; }; - programs.git-credential-oauth = { enable = true; }; + programs.git-credential-oauth = { + enable = true; + }; programs.gh.enable = true; programs.gh-dash.enable = true; programs.lazygit.enable = true; diff --git a/home-manager/programs/go.nix b/home-manager/programs/go.nix index 91d9225..bb3323f 100644 --- a/home-manager/programs/go.nix +++ b/home-manager/programs/go.nix @@ -1 +1,5 @@ -{ programs.go = { enable = true; }; } +{ + programs.go = { + enable = true; + }; +} diff --git a/home-manager/programs/hstr.nix b/home-manager/programs/hstr.nix index 08b4ba7..c31b036 100644 --- a/home-manager/programs/hstr.nix +++ b/home-manager/programs/hstr.nix @@ -1 +1,5 @@ -{ programs.hstr = { enable = true; }; } +{ + programs.hstr = { + enable = true; + }; +} diff --git a/home-manager/programs/mpv.nix b/home-manager/programs/mpv.nix index c286a52..df771eb 100644 --- a/home-manager/programs/mpv.nix +++ b/home-manager/programs/mpv.nix @@ -3,6 +3,10 @@ { programs.mpv = { enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false; - scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ]; + scripts = with pkgs.mpvScripts; [ + autoload + mpris + sponsorblock + ]; }; } diff --git a/home-manager/programs/neovim.nix b/home-manager/programs/neovim.nix index 5d322e6..c3df955 100644 --- a/home-manager/programs/neovim.nix +++ b/home-manager/programs/neovim.nix @@ -7,7 +7,9 @@ viAlias = true; vimAlias = true; vimdiffAlias = true; - coc = { enable = true; }; + coc = { + enable = true; + }; extraConfig = '' set title set ignorecase diff --git a/home-manager/programs/starship.nix b/home-manager/programs/starship.nix index d7e4461..0f66a99 100644 --- a/home-manager/programs/starship.nix +++ b/home-manager/programs/starship.nix @@ -3,8 +3,12 @@ enable = true; settings = { add_newline = false; - character = { success_symbol = "[❯](bold white)"; }; - package = { disabled = true; }; + character = { + success_symbol = "[❯](bold white)"; + }; + package = { + disabled = true; + }; }; }; } diff --git a/home-manager/programs/syncthing.nix b/home-manager/programs/syncthing.nix index 66ea77d..2ab81c9 100644 --- a/home-manager/programs/syncthing.nix +++ b/home-manager/programs/syncthing.nix @@ -1 +1,5 @@ -{ services.syncthing = { enable = true; }; } +{ + services.syncthing = { + enable = true; + }; +} diff --git a/home-manager/programs/thefuck.nix b/home-manager/programs/thefuck.nix index b68d76e..78cb070 100644 --- a/home-manager/programs/thefuck.nix +++ b/home-manager/programs/thefuck.nix @@ -1,3 +1,5 @@ { - programs.thefuck = { enable = false; }; + programs.thefuck = { + enable = false; + }; } diff --git a/home-manager/programs/topgrade.nix b/home-manager/programs/topgrade.nix index 03d1fd1..a57b6f5 100644 --- a/home-manager/programs/topgrade.nix +++ b/home-manager/programs/topgrade.nix @@ -1,11 +1,13 @@ -{ config, pkgs, ... }: +{ config, pkgs, ... }: let - configPath = if config.machine.isGeneric then - "${config.home.homeDirectory}/.config/home-manager" - else - "${config.home.homeDirectory}/.nixos-config"; -in { + configPath = + if config.machine.isGeneric then + "${config.home.homeDirectory}/.config/home-manager" + else + "${config.home.homeDirectory}/.nixos-config"; +in +{ programs.topgrade = { enable = true; settings = { @@ -16,13 +18,18 @@ in { pre_sudo = false; cleanup = true; skip_notify = true; - disable = [ "bun" "tldr" "flutter" ]; + disable = [ + "bun" + "tldr" + "flutter" + ]; }; git.repos = [ configPath ]; - firmware = { upgrade = true; }; + firmware = { + upgrade = true; + }; pre_commands = { - flakeUpgrade = - "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair"; + flakeUpgrade = "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair"; }; }; }; diff --git a/home-manager/programs/yt-dlp.nix b/home-manager/programs/yt-dlp.nix index d995c24..c51e9a0 100644 --- a/home-manager/programs/yt-dlp.nix +++ b/home-manager/programs/yt-dlp.nix @@ -1,2 +1,5 @@ -{ programs.yt-dlp = { enable = true; }; } - +{ + programs.yt-dlp = { + enable = true; + }; +} diff --git a/home-manager/utils/nixGLWrap.nix b/home-manager/utils/nixGLWrap.nix index ae3f199..e068d3d 100644 --- a/home-manager/utils/nixGLWrap.nix +++ b/home-manager/utils/nixGLWrap.nix @@ -1,12 +1,9 @@ # Call once on import to load global context -{ - pkgs, - config, -}: +{ pkgs, config }: # Wrap a single package pkg: -if config.nixGLPrefix == "" -then pkg +if config.nixGLPrefix == "" then + pkg else # Wrap the package's binaries with nixGL, while preserving the rest of # the outputs and derivation attributes. @@ -17,12 +14,14 @@ else ${ # Heavily inspired by https://stackoverflow.com/a/68523368/6259505 - pkgs.lib.concatStringsSep "\n" (map (outputName: '' - echo "Copying output ${outputName}" - set -x - cp -rs --no-preserve=mode "${pkg.${outputName}}" "''$${outputName}" - set +x - '') (old.outputs or ["out"])) + pkgs.lib.concatStringsSep "\n" ( + map (outputName: '' + echo "Copying output ${outputName}" + set -x + cp -rs --no-preserve=mode "${pkg.${outputName}}" "''$${outputName}" + set +x + '') (old.outputs or [ "out" ]) + ) } rm -rf $out/bin/* @@ -34,4 +33,4 @@ else done shopt -u nullglob # Revert nullglob back to its normal default state ''; - })) \ No newline at end of file + })) diff --git a/home-manager/wrappers/fedora.nix b/home-manager/wrappers/fedora.nix index d5a92f2..a047317 100644 --- a/home-manager/wrappers/fedora.nix +++ b/home-manager/wrappers/fedora.nix @@ -24,7 +24,8 @@ let chrome-stable-wrapper = pkgs.writeShellScriptBin "google-chrome-stable" '' exec /usr/bin/google-chrome-stable ${chromeArgs} "$@" ''; -in { +in +{ home.packages = with pkgs; [ code-wrapper chrome-wrapper diff --git a/nix.nix b/nix.nix index 108f0ad..6b37e46 100644 --- a/nix.nix +++ b/nix.nix @@ -8,7 +8,10 @@ sandbox = relaxed ''; settings = { - trusted-users = [ "root" "thilo" ]; + trusted-users = [ + "root" + "thilo" + ]; substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" diff --git a/nixos/builders.nix b/nixos/builders.nix index b714ceb..0183f23 100644 --- a/nixos/builders.nix +++ b/nixos/builders.nix @@ -8,71 +8,76 @@ nix = { distributedBuilds = true; - buildMachines = [ { - hostName = "build1.darmstadt.ccc.de"; - protocol = "ssh"; - sshUser = "avocadoom"; - sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; - systems = [ - "i686-linux" - "x86_64-linux" - ]; - maxJobs = 4; - speedFactor = 6; - supportedFeatures = [ - "big-parallel" - "kvm" - "nixos-test" - ]; - } { - hostName = "build2.darmstadt.ccc.de"; - protocol = "ssh"; - sshUser = "avocadoom"; - sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; - systems = [ - "i686-linux" - "x86_64-linux" - ]; - maxJobs = 4; - speedFactor = 6; - supportedFeatures = [ - "big-parallel" - "kvm" - "nixos-test" - ]; - } { - hostName = "build3.darmstadt.ccc.de"; - protocol = "ssh"; - sshUser = "avocadoom"; - sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; - systems = [ - "i686-linux" - "x86_64-linux" - ]; - maxJobs = 4; - speedFactor = 6; - supportedFeatures = [ - "big-parallel" - "kvm" - "nixos-test" - ]; - } { - hostName = "build4.darmstadt.ccc.de"; - protocol = "ssh"; - sshUser = "avocadoom"; - sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; - systems = [ - "i686-linux" - "x86_64-linux" - ]; - # this node has half the cpu of the others - maxJobs = 2; - speedFactor = 6; - supportedFeatures = [ - "big-parallel" - "kvm" - "nixos-test" - ]; - } ]; + buildMachines = [ + { + hostName = "build1.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "avocadoom"; + sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + maxJobs = 4; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } + { + hostName = "build2.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "avocadoom"; + sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + maxJobs = 4; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } + { + hostName = "build3.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "avocadoom"; + sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + maxJobs = 4; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } + { + hostName = "build4.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "avocadoom"; + sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + # this node has half the cpu of the others + maxJobs = 2; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } + ]; }; } diff --git a/nixos/common.nix b/nixos/common.nix index 444a4a9..5d516f3 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, inputs, ... }: +{ + config, + pkgs, + lib, + inputs, + ... +}: { imports = [ ./../nix.nix ]; @@ -10,13 +16,15 @@ # This will additionally add your inputs to the system's legacy channels # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") - config.nix.registry; + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; }; nixpkgs = { config = { - permittedInsecurePackages = [ "electron-24.8.6" "electron-25.9.0" ]; + permittedInsecurePackages = [ + "electron-24.8.6" + "electron-25.9.0" + ]; allowUnfree = true; }; }; @@ -78,7 +86,12 @@ }; }; - environment.systemPackages = with pkgs; [ git zsh kitty steamtinkerlaunch ]; + environment.systemPackages = with pkgs; [ + git + zsh + kitty + steamtinkerlaunch + ]; networking.networkmanager.enable = true; @@ -91,7 +104,9 @@ pulse.enable = true; jack.enable = true; }; - tailscale = { enable = true; }; + tailscale = { + enable = true; + }; flatpak.enable = true; avahi = { enable = true;