diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 4363d05..c984c54 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -132,7 +132,8 @@ in # FIXME: depends on insecure openssl 1.1.1t # kotatogram-desktop pkgsUnstable.tdesktop - nodeFlake.inputs.signal-desktop.packages.${pkgs.system}.default + # TODO: remove or reuse this depending on whether waydroid signal works + pkgsUnstable.signal-desktop # Virtualization virt-manager diff --git a/nix/home-manager/programs/firefox.nix b/nix/home-manager/programs/firefox.nix index 196ee23..8115434 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.overlays.default + repoFlake.inputs.nur.overlay ]; nixpkgs.config.allowUnfreePredicate = diff --git a/nix/home-manager/programs/libreoffice.nix b/nix/home-manager/programs/libreoffice.nix index 2091dc8..1e846d4 100644 --- a/nix/home-manager/programs/libreoffice.nix +++ b/nix/home-manager/programs/libreoffice.nix @@ -1,8 +1,4 @@ -{ pkgs, nodeFlake, ... }: - -let - pkgsStable = nodeFlake.inputs.nixpkgs-stable.legacyPackages.${pkgs.system}; -in +{ pkgs, ... }: { - home.packages = [ pkgsStable.libreoffice ]; + home.packages = [ pkgs.libreoffice ]; } diff --git a/nix/os/devices/steveej-x13s/configuration.nix b/nix/os/devices/steveej-x13s/configuration.nix index 472fcb5..befd81a 100644 --- a/nix/os/devices/steveej-x13s/configuration.nix +++ b/nix/os/devices/steveej-x13s/configuration.nix @@ -83,8 +83,6 @@ ../../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 b92be30..35b4497 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": 1739552113, - "narHash": "sha256-jO57Sqz/9BGgTfECm4Cs9yi8uFcd3YxpJjG5J7sj4Z8=", + "lastModified": 1738780660, + "narHash": "sha256-xDKtJUEksN/kuL49AtTyerCKn1XCJQH3zzcQV+m7r5Q=", "ref": "refs/heads/main", - "rev": "eb147907112ebb2874426f679ed722201548cc33", - "revCount": 167, + "rev": "ae4407c02a434534590dec3e0ef26b371fd7888b", + "revCount": 165, "type": "git", "url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git" }, @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1738765162, + "narHash": "sha256-3Z40qHaFScWUCVQrGc4Y+RdoPsh1R/wIh+AN4cTXP0I=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "ff3568858c54bd306e9e1f2886f0f781df307dff", "type": "github" }, "original": { @@ -56,27 +56,6 @@ "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, @@ -150,24 +129,6 @@ "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=", @@ -220,16 +181,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1739778587, - "narHash": "sha256-fMt2Ao9+y71/x7zaUxzpu28M9Ugie6yl4N9lufxhc2Q=", + "lastModified": 1739194097, + "narHash": "sha256-vPoE9Hu2dXqZh7n0BMQwXx9Q2pFRdsu17bhFaHrgi8Q=", "owner": "jhovold", "repo": "linux", - "rev": "a2890743ed6d5cdfd2591cebf2d06af8dfd9180d", + "rev": "7a06e4bfc53f53969db374662de9e5f43e3c3d1d", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.14-rc3", + "ref": "wip/sc8280xp-6.14-rc2", "repo": "linux", "type": "github" } @@ -238,18 +199,18 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1739291535, - "narHash": "sha256-69p2Eu/3OvKmCtuafv/yPPwsBQJjAfxThk2U+7yTGVQ=", + "lastModified": 1739197353, + "narHash": "sha256-KhXCjlXYX1DIFjbDtFsR2WOeUvsrsYao06u9ixl+kM8=", "owner": "threefoldtech", "repo": "mycelium", - "rev": "f420a9c0c82527ba8deb89c436f8e704bb61920c", + "rev": "f58df6c244826a43897efe9471b165ddf8d7480a", "type": "github" }, "original": { @@ -303,11 +264,11 @@ "x13s-bt-linux-firmware": "x13s-bt-linux-firmware" }, "locked": { - "lastModified": 1739804099, - "narHash": "sha256-CK192CNcOtO0v8y0QT+vpWhlvJ8qm6vSszTBBW7Fu84=", + "lastModified": 1739273873, + "narHash": "sha256-Gjyp1W1YIGcnXUOIZLHwVHvrhfidxMAGNfDYHcpYwjM=", "ref": "bump", - "rev": "4736fc5861dd329e0e41fde67d7cc9452470a368", - "revCount": 137, + "rev": "6784c72db5476449c9be197ed1bfd4fa9bf8b6a7", + "revCount": 136, "type": "git", "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" }, @@ -347,11 +308,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -363,11 +324,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739899529, - "narHash": "sha256-+YAryDpuWmJm+xx8xAAGrN7TQoBF/3DSJvhSxFtr7us=", + "lastModified": 1736274150, + "narHash": "sha256-kucNsE9V9/jTQ3QsTP2+UeIHvmYOomBR0+ecjVSSUfA=", "owner": "steveej-forks", "repo": "nixpkgs", - "rev": "4c624626f381e0cc1aa4e4a052dc6322342b2801", + "rev": "d8de481c687c467d22ed7b0b398240f806f2c4b9", "type": "github" }, "original": { @@ -381,7 +342,6 @@ "inputs": { "ath11k-firmware": "ath11k-firmware", "disko": "disko", - "extra-container": "extra-container", "get-flake": "get-flake", "home-manager": "home-manager", "mycelium": "mycelium", @@ -391,28 +351,7 @@ "nixpkgs-unstable" ], "nixpkgs-stable": "nixpkgs-stable", - "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" + "nixpkgs-unstable": "nixpkgs-unstable" } }, "systems": { @@ -430,21 +369,6 @@ "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 d703881..5cb0e60 100644 --- a/nix/os/devices/steveej-x13s/flake.nix +++ b/nix/os/devices/steveej-x13s/flake.nix @@ -42,16 +42,6 @@ # 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 =