diff --git a/flake.lock b/flake.lock index 33028a8..1e733a2 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764885363, - "narHash": "sha256-P6UHmw6enwxmP5wP4Lv722+tgpq1PFDAPAdtj7l/16U=", + "lastModified": 1765990358, + "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", "owner": "catppuccin", "repo": "nix", - "rev": "95042630028d613080393e0f03c694b77883c7db", + "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1764870617, - "narHash": "sha256-Og3V5eIMzmxOnCoVIJD5Xpz7X9OBevdHBJqSoNwV/Ig=", + "lastModified": 1766045858, + "narHash": "sha256-lsbdHVSc5EB2+XgKDbeG1DjLLY5DnzlKQIPV0uQu/bQ=", "owner": "9001", "repo": "copyparty", - "rev": "fa918228d56e1384e77adc193c4bd26356f6bd18", + "rev": "0e6b167167eaf04036df8576f1ea96bc116ea951", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "eza-themes": { "flake": false, "locked": { - "lastModified": 1760304074, - "narHash": "sha256-qEC7H9/ghnjkwmMZ788TSgS9ysyIfD+3NHCjxq0Dps0=", + "lastModified": 1765813820, + "narHash": "sha256-WcwzKm2mi/tyA+zZCpyvTdrOrZ1R1ENA3t622SGzFas=", "owner": "eza-community", "repo": "eza-themes", - "rev": "c03051f67e84110fbae91ab7cbc377b3460f035c", + "rev": "1239cb1dd23fa8b70865550db77701b164a53cde", "type": "github" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1764872372, - "narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=", + "lastModified": 1765980955, + "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "05a56dbf24f195c62286e3273a2671d3b4904b00", + "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1764866045, - "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", + "lastModified": 1765979862, + "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", + "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1764746434, - "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", + "lastModified": 1766067735, + "narHash": "sha256-cRC/rOYRtZNzc5y9nTccozyo/mkI4/1eFE33Aqgs+SQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", + "rev": "34a16089be30f77ac9444907ec97c02b4b711896", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1764846683, - "narHash": "sha256-wW+hjhr2/rUTVAs8VM5Oq8hkT6HZ4zEnaiwYI1VPGDk=", - "rev": "8f5bf1e90556e0cdbee7899a7bee51b6ef76fc94", + "lastModified": 1765883751, + "narHash": "sha256-clrWX/t2swPGBVs50Yegq2HK3q5bbwOt3kWMsL7JIZM=", + "rev": "fc0073f54095f15ee272621d4746eb9f40946385", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8f5bf1e90556e0cdbee7899a7bee51b6ef76fc94.tar.gz?rev=8f5bf1e90556e0cdbee7899a7bee51b6ef76fc94" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fc0073f54095f15ee272621d4746eb9f40946385.tar.gz?rev=fc0073f54095f15ee272621d4746eb9f40946385" }, "original": { "type": "tarball", @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1764475780, - "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1764475780, - "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -429,11 +429,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs-raw": { "locked": { - "lastModified": 1764677808, - "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { @@ -460,11 +460,11 @@ }, "nixpkgs-unstable-raw": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -544,11 +544,11 @@ ] }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1765836173, + "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0482568..8bd2ed9 100644 --- a/flake.nix +++ b/flake.nix @@ -104,6 +104,7 @@ name = "patched-nixpkgs-unstable"; src = nixpkgs-unstable-raw; patches = [ + ./nixpkgs-patches/pr471291.patch ./nixpkgs-patches/revert-mangohud-update.patch ]; }; diff --git a/machines/Archie/hardware-configuration.nix b/machines/Archie/hardware-configuration.nix index 8ce6999..cb7bd98 100644 --- a/machines/Archie/hardware-configuration.nix +++ b/machines/Archie/hardware-configuration.nix @@ -54,6 +54,12 @@ fsType = config.fileSystems."/".fsType; options = ["subvolid=5" "ro"]; }; + "/mnt/hdd" = { + # device = "/dev/disk/by-id/ata-SAMSUNG_HD103SI_S1Y5J9CZA19763-part1"; + label = "Archie\\x20HDD"; + fsType = "bcachefs"; + options = ["x-systemd.automount"]; + }; "/mnt/windows" = { device = "/dev/disk/by-uuid/B61AFDAC1AFD6A2F"; fsType = "ntfs3"; diff --git a/nixpkgs-patches/pr471291.patch b/nixpkgs-patches/pr471291.patch new file mode 100644 index 0000000..7111330 --- /dev/null +++ b/nixpkgs-patches/pr471291.patch @@ -0,0 +1,61 @@ +From ef52b16862caa43dd4abc0aedf1814796342b664 Mon Sep 17 00:00:00 2001 +From: K900 +Date: Tue, 16 Dec 2025 11:48:37 +0300 +Subject: [PATCH] kdePackages.plasma-vault: refresh patch + +No idea how this happened. +--- + .../plasma/plasma-vault/hardcode-paths.patch | 26 +++++++++---------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch +index d8a5f4a025de3..090df77eb15b0 100644 +--- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch ++++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch +@@ -1,5 +1,5 @@ + diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp +-index f425eb3..5b8cd43 100644 ++index 64138b6..5d249aa 100644 + --- a/kded/engine/backends/cryfs/cryfsbackend.cpp + +++ b/kded/engine/backends/cryfs/cryfsbackend.cpp + @@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const +@@ -44,7 +44,7 @@ index b992f6f..eb828dd 100644 + + QString GocryptfsBackend::getConfigFilePath(const Device &device) const + diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp +-index 8763304..e6860d2 100644 ++index 714b660..61d8bf5 100644 + --- a/kded/engine/fusebackend_p.cpp + +++ b/kded/engine/fusebackend_p.cpp + @@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg +@@ -57,19 +57,19 @@ index 8763304..e6860d2 100644 + + FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload) + diff --git a/kded/engine/vault.cpp b/kded/engine/vault.cpp +-index c101079..67c8a83 100644 ++index a7a4741..773b671 100644 + --- a/kded/engine/vault.cpp + +++ b/kded/engine/vault.cpp +-@@ -485,7 +485,7 @@ FutureResult<> Vault::close() +- } else { +- // We want to check whether there is an application +- // that is accessing the vault +-- AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this] { +-+ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this] { +- d->updateMessage(i18n("Unable to lock the vault because an application is using it")); +- }) | onSuccess([this](const QString &result) { +- // based on ksolidnotify.cpp +-@@ -538,7 +538,7 @@ FutureResult<> Vault::forceClose() ++@@ -490,7 +490,7 @@ FutureResult<> Vault::close() ++ } else { ++ // We want to check whether there is an application ++ // that is accessing the vault ++- AsynQt::Process::getOutput(QStringLiteral("lsof"), { QStringLiteral("-t"), mountPoint().data() }) +++ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), { QStringLiteral("-t"), mountPoint().data() }) ++ | cast() ++ | onError([this] { ++ d->updateMessage(i18n("Unable to close the vault because an application is using it")); ++@@ -546,7 +546,7 @@ FutureResult<> Vault::forceClose() + using namespace AsynQt::operators; + + AsynQt::await( diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix index 42fe870..1e2eac3 100755 --- a/roles/desktop/programs/default.nix +++ b/roles/desktop/programs/default.nix @@ -10,5 +10,6 @@ ./mpv.nix ./sysdvr-qt.nix ./spotify.nix + ./distrobox.nix ]; } diff --git a/roles/desktop/programs/distrobox.nix b/roles/desktop/programs/distrobox.nix new file mode 100644 index 0000000..6de5db5 --- /dev/null +++ b/roles/desktop/programs/distrobox.nix @@ -0,0 +1,28 @@ +{...}: { + virtualisation.podman = { + # Due to limitations with home-manager, podman has to be available system wide + enable = true; + }; + home-manager.users.toast = { + programs.distrobox = { + enable = true; + containers = { + uav = { + image = "quay.io/toolbx/ubuntu-toolbox:24.04"; + # additional_packages = "lsb-release dmidecode git"; + additional_packages = "git"; + init_hooks = [ + "git clone https://github.com/PX4/PX4-Autopilot.git --recursive /tmp/px4" + "cd /tmp/px4/Tools/setup/" + # The install scripts wants to add things to .bashrc, so it errors out + # This removes the line that does that + "sed -i '181d' ubuntu.sh" + "bash ubuntu.sh" + "rm -rf /tmp/px4 --one-file-system" + ]; + entry = true; + }; + }; + }; + }; +}