Changes
3 changed files (+4/-57)
-
-
@@ -11,9 +11,6 @@./hardware-configuration.nix ]; # Overlays! Fixed points! nixpkgs.overlays = [ (import ./overlays.nix) ]; hardware = { # Auto screen rotation in tablet mode sensor.iio.enable = true;
-
@@ -86,7 +83,6 @@kdePackages.tokodon keepassxc kile krita # TODO: maliit-keyboard or libpinyin creates the file ~/user.conf for some weird reason # TODO: Eventually replace with https://invent.kde.org/plasma/plasma-keyboard maliit-keyboard
-
-
ThinkPad-X1-Yoga-Gen-6/overlays.nix (deleted)
-
@@ -1,49 +0,0 @@final: prev: let # For Qt6 and Wayland support unwrapped = prev.krita.unwrapped.overrideAttrs (old: { version = "6.0.0-prealpha"; src = prev.fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "krita"; rev = "81586693ef6bfddefa408a9e88380ceafe8d9f54"; hash = "sha256-bas48pyrLhHjGtdG3AccAP3NFnJ5yVTkJZI1XRDNP68="; }; buildInputs = map ( x: if x.pname == "pyqt5" || x.pname == "qtx11extras" then prev.python3Packages.pyqt6 else if x.pname == "poppler-qt5" then prev.kdePackages.poppler else prev.kdePackages.${x.pname} or x ) old.buildInputs; nativeBuildInputs = map ( x: if x.name == "wrap-qt5-apps-hook" then prev.qt6.wrapQtAppsHook else prev.kdePackages.${x.pname} or x ) old.nativeBuildInputs; patches = [ ]; cmakeFlags = [ "-DPYQT5_SIP_DIR=${prev.python3Packages.pyqt6}/${prev.python3Packages.python.sitePackages}/PyQt6/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${prev.python3Packages.pyqt6}/${prev.python3Packages.python.sitePackages}/PyQt6/bindings" # "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" "-DBUILD_WITH_QT6=ON" ]; }); in { krita = prev.krita.overrideAttrs (old: { name = prev.lib.replaceString "-unwrapped" "" unwrapped.name; inherit (unwrapped) version buildInputs nativeBuildInputs meta ; __intentionallyOverridingVersion = true; paths = [ unwrapped ]; buildCommand = (prev.lib.strings.removeSuffix "\n\n" old.buildCommand) + " \\\n --set QT_QPA_PLATFORM wayland"; }); }
-
-
-
@@ -23,17 +23,17 @@}, "nixpkgs": { "locked": { "lastModified": 1761654629, "narHash": "sha256-rXmWra2OFO7r4Sz2733DxJUfpLuSpi1RkBoR7KbabZ0=", "lastModified": 1761672384, "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "NixOS", "repo": "nixpkgs", "rev": "07a00f6b176cebe5bdcc9c0ae57d4a16e32520fc", "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "rev": "07a00f6b176cebe5bdcc9c0ae57d4a16e32520fc", "type": "github" } },
-