diff --git a/flake.lock b/flake.lock index b389782..82d7a40 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767520119, - "narHash": "sha256-+OmNQLA9Fv5WBaxYHlPghS9XmnYWDaLt+AatCGhG+hc=", + "lastModified": 1772290697, + "narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "5720d3282844b6b23b26dfac075a5f1f58ea8844", + "rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1769201405, - "narHash": "sha256-k/KQL7J9ZnLlF28E6ywGpfo5dxkuxCcEtJ/XEZDTw3M=", + "lastModified": 1773425695, + "narHash": "sha256-O5Fr6f+iS+IVKdB59yqkCaWfkr1SSHD5BLDDlZO7RwU=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "ff53672af48a106f52857d62c9275b165cc452ef", + "rev": "3b9ae1ae5d4ee95e1509d350b65c0777dde97628", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1769199354, - "narHash": "sha256-y1DKMryOr1w4xcZnDkaZjvENIPmr3j/YB4Srtfd3I2Y=", + "lastModified": 1773430072, + "narHash": "sha256-0X47YCF1CUnLiQ1M6Lh4hc3ax9aV5DX/wCmMfuMyM1o=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "c8b990198baf3c34b64e4e5c5ffeb7c068eede1a", + "rev": "ac70453c25200f0a30ad38b3caa63020869f0f8a", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -248,7 +248,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1728511087, - "narHash": "sha256-CvO74jwMjUUPySy0QCt7sPImbxKlhWcSAet93Fkt6iU=", + "lastModified": 1771895942, + "narHash": "sha256-2G212O6uoBCjmyIBux/Kfy/FVlsAY+3mTT4JRstYRZ0=", "owner": "local-interloper", "repo": "game-of-life", - "rev": "c39d37e394f5da79a6a7d198e1d7e505aa5298a7", + "rev": "dd5cba5d873ece0ca5c8a7d74243b3b0199a2194", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1769450270, - "narHash": "sha256-pdVm/zJazDUAasTyHFX/Pbrlk9Upjxi0yzgn7GjGe4g=", + "lastModified": 1773681856, + "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a10c1e8f5ad2589414407f4851c221cb66270257", + "rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce", "type": "github" }, "original": { @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -347,27 +347,6 @@ "type": "github" } }, - "kwin-effects-forceblur": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1755098995, - "narHash": "sha256-6FN7XEf27DenQHDIKjrjOW3tGIaJlyqRlXarmt1v+M0=", - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "rev": "51a1d49d7fd7df3ce40ccf6ba4c4410cf6f510e1", - "type": "github" - }, - "original": { - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -403,11 +382,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769363279, - "narHash": "sha256-XJCuB8GWkFLRFBR6GQoxRB9/lobB45ERp0JN0Lo2nvs=", + "lastModified": 1773597464, + "narHash": "sha256-3SVrc1AMkY1UE36MD4qvmTkY/ZToK2F55Afut5Qm5F8=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "4aa98db78c1d663c3dad59775e95ad93fe58a844", + "rev": "30468236d5cdd9cb5dea6e757159e04816439146", "type": "github" }, "original": { @@ -425,11 +404,11 @@ ] }, "locked": { - "lastModified": 1769217863, - "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=", + "lastModified": 1773603777, + "narHash": "sha256-oXSEbMR/IuHYk9nvrbRhaYBxVK5s63DH2UGOZT2ok48=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "38a5250e57f583662eac3b944830e4b9e169e965", + "rev": "0efe7af73d6e4a8d447a22936c5526d73822b0a7", "type": "github" }, "original": { @@ -457,11 +436,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -472,11 +451,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769300497, - "narHash": "sha256-W7NbQnQGqUPRnpHOlLXk3g52TSQDkFVzhax9YNv9K+U=", + "lastModified": 1773563071, + "narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60f9d776547020ff3be5a2cfbd0a457fddd88ecc", + "rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae", "type": "github" }, "original": { @@ -488,11 +467,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1773646010, + "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605", "type": "github" }, "original": { @@ -534,7 +513,6 @@ "anikki": "anikki", "game-of-life": "game-of-life", "home-manager": "home-manager", - "kwin-effects-forceblur": "kwin-effects-forceblur", "lanzaboote": "lanzaboote", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixos-wsl": "nixos-wsl", @@ -550,11 +528,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1770952264, + "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", "type": "github" }, "original": { @@ -613,11 +591,11 @@ ] }, "locked": { - "lastModified": 1769469829, - "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", + "lastModified": 1773698643, + "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=", "owner": "mic92", "repo": "sops-nix", - "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", + "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044", "type": "github" }, "original": { @@ -656,21 +634,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "trilium-next-pr": { "locked": { "lastModified": 1736678965, @@ -687,24 +650,6 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -713,11 +658,11 @@ ] }, "locked": { - "lastModified": 1769431876, - "narHash": "sha256-FnOW+ulwocxfYGVKV2H/7MlSbn52+hfX9oaRR6FClZ4=", + "lastModified": 1773695806, + "narHash": "sha256-HYmp4Ym/dlkRIPap7GFznNUNuDTTW0iIcOtHmhRzl3w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d5ef79d18dca7617aefe511db8267d47f7cf953f", + "rev": "ced61240cc38dee9e659a7ced0cd9a839c6085d3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9dea05c..4e29d88 100644 --- a/flake.nix +++ b/flake.nix @@ -42,10 +42,10 @@ url = "github:nix-community/lanzaboote/v0.4.3"; inputs.nixpkgs.follows = "nixpkgs"; }; - kwin-effects-forceblur = { - url = "github:taj-ny/kwin-effects-forceblur"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # kwin-effects-forceblur = { Archived. + # url = "github:taj-ny/kwin-effects-forceblur"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix index cb2a0f1..6c33666 100644 --- a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix +++ b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix @@ -32,7 +32,7 @@ in # pkgs.vesktop pkgs.obsidian inputs.zen-browser.packages.x86_64-linux.default - inputs.kwin-effects-forceblur.packages.${pkgs.stdenv.hostPlatform.system}.default + # inputs.kwin-effects-forceblur.packages.${pkgs.stdenv.hostPlatform.system}.default # Archived. ]; }; diff --git a/modules/nixos/nixos/default.nix b/modules/nixos/nixos/default.nix index 25f6b29..a7ced6d 100644 --- a/modules/nixos/nixos/default.nix +++ b/modules/nixos/nixos/default.nix @@ -43,7 +43,7 @@ in age wget sops - bitwarden-desktop #replaced bitwarden + # bitwarden-desktop #replaced bitwarden bitwarden-cli cowsay remmina diff --git a/overlays/libvirt-python313-fix/default.nix b/overlays/libvirt-python313-fix/default.nix new file mode 100644 index 0000000..69cc318 --- /dev/null +++ b/overlays/libvirt-python313-fix/default.nix @@ -0,0 +1,28 @@ +{ ... }: + +final: prev: +let + python313ForCeph = + let + base = final.python313; + in + base + // { + override = args: + base.override (args // { + packageOverrides = self: super: + (if args ? packageOverrides then args.packageOverrides self super else { }) + // { + # Ceph still references cython_0 in nixpkgs; map it to modern cython on py3.13. + cython_0 = super.cython; + }; + }); + }; +in { + # Work around nixos-unstable eval failure: + # sphinx-9.1.0 not supported for interpreter python3.11 + # (seen through libvirtd -> qemu_full -> ceph Python dependency chain). + ceph = prev.ceph.override { + python311 = python313ForCeph; + }; +} diff --git a/overlays/synergy-fix/default.nix b/overlays/synergy-fix/default.nix deleted file mode 100644 index 704b183..0000000 --- a/overlays/synergy-fix/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -final: prev: { - synergy = prev.synergy.overrideAttrs (oldAttrs: { - postPatch = (oldAttrs.postPatch or "") + '' - # Fix deprecated Qt endl usage in QTextStream contexts only - # Don't touch cerr/cout which use std::endl - find . -name "*.cpp" -type f -exec sed -i \ - 's/\(outStream.*<<.*\)endl/\1Qt::endl/g; s/\(QTextStream.*<<.*\)endl/\1Qt::endl/g' {} + - find . -name "*.h" -type f -exec sed -i \ - 's/\(outStream.*<<.*\)endl/\1Qt::endl/g; s/\(QTextStream.*<<.*\)endl/\1Qt::endl/g' {} + - - # Fix missing SIZE_MAX include - sed -i '/#include /a#include ' src/lib/server/InputFilter.cpp - ''; - }); -} diff --git a/shell.nix b/shell.nix index f799dc4..ff3bec8 100644 --- a/shell.nix +++ b/shell.nix @@ -7,7 +7,7 @@ pkgs.mkShellNoCC { packages = with pkgs; [ cowsay lolcat - bitwarden-desktop #replaced bitwarden + # bitwarden-desktop #replaced bitwarden bitwarden-cli sops ]; diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix index 886b0e0..4d79a33 100644 --- a/systems/x86_64-linux/drivebystation-nix/configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix @@ -128,7 +128,7 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget - (python312.withPackages (ps: with ps; [ websockets ])) + (python3.withPackages (ps: with ps; [ websockets ])) sqlite javaPackages.compiler.openjdk25 javaPackages.compiler.openjdk21 @@ -171,7 +171,9 @@ virtualisation.libvirtd = { enable = true; qemu = { - package = pkgs.qemu_full; + package = pkgs.qemu_full.override { + cephSupport = false; + }; runAsRoot = true; swtpm.enable = true; vhostUserPackages = [ pkgs.virtiofsd ]; diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix index ee86007..cea84c8 100644 --- a/systems/x86_64-linux/drivebystation-nix/default.nix +++ b/systems/x86_64-linux/drivebystation-nix/default.nix @@ -127,7 +127,6 @@ in mangohud my-namespace.udev-steelseries my-namespace.hello - kde-rounded-corners my-namespace.linux-wallpaperengine (pkgs.writeShellScriptBin "switch-to-desktop" ''