Home Gen20 @ 2026-03-19-15:33 by admin-jroeger@T14-OE130-7-ubuntu

fixes/plasma-fix.nix

@@ -0,0 +1,57 @@
+# https://github.com/NixOS/nixpkgs/issues/126590#issuecomment-3194531220
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  nixpkgs.overlays = lib.singleton (final: prev: {
+    kdePackages =
+      prev.kdePackages
+      // {
+        plasma-workspace = let
+          # the package we want to override
+          basePkg = prev.kdePackages.plasma-workspace;
+
+          # a helper package that merges all the XDG_DATA_DIRS into a single directory
+          xdgdataPkg = pkgs.stdenv.mkDerivation {
+            name = "${basePkg.name}-xdgdata";
+            buildInputs = [basePkg];
+            dontUnpack = true;
+            dontFixup = true;
+            dontWrapQtApps = true;
+            installPhase = ''
+              mkdir -p $out/share
+              ( IFS=:
+                for DIR in $XDG_DATA_DIRS; do
+                  if [[ -d "$DIR" ]]; then
+                    cp -r $DIR/. $out/share/
+                    chmod -R u+w $out/share
+                  fi
+                done
+              )
+            '';
+          };
+
+          # undo the XDG_DATA_DIRS injection that is usually done in the qt wrapper
+          # script and instead inject the path of the above helper package
+          derivedPkg = basePkg.overrideAttrs {
+            preFixup = ''
+              for index in "''${!qtWrapperArgs[@]}"; do
+                if [[ ''${qtWrapperArgs[$((index+0))]} == "--prefix" ]] && [[ ''${qtWrapperArgs[$((index+1))]} == "XDG_DATA_DIRS" ]]; then
+                  unset -v "qtWrapperArgs[$((index+0))]"
+                  unset -v "qtWrapperArgs[$((index+1))]"
+                  unset -v "qtWrapperArgs[$((index+2))]"
+                  unset -v "qtWrapperArgs[$((index+3))]"
+                fi
+              done
+              qtWrapperArgs=("''${qtWrapperArgs[@]}")
+              qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "${xdgdataPkg}/share")
+              qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share")
+            '';
+          };
+        in
+          derivedPkg;
+      };
+  });
+}

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762356719,
+        "lastModified": 1770411700,
-        "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
+        "narHash": "sha256-VpeOlyospHF+vxE+xEGEy0utMN0d/FUDvD2dOg9ZiIo=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
+        "rev": "b91f570bb7885df9e4a512d6e95a13960a5bdca0",
         "type": "github"
       },
       "original": {
@@ -35,17 +35,18 @@
     },
     "audio": {
       "inputs": {
+        "mucap": "mucap",
         "nix-buildproxy": "nix-buildproxy",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1762547735,
+        "lastModified": 1769805770,
-        "narHash": "sha256-uJb+4GjFynnDQdDstcmdccx7kIYIf9STk3XymMKEJfs=",
+        "narHash": "sha256-gTSS83rAxZU2VYjgmxrbWEnFxk7OMEQFf38omYi2wQw=",
         "owner": "polygon",
         "repo": "audio.nix",
-        "rev": "46b42efb0c382daca6f1184a1060ffa0636a22a6",
+        "rev": "3b0ad654379d080f7ddc98e9de6ff9eedaa20d2d",
         "type": "github"
       },
       "original": {
@@ -61,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749410315,
+        "lastModified": 1764972059,
-        "narHash": "sha256-5H8MuMMSq1WnQcvb1FiDNkKP+uyeZ8HX5GRTMfEOyLI=",
+        "narHash": "sha256-MLdmXiPhouR4nSxIZwNEHWGYT2rR9UquaYGbZPEBgRk=",
         "owner": "lelgenio",
         "repo": "dzgui-nix",
-        "rev": "49adbb1edfb3c25b0cd8256d35673394386065e7",
+        "rev": "14bd77c58f4cc4864513f9d887ad387337c9411f",
         "type": "github"
       },
       "original": {
@@ -74,6 +75,30 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "audio",
+          "mucap",
+          "naersk",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1752475459,
+        "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "firefox-addons": {
       "inputs": {
         "nixpkgs": [
@@ -82,11 +107,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1762920261,
+        "lastModified": 1770609827,
-        "narHash": "sha256-VuUg2EP2Y0QrDTsDP6/3kN3Hurn6HfyMW3rGzdruhW8=",
+        "narHash": "sha256-5J3I/ERia1xhWkPwugnpbucAE8lI5ip2ohTZ3xK2HrY=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "8cd76837f50debe28b51820adb00b522df8ade91",
+        "rev": "60b2a2d7633b61981a694ad30bc1b19b64a949f1",
         "type": "gitlab"
       },
       "original": {
@@ -99,15 +124,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1767039857,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -157,16 +182,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
+        "lastModified": 1770260404,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -216,11 +241,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762462052,
+        "lastModified": 1770511807,
-        "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
         "type": "github"
       },
       "original": {
@@ -239,6 +264,7 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -247,11 +273,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1762987426,
+        "lastModified": 1770641595,
-        "narHash": "sha256-MTW2FfSP1gqjzL3nVKuz/RfvlextYjlgQPHEZbZI5cM=",
+        "narHash": "sha256-eeu1HrA9dW1DHxPuIZcZ8giUi1BcrvjGkVV1Bx3vEzk=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "b77cbad50251f0506b61d834b025247dcf74dddf",
+        "rev": "f16ebef00366d2f85499196b9c7fb702b9f1c547",
         "type": "github"
       },
       "original": {
@@ -293,11 +319,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762755186,
+        "lastModified": 1767023960,
-        "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=",
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
         "type": "github"
       },
       "original": {
@@ -323,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762989208,
+        "lastModified": 1769285097,
-        "narHash": "sha256-NBTbKW0MVIMFCjAqeoJWkg5iUucAZ9jS4Lbyax6rIBE=",
+        "narHash": "sha256-eVD4U3Oqzz0VU9ylJ5wo76xDcYKv2CpiiRXq4Is4QdA=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "befb2670803cf7c1b9f0323449c8d9ccdaa485e2",
+        "rev": "06c0749a0dac978d89b1a76ae6adc76a3c15dbfa",
         "type": "github"
       },
       "original": {
@@ -348,11 +374,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759610243,
+        "lastModified": 1765214753,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
         "type": "github"
       },
       "original": {
@@ -377,11 +403,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758927902,
+        "lastModified": 1767983607,
-        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
         "type": "github"
       },
       "original": {
@@ -429,11 +455,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762463729,
+        "lastModified": 1764592794,
-        "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
         "type": "github"
       },
       "original": {
@@ -454,11 +480,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762387740,
+        "lastModified": 1770139857,
-        "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
+        "narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
+        "rev": "9038eec033843c289b06b83557a381a2648d8fa5",
         "type": "github"
       },
       "original": {
@@ -479,11 +505,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755184602,
+        "lastModified": 1770501770,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
         "type": "github"
       },
       "original": {
@@ -492,9 +518,87 @@
         "type": "github"
       }
     },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770203293,
+        "narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
+    "mucap": {
+      "inputs": {
+        "naersk": "naersk",
+        "nixpkgs": [
+          "audio",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1765670987,
+        "narHash": "sha256-LqcywUPXsQMrcl4zakVYHotLGfq2rzASMYuHrQp3KaY=",
+        "owner": "polygon",
+        "repo": "mucap",
+        "rev": "f798f8c4757e0dc80de5c1ddcb8be14aac916b99",
+        "type": "github"
+      },
+      "original": {
+        "owner": "polygon",
+        "repo": "mucap",
+        "type": "github"
+      }
+    },
+    "naersk": {
+      "inputs": {
+        "fenix": "fenix",
+        "nixpkgs": [
+          "audio",
+          "mucap",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763384566,
+        "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "nix-buildproxy": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "audio",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1708455753,
@@ -518,7 +622,7 @@
           "nixpkgs"
         ],
         "nixpkgs-stable": "nixpkgs-stable",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
         "lastModified": 1751591814,
@@ -536,11 +640,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1762847253,
+        "lastModified": 1770631810,
-        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
+        "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
+        "rev": "2889685785848de940375bf7fea5e7c5a3c8d502",
         "type": "github"
       },
       "original": {
@@ -552,16 +656,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708118438,
+        "lastModified": 1770464364,
-        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
+        "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
+        "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -584,11 +688,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1762844143,
+        "lastModified": 1770562336,
-        "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
+        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
+        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
         "type": "github"
       },
       "original": {
@@ -598,22 +702,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1762756533,
-        "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "plasma-manager": {
       "inputs": {
         "home-manager": [
@@ -624,11 +712,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762784320,
+        "lastModified": 1769956244,
-        "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=",
+        "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321",
+        "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831",
         "type": "github"
       },
       "original": {
@@ -647,11 +735,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762441963,
+        "lastModified": 1769939035,
-        "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
+        "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
+        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
         "type": "github"
       },
       "original": {
@@ -670,13 +758,52 @@
         "hyprland-plugins": "hyprland-plugins",
         "nixos-cosmic": "nixos-cosmic",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1752428706,
+        "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "audio",
+          "mucap",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762655942,
+        "narHash": "sha256-hOM12KcQNQALrhB9w6KJmV5hPpm3GA763HRe9o7JUiI=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "6ac961b02d4235572692241e333d0470637f5492",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
       "inputs": {
         "nixpkgs": [
           "nixos-cosmic",
@@ -704,11 +831,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762812535,
+        "lastModified": 1770526836,
-        "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=",
+        "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7",
+        "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,11 +2,11 @@
   description = "Nixos config flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix = {
@@ -85,7 +85,13 @@
           isHM = false;
         };
         modules = [
-          ({...}: {nixpkgs.overlays = [overlay-unstable self.overlays.default audio.overlays.default];})
+          ({...}: {
+            nixpkgs.overlays = [
+              overlay-unstable
+              self.overlays.default
+              audio.overlays.default
+            ];
+          })
           ({...}: {
             nixpkgs.config.allowUnfree = true;
             nixpkgs.config.nvidia.acceptLicense = true;
@@ -99,6 +105,7 @@
           nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
           inputs.sops-nix.nixosModules.sops
           nixos-cosmic.nixosModules.default
+          ./fixes/plasma-fix.nix
           ./modules
           ./hosts/monolith/configuration.nix
         ];

home/admin-jroeger.nix

@@ -37,11 +37,12 @@
   programs.home-manager.enable = true;
 
   # Git
+  programs.difftastic.enable = true;
+  programs.difftastic.git.enable = true;
   programs.git = {
     enable = true;
-    userName = "Jonas Röger";
+    settings.user.name = "Jonas Röger";
-    userEmail = "jonas.kieran.roeger@iml.fraunhofer.de";
+    settings.user.email = "jonas.kieran.roeger@iml.fraunhofer.de";
-    difftastic.enable = true;
     signing = {
       signByDefault = true;
       key = "4000EB35E1AE0F07";

home/jonas@comfy-station.nix

@@ -91,11 +91,12 @@
   programs.home-manager.enable = true;
 
   # Git
+  programs.difftastic.enable = true;
+  programs.difftastic.git.enable = true;
   programs.git = {
     enable = true;
-    userName = "Jonas Röger";
+    settings.user.name = "Jonas Röger";
-    userEmail = "jonas.roeger@tu-dortmund.de";
+    settings.user.email = "jonas.roeger@tu-dortmund.de";
-    difftastic.enable = true;
     signing = {
       signByDefault = true;
       key = "4000EB35E1AE0F07";

home/jonas@harbor.nix

@@ -30,11 +30,12 @@
   programs.home-manager.enable = true;
 
   # Git
+  programs.difftastic.enable = true;
+  programs.difftastic.git.enable = true;
   programs.git = {
     enable = true;
-    userName = "Jonas Röger";
+    settings.user.name = "Jonas Röger";
-    userEmail = "jonas.roeger@tu-dortmund.de";
+    settings.user.email = "jonas.roeger@tu-dortmund.de";
-    difftastic.enable = true;
     signing = {
       signByDefault = true;
       key = "4000EB35E1AE0F07";

home/jonas@monolith.nix

@@ -23,8 +23,8 @@
   # hive moduless
   hive.doom.enable = true;
   hive.doom.asDefaultEditor = true;
-  hive.doom.enableCopilot = true;
+  hive.doom.enableCopilot = false;
-  hive.doom.enableTidal = true;
+  hive.doom.enableTidal = false;
   hive.doom.withNixPkgs = true;
   hive.doom.withShellPkgs = true;
   hive.doom.withPythonPkgs = true;
@@ -91,11 +91,12 @@
   programs.home-manager.enable = true;
 
   # Git
+  programs.difftastic.enable = true;
+  programs.difftastic.git.enable = true;
   programs.git = {
     enable = true;
-    userName = "Jonas Röger";
+    settings.user.name = "Jonas Röger";
-    userEmail = "jonas.roeger@tu-dortmund.de";
+    settings.user.email = "jonas.roeger@tu-dortmund.de";
-    difftastic.enable = true;
     signing = {
       signByDefault = true;
       key = "4000EB35E1AE0F07";

hosts/comfy-station/configuration.nix

@@ -120,6 +120,8 @@
       trusted-users = [
         "@wheel"
       ];
+      max-jobs = 2;
+      cores = 8;
     };
     gc = {
       automatic = true;

hosts/monolith/configuration.nix

@@ -79,6 +79,10 @@
     video-editing-heavy = true;
     daws = true;
   };
+  hive.programs.utils = {
+    enable = true;
+    camera = true;
+  };
   hive.programs.spotify-shortcuts = {
     enable = true;
     clientIdSopsKey = config.sops.secrets.spotifyShortcutsClientId.name;
@@ -131,7 +135,18 @@
   virtualisation.docker.enable = true;
 
   # Corsair drivers
-  hardware.ckb-next.enable = true;
+  hardware.ckb-next = {
+    enable = true;
+    # Workarount until https://github.com/NixOS/nixpkgs/issues/444209
+    # is fixed
+    package = pkgs.ckb-next.overrideAttrs (prev: {
+      cmakeFlags =
+        (prev.cmakeFlags or [])
+        ++ [
+          "-DUSE_DBUS_MENU=0"
+        ];
+    });
+  };
 
   # dpi correction
   services.xserver.dpi = 91;

hosts/monolith/hardware-configuration.nix

@@ -41,7 +41,7 @@
   swapDevices = [
     {
       device = "/.swapfile";
-      size = 4 * 1024;
+      size = 24 * 1024;
     }
   ];
 

modules/default.nix

@@ -26,6 +26,7 @@
       ./programs/creative.nix
       ./programs/games.nix
       ./programs/spotify-shortcuts.nix
+      ./programs/utils.nix
       ./services/borg-server.nix
       ./services/gitea-instance.nix
       ./services/gotify-instance.nix

modules/home/doom/doom.nix

@@ -26,6 +26,14 @@
     ispell
     libtool
     vscode-langservers-extracted
+    (pkgs.stdenvNoCC.mkDerivation {
+      name = "epdfinfo";
+      phases = "installPhase";
+      installPhase = ''
+        mkdir -p $out/bin
+        ln -s $(${pkgs.findutils}/bin/find ${pkgs.emacsPackages.pdf-tools}/ -name epdfinfo) $out/bin/
+      '';
+    })
   ];
   default-shell-pkgs = with pkgs; [
     bash-language-server
@@ -50,8 +58,8 @@
     ninja
   ];
   default-python-pkgs = with pkgs; [
-    python
+    python312
-    pythonPackages.black
+    python312Packages.black
     pyright
   ];
   doom-path-pkgs =
@@ -59,6 +67,7 @@
     ++ lib.optionals cfg.withShellPkgs (cfg.overrideShellPkgs default-shell-pkgs)
     ++ lib.optionals cfg.withNixPkgs (cfg.overrideNixPkgs default-nix-pkgs)
     ++ lib.optionals cfg.withCXXPkgs (cfg.overrideCXXPkgs default-cxx-pkgs)
+    ++ lib.optionals cfg.withPythonPkgs (cfg.overridePythonPkgs default-python-pkgs)
     ++ lib.optional cfg.enableCopilot pkgs.unstable.copilot-language-server
     ++ default-core-pkgs;
   doom-socket-name = "main";
@@ -241,7 +250,7 @@ in {
         "doom-emacs" = {
           source = builtins.fetchGit {
             url = "https://github.com/doomemacs/doomemacs";
-            rev = "c27621a777c11354a4913c7eb455db3766984709";
+            rev = "a0d6aac43fc94def29c98826e2f0088bcb703d13";
           };
           onChange = "${doom-setup} --force sync -u -e";
         };

modules/home/doom/static/config.el

@@ -34,7 +34,7 @@
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-monokai-classic)
+(setq doom-theme 'doom-gruvbox)
 (custom-set-faces! `(font-lock-operator-face :foreground ,(doom-color 'operators)))
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
@@ -98,9 +98,8 @@
       :desc "File Symbols" "c s" #'consult-lsp-file-symbols
       :desc "All Symbols" "c S" #'consult-lsp-symbols)
 
-(use-package! direnv
+(use-package envrc
-  :config
+  :hook (after-init . envrc-global-mode))
-  (direnv-mode))
 
 (after! markdown-mode
   (setq markdown-split-window-direction 'right)

modules/home/doom/static/packages.el

@@ -69,7 +69,20 @@
            :local-repo "smtlib-mode")
   :pin "ed387e63b64091228e6a8a429b02b8fba165f5b5")
 
-(package! direnv)
+;; Usabel ein PR branch. Original is deprecated
+(package! ein
+  :recipe (:host github
+           :repo "natsirtguy/emacs-ipython-notebook"
+           :branch "fix-polymode-compatibility")
+  :pin "2ff01b4adbb6302798fc84464d1e420e337113fd")
+
+(package! envrc
+  :recipe (:host github
+           :repo "Grimpper/envrc"
+           :branch "support-async-execution"
+           )
+  :pin "71f67971bc5eb2974ae2f738512c8f09f0822527")
+
 (package! pdf-tools)
 (package! eww)
 (package! pandoc-mode)

modules/home/hyprland/config.nix

@@ -342,9 +342,8 @@ in {
           # new_is_master = true;
         };
 
-        gestures = {
+        ecosystem = {
-          # See https://wiki.hyprland.org/Configuring/Variables/ for more
+          no_update_news = true;
-          workspace_swipe = "off";
         };
 
         misc = {

modules/home/jj.nix

@@ -24,10 +24,10 @@ in {
       enable = true;
       settings = {
         user = lib.optionalAttrs cfg.followGit {
-          name = config.programs.git.userName;
+          name = config.programs.git.settings.user.name;
-          email = config.programs.git.userEmail;
+          email = config.programs.git.settings.user.email;
         };
-        ui = lib.optionalAttrs (cfg.followGit && config.programs.git.difftastic.enable) {
+        ui = lib.optionalAttrs (cfg.followGit && config.programs.difftastic.enable) {
           diff-formatter = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];
         };
       };

modules/home/zsh/default.nix

@@ -48,7 +48,6 @@ in {
           "poetry"
           "python"
           "rust"
-          "thefuck"
         ];
         theme = "my_bureau";
         custom = omz_custom;
@@ -61,15 +60,15 @@ in {
       git
       htop
       killall
+      mmtui
       nh
       nix-output-monitor
       nix-search-cli
       nix-tree
       nixpkgs-fmt
       pass
+      pay-respects
       ranger
-      thefuck
-      unstable.mmtui
       unzip
       vim
       w3m

modules/programs/creative.nix

@@ -35,7 +35,7 @@ in {
       type = lib.types.bool;
       default = false;
       description = ''
-        Enable Darktable for raw processing.
+        Enable raw processing programs.
       '';
     };
     video-editing-light = lib.mkOption {
@@ -66,21 +66,23 @@ in {
       lib.optionals cfg.image-editing [gimp krita drawio]
       ++ lib.optional cfg.image-management digikam
       ++ lib.optionals cfg.image-raw-processing [
-        darktable
-        rawtherapee
         enblend-enfuse
         hdrmerge
         hugin
+        rawtherapee
+        unstable.darktable
+        unstable.rapidraw
       ]
       ++ lib.optionals cfg.video-editing-light [
-        ffmpeg
-        losslesscut-bin
         avidemux-wayland-fix
+        ffmpeg
+        hive.bulk-transcode
+        losslesscut-bin
       ]
       ++ lib.optionals cfg.video-editing-heavy [
         davinci-resolve
-        hive.bulk-transcode
         kdePackages.kdenlive
+        obs-studio
       ]
       ++ lib.optional cfg.daws bitwig-studio-latest;
   };

modules/programs/games.nix

@@ -63,8 +63,7 @@ in {
       ++ lib.optionals cfg.wine [
         pkgs.wine
         pkgs.winetricks
-      ]
+      ];
-      ++ lib.optional (cfg.steam && cfg.wine) pkgs.proton-caller;
 
     programs.steam = lib.mkIf cfg.steam {
       enable = true;

modules/programs/utils.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.hive.programs.utils;
+in {
+  options.hive.programs.utils = {
+    enable = lib.mkEnableOption "Enable utilities";
+    camera = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Camera utilities
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = lib.optionals cfg.camera [
+      pkgs.cheese
+      pkgs.obs-studio
+    ];
+  };
+}

pkgs/bulk-transcode/bulk-transcode.sh

@@ -2,16 +2,27 @@
 
 declare -rA presets=(
     [davinci-resolve]="-c:v dnxhd -profile:v dnxhr_hq -pix_fmt yuv422p -c:a pcm_s16le"
-    [instagram]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -pix_fmt yuv420p -c:v h264_nvenc -b:v 3500k -b:a 128k -c:a aac -movflags +faststart"
+    [instagram]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)':flags=lanczos -r 30 -c:v libx264 -profile:v high -level 4.1 -pix_fmt yuv420p -preset slow -crf 18 -bf 2 -g 15 -keyint_min 15 -x264-params \"open-gop=0:cabac=1:b-pyramid=none\" -movflags +faststart -c:a aac -b:a 96k"
-    [web-generic]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -pix_fmt yuv420p -c:v h264_nvenc -crf 23 -preset medium -c:a aac -b:a 128k -movflags +faststart"
+    [insta-4k]="-r 30 -c:v libx264 -profile:v high -level 4.1 -pix_fmt yuv420p -preset slow -crf 18 -bf 2 -g 15 -keyint_min 15 -x264-params \"open-gop=0:cabac=1:b-pyramid=none\" -movflags +faststart -c:a aac -b:a 96k"
-    [storage]="-c:v hevc_nvenc -preset p7 -b:v 0 -spatial-aq 1 -rc vbr_hq -c:a copy"
+    [storage-hevc]="-c:v libx265 -preset slower -crf 18 -pix_fmt yuv420p10le -x265-params aq-mode=3:aq-strength=1.0:psy-rd=1.8:psy-rdoq=1.0 -c:a copy"
+    [storage-av1]="-c:v libsvtav1 -preset 6 -crf 28 -pix_fmt yuv420p -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy"
+    [storage-av1-1080p]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libsvtav1 -preset 6 -crf 28 -pix_fmt yuv420p -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy"
+    [storage-av1-nvenc]="-c:v av1_nvenc -cq 28 -preset slow -pix_fmt yuv420p10le -c:a copy"
+    [network]="-c:v libx264 -preset slow -crf 22 -pix_fmt yuv420p -c:a aac -b:a 128k"
+    [network-1080p]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libx264 -preset slow -crf 22 -pix_fmt yuv420p -c:a aac -b:a 128k"
     [whatsapp]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libx264 -preset slow -crf 30 -profile:v baseline -level 3.0 -pix_fmt yuv420p -r 25 -g 50 -c:a aac -b:a 160k -r:a 44100"
 )
+
 declare -rA containers=(
     [davinci-resolve]="mov"
     [instagram]="mp4"
-    [web-generic]="mp4"
+    [insta-4k]="mp4"
-    [storage]="mp4"
+    [storage-hevc]="mkv"
+    [storage-av1]="mkv"
+    [storage-av1-1080p]="mkv"
+    [storage-av1-nvenc]="mkv"
+    [network]="mp4"
+    [network-1080p]="mp4"
     [whatsapp]="mp4"
 )
 

pkgs/default.nix

@@ -2,7 +2,7 @@ final: _: {
   hive = {
     crossover = final.callPackage ./crossover.nix {};
     bulk-transcode = final.callPackage ./bulk-transcode {};
-    spotify-shortcuts = final.callPackage ./spotify-shortcuts {};
+    spotify-shortcuts = final.callPackage ./spotify-shortcuts/derivation.nix {};
     layan-qt6 = final.kdePackages.callPackage ./layan-qt6.nix {};
   };
 }

pkgs/spotify-shortcuts/derivation.nix

@@ -3,5 +3,7 @@ with python3Packages;
   buildPythonApplication {
     name = "spotify-shortcuts";
     propagatedBuildInputs = [spotipy pyxdg desktop-notifier];
+    pyproject = true;
+    build-system = [setuptools];
     src = ./.;
   }