From b5654b0de19ee69eedfb4da08766064eacc97152 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 17 Feb 2025 15:51:50 +0100 Subject: [PATCH 1/6] nix/os/devices/steveej-x13s: bump versions --- nix/os/devices/steveej-x13s/flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index 35b4497..d6dc600 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -3,11 +3,11 @@ "ath11k-firmware": { "flake": false, "locked": { - "lastModified": 1738780660, - "narHash": "sha256-xDKtJUEksN/kuL49AtTyerCKn1XCJQH3zzcQV+m7r5Q=", + "lastModified": 1739552113, + "narHash": "sha256-jO57Sqz/9BGgTfECm4Cs9yi8uFcd3YxpJjG5J7sj4Z8=", "ref": "refs/heads/main", - "rev": "ae4407c02a434534590dec3e0ef26b371fd7888b", - "revCount": 165, + "rev": "eb147907112ebb2874426f679ed722201548cc33", + "revCount": 167, "type": "git", "url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git" }, @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1738765162, - "narHash": "sha256-3Z40qHaFScWUCVQrGc4Y+RdoPsh1R/wIh+AN4cTXP0I=", + "lastModified": 1739791827, + "narHash": "sha256-l6ooDEtfzet9qRQxlb5A+H6eY7VPpdiGMwqX0nqD1xM=", "owner": "nix-community", "repo": "disko", - "rev": "ff3568858c54bd306e9e1f2886f0f781df307dff", + "rev": "af4a580628e98302bb922c01e1169ce08d7bee57", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1739197353, - "narHash": "sha256-KhXCjlXYX1DIFjbDtFsR2WOeUvsrsYao06u9ixl+kM8=", + "lastModified": 1739291535, + "narHash": "sha256-69p2Eu/3OvKmCtuafv/yPPwsBQJjAfxThk2U+7yTGVQ=", "owner": "threefoldtech", "repo": "mycelium", - "rev": "f58df6c244826a43897efe9471b165ddf8d7480a", + "rev": "f420a9c0c82527ba8deb89c436f8e704bb61920c", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739055578, - "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", + "lastModified": 1739624908, + "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", + "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "type": "github" }, "original": { From 867d5552b6764b3a61047ea508a6d1f6502f0137 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 17 Feb 2025 17:16:29 +0100 Subject: [PATCH 2/6] nix/os/devices/steveej-x13s: bump versions --- nix/os/devices/steveej-x13s/flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index d6dc600..32f5f40 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -181,16 +181,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1739194097, - "narHash": "sha256-vPoE9Hu2dXqZh7n0BMQwXx9Q2pFRdsu17bhFaHrgi8Q=", + "lastModified": 1739778587, + "narHash": "sha256-fMt2Ao9+y71/x7zaUxzpu28M9Ugie6yl4N9lufxhc2Q=", "owner": "jhovold", "repo": "linux", - "rev": "7a06e4bfc53f53969db374662de9e5f43e3c3d1d", + "rev": "a2890743ed6d5cdfd2591cebf2d06af8dfd9180d", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.14-rc2", + "ref": "wip/sc8280xp-6.14-rc3", "repo": "linux", "type": "github" } @@ -264,11 +264,11 @@ "x13s-bt-linux-firmware": "x13s-bt-linux-firmware" }, "locked": { - "lastModified": 1739273873, - "narHash": "sha256-Gjyp1W1YIGcnXUOIZLHwVHvrhfidxMAGNfDYHcpYwjM=", + "lastModified": 1739804099, + "narHash": "sha256-CK192CNcOtO0v8y0QT+vpWhlvJ8qm6vSszTBBW7Fu84=", "ref": "bump", - "rev": "6784c72db5476449c9be197ed1bfd4fa9bf8b6a7", - "revCount": 136, + "rev": "4736fc5861dd329e0e41fde67d7cc9452470a368", + "revCount": 137, "type": "git", "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" }, From f12d3d85a39baf1eef746c80c6792f245aaea84c Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 17 Feb 2025 17:18:01 +0100 Subject: [PATCH 3/6] chore: nur.overlay update --- nix/home-manager/programs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/home-manager/programs/firefox.nix b/nix/home-manager/programs/firefox.nix index 8115434..196ee23 100644 --- a/nix/home-manager/programs/firefox.nix +++ b/nix/home-manager/programs/firefox.nix @@ -303,7 +303,7 @@ let in { nixpkgs.overlays = [ - repoFlake.inputs.nur.overlay + repoFlake.inputs.nur.overlays.default ]; nixpkgs.config.allowUnfreePredicate = From 54655b773d7954321b2af7626ac320dd8a7b039a Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 18 Feb 2025 11:09:50 +0100 Subject: [PATCH 4/6] nix/os/devices/steveej-x13s: bump versions --- nix/os/devices/steveej-x13s/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index 32f5f40..bfcd633 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1739791827, - "narHash": "sha256-l6ooDEtfzet9qRQxlb5A+H6eY7VPpdiGMwqX0nqD1xM=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "af4a580628e98302bb922c01e1169ce08d7bee57", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { From fe7930c50b40e4442faca37f0380656be4da792c Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 18 Feb 2025 18:25:02 +0100 Subject: [PATCH 5/6] nix/os/devices/steveej-x13s: bump versions --- nix/os/devices/steveej-x13s/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index bfcd633..a78ec03 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -324,11 +324,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736274150, - "narHash": "sha256-kucNsE9V9/jTQ3QsTP2+UeIHvmYOomBR0+ecjVSSUfA=", + "lastModified": 1739875727, + "narHash": "sha256-QZCdMYUT4QM0sXLugCNYXRsl9prxBMh4kzg1qdS8Te4=", "owner": "steveej-forks", "repo": "nixpkgs", - "rev": "d8de481c687c467d22ed7b0b398240f806f2c4b9", + "rev": "a5d3e7fdbad883a050e0d780694d0a219675c13f", "type": "github" }, "original": { From d1a0771733a17f4d552738390e1eae09d70f91ae Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 20 Feb 2025 10:32:17 +0100 Subject: [PATCH 6/6] x13s: bump nixpkgs-unstable, use signal from 3rd party flake, add extra-container --- .../configuration/graphical-fullblown.nix | 3 +- nix/home-manager/programs/libreoffice.nix | 8 +- nix/os/devices/steveej-x13s/configuration.nix | 2 + nix/os/devices/steveej-x13s/flake.lock | 86 +++++++++++++++++-- nix/os/devices/steveej-x13s/flake.nix | 10 +++ 5 files changed, 100 insertions(+), 9 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index c984c54..4363d05 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -132,8 +132,7 @@ in # FIXME: depends on insecure openssl 1.1.1t # kotatogram-desktop pkgsUnstable.tdesktop - # TODO: remove or reuse this depending on whether waydroid signal works - pkgsUnstable.signal-desktop + nodeFlake.inputs.signal-desktop.packages.${pkgs.system}.default # Virtualization virt-manager diff --git a/nix/home-manager/programs/libreoffice.nix b/nix/home-manager/programs/libreoffice.nix index 1e846d4..2091dc8 100644 --- a/nix/home-manager/programs/libreoffice.nix +++ b/nix/home-manager/programs/libreoffice.nix @@ -1,4 +1,8 @@ -{ pkgs, ... }: +{ pkgs, nodeFlake, ... }: + +let + pkgsStable = nodeFlake.inputs.nixpkgs-stable.legacyPackages.${pkgs.system}; +in { - home.packages = [ pkgs.libreoffice ]; + home.packages = [ pkgsStable.libreoffice ]; } diff --git a/nix/os/devices/steveej-x13s/configuration.nix b/nix/os/devices/steveej-x13s/configuration.nix index befd81a..472fcb5 100644 --- a/nix/os/devices/steveej-x13s/configuration.nix +++ b/nix/os/devices/steveej-x13s/configuration.nix @@ -83,6 +83,8 @@ ../../snippets/nix-settings-holo-chain.nix ../../snippets/mycelium.nix + nodeFlake.inputs.extra-container.nixosModules.default + # TODO: broken with: v4l2loopback-0.13.2-6.13.0-rc3.drv # make: *** [Makefile:53: v4l2loopback.ko] Error 2 # ../../snippets/obs-studio.nix diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index a78ec03..b92be30 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -56,6 +56,27 @@ "type": "indirect" } }, + "extra-container": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734542275, + "narHash": "sha256-wnRkafo4YrIuvJeRsOmfStxIzi7ty2I0OtGMO9chwJc=", + "owner": "erikarvstedt", + "repo": "extra-container", + "rev": "fa723fb67201c1b4610fd3d608681da362f800eb", + "type": "github" + }, + "original": { + "owner": "erikarvstedt", + "repo": "extra-container", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -129,6 +150,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -199,7 +238,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" @@ -324,11 +363,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739875727, - "narHash": "sha256-QZCdMYUT4QM0sXLugCNYXRsl9prxBMh4kzg1qdS8Te4=", + "lastModified": 1739899529, + "narHash": "sha256-+YAryDpuWmJm+xx8xAAGrN7TQoBF/3DSJvhSxFtr7us=", "owner": "steveej-forks", "repo": "nixpkgs", - "rev": "a5d3e7fdbad883a050e0d780694d0a219675c13f", + "rev": "4c624626f381e0cc1aa4e4a052dc6322342b2801", "type": "github" }, "original": { @@ -342,6 +381,7 @@ "inputs": { "ath11k-firmware": "ath11k-firmware", "disko": "disko", + "extra-container": "extra-container", "get-flake": "get-flake", "home-manager": "home-manager", "mycelium": "mycelium", @@ -351,7 +391,28 @@ "nixpkgs-unstable" ], "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "signal-desktop": "signal-desktop" + } + }, + "signal-desktop": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739931434, + "narHash": "sha256-XIcisx/PG/Li6l9A0k7T1ule3yX7VCGBQmKpljbbJmU=", + "owner": "youwen5", + "repo": "signal-desktop-flake", + "rev": "6f0ec210e6a2a0060ad1297d9f5a0871c4aeac36", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "signal-desktop-flake", + "type": "github" } }, "systems": { @@ -369,6 +430,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "x13s-bt-linux-firmware": { "flake": false, "locked": { diff --git a/nix/os/devices/steveej-x13s/flake.nix b/nix/os/devices/steveej-x13s/flake.nix index 5cb0e60..d703881 100644 --- a/nix/os/devices/steveej-x13s/flake.nix +++ b/nix/os/devices/steveej-x13s/flake.nix @@ -42,6 +42,16 @@ # url = "github:pdtpartners/nix-snapshotter"; inputs.nixpkgs.follows = "nixpkgs"; }; + + extra-container = { + url = "github:erikarvstedt/extra-container"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + signal-desktop = { + url = "github:youwen5/signal-desktop-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs =