From d1a0771733a17f4d552738390e1eae09d70f91ae Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 20 Feb 2025 10:32:17 +0100 Subject: [PATCH] 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 =