From 81ccd1e8e7bc1524ff5b5a5509c35bead3107ab4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 28 Nov 2024 17:53:18 +0100 Subject: [PATCH 01/66] add fonts --- systems/omoikane/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index fa3722e..fc86127 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -86,6 +86,8 @@ gh ]; + fonts.packages = [ pkgs.google-fonts ]; + programs = { adb.enable = true; dconf.enable = true; From f74512b261e1c04be0bc7f17cb375ba2a6024de5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Nov 2024 19:04:27 +0100 Subject: [PATCH 02/66] enable repology --- flake.lock | 19 +++++++++---------- flake.nix | 2 +- systems/omoikane/default.nix | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 54f5c0c..f0c6ecd 100644 --- a/flake.lock +++ b/flake.lock @@ -661,18 +661,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" + "lastModified": 1732992164, + "narHash": "sha256-ZpFerMSS731FNmGPkZecbq2Ck3GpOYowuGe+bouBfA0=", + "ref": "refs/heads/repology", + "rev": "fbbf93a6b4c50ad51f5f2173d0cb6eb7dc9f3eda", + "revCount": 714686, + "type": "git", + "url": "file:///home/jopejoe1/Documents/nixpkgs" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "git", + "url": "file:///home/jopejoe1/Documents/nixpkgs" } }, "nixpkgs-24_05": { diff --git a/flake.nix b/flake.nix index d9c2f64..16edad6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "/home/jopejoe1/Documents/nixpkgs/"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index fc86127..d275438 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -65,6 +65,7 @@ udev.packages = [ pkgs.yubikey-personalization ]; fwupd.enable = true; libinput.enable = true; + repology.enable = true; }; time.timeZone = "Europe/Berlin"; From 5cf5f94e57260b6eeda1e49f9aacf6191ef2869c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Dec 2024 19:20:49 +0100 Subject: [PATCH 03/66] add printer --- nixos-modules/printing/default.nix | 3 ++- systems/omoikane/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos-modules/printing/default.nix b/nixos-modules/printing/default.nix index d72a43d..5bda132 100644 --- a/nixos-modules/printing/default.nix +++ b/nixos-modules/printing/default.nix @@ -17,7 +17,7 @@ in services.printing = { enable = true; webInterface = true; - drivers = with pkgs; [ ]; + drivers = with pkgs; [ hplip ]; }; hardware = { @@ -30,6 +30,7 @@ in services.avahi = { enable = true; nssmdns4 = true; + nssmdns6 = true; openFirewall = true; }; }; diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index d275438..a5eb67f 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -65,7 +65,7 @@ udev.packages = [ pkgs.yubikey-personalization ]; fwupd.enable = true; libinput.enable = true; - repology.enable = true; + #repology.enable = true; }; time.timeZone = "Europe/Berlin"; From 211ea5c51d343a1691b64cf81c62b9e50454786a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 16 Nov 2024 22:10:26 +0100 Subject: [PATCH 04/66] test --- systems/kuraokami/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 3deed70..6c7cf63 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -110,6 +110,7 @@ strawberry-qt6 jitsi-meet-electron thunderbird + (pkgs.wrapFirefox (pkgs.librewolf-unwrapped.override { pipewireSupport = true; }) { }) (ffmpeg-full.override { #withTensorflow = true; withUnfree = true; From 713ba5dea1da3b32511c7f72c6a5446e525d51af Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 16 Nov 2024 22:29:09 +0100 Subject: [PATCH 05/66] test local branch --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 16edad6..9b1b193 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "/home/jopejoe1/Documents/nixpkgs/"; + nixpkgs.url = "/home/jopejoe1/dev/nixpkgs/"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From 8a01628c8c55e8dcadb7d3ec0c8e5cf12c75c9f1 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Dec 2024 20:31:59 +0100 Subject: [PATCH 06/66] rm librewolf --- systems/kuraokami/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 6c7cf63..3deed70 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -110,7 +110,6 @@ strawberry-qt6 jitsi-meet-electron thunderbird - (pkgs.wrapFirefox (pkgs.librewolf-unwrapped.override { pipewireSupport = true; }) { }) (ffmpeg-full.override { #withTensorflow = true; withUnfree = true; From ac5199a2b1f256153e14d0958efc65ca07827ed9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Dec 2024 20:35:19 +0100 Subject: [PATCH 07/66] ise regular nixpkgs --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9b1b193..d9c2f64 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "/home/jopejoe1/dev/nixpkgs/"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From 37a4e14941a2459d27fa47db779b1d5437e3af96 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Dec 2024 20:37:07 +0100 Subject: [PATCH 08/66] update lock --- flake.lock | 109 +++++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index f0c6ecd..f8cb2cb 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1732645828, - "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732593794, - "narHash": "sha256-VhS+81/eTDiin5ULZLWvqI+9ggI+qXNUSvi3dIQfBX4=", + "lastModified": 1733318736, + "narHash": "sha256-rZx3gJKSg8RkQIkcGcEKLMMKobZPFfgX4xbJb7acRYM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9b7d4fb4739c0bf808d31e2b66b337f1234e4447", + "rev": "71ebc2ee2764d5ca5e49189551fac1f1ffb7cb1a", "type": "gitlab" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733317578, + "narHash": "sha256-anN/LcP5IuqEARvhPETg1vnbyG3IQ0wdvSAYEJfIQzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "ad48eb25cd0b00ce730da00fa1f8e6e6c27b397d", "type": "github" }, "original": { @@ -496,11 +496,11 @@ ] }, "locked": { - "lastModified": 1732324260, - "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -511,11 +511,11 @@ }, "nixlib": { "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1731763758, - "narHash": "sha256-zcoxeMRGPpOd46dLeo2bgGLkjW5w50VC5DwZlvZD+A4=", + "lastModified": 1733093391, + "narHash": "sha256-tktgkyaBCJDJs0qVyREpETTcpDY7FZbnDurTAM9jIOE=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "80a2e7d6d9816a80fd412befd5f173836e675185", + "rev": "9ba099b2ead073e0801b863c880be03a981f2dd1", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1732496924, - "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", + "lastModified": 1733101779, + "narHash": "sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", + "rev": "a471acc460d4c238936a5116c8cc48a3c431dd66", "type": "github" }, "original": { @@ -605,11 +605,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -661,17 +661,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732992164, - "narHash": "sha256-ZpFerMSS731FNmGPkZecbq2Ck3GpOYowuGe+bouBfA0=", - "ref": "refs/heads/repology", - "rev": "fbbf93a6b4c50ad51f5f2173d0cb6eb7dc9f3eda", - "revCount": 714686, - "type": "git", - "url": "file:///home/jopejoe1/Documents/nixpkgs" + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/jopejoe1/Documents/nixpkgs" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-24_05": { @@ -706,11 +707,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1732629460, - "narHash": "sha256-Cr8EyxEFPbVmX6p8LsslFBjDEuVlFNPILrWlwbBNnNA=", + "lastModified": 1733326706, + "narHash": "sha256-lUX5R3HgfQ6qWj0pJ/vvtYAxtPU3n71y2OcjVTcCFYg=", "owner": "nix-community", "repo": "nixvim", - "rev": "8b19d154823619af7ced464185e8d13ec80a758b", + "rev": "d4ae1e362fa2deed663952e31c73f4d85fef6070", "type": "github" }, "original": { @@ -728,11 +729,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1733006402, + "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "type": "github" }, "original": { @@ -751,11 +752,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1733006402, + "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "type": "github" }, "original": { @@ -840,11 +841,11 @@ ] }, "locked": { - "lastModified": 1732575825, - "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { @@ -860,11 +861,11 @@ ] }, "locked": { - "lastModified": 1732570520, - "narHash": "sha256-ANPZf+osgErYUs27N7ItYovc0d/TJKwOpMtlpk6W9+M=", + "lastModified": 1733217096, + "narHash": "sha256-cERPAk4SapOveXNNjKZYuiazXHw2bp3L87eOw6BlrP8=", "owner": "nix-community", "repo": "srvos", - "rev": "0ba8119cd4077eaea0f2406b8e1ec491429b8fc4", + "rev": "9f50af3cd4d8b180c5048ccb80da3c36720c0910", "type": "github" }, "original": { @@ -990,11 +991,11 @@ ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { @@ -1010,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1732643199, - "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { From 9ecbc5f7be5df4bcc5f44947ccd3b4e6bdff5b31 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Dec 2024 20:50:45 +0100 Subject: [PATCH 09/66] use master --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d9c2f64..b0ea288 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From e799b148f5fd185a803c9a3f9b42c6f9c20fced2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Dec 2024 20:53:55 +0100 Subject: [PATCH 10/66] use system --- flake.lock | 19 +++++++++---------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f8cb2cb..c60ea03 100644 --- a/flake.lock +++ b/flake.lock @@ -661,18 +661,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", - "type": "github" + "lastModified": 1733341920, + "narHash": "sha256-VO+J0b7eo9eIEpfUsfmdVbNvumKvkZcpbu/j4qIhNWY=", + "ref": "refs/heads/master", + "rev": "4bdc7d1d4503e0ab509cd8edb7b701802075fefd", + "revCount": 716788, + "type": "git", + "url": "file:///home/jopejoe1/dev/nixpkgs" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "git", + "url": "file:///home/jopejoe1/dev/nixpkgs" } }, "nixpkgs-24_05": { diff --git a/flake.nix b/flake.nix index b0ea288..9b1b193 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs"; + nixpkgs.url = "/home/jopejoe1/dev/nixpkgs/"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From 018992731001a23c14ac33ce9bc9064cb1259194 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Dec 2024 21:01:32 +0100 Subject: [PATCH 11/66] disable mixxx --- systems/kuraokami/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 3deed70..dfd6cbd 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -105,7 +105,7 @@ environment.systemPackages = with pkgs; [ prismlauncher picard - mixxx + #mixxx goverlay strawberry-qt6 jitsi-meet-electron From 177d1865aebc12dcc5cdb284c9aaa957dc272f6b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Dec 2024 21:06:24 +0100 Subject: [PATCH 12/66] postgresql use extensions --- systems/kuraokami/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index dfd6cbd..648f352 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -58,7 +58,7 @@ }; postgresql = { enable = true; - extraPlugins = ps: with ps; [ pg_libversion ]; + extensions = ps: with ps; [ pg_libversion ]; enableTCPIP = true; initialScript = pkgs.writeText "backend-initScript" '' CREATE DATABASE repology From 894d95f6bbac043117c968161e52c72371d1a2d6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 7 Dec 2024 16:21:49 +0100 Subject: [PATCH 13/66] update lock --- flake.lock | 92 +++++++++++++++++++++++++++--------------------------- flake.nix | 2 +- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index c60ea03..2b7a0a1 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733318736, - "narHash": "sha256-rZx3gJKSg8RkQIkcGcEKLMMKobZPFfgX4xbJb7acRYM=", + "lastModified": 1733574830, + "narHash": "sha256-2ZYNh7CLQvIyE3nk3C36pnvDiD+xZOscBSTI7Kf5KOU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "71ebc2ee2764d5ca5e49189551fac1f1ffb7cb1a", + "rev": "f2721e6b09c55e4a272624dab404b99ea7d62ce9", "type": "gitlab" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1733317578, - "narHash": "sha256-anN/LcP5IuqEARvhPETg1vnbyG3IQ0wdvSAYEJfIQzA=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "ad48eb25cd0b00ce730da00fa1f8e6e6c27b397d", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -496,11 +496,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733351379, + "narHash": "sha256-MTMsAhXxMMVHVN99jT8E0afOAOtt3JQWjYpTja94PAU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "55d07816a0944f06a9df5ef174999a72fa4060c7", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1733101779, - "narHash": "sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk=", + "lastModified": 1733360821, + "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a471acc460d4c238936a5116c8cc48a3c431dd66", + "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", "type": "github" }, "original": { @@ -605,11 +605,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -661,17 +661,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733341920, - "narHash": "sha256-VO+J0b7eo9eIEpfUsfmdVbNvumKvkZcpbu/j4qIhNWY=", - "ref": "refs/heads/master", - "rev": "4bdc7d1d4503e0ab509cd8edb7b701802075fefd", - "revCount": 716788, + "lastModified": 1733584530, + "narHash": "sha256-jaj3zAxrKSoJM4c+k46cS7luEPN+81RrzyVIAFtn0F0=", + "ref": "refs/heads/repology", + "rev": "19c5c7d061a6f4fa43bf8b6f0293941b819ca242", + "revCount": 718297, "type": "git", - "url": "file:///home/jopejoe1/dev/nixpkgs" + "url": "file:///home/jopejoe1/Documents/nixpkgs" }, "original": { "type": "git", - "url": "file:///home/jopejoe1/dev/nixpkgs" + "url": "file:///home/jopejoe1/Documents/nixpkgs" } }, "nixpkgs-24_05": { @@ -706,11 +706,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1733326706, - "narHash": "sha256-lUX5R3HgfQ6qWj0pJ/vvtYAxtPU3n71y2OcjVTcCFYg=", + "lastModified": 1733498727, + "narHash": "sha256-R+n4JfXjGrJG2gbhJPsZPTwdDsHoJvwxxpWcRY4KjyQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "d4ae1e362fa2deed663952e31c73f4d85fef6070", + "rev": "ae78face8d6a09abe2504d41c035b6460c15a17b", "type": "github" }, "original": { @@ -728,11 +728,11 @@ ] }, "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", "owner": "NuschtOS", "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", "type": "github" }, "original": { @@ -751,11 +751,11 @@ ] }, "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", "owner": "NuschtOS", "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", "type": "github" }, "original": { @@ -860,11 +860,11 @@ ] }, "locked": { - "lastModified": 1733217096, - "narHash": "sha256-cERPAk4SapOveXNNjKZYuiazXHw2bp3L87eOw6BlrP8=", + "lastModified": 1733365027, + "narHash": "sha256-Vl0pOGckECuFoMbiotwj65jjoFE8Mc2yUXNIllttxkI=", "owner": "nix-community", "repo": "srvos", - "rev": "9f50af3cd4d8b180c5048ccb80da3c36720c0910", + "rev": "6047d415ca8dc7eae73dd17c832f7dc08ad544f4", "type": "github" }, "original": { @@ -990,11 +990,11 @@ ] }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "type": "github" }, "original": { @@ -1010,11 +1010,11 @@ ] }, "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9b1b193..16edad6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "/home/jopejoe1/dev/nixpkgs/"; + nixpkgs.url = "/home/jopejoe1/Documents/nixpkgs/"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From b2df5ffd6a8259c8e7d83538f558c3b0da84c8c1 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 7 Dec 2024 16:24:16 +0100 Subject: [PATCH 14/66] enable repology --- systems/omoikane/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index a5eb67f..d275438 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -65,7 +65,7 @@ udev.packages = [ pkgs.yubikey-personalization ]; fwupd.enable = true; libinput.enable = true; - #repology.enable = true; + repology.enable = true; }; time.timeZone = "Europe/Berlin"; From 3dcff28b4ebd713e957a1efbef43a1577bdecbba Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 7 Dec 2024 19:55:11 +0100 Subject: [PATCH 15/66] update lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2b7a0a1..898d4a4 100644 --- a/flake.lock +++ b/flake.lock @@ -496,11 +496,11 @@ ] }, "locked": { - "lastModified": 1733351379, - "narHash": "sha256-MTMsAhXxMMVHVN99jT8E0afOAOtt3JQWjYpTja94PAU=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "55d07816a0944f06a9df5ef174999a72fa4060c7", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -661,10 +661,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733584530, - "narHash": "sha256-jaj3zAxrKSoJM4c+k46cS7luEPN+81RrzyVIAFtn0F0=", + "lastModified": 1733597833, + "narHash": "sha256-R9KDyKQo9VfaV5JKr/KHwTBv/Laipzr+L2pTW9KbmbU=", "ref": "refs/heads/repology", - "rev": "19c5c7d061a6f4fa43bf8b6f0293941b819ca242", + "rev": "9aa93171a30d381c4e98c50ff5d9f9cc5a4906f8", "revCount": 718297, "type": "git", "url": "file:///home/jopejoe1/Documents/nixpkgs" @@ -706,11 +706,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1733498727, - "narHash": "sha256-R+n4JfXjGrJG2gbhJPsZPTwdDsHoJvwxxpWcRY4KjyQ=", + "lastModified": 1733574898, + "narHash": "sha256-8Meoqfk61EsMB3x/HQcttkgJqUm45kjtOyQGrtHP/H4=", "owner": "nix-community", "repo": "nixvim", - "rev": "ae78face8d6a09abe2504d41c035b6460c15a17b", + "rev": "08be20270d62e31f215f4592867d53576af15001", "type": "github" }, "original": { From 6d81c885e76416e09fa90ffbb6c655c17694f574 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 9 Dec 2024 22:39:22 +0100 Subject: [PATCH 16/66] shairport sync test --- flake.lock | 10 +++++----- systems/omoikane/default.nix | 26 +++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 898d4a4..8b7b2bf 100644 --- a/flake.lock +++ b/flake.lock @@ -661,11 +661,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733597833, - "narHash": "sha256-R9KDyKQo9VfaV5JKr/KHwTBv/Laipzr+L2pTW9KbmbU=", - "ref": "refs/heads/repology", - "rev": "9aa93171a30d381c4e98c50ff5d9f9cc5a4906f8", - "revCount": 718297, + "lastModified": 1733780082, + "narHash": "sha256-Y6UzC+ZqoeBaIQQkVLEQn8bbcoYfbt6H6VAMvNkKuvE=", + "ref": "refs/heads/shairport-sync-conf", + "rev": "7837a25f8579028e967f5d39e18268458bf481a7", + "revCount": 719714, "type": "git", "url": "file:///home/jopejoe1/Documents/nixpkgs" }, diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index d275438..d3c68fb 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -65,7 +65,31 @@ udev.packages = [ pkgs.yubikey-personalization ]; fwupd.enable = true; libinput.enable = true; - repology.enable = true; + #repology.enable = true; + shairport-sync = { + enable = true; + package = pkgs.shairport-sync-airplay2; + arguments = "-o pw -v"; + settings = { + general = { + name = "NixOS Shairport"; + }; + metadata = { + enabled = "yes"; + include_cover_art = "yes"; + cover_art_cache_directory = "/tmp/shairport-sync/.cache/coverart"; + pipe_name = "/tmp/shairport-sync-metadata"; + pipe_timeout = 5000; + }; + mqtt = { + enabled = "yes"; + hostname = "mqtt.server.domain.example"; + port = 1883; + publish_parsed = "yes"; + publish_cover = "yes"; + }; + }; + }; }; time.timeZone = "Europe/Berlin"; From 9647193ccf281b7a4b1c0c679ebb42192d2b7ac8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 15 Dec 2024 16:02:41 +0100 Subject: [PATCH 17/66] change display name --- nixos-modules/users/jopejoe1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-modules/users/jopejoe1/default.nix b/nixos-modules/users/jopejoe1/default.nix index 56d1173..ce4e99d 100644 --- a/nixos-modules/users/jopejoe1/default.nix +++ b/nixos-modules/users/jopejoe1/default.nix @@ -18,7 +18,7 @@ in users.users.jopejoe1 = { isNormalUser = true; shell = pkgs.nushell; - description = "Johannes Jöns"; + description = "jopejoe1"; hashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC"; extraGroups = [ "wheel" From e7b5e18e7645bad1b61e1900aee569e4d088df08 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 15 Dec 2024 16:04:02 +0100 Subject: [PATCH 18/66] change back to unstaabek --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 16edad6..8c2b4df 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "/home/jopejoe1/Documents/nixpkgs/"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From 8d66e86242d1c3e447259c469cfed0bb17b35e47 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 15 Dec 2024 16:04:43 +0100 Subject: [PATCH 19/66] update lock --- flake.lock | 141 +++++++++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 8b7b2bf..53b533b 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1734088167, + "narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "d32f2d1750d61a476a236526b725ec5a32e16342", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733574830, - "narHash": "sha256-2ZYNh7CLQvIyE3nk3C36pnvDiD+xZOscBSTI7Kf5KOU=", + "lastModified": 1734235408, + "narHash": "sha256-0yHVZ2+VaW36/RTGHm1x3p+KS1oAWIj+TWObLDUzHfQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f2721e6b09c55e4a272624dab404b99ea7d62ce9", + "rev": "02261a5dd442b8c6eb778c31e7967e734bc2ff76", "type": "gitlab" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "impermanence": { "locked": { - "lastModified": 1731242966, - "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", + "lastModified": 1734200366, + "narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=", "owner": "nix-community", "repo": "impermanence", - "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", + "rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48", "type": "github" }, "original": { @@ -511,11 +511,11 @@ }, "nixlib": { "locked": { - "lastModified": 1733015484, - "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", + "lastModified": 1733620091, + "narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", + "rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1733093391, - "narHash": "sha256-tktgkyaBCJDJs0qVyREpETTcpDY7FZbnDurTAM9jIOE=", + "lastModified": 1734099322, + "narHash": "sha256-C1fNMbPY5SdDsZEWya7DwAHYpFzpRWdyiVdpsjLdb2g=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "9ba099b2ead073e0801b863c880be03a981f2dd1", + "rev": "f9d38cae32025a98fbba2cc3c3732cdd4829ea79", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1733360821, - "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", + "lastModified": 1733965598, + "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", + "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", "type": "github" }, "original": { @@ -605,11 +605,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -630,11 +630,11 @@ ] }, "locked": { - "lastModified": 1727367213, - "narHash": "sha256-7O4pi8MmcJpA0nYUQkdolvKGyu6zNjf2gFYD1Q0xppc=", + "lastModified": 1734098258, + "narHash": "sha256-3mzGstXtPqt+zWzXqesgQ2haEI6LNCFhc/uU3Bcj6Ak=", "owner": "nix-community", "repo": "nixos-images", - "rev": "3e7978bab153f39f3fc329ad346d35a8871420f7", + "rev": "231f5f6370e78d04675c9fa8199be6c3b1b85773", "type": "github" }, "original": { @@ -645,33 +645,34 @@ }, "nixos-stable": { "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1733780082, - "narHash": "sha256-Y6UzC+ZqoeBaIQQkVLEQn8bbcoYfbt6H6VAMvNkKuvE=", - "ref": "refs/heads/shairport-sync-conf", - "rev": "7837a25f8579028e967f5d39e18268458bf481a7", - "revCount": 719714, - "type": "git", - "url": "file:///home/jopejoe1/Documents/nixpkgs" + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/jopejoe1/Documents/nixpkgs" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-24_05": { @@ -706,11 +707,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1733574898, - "narHash": "sha256-8Meoqfk61EsMB3x/HQcttkgJqUm45kjtOyQGrtHP/H4=", + "lastModified": 1734223742, + "narHash": "sha256-vp3wSbCVU/4y5W+YI6H9PSix3WD7XbcIyesmB7W0ZWo=", "owner": "nix-community", "repo": "nixvim", - "rev": "08be20270d62e31f215f4592867d53576af15001", + "rev": "58d2a5ac9cc4ff987e6edb77f2b55d1dec05ce50", "type": "github" }, "original": { @@ -728,11 +729,11 @@ ] }, "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -751,11 +752,11 @@ ] }, "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -840,11 +841,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { @@ -860,11 +861,11 @@ ] }, "locked": { - "lastModified": 1733365027, - "narHash": "sha256-Vl0pOGckECuFoMbiotwj65jjoFE8Mc2yUXNIllttxkI=", + "lastModified": 1733965925, + "narHash": "sha256-hPXtCGEna+jerXrednMwjVuBV/AqrSAVida0yTTRMqE=", "owner": "nix-community", "repo": "srvos", - "rev": "6047d415ca8dc7eae73dd17c832f7dc08ad544f4", + "rev": "04f4200ac3a4eee62f9065b1f35010a382adfc6a", "type": "github" }, "original": { @@ -969,11 +970,11 @@ ] }, "locked": { - "lastModified": 1727252110, - "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -990,11 +991,11 @@ ] }, "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -1010,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { From bb3d378f5e353fce6ecfded68d66e0a30cb1c477 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 15 Dec 2024 16:07:10 +0100 Subject: [PATCH 20/66] remove shairport-sync --- systems/omoikane/default.nix | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index d3c68fb..a5eb67f 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -66,30 +66,6 @@ fwupd.enable = true; libinput.enable = true; #repology.enable = true; - shairport-sync = { - enable = true; - package = pkgs.shairport-sync-airplay2; - arguments = "-o pw -v"; - settings = { - general = { - name = "NixOS Shairport"; - }; - metadata = { - enabled = "yes"; - include_cover_art = "yes"; - cover_art_cache_directory = "/tmp/shairport-sync/.cache/coverart"; - pipe_name = "/tmp/shairport-sync-metadata"; - pipe_timeout = 5000; - }; - mqtt = { - enabled = "yes"; - hostname = "mqtt.server.domain.example"; - port = 1883; - publish_parsed = "yes"; - publish_cover = "yes"; - }; - }; - }; }; time.timeZone = "Europe/Berlin"; From c2390e575f4107350adaccc8eaf8cf67337d76de Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 11 Dec 2024 20:02:25 +0100 Subject: [PATCH 21/66] enable shairport --- systems/kuraokami/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 648f352..3a4c3d2 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -77,6 +77,10 @@ openFirewall = true; secretKeyFile = "/var/cache-priv-key.pem"; }; + shairport-sync = { + enable = true; + package = pkgs.shairport-sync-airplay2; + }; }; nixpkgs = { From 0e79c59c9d56de1b88c9ab38261f859cf212fd94 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 2 Jan 2025 15:37:41 +0100 Subject: [PATCH 22/66] update lock --- flake.lock | 120 ++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 53b533b..664cb59 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1734088167, - "narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=", + "lastModified": 1735468753, + "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "owner": "nix-community", "repo": "disko", - "rev": "d32f2d1750d61a476a236526b725ec5a32e16342", + "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1734235408, - "narHash": "sha256-0yHVZ2+VaW36/RTGHm1x3p+KS1oAWIj+TWObLDUzHfQ=", + "lastModified": 1735790613, + "narHash": "sha256-xH79ynL9yRIgcaotoTfjeAyhkPJQDTe2pb4/iTqOfM0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "02261a5dd442b8c6eb778c31e7967e734bc2ff76", + "rev": "914251401c955eac60c1f59b5ae729bc91d71bd9", "type": "gitlab" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1733665616, - "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "impermanence": { "locked": { - "lastModified": 1734200366, - "narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=", + "lastModified": 1734945620, + "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "owner": "nix-community", "repo": "impermanence", - "rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48", + "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "type": "github" }, "original": { @@ -496,11 +496,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1735478292, + "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", "type": "github" }, "original": { @@ -511,11 +511,11 @@ }, "nixlib": { "locked": { - "lastModified": 1733620091, - "narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1734099322, - "narHash": "sha256-C1fNMbPY5SdDsZEWya7DwAHYpFzpRWdyiVdpsjLdb2g=", + "lastModified": 1735024884, + "narHash": "sha256-aoTJqEImmpgsol+TyDASuyHW6tuL7NIS8gusUJ/kxyk=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "f9d38cae32025a98fbba2cc3c3732cdd4829ea79", + "rev": "97b45ac774699b1cfd267e98a8bdecb74bace593", "type": "github" }, "original": { @@ -569,11 +569,11 @@ }, "nixos-facter-modules_2": { "locked": { - "lastModified": 1732288619, - "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=", + "lastModified": 1734596637, + "narHash": "sha256-MRqwVAe3gsb88u4ME1UidmZFVCx+FEnoob0zkpO9DMY=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "862648589993a96480c2255197a28feea712f68f", + "rev": "536472754982bf03079b4b4e0261838a760587c0", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1733965598, - "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "type": "github" }, "original": { @@ -605,11 +605,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -661,11 +661,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -675,18 +675,18 @@ "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -707,11 +707,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1734223742, - "narHash": "sha256-vp3wSbCVU/4y5W+YI6H9PSix3WD7XbcIyesmB7W0ZWo=", + "lastModified": 1735802549, + "narHash": "sha256-aS03+IGLexQt5HL+tLZqSko6Jpxa+eozqcide/pab34=", "owner": "nix-community", "repo": "nixvim", - "rev": "58d2a5ac9cc4ff987e6edb77f2b55d1dec05ce50", + "rev": "3285bbda0aa0151c3b1914758e6950dfb554962f", "type": "github" }, "original": { @@ -792,14 +792,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1722877200, - "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", + "lastModified": 1735230346, + "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", + "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", "type": "gitlab" }, "original": { @@ -841,11 +841,11 @@ ] }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1735468296, + "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", "type": "github" }, "original": { @@ -861,11 +861,11 @@ ] }, "locked": { - "lastModified": 1733965925, - "narHash": "sha256-hPXtCGEna+jerXrednMwjVuBV/AqrSAVida0yTTRMqE=", + "lastModified": 1735379278, + "narHash": "sha256-DpihJuI9SaWOUc1lRrw+e5014Qj+WHn9Xla89jxA6jk=", "owner": "nix-community", "repo": "srvos", - "rev": "04f4200ac3a4eee62f9065b1f35010a382adfc6a", + "rev": "e3b404890cfb44caec3edc8b84facb8934299428", "type": "github" }, "original": { @@ -991,11 +991,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1735135567, + "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", "type": "github" }, "original": { @@ -1011,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1735827994, + "narHash": "sha256-Y3IBRGmza5YKiHgNwEbVQkETQPir+lrJj4ErbVHktO0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "246639a1ec081bb40941a25e9eb8481a66d71b49", "type": "github" }, "original": { From c758e8c4442d60d07494c9bfe64ee51a3029bc35 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 15 Dec 2024 17:35:26 +0100 Subject: [PATCH 23/66] use locl nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8c2b4df..16edad6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "/home/jopejoe1/Documents/nixpkgs/"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From 52c0513e8cb0c97f504ed358357c4eb313cb3f20 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 15 Dec 2024 17:36:09 +0100 Subject: [PATCH 24/66] enable shairport --- systems/omoikane/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index a5eb67f..cf765c4 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -66,6 +66,7 @@ fwupd.enable = true; libinput.enable = true; #repology.enable = true; + shairport-sync.enable =true; }; time.timeZone = "Europe/Berlin"; From df5da21b59f7cb753c1f99911313dc0c08086104 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 15 Dec 2024 17:37:28 +0100 Subject: [PATCH 25/66] update lock --- flake.lock | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 664cb59..460875b 100644 --- a/flake.lock +++ b/flake.lock @@ -669,10 +669,8 @@ "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "git", + "url": "file:///home/jopejoe1/Documents/nixpkgs" } }, "nixpkgs-24_11": { From 3a14487095ee7744e77b0a1f94cbf2196ae7a77d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 17 Dec 2024 16:07:41 +0100 Subject: [PATCH 26/66] update email --- home-modules/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/git/default.nix b/home-modules/git/default.nix index af6723f..a47c7f5 100644 --- a/home-modules/git/default.nix +++ b/home-modules/git/default.nix @@ -18,7 +18,7 @@ in programs.git = { enable = true; package = pkgs.git; - userEmail = "johannes@joens.email"; + userEmail = "jopejoe1@missing.ninja"; userName = "jopejoe1"; extraConfig = { core = { From a6f90fc29c598b6e0022ba029b21037146cbf034 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 17 Dec 2024 16:22:35 +0100 Subject: [PATCH 27/66] shairport use pipewire --- systems/omoikane/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index cf765c4..e6ba3ca 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -66,7 +66,8 @@ fwupd.enable = true; libinput.enable = true; #repology.enable = true; - shairport-sync.enable =true; + shairport-sync.enable = true; + shairport-sync.arguments = "-v -o pw"; }; time.timeZone = "Europe/Berlin"; From 3b698d923d4fa6754da10732750f2ae2c34a62cf Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 2 Jan 2025 16:17:17 +0100 Subject: [PATCH 28/66] update nixpkgs --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 16edad6..8c2b4df 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "/home/jopejoe1/Documents/nixpkgs/"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # Outputs From d22aea219748e75fb09e1c8bf024c65ab1271074 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 2 Jan 2025 16:19:55 +0100 Subject: [PATCH 29/66] uodate lock --- flake.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 460875b..664cb59 100644 --- a/flake.lock +++ b/flake.lock @@ -669,8 +669,10 @@ "type": "github" }, "original": { - "type": "git", - "url": "file:///home/jopejoe1/Documents/nixpkgs" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-24_11": { From 2eb114c0b411f85f2b5b8b6c037df23ef912381b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 2 Jan 2025 16:35:18 +0100 Subject: [PATCH 30/66] rm jitsi --- systems/kuraokami/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 3a4c3d2..c9ba7b9 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -112,7 +112,6 @@ #mixxx goverlay strawberry-qt6 - jitsi-meet-electron thunderbird (ffmpeg-full.override { #withTensorflow = true; From 2b6a2736f2680ea0873ded81e21cc6c6ca1816f8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 3 Jan 2025 17:49:41 +0100 Subject: [PATCH 31/66] formt with nix fmt --- nixos-modules/sops/default.nix | 4 +++- systems/hetzner/default.nix | 10 ++++++++-- systems/hetzner/nginx.nix | 17 ++++++++++++----- systems/omoikane/disk.nix | 2 +- systems/zap/wp-test.nix | 8 +++----- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/nixos-modules/sops/default.nix b/nixos-modules/sops/default.nix index 33bc526..b87ee47 100644 --- a/nixos-modules/sops/default.nix +++ b/nixos-modules/sops/default.nix @@ -11,7 +11,9 @@ let in { options.jopejoe1.sops = { - enable = (lib.mkEnableOption "Enable sops") // { default = true;}; + enable = (lib.mkEnableOption "Enable sops") // { + default = true; + }; }; config = lib.mkIf cfg.enable { diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index dc39ce2..50ff0b8 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -42,8 +42,14 @@ networking.firewall = { enable = true; - allowedTCPPorts = [ 21 80 ]; - allowedUDPPorts = [ 21 80 ]; + allowedTCPPorts = [ + 21 + 80 + ]; + allowedUDPPorts = [ + 21 + 80 + ]; }; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:a0:31e5::/64"; diff --git a/systems/hetzner/nginx.nix b/systems/hetzner/nginx.nix index d81a24c..54f201b 100644 --- a/systems/hetzner/nginx.nix +++ b/systems/hetzner/nginx.nix @@ -58,7 +58,8 @@ "cache.missing.ninja" = { forceSSL = true; enableACME = true; - locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; + locations."/".proxyPass = + "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; }; "nix.missing.ninja" = { forceSSL = true; @@ -98,23 +99,29 @@ urlPrefix = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/blob/master/"; } { - optionsJSON = (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json; + optionsJSON = + (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json; name = "NixOS"; urlPrefix = "https://github.com/NixOS/nixpkgs/tree/master/"; } { - optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos + /share/doc/nixos/options.json; + optionsJSON = + self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos + + /share/doc/nixos/options.json; name = "Home Manager NixOS"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; } { - optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json + /share/doc/home-manager/options.json; + optionsJSON = + self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json + + /share/doc/home-manager/options.json; optionsPrefix = "home-manager.users."; name = "Home Manager"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; } { - optionsJSON = self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json; + optionsJSON = + self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json; optionsPrefix = "programs.nixvim"; name = "NixVim"; urlPrefix = "https://github.com/nix-community/nixvim/tree/main/"; diff --git a/systems/omoikane/disk.nix b/systems/omoikane/disk.nix index 06fd1be..4d56549 100644 --- a/systems/omoikane/disk.nix +++ b/systems/omoikane/disk.nix @@ -1,4 +1,4 @@ -{...}: +{ ... }: { disko.devices = { disk = { diff --git a/systems/zap/wp-test.nix b/systems/zap/wp-test.nix index a5bdf45..668e0fe 100644 --- a/systems/zap/wp-test.nix +++ b/systems/zap/wp-test.nix @@ -121,11 +121,9 @@ if ! test -e "${hostStateDir}/secret-keys.php"; then umask 0177 echo "> "${hostStateDir}/secret-keys.php" - ${ - lib.concatMapStringsSep "\n" (var: '' - echo "define('${var}', '`tr -dc a-zA-Z0-9 > "${hostStateDir}/secret-keys.php" - '') secretsVars - } + ${lib.concatMapStringsSep "\n" (var: '' + echo "define('${var}', '`tr -dc a-zA-Z0-9 > "${hostStateDir}/secret-keys.php" + '') secretsVars} echo "?>" >> "${hostStateDir}/secret-keys.php" chmod 440 "${hostStateDir}/secret-keys.php" fi From 792ceb606069fb6c0db8c333b839cc957d3cf3a8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Jan 2025 22:46:19 +0100 Subject: [PATCH 32/66] clean up omoikane --- systems/omoikane/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index e6ba3ca..4749eda 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -66,8 +66,6 @@ fwupd.enable = true; libinput.enable = true; #repology.enable = true; - shairport-sync.enable = true; - shairport-sync.arguments = "-v -o pw"; }; time.timeZone = "Europe/Berlin"; @@ -82,15 +80,12 @@ environment.systemPackages = with pkgs; [ prismlauncher - goverlay thunderbird strawberry-qt6 picard gh ]; - fonts.packages = [ pkgs.google-fonts ]; - programs = { adb.enable = true; dconf.enable = true; @@ -116,9 +111,6 @@ "aarch64-linux" "armv6l-linux" ]; - boot.plymouth = { - enable = true; - }; boot.initrd.systemd.enable = true; programs.captive-browser = { From c5bb2788a2a2fb11237afb666fd9fb5d439d68b2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Jan 2025 22:47:13 +0100 Subject: [PATCH 33/66] update lock --- flake.lock | 94 ++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 664cb59..b729822 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1736437680, + "narHash": "sha256-9Sy17XguKdEU9M5peTrkWSlI/O5IAqjHzdzxbXnc30g=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "4d5d07d37ff773338e40a92088f45f4f88e509c8", "type": "github" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -333,18 +333,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -382,11 +378,11 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1736421950, + "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", + "rev": "d4aebb947a301b8da8654a804979a738c5c5da50", "type": "github" }, "original": { @@ -496,11 +492,11 @@ ] }, "locked": { - "lastModified": 1735478292, - "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -605,11 +601,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -661,11 +657,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -707,11 +703,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1735802549, - "narHash": "sha256-aS03+IGLexQt5HL+tLZqSko6Jpxa+eozqcide/pab34=", + "lastModified": 1736430661, + "narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=", "owner": "nix-community", "repo": "nixvim", - "rev": "3285bbda0aa0151c3b1914758e6950dfb554962f", + "rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b", "type": "github" }, "original": { @@ -729,11 +725,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -752,11 +748,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -841,11 +837,11 @@ ] }, "locked": { - "lastModified": 1735468296, - "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -861,11 +857,11 @@ ] }, "locked": { - "lastModified": 1735379278, - "narHash": "sha256-DpihJuI9SaWOUc1lRrw+e5014Qj+WHn9Xla89jxA6jk=", + "lastModified": 1735858634, + "narHash": "sha256-qp83fDr3W5b6QoWSp+vfcH1vFNEhreW98qe9tlhSaXE=", "owner": "nix-community", "repo": "srvos", - "rev": "e3b404890cfb44caec3edc8b84facb8934299428", + "rev": "eea4ff2050968da5134788c73d63a2461f9daf27", "type": "github" }, "original": { @@ -991,11 +987,11 @@ ] }, "locked": { - "lastModified": 1735135567, - "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { @@ -1011,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1735827994, - "narHash": "sha256-Y3IBRGmza5YKiHgNwEbVQkETQPir+lrJj4ErbVHktO0=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "246639a1ec081bb40941a25e9eb8481a66d71b49", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { From 2fb2e703902a17567ce252c76953101c8d73dea8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Jan 2025 22:55:11 +0100 Subject: [PATCH 34/66] limit grnd --- nixos-modules/boot/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-modules/boot/systemd/default.nix b/nixos-modules/boot/systemd/default.nix index d205795..91a709a 100644 --- a/nixos-modules/boot/systemd/default.nix +++ b/nixos-modules/boot/systemd/default.nix @@ -13,7 +13,7 @@ in loader = { systemd-boot = { enable = true; - configurationLimit = 10; + configurationLimit = 5; editor = false; }; efi = { From 089ef613021c574f1d5b361cd1819202f6d1d049 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Jan 2025 23:27:33 +0100 Subject: [PATCH 35/66] remove hardware conf --- systems/benzaiten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systems/benzaiten/default.nix b/systems/benzaiten/default.nix index 7323b74..48742f0 100644 --- a/systems/benzaiten/default.nix +++ b/systems/benzaiten/default.nix @@ -10,8 +10,8 @@ ./hardware-configuration.nix nixos-hardware.nixosModules.common-cpu-intel #nixos-hardware.nixosModules.common-gpu-nvidia - nixos-hardware.nixosModules.common-pc-laptop - nixos-hardware.nixosModules.common-pc-laptop-hdd + #nixos-hardware.nixosModules.common-pc-laptop + #nixos-hardware.nixosModules.common-pc-laptop-hdd ]; facter.reportPath = ./facter.json; From 6728dae390bb8d97d67ba48e1ec2c7933164d36b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Jan 2025 23:30:34 +0100 Subject: [PATCH 36/66] search remove hardware --- systems/hetzner/nginx.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/systems/hetzner/nginx.nix b/systems/hetzner/nginx.nix index 54f201b..3c4ecc9 100644 --- a/systems/hetzner/nginx.nix +++ b/systems/hetzner/nginx.nix @@ -72,15 +72,6 @@ specialArgs.modulesPath = pkgs.path + "/nixos/modules"; urlPrefix = "https://github.com/nix-community/disko/blob/master/"; } - { - modules = lib.attrValues self.inputs.nixos-hardware.nixosModules; - name = "NixOS Hardware"; - specialArgs = { - modulesPath = pkgs.path + "/nixos/modules"; - inherit pkgs; - }; - urlPrefix = "https://github.com/NixOS/nixos-hardware/blob/master/"; - } { modules = [ self.inputs.snm.nixosModules.default From 8e84f240d28b723000386d9c911d28d05fcb8dc2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 09:20:53 +0100 Subject: [PATCH 37/66] open port --- systems/omoikane/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index 4749eda..1bd54d1 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -66,6 +66,9 @@ fwupd.enable = true; libinput.enable = true; #repology.enable = true; + zerotierone.joinNetworks = [ + "d5e5fb653774ee43" + ]; }; time.timeZone = "Europe/Berlin"; @@ -106,6 +109,11 @@ "nixos-test" ]; + networking.firewall = { + allowedTCPPorts = [ 8080 ]; + allowedUDPPorts = [ 8080 ]; + }; + boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" From 014ddd954bc05ecb16fc62976cee853ad5a9d992 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 12:23:23 +0100 Subject: [PATCH 38/66] open firewall --- systems/kuraokami/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index c9ba7b9..047f889 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -50,12 +50,19 @@ networking = { hostId = "16c22faf"; + firewall = { + allowedTCPPorts = [ 8080 ]; + allowedUDPPorts = [ 8080 ]; + }; }; services = { hardware.openrgb = { enable = true; }; + zerotierone.joinNetworks = [ + "d5e5fb653774ee43" + ]; postgresql = { enable = true; extensions = ps: with ps; [ pg_libversion ]; From 221ffd2d60f78e662faf9fab36475249e29b24e6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 14:44:17 +0100 Subject: [PATCH 39/66] add nspawn container --- systems/hetzner/default.nix | 46 +++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 50ff0b8..2af39f2 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -40,16 +40,31 @@ }; }; - networking.firewall = { - enable = true; - allowedTCPPorts = [ - 21 - 80 - ]; - allowedUDPPorts = [ - 21 - 80 - ]; + networking = { + firewall = { + enable = true; + allowedTCPPorts = [ + 21 + 80 + ]; + allowedUDPPorts = [ + 21 + 80 + ]; + }; + bridges.br0.interfaces = [ "enp41s0" ]; + useDHCP = false; + interfaces."br0" = { + useDHCP = true; + ipv4.addresses = [ + { + address = "192.168.100.3"; + prefixLength = 24; + } + ]; + }; + defaultGateway = "192.168.100.1"; + nameservers = [ "192.168.100.1" ]; }; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:a0:31e5::/64"; @@ -77,6 +92,17 @@ initialPassword = "backupPassword"; }; + containers = { + nyan = { + privateNetwork = true; + hostBridge = "br0"; # Specify the bridge name + localAddress = "192.168.100.5/24"; + config = { + services.mastodon.enable = true; + }; + }; + }; + disko.devices = { disk = { vdb = { From 11423944d421c37a067b623e277665248c73ce3b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 14:50:25 +0100 Subject: [PATCH 40/66] fix defaultGateway --- systems/hetzner/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 2af39f2..7965399 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -63,7 +63,10 @@ } ]; }; - defaultGateway = "192.168.100.1"; + defaultGateway = { + address = "192.168.100.1"; + interface = "enp41s0"; + }; nameservers = [ "192.168.100.1" ]; }; From cd4b0a78daca27a1606cdbd3e6aa7ad54eb03e54 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 14:57:43 +0100 Subject: [PATCH 41/66] set streamingProcesses --- systems/hetzner/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 7965399..33b4abf 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -101,7 +101,10 @@ hostBridge = "br0"; # Specify the bridge name localAddress = "192.168.100.5/24"; config = { - services.mastodon.enable = true; + services.mastodon = { + enable = true; + streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; + }; }; }; }; From b4499da9e629367e03a35f1762766c03c2c9c8b8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 15:00:01 +0100 Subject: [PATCH 42/66] add missing options --- systems/hetzner/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 33b4abf..a82b601 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -101,9 +101,11 @@ hostBridge = "br0"; # Specify the bridge name localAddress = "192.168.100.5/24"; config = { + system.stateVersion = "25.05"; services.mastodon = { enable = true; streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; + localDomain = "nyan.social"; }; }; }; From 1fd976dfd07cd023436bfc1fdf5ade641235703a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 15:16:30 +0100 Subject: [PATCH 43/66] get network interface name from hardware report --- systems/hetzner/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index a82b601..b7ceefd 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -6,6 +6,9 @@ ... }: +let + network_interface_name = (lib.elemAt config.facter.report.hardware.hardware.network_interface 0).unix_device_name; +in { imports = [ @@ -52,7 +55,9 @@ 80 ]; }; - bridges.br0.interfaces = [ "enp41s0" ]; + bridges.br0.interfaces = [ + network_interface_name + ]; useDHCP = false; interfaces."br0" = { useDHCP = true; @@ -65,7 +70,7 @@ }; defaultGateway = { address = "192.168.100.1"; - interface = "enp41s0"; + interface = network_interface_name; }; nameservers = [ "192.168.100.1" ]; }; From cf739561302f91b4a462e5021b02433988982327 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 15:18:49 +0100 Subject: [PATCH 44/66] add mail for nyan.social --- systems/hetzner/default.nix | 1 + systems/hetzner/mail.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index b7ceefd..4055447 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -111,6 +111,7 @@ in enable = true; streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; localDomain = "nyan.social"; + smtp.fromAddress = "mastodon@nyan.social" }; }; }; diff --git a/systems/hetzner/mail.nix b/systems/hetzner/mail.nix index 0ade0e1..a8167ca 100644 --- a/systems/hetzner/mail.nix +++ b/systems/hetzner/mail.nix @@ -25,6 +25,7 @@ "net0loggy.de" "dtg-c.de" "joens.email" + "nyan.social" ]; # A list of all login accounts. To create the password hashes, use @@ -48,6 +49,7 @@ "@net0loggy.de" "@dtg-c.de" "@joens.email" + "@nyan.social" ]; }; }; From 71d799a77956edb411d0273cb57af3cb329df09b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 15:19:20 +0100 Subject: [PATCH 45/66] fix typo --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 4055447..d6b9508 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -111,7 +111,7 @@ in enable = true; streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; localDomain = "nyan.social"; - smtp.fromAddress = "mastodon@nyan.social" + smtp.fromAddress = "mastodon@nyan.social"; }; }; }; From 7166d84864ba1faa15c3b49fb6f900278f3a03bc Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 15:19:50 +0100 Subject: [PATCH 46/66] remove dupe --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index d6b9508..b813ba3 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -7,7 +7,7 @@ }: let - network_interface_name = (lib.elemAt config.facter.report.hardware.hardware.network_interface 0).unix_device_name; + network_interface_name = (lib.elemAt config.facter.report.hardware.network_interface 0).unix_device_name; in { From 3703a67930928088595cd7f9136542a5feacfead Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 15:32:13 +0100 Subject: [PATCH 47/66] fix matrix --- nixos-modules/nix/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos-modules/nix/default.nix b/nixos-modules/nix/default.nix index 9359bae..82fb255 100644 --- a/nixos-modules/nix/default.nix +++ b/nixos-modules/nix/default.nix @@ -127,6 +127,18 @@ in (_self: super: rec { firefox-addons = self.inputs.firefox-addons.packages.${config.nixpkgs.hostPlatform.system}; localPkgs = self.outputs.packages.${config.nixpkgs.hostPlatform.system}; + matrix-synapse-unwrapped = super.matrix-synapse-unwrapped.overrideAttrs (oldAttrs: { + patches = [ + (super.fetchpatch2 { + url = "https://github.com/element-hq/synapse/commit/3eb92369ca14012a07da2fbf9250e66f66afb710.patch"; + sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A="; + }) + ]; + postPatch = oldAttrs.postPatch ++ '' + substituteInPlace tests/storage/databases/main/test_events_worker.py \ + --replace-fail "def test_recovery" "def no_test_recovery" + ''; + }); }) ]; }; From a38010b90066b3490ea2e6ab5357a1236e7fa162 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 10 Jan 2025 15:33:14 +0100 Subject: [PATCH 48/66] use string merginf not list merging --- nixos-modules/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos-modules/nix/default.nix b/nixos-modules/nix/default.nix index 82fb255..df32e4f 100644 --- a/nixos-modules/nix/default.nix +++ b/nixos-modules/nix/default.nix @@ -134,7 +134,7 @@ in sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A="; }) ]; - postPatch = oldAttrs.postPatch ++ '' + postPatch = oldAttrs.postPatch + '' substituteInPlace tests/storage/databases/main/test_events_worker.py \ --replace-fail "def test_recovery" "def no_test_recovery" ''; From e8abbcf5165c4eb07258bff05aa05b9ca3e3c171 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 12 Jan 2025 19:07:34 +0100 Subject: [PATCH 49/66] fix disk mount --- systems/omoikane/hardware.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/omoikane/hardware.nix b/systems/omoikane/hardware.nix index 539489f..006d1f7 100644 --- a/systems/omoikane/hardware.nix +++ b/systems/omoikane/hardware.nix @@ -12,7 +12,7 @@ fileSystems."/home/jopejoe1/Public/games" = { device = "/dev/sda"; fsType = "bcachefs"; - options = [ "compression=zstd" ]; + options = [ "compression=zstd" "nofail" ]; }; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; From 916a161c4fd03e4404f0d41a773d4357c98d1d3f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Jan 2025 16:17:53 +0100 Subject: [PATCH 50/66] configure mastadon --- systems/hetzner/default.nix | 14 ++++++++------ systems/hetzner/mail.nix | 4 ++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index b813ba3..efbafa0 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -95,6 +95,14 @@ in chrootlocalUser = true; }; + services.mastodon = { + enable = true; + streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; + localDomain = "nyan.social"; + smtp.fromAddress = "mastodon@nyan.social"; + configureNginx = true; + }; + users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; @@ -107,12 +115,6 @@ in localAddress = "192.168.100.5/24"; config = { system.stateVersion = "25.05"; - services.mastodon = { - enable = true; - streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; - localDomain = "nyan.social"; - smtp.fromAddress = "mastodon@nyan.social"; - }; }; }; }; diff --git a/systems/hetzner/mail.nix b/systems/hetzner/mail.nix index a8167ca..4312983 100644 --- a/systems/hetzner/mail.nix +++ b/systems/hetzner/mail.nix @@ -26,6 +26,8 @@ "dtg-c.de" "joens.email" "nyan.social" + "miau.social" + "pumkin.social" ]; # A list of all login accounts. To create the password hashes, use @@ -50,6 +52,8 @@ "@dtg-c.de" "@joens.email" "@nyan.social" + "@miau.social" + "@pumpkin.social" ]; }; }; From ead0fcea69beff12ca5a534314e93a9b6a32e542 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Jan 2025 16:31:31 +0100 Subject: [PATCH 51/66] disable mastodon --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index efbafa0..b7aa48a 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -96,7 +96,7 @@ in }; services.mastodon = { - enable = true; + enable = false; streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; localDomain = "nyan.social"; smtp.fromAddress = "mastodon@nyan.social"; From 6963d7846165fb36631a36665df06af654ab4dee Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Jan 2025 16:45:09 +0100 Subject: [PATCH 52/66] enable mastodon --- systems/hetzner/default.nix | 43 ++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index b7aa48a..e7d214d 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -95,19 +95,22 @@ in chrootlocalUser = true; }; - services.mastodon = { - enable = false; - streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; - localDomain = "nyan.social"; - smtp.fromAddress = "mastodon@nyan.social"; - configureNginx = true; - }; - users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; }; + services.nginx = { + virtualHosts."${config.containers.nyan.config.services.mastodon.localDomain}" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://192.168.100.5"; + proxyWebsockets = true; + }; + }; + }; + containers = { nyan = { privateNetwork = true; @@ -115,6 +118,30 @@ in localAddress = "192.168.100.5/24"; config = { system.stateVersion = "25.05"; + services.mastodon = { + enable = true; + streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; + localDomain = "nyan.social"; + smtp.fromAddress = "mastodon@nyan.social"; + configureNginx = true; + }; + services.nginx = { + virtualHosts."${config.containers.nyan.config.services.mastodon.localDomain}" = { + forceSSL = false; + enableACME = false; + }; + }; + networking = { + firewall = { + enable = true; + allowedTCPPorts = [ + 80 + ]; + allowedUDPPorts = [ + 80 + ]; + }; + }; }; }; }; From 7b3a97cfc36ae14d4792c946103a0c05e3c0bbe7 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 15 Jan 2025 20:04:53 +0100 Subject: [PATCH 53/66] update facter link --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8c2b4df..6fed9f5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; + nixos-facter-modules.url = "github:nix-community/nixos-facter-modules"; # Outputs nixos-generators = { From 368c90a01dcd84dfeccaa85869ac4e9142b10622 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 15 Jan 2025 20:09:33 +0100 Subject: [PATCH 54/66] update facter --- systems/omoikane/facter.json | 1088 +++++++++++++++++----------------- 1 file changed, 538 insertions(+), 550 deletions(-) diff --git a/systems/omoikane/facter.json b/systems/omoikane/facter.json index b0215b0..77908e1 100644 --- a/systems/omoikane/facter.json +++ b/systems/omoikane/facter.json @@ -23,8 +23,8 @@ }, "bluetooth": [ { - "index": 79, - "attached_to": 87, + "index": 80, + "attached_to": 89, "class_list": [ "usb", "bluetooth" @@ -125,8 +125,8 @@ "module_alias": "usb:v0E8DpE616d0100dcEFdsc02dp01icE0isc01ip01in01" }, { - "index": 93, - "attached_to": 87, + "index": 94, + "attached_to": 89, "class_list": [ "usb", "bluetooth" @@ -216,19 +216,11 @@ } }, "hotplug": "usb", - "driver": "btusb", - "driver_module": "btusb", - "drivers": [ - "btusb" - ], - "driver_modules": [ - "btusb" - ], "module_alias": "usb:v0E8DpE616d0100dcEFdsc02dp01icE0isc01ip01in02" }, { "index": 97, - "attached_to": 87, + "attached_to": 89, "class_list": [ "usb", "bluetooth" @@ -2066,11 +2058,12 @@ "decodeassists", "pausefilter", "pfthreshold", - "v_vmsave_vmload", "vgif", "x2avic", "v_spec_ctrl", - "vn" + "vnmi", + "avx512vbmi", + "um" ], "bugs": [ "sysret_ss_attrs", @@ -2090,7 +2083,7 @@ "[14]", "[15]" ], - "bogo": 7985.06, + "bogo": 7985.41, "cache": 1024, "units": 16, "physical_id": 0, @@ -2171,7 +2164,9 @@ "/dev/disk/by-id/nvme-WD_BLACK_SN770M_500GB_233104400961", "/dev/disk/by-id/nvme-WD_BLACK_SN770M_500GB_233104400961_1", "/dev/disk/by-id/nvme-eui.e8238fa6bf530001001b444a48dc22ef", + "/dev/disk/by-label/framework_root", "/dev/disk/by-path/pci-0000:04:00.0-nvme-1", + "/dev/disk/by-uuid/74c6ec50-88b4-41a8-91fc-c58f4c718d6e", "/dev/nvme0n1" ], "resources": [ @@ -2201,6 +2196,103 @@ }, { "index": 69, + "attached_to": 24, + "class_list": [ + "disk", + "usb", + "scsi", + "block_device" + ], + "bus_type": { + "hex": "0084", + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "090c", + "name": "SMI", + "value": 2316 + }, + "device": { + "hex": "1000", + "name": "USB DISK", + "value": 4096 + }, + "revision": { + "hex": "0000", + "name": "1100", + "value": 0 + }, + "serial": "SM3350", + "model": "SMI USB DISK", + "sysfs_id": "/class/block/sdb", + "sysfs_bus_id": "0:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-2/2-2.2/2-2.2:1.0/host0/target0:0:0/0:0:0:0", + "unix_device_name": "/dev/sdb", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 16, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/14", + "/dev/disk/by-id/usb-SMI_USB_DISK_AA00000000015055-0:0", + "/dev/disk/by-path/pci-0000:c5:00.3-usb-0:2.2:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:c5:00.3-usbv3-0:2.2:1.0-scsi-0:0:0:0", + "/dev/sdb" + ], + "unix_device_name2": "/dev/sg1", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 1, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 31107, + "heads": 255, + "sectors": 63, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 499744768, + "value_2": 512 + } + ], + "driver": "usb-storage", + "driver_module": "usb_storage", + "drivers": [ + "sd", + "usb-storage" + ], + "driver_modules": [ + "sd_mod", + "usb_storage" + ], + "module_alias": "usb:v090Cp1000d1100dc00dsc00dp00ic08isc06ip50in00" + }, + { + "index": 70, "attached_to": 46, "class_list": [ "disk", @@ -2289,7 +2381,7 @@ ] }, { - "index": 70, + "index": 71, "attached_to": 24, "class_list": [ "disk", @@ -2303,7 +2395,7 @@ "value": 132 }, "slot": { - "bus": 0, + "bus": 1, "number": 0 }, "base_class": { @@ -2334,8 +2426,8 @@ "serial": "071C4350011FA939", "model": "FRMW 1TB Card", "sysfs_id": "/class/block/sda", - "sysfs_bus_id": "0:0:0:0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-2/2-2.3/2-2.3:1.0/host0/target0:0:0/0:0:0:0", + "sysfs_bus_id": "1:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-2/2-2.3/2-2.3:1.0/host1/target1:0:0/1:0:0:0", "unix_device_name": "/dev/sda", "unix_device_number": { "type": 98, @@ -2629,7 +2721,7 @@ ], "hub": [ { - "index": 71, + "index": 72, "attached_to": 58, "class_list": [ "usb", @@ -2651,7 +2743,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -2661,11 +2753,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.3/usb6/6-0:1.0", "sysfs_bus_id": "6-0:1.0", "detail": { @@ -2699,11 +2791,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { "index": 74, - "attached_to": 87, + "attached_to": 89, "class_list": [ "usb", "hub" @@ -2806,7 +2898,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -2816,11 +2908,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.4/usb3/3-0:1.0", "sysfs_bus_id": "3-0:1.0", "resources": [ @@ -2864,7 +2956,7 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { "index": 78, @@ -2889,7 +2981,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -2899,11 +2991,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.4/usb7/7-0:1.0", "sysfs_bus_id": "7-0:1.0", "resources": [ @@ -2947,11 +3039,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 80, - "attached_to": 87, + "index": 81, + "attached_to": 89, "class_list": [ "usb", "hub" @@ -3031,7 +3123,7 @@ "module_alias": "usb:v05E3p0610d6060dc09dsc00dp02ic09isc00ip02in00" }, { - "index": 81, + "index": 82, "attached_to": 96, "class_list": [ "usb", @@ -3103,7 +3195,7 @@ "module_alias": "usb:v05E3p0625d3404dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 84, + "index": 85, "attached_to": 44, "class_list": [ "usb", @@ -3125,7 +3217,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3135,11 +3227,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.4/usb4/4-0:1.0", "sysfs_bus_id": "4-0:1.0", "detail": { @@ -3173,10 +3265,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 85, + "index": 87, "attached_to": 32, "class_list": [ "usb", @@ -3198,7 +3290,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3208,11 +3300,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.4/usb8/8-0:1.0", "sysfs_bus_id": "8-0:1.0", "detail": { @@ -3246,10 +3338,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 87, + "index": 89, "attached_to": 24, "class_list": [ "usb", @@ -3271,7 +3363,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3281,11 +3373,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -3329,11 +3421,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 89, - "attached_to": 87, + "index": 90, + "attached_to": 89, "class_list": [ "usb", "hub" @@ -3435,7 +3527,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3445,11 +3537,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.3/usb5/5-0:1.0", "sysfs_bus_id": "5-0:1.0", "resources": [ @@ -3493,7 +3585,7 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { "index": 96, @@ -3518,7 +3610,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3528,11 +3620,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { @@ -3566,13 +3658,123 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" } ], "keyboard": [ { - "index": 90, - "attached_to": 89, + "index": 75, + "attached_to": 81, + "class_list": [ + "keyboard", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0108", + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "hex": "0000", + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "hex": "32ac", + "name": "Framework", + "value": 12972 + }, + "device": { + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 + }, + "revision": { + "hex": "0000", + "name": "0.29", + "value": 0 + }, + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.0", + "sysfs_bus_id": "1-3.2:1.0", + "unix_device_name": "/dev/input/event1", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 65, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/by-id/usb-Framework_Laptop_16_RGB_Macropad_FRAKDKEN0100000000-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usb-0:3.2:1.0-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:3.2:1.0-event-kbd", + "/dev/input/event1" + ], + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v32ACp0013d0029dc00dsc00dp00ic03isc01ip01in00" + }, + { + "index": 83, + "attached_to": 90, "class_list": [ "keyboard", "usb" @@ -3613,20 +3815,20 @@ }, "serial": "FRAKDKEN0100000000", "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.0", - "sysfs_bus_id": "1-4.3:1.0", - "unix_device_name": "/dev/input/event1", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.0", + "sysfs_bus_id": "1-4.2:1.0", + "unix_device_name": "/dev/input/event6", "unix_device_number": { "type": 99, "major": 13, - "minor": 65, + "minor": 70, "range": 1 }, "unix_device_names": [ "/dev/input/by-id/usb-Framework_Laptop_16_Keyboard_Module_-_ANSI_FRAKDKEN0100000000-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usb-0:4.3:1.0-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:4.3:1.0-event-kbd", - "/dev/input/event1" + "/dev/input/by-path/pci-0000:c5:00.3-usb-0:4.2:1.0-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:4.2:1.0-event-kbd", + "/dev/input/event6" ], "resources": [ { @@ -3703,7 +3905,7 @@ { "type": "mem", "base": 0, - "range": 65111613440, + "range": 65110425600, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -3793,6 +3995,40 @@ } } ], + "mouse": [ + { + "index": 102, + "attached_to": 0, + "bus_type": { + "hex": "0081", + "name": "serial", + "value": 129 + }, + "base_class": { + "hex": "0118", + "name": "touchpad", + "value": 280 + }, + "sub_class": { + "hex": "0001", + "name": "bus", + "value": 1 + }, + "vendor": { + "hex": "093a", + "value": 2362 + }, + "device": { + "hex": "0274", + "value": 628 + }, + "sysfs_id": "/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00/0018:093A:0274.000A/input/input23", + "unix_device_names": [ + "/dev/input/event21", + "/dev/input/ + handler" + ] + } + ], "network_controller": [ { "index": 54, @@ -3852,7 +4088,7 @@ }, { "type": "irq", - "base": 137, + "base": 141, "triggered": 0, "enabled": true }, @@ -3965,7 +4201,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 137, + "irq": 141, "prog_if": 0 }, "driver": "mt7921e", @@ -3982,6 +4218,29 @@ "network_interface": [ { "index": 98, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0000", + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 100, "attached_to": 54, "class_list": [ "network_interface" @@ -4021,29 +4280,6 @@ "driver_modules": [ "mt7921e" ] - }, - { - "index": 100, - "attached_to": 0, - "class_list": [ - "network_interface" - ], - "base_class": { - "hex": "0107", - "name": "Network Interface", - "value": 263 - }, - "sub_class": { - "hex": "0000", - "name": "Loopback", - "value": 0 - }, - "model": "Loopback network interface", - "sysfs_id": "/class/net/lo", - "unix_device_name": "lo", - "unix_device_names": [ - "lo" - ] } ], "pci": [ @@ -4611,7 +4847,7 @@ "resources": [ { "type": "irq", - "base": 140, + "base": 137, "triggered": 0, "enabled": true }, @@ -4629,7 +4865,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 140, + "irq": 137, "prog_if": 0 }, "driver": "snd_hda_intel", @@ -4691,7 +4927,7 @@ "resources": [ { "type": "irq", - "base": 67, + "base": 51, "triggered": 0, "enabled": true }, @@ -4709,7 +4945,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 67, + "irq": 51, "prog_if": 0 }, "driver": "snd_hda_intel", @@ -4771,7 +5007,7 @@ "resources": [ { "type": "irq", - "base": 141, + "base": 138, "triggered": 0, "enabled": true }, @@ -4789,7 +5025,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 141, + "irq": 138, "prog_if": 0 }, "driver": "snd_hda_intel", @@ -4860,7 +5096,7 @@ "resources": [ { "type": "irq", - "base": 64, + "base": 50, "triggered": 0, "enabled": true }, @@ -4878,7 +5114,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 64, + "irq": 50, "prog_if": 2 }, "driver": "nvme", @@ -4947,7 +5183,7 @@ "resources": [ { "type": "irq", - "base": 65, + "base": 49, "triggered": 0, "enabled": true }, @@ -4965,7 +5201,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 65, + "irq": 49, "prog_if": 2 }, "driver": "nvme", @@ -4983,101 +5219,9 @@ "form_factor": "laptop" }, "usb": [ - { - "index": 72, - "attached_to": 89, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework", - "value": 12972 - }, - "device": { - "hex": "0012", - "name": "Laptop 16 Keyboard Module - ANSI", - "value": 18 - }, - "revision": { - "hex": "0000", - "name": "0.29", - "value": 0 - }, - "serial": "FRAKDKEN0100000000", - "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.3", - "sysfs_bus_id": "1-4.3:1.3", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 3, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in03" - }, { "index": 73, - "attached_to": 74, + "attached_to": 81, "class_list": [ "usb", "unknown" @@ -5107,96 +5251,9 @@ "value": 12972 }, "device": { - "hex": "0002", - "name": "HDMI Expansion Card", - "value": 2 - }, - "serial": "11AD1D00A49C40112C250B00", - "model": "Framework HDMI Expansion Card", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-2/1-2.1/1-2.1:1.1", - "sysfs_bus_id": "1-2.1:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "module_alias": "usb:v32ACp0002d0000dc00dsc00dp00ic03isc00ip00in01" - }, - { - "index": 75, - "attached_to": 89, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework", - "value": 12972 - }, - "device": { - "hex": "0012", - "name": "Laptop 16 Keyboard Module - ANSI", - "value": 18 + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 }, "revision": { "hex": "0000", @@ -5204,9 +5261,22 @@ "value": 0 }, "serial": "FRAKDKEN0100000000", - "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.1", - "sysfs_bus_id": "1-4.3:1.1", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.2", + "sysfs_bus_id": "1-3.2:1.2", + "unix_device_name": "/dev/input/event5", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 69, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/by-id/usb-Framework_Laptop_16_RGB_Macropad_FRAKDKEN0100000000-if02-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usb-0:3.2:1.2-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:3.2:1.2-event-kbd", + "/dev/input/event5" + ], "resources": [ { "type": "baud", @@ -5240,7 +5310,7 @@ "value": 0 }, "interface_protocol": 0, - "interface_number": 1, + "interface_number": 2, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -5252,11 +5322,11 @@ "driver_modules": [ "usbhid" ], - "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in01" + "module_alias": "usb:v32ACp0013d0029dc00dsc00dp00ic03isc00ip00in02" }, { "index": 77, - "attached_to": 89, + "attached_to": 90, "class_list": [ "usb", "unknown" @@ -5339,192 +5409,8 @@ "module_alias": "usb:v27C6p609Cd0100dcEFdsc00dp00icFFisc00ip00in00" }, { - "index": 82, - "attached_to": 80, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework Computer Inc", - "value": 12972 - }, - "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 - }, - "revision": { - "hex": "0000", - "name": "0.20", - "value": 0 - }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.3/1-3.3:1.0", - "sysfs_bus_id": "1-3.3:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", - "drivers": [ - "cdc_acm" - ], - "driver_modules": [ - "cdc_acm" - ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic02isc02ip00in00" - }, - { - "index": 83, - "attached_to": 89, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework Computer Inc", - "value": 12972 - }, - "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 - }, - "revision": { - "hex": "0000", - "name": "0.20", - "value": 0 - }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.0", - "sysfs_bus_id": "1-4.2:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", - "drivers": [ - "cdc_acm" - ], - "driver_modules": [ - "cdc_acm" - ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic02isc02ip00in00" - }, - { - "index": 86, - "attached_to": 89, + "index": 79, + "attached_to": 90, "class_list": [ "usb", "unknown" @@ -5565,20 +5451,17 @@ }, "serial": "FRAKDKEN0100000000", "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.2", - "sysfs_bus_id": "1-4.3:1.2", - "unix_device_name": "/dev/input/event5", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.2", + "sysfs_bus_id": "1-4.2:1.2", + "unix_device_name": "/dev/input/event9", "unix_device_number": { "type": 99, "major": 13, - "minor": 69, + "minor": 73, "range": 1 }, "unix_device_names": [ - "/dev/input/by-id/usb-Framework_Laptop_16_Keyboard_Module_-_ANSI_FRAKDKEN0100000000-if02-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usb-0:4.3:1.2-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:4.3:1.2-event-kbd", - "/dev/input/event5" + "/dev/input/event9" ], "resources": [ { @@ -5628,8 +5511,8 @@ "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in02" }, { - "index": 88, - "attached_to": 74, + "index": 86, + "attached_to": 81, "class_list": [ "usb", "unknown" @@ -5659,14 +5542,19 @@ "value": 12972 }, "device": { - "hex": "0002", - "name": "HDMI Expansion Card", - "value": 2 + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 }, - "serial": "11AD1D00A49C40112C250B00", - "model": "Framework HDMI Expansion Card", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-2/1-2.1/1-2.1:1.0", - "sysfs_bus_id": "1-2.1:1.0", + "revision": { + "hex": "0000", + "name": "0.29", + "value": 0 + }, + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.3", + "sysfs_bus_id": "1-3.2:1.3", "resources": [ { "type": "baud", @@ -5690,9 +5578,9 @@ }, "device_protocol": 0, "interface_class": { - "hex": "0011", - "name": "billboard", - "value": 17 + "hex": "0003", + "name": "hid", + "value": 3 }, "interface_subclass": { "hex": "0000", @@ -5700,15 +5588,23 @@ "value": 0 }, "interface_protocol": 0, - "interface_number": 0, + "interface_number": 3, "interface_alternate_setting": 0 }, "hotplug": "usb", - "module_alias": "usb:v32ACp0002d0000dc00dsc00dp00ic11isc00ip00in00" + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v32ACp0013d0029dc00dsc00dp00ic03isc00ip00in03" }, { - "index": 94, - "attached_to": 80, + "index": 88, + "attached_to": 81, "class_list": [ "usb", "unknown" @@ -5734,23 +5630,23 @@ }, "vendor": { "hex": "32ac", - "name": "Framework Computer Inc", + "name": "Framework", "value": 12972 }, "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 }, "revision": { "hex": "0000", - "name": "0.20", + "name": "0.29", "value": 0 }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.3/1-3.3:1.1", - "sysfs_bus_id": "1-3.3:1.1", + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.1", + "sysfs_bus_id": "1-3.2:1.1", "resources": [ { "type": "baud", @@ -5763,9 +5659,9 @@ ], "detail": { "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 + "hex": "0000", + "name": "per_interface", + "value": 0 }, "device_subclass": { "hex": "0000", @@ -5774,9 +5670,9 @@ }, "device_protocol": 0, "interface_class": { - "hex": "000a", - "name": "data", - "value": 10 + "hex": "0003", + "name": "hid", + "value": 3 }, "interface_subclass": { "hex": "0000", @@ -5788,19 +5684,19 @@ "interface_alternate_setting": 0 }, "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", + "driver": "usbhid", + "driver_module": "usbhid", "drivers": [ - "cdc_acm" + "usbhid" ], "driver_modules": [ - "cdc_acm" + "usbhid" ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic0Aisc00ip00in01" + "module_alias": "usb:v32ACp0013d0029dc00dsc00dp00ic03isc00ip00in01" }, { - "index": 95, - "attached_to": 89, + "index": 93, + "attached_to": 90, "class_list": [ "usb", "unknown" @@ -5826,21 +5722,113 @@ }, "vendor": { "hex": "32ac", - "name": "Framework Computer Inc", + "name": "Framework", "value": 12972 }, "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 + "hex": "0012", + "name": "Laptop 16 Keyboard Module - ANSI", + "value": 18 }, "revision": { "hex": "0000", - "name": "0.20", + "name": "0.29", "value": 0 }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 Keyboard Module - ANSI", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.3", + "sysfs_bus_id": "1-4.2:1.3", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 3, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in03" + }, + { + "index": 95, + "attached_to": 90, + "class_list": [ + "usb", + "unknown" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "32ac", + "name": "Framework", + "value": 12972 + }, + "device": { + "hex": "0012", + "name": "Laptop 16 Keyboard Module - ANSI", + "value": 18 + }, + "revision": { + "hex": "0000", + "name": "0.29", + "value": 0 + }, + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 Keyboard Module - ANSI", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.1", "sysfs_bus_id": "1-4.2:1.1", "resources": [ @@ -5855,9 +5843,9 @@ ], "detail": { "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 + "hex": "0000", + "name": "per_interface", + "value": 0 }, "device_subclass": { "hex": "0000", @@ -5866,9 +5854,9 @@ }, "device_protocol": 0, "interface_class": { - "hex": "000a", - "name": "data", - "value": 10 + "hex": "0003", + "name": "hid", + "value": 3 }, "interface_subclass": { "hex": "0000", @@ -5880,15 +5868,15 @@ "interface_alternate_setting": 0 }, "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", + "driver": "usbhid", + "driver_module": "usbhid", "drivers": [ - "cdc_acm" + "usbhid" ], "driver_modules": [ - "cdc_acm" + "usbhid" ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic0Aisc00ip00in01" + "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in01" } ], "usb_controller": [ @@ -5946,7 +5934,7 @@ "resources": [ { "type": "irq", - "base": 49, + "base": 53, "triggered": 0, "enabled": true }, @@ -5964,7 +5952,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 49, + "irq": 53, "prog_if": 48 }, "driver": "xhci_hcd", @@ -6286,7 +6274,7 @@ "resources": [ { "type": "irq", - "base": 51, + "base": 54, "triggered": 0, "enabled": true }, @@ -6304,7 +6292,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 51, + "irq": 54, "prog_if": 64 }, "driver": "thunderbolt", From 70fa1e1d4efa91bcbb14ca64d5e9232f8d4a286c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 15 Jan 2025 20:10:20 +0100 Subject: [PATCH 55/66] update lock --- flake.lock | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index b729822..1e8b299 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1736437680, - "narHash": "sha256-9Sy17XguKdEU9M5peTrkWSlI/O5IAqjHzdzxbXnc30g=", + "lastModified": 1736711425, + "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", "owner": "nix-community", "repo": "disko", - "rev": "4d5d07d37ff773338e40a92088f45f4f88e509c8", + "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1735790613, - "narHash": "sha256-xH79ynL9yRIgcaotoTfjeAyhkPJQDTe2pb4/iTqOfM0=", + "lastModified": 1736913802, + "narHash": "sha256-72be03HWS5Q8I1W9hlWRVicZxL5MJURVKbnJGIcbjIE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "914251401c955eac60c1f59b5ae729bc91d71bd9", + "rev": "79a77a7d0b22e82d52a90055cc8206447ab85285", "type": "gitlab" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1736421950, - "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4aebb947a301b8da8654a804979a738c5c5da50", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "impermanence": { "locked": { - "lastModified": 1734945620, - "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", + "lastModified": 1736688610, + "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", "owner": "nix-community", "repo": "impermanence", - "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", + "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixlib": { "locked": { - "lastModified": 1734829460, - "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "type": "github" }, "original": { @@ -565,15 +565,15 @@ }, "nixos-facter-modules_2": { "locked": { - "lastModified": 1734596637, - "narHash": "sha256-MRqwVAe3gsb88u4ME1UidmZFVCx+FEnoob0zkpO9DMY=", - "owner": "numtide", + "lastModified": 1736931726, + "narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=", + "owner": "nix-community", "repo": "nixos-facter-modules", - "rev": "536472754982bf03079b4b4e0261838a760587c0", + "rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c", "type": "github" }, "original": { - "owner": "numtide", + "owner": "nix-community", "repo": "nixos-facter-modules", "type": "github" } @@ -586,11 +586,11 @@ ] }, "locked": { - "lastModified": 1734915500, - "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", + "lastModified": 1736730523, + "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", + "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937", "type": "github" }, "original": { @@ -657,11 +657,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { @@ -703,11 +703,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1736430661, - "narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=", + "lastModified": 1736961674, + "narHash": "sha256-nuOFHtSUHYsb6PHueFF9KPLS8v+Wi+wGCXZCI+J54QI=", "owner": "nix-community", "repo": "nixvim", - "rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b", + "rev": "54e6dbd8c83586d9553f61c21fa639b500e51f93", "type": "github" }, "original": { @@ -837,11 +837,11 @@ ] }, "locked": { - "lastModified": 1736203741, - "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", + "lastModified": 1736808430, + "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", + "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", "type": "github" }, "original": { @@ -857,11 +857,11 @@ ] }, "locked": { - "lastModified": 1735858634, - "narHash": "sha256-qp83fDr3W5b6QoWSp+vfcH1vFNEhreW98qe9tlhSaXE=", + "lastModified": 1736810122, + "narHash": "sha256-29Mp0xa3jXF33Qu92hd/uPz1HZWBestpEKmgG4RyzCo=", "owner": "nix-community", "repo": "srvos", - "rev": "eea4ff2050968da5134788c73d63a2461f9daf27", + "rev": "61cc2047ad1a4c52ef18d117ac8e6ccfc0e38ea5", "type": "github" }, "original": { From 0649b83930abcf14945e24add50a2dea9fccbad4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 10:43:46 +0100 Subject: [PATCH 56/66] add gh --- systems/kuraokami/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 047f889..9b3957a 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -120,6 +120,7 @@ goverlay strawberry-qt6 thunderbird + gh (ffmpeg-full.override { #withTensorflow = true; withUnfree = true; From 12c1ae47aa6c2422ee98aabbed3da6c717de5697 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 17:01:53 +0100 Subject: [PATCH 57/66] run mastadon in main --- systems/hetzner/default.nix | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index e7d214d..94321d6 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -95,22 +95,19 @@ in chrootlocalUser = true; }; + services.mastodon = { + enable = true; + streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; + localDomain = "nyan.social"; + smtp.fromAddress = "mastodon@nyan.social"; + configureNginx = true; + }; + users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; }; - services.nginx = { - virtualHosts."${config.containers.nyan.config.services.mastodon.localDomain}" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://192.168.100.5"; - proxyWebsockets = true; - }; - }; - }; - containers = { nyan = { privateNetwork = true; @@ -118,13 +115,6 @@ in localAddress = "192.168.100.5/24"; config = { system.stateVersion = "25.05"; - services.mastodon = { - enable = true; - streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; - localDomain = "nyan.social"; - smtp.fromAddress = "mastodon@nyan.social"; - configureNginx = true; - }; services.nginx = { virtualHosts."${config.containers.nyan.config.services.mastodon.localDomain}" = { forceSSL = false; From 1a72f14a6517bb51db7af400450f21377c534afe Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 17:04:46 +0100 Subject: [PATCH 58/66] dont patch matrix --- nixos-modules/nix/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos-modules/nix/default.nix b/nixos-modules/nix/default.nix index df32e4f..9359bae 100644 --- a/nixos-modules/nix/default.nix +++ b/nixos-modules/nix/default.nix @@ -127,18 +127,6 @@ in (_self: super: rec { firefox-addons = self.inputs.firefox-addons.packages.${config.nixpkgs.hostPlatform.system}; localPkgs = self.outputs.packages.${config.nixpkgs.hostPlatform.system}; - matrix-synapse-unwrapped = super.matrix-synapse-unwrapped.overrideAttrs (oldAttrs: { - patches = [ - (super.fetchpatch2 { - url = "https://github.com/element-hq/synapse/commit/3eb92369ca14012a07da2fbf9250e66f66afb710.patch"; - sha256 = "sha256-VDn3kQy23+QC2WKhWfe0FrUOnLuI1YwH5GxdTTVWt+A="; - }) - ]; - postPatch = oldAttrs.postPatch + '' - substituteInPlace tests/storage/databases/main/test_events_worker.py \ - --replace-fail "def test_recovery" "def no_test_recovery" - ''; - }); }) ]; }; From 84c5aed0a9f3eabbcf30ce8d9bb64e98f755622c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 17:19:06 +0100 Subject: [PATCH 59/66] disable mastodon --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 94321d6..78f4eab 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -96,7 +96,7 @@ in }; services.mastodon = { - enable = true; + enable = false; streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; localDomain = "nyan.social"; smtp.fromAddress = "mastodon@nyan.social"; From 746063d9e03fac1e5b30a60c6a814ee840597fb7 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 17:54:10 +0100 Subject: [PATCH 60/66] re-enable mastodon --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 78f4eab..94321d6 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -96,7 +96,7 @@ in }; services.mastodon = { - enable = false; + enable = true; streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; localDomain = "nyan.social"; smtp.fromAddress = "mastodon@nyan.social"; From e4ca35cf8fe3be3650413b9346daeb78a1b3cf60 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 18:09:21 +0100 Subject: [PATCH 61/66] enable text search mastodon --- systems/hetzner/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 94321d6..03061b0 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -99,10 +99,13 @@ in enable = true; streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; localDomain = "nyan.social"; + elasticsearch.host = "127.0.0.1"; smtp.fromAddress = "mastodon@nyan.social"; configureNginx = true; }; + services.opensearch.enable = true; + users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; From 9fd5ce7074739016e76adf443edc0fbe8767296f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 18:45:30 +0100 Subject: [PATCH 62/66] use akkoma instead of mastodon --- systems/hetzner/default.nix | 55 +++++++++++++------------------------ 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 03061b0..607f016 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -95,50 +95,33 @@ in chrootlocalUser = true; }; - services.mastodon = { + services.akkoma = { enable = true; - streamingProcesses = (lib.elemAt config.facter.report.hardware.cpu 0).cores - 1; - localDomain = "nyan.social"; - elasticsearch.host = "127.0.0.1"; - smtp.fromAddress = "mastodon@nyan.social"; - configureNginx = true; - }; + nginx = { + enableACME = true; + forceSSL = true; + }; + config = { + ":pleroma" = { + ":instance" = { + name = "Nyan Social"; + description = "More detailed description"; + email = "admin@nyan.social"; + registration_open = false; + }; - services.opensearch.enable = true; + "Pleroma.Web.Endpoint" = { + url.host = "nyan.social"; + }; + }; + }; + }; users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; }; - containers = { - nyan = { - privateNetwork = true; - hostBridge = "br0"; # Specify the bridge name - localAddress = "192.168.100.5/24"; - config = { - system.stateVersion = "25.05"; - services.nginx = { - virtualHosts."${config.containers.nyan.config.services.mastodon.localDomain}" = { - forceSSL = false; - enableACME = false; - }; - }; - networking = { - firewall = { - enable = true; - allowedTCPPorts = [ - 80 - ]; - allowedUDPPorts = [ - 80 - ]; - }; - }; - }; - }; - }; - disko.devices = { disk = { vdb = { From 1bdcab3c570ca666880e8f212b43abc5d65295ef Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Jan 2025 18:54:13 +0100 Subject: [PATCH 63/66] add media url --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 607f016..32d8221 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -109,10 +109,10 @@ in email = "admin@nyan.social"; registration_open = false; }; - "Pleroma.Web.Endpoint" = { url.host = "nyan.social"; }; + "Pleroma.Upload".base_url = "https://nyan.social/media/"; }; }; }; From b4005a027f41ca92613f020c73dc45093f7b03c4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 19 Jan 2025 18:45:23 +0100 Subject: [PATCH 64/66] add patch --- systems/hetzner/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 32d8221..2434d6d 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -97,6 +97,14 @@ in services.akkoma = { enable = true; + package = pkgs.akkoma.overrideAttrs (finalAttrs: previousAttrs: { + patches = [ + (pkgs.fetchPatch2 { + url = "https://akkoma.dev/AkkomaGang/akkoma/pulls/846.patch"; + hash = ""; + }) + ]; + }); nginx = { enableACME = true; forceSSL = true; From 7a2a020ccd36148587de82496e2dd02f21d9f444 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 19 Jan 2025 18:46:28 +0100 Subject: [PATCH 65/66] ops forgot this --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 2434d6d..64e1fbe 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -99,7 +99,7 @@ in enable = true; package = pkgs.akkoma.overrideAttrs (finalAttrs: previousAttrs: { patches = [ - (pkgs.fetchPatch2 { + (pkgs.fetchpatch2 { url = "https://akkoma.dev/AkkomaGang/akkoma/pulls/846.patch"; hash = ""; }) From 88e4d59f0ca8d27caaf1b47aed7e909f6e5dffaf Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 19 Jan 2025 18:47:12 +0100 Subject: [PATCH 66/66] add hash --- systems/hetzner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 64e1fbe..f04fd6b 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -101,7 +101,7 @@ in patches = [ (pkgs.fetchpatch2 { url = "https://akkoma.dev/AkkomaGang/akkoma/pulls/846.patch"; - hash = ""; + hash = "sha256-KTv7YKzSAzLqBnG22EIbIiX4B5D4WUYT9FzZCb4CYrU="; }) ]; });