krita6 (again), update Caddy

Changes

4 changed files (+33/-6)

• ThinkPad-X1-Yoga-Gen-6/default.nix
  • @@ -3,6 +3,7 @@
    lib, pkgs, pkgs-old, + pkgs-krita, ... }:
  • @@ -99,8 +100,12 @@
    visualizer ]; }) - # TODO: Use krita6 from + # TODO: Wait for this to be merged # https://github.com/NixOS/nixpkgs/pull/471326 + (pkgs-krita.krita6.overrideAttrs (old: { + buildCommand = + (lib.strings.removeSuffix "\n\n" old.buildCommand) + " \\\n --set QT_QPA_PLATFORM wayland"; + })) # TODO: Rnote in nixos-unstable is broken # https://github.com/flxzt/rnote/issues/1543 pkgs-old.rnote
• Unnamed-Server/default.nix
  • @@ -111,7 +111,7 @@
    "github.com/caddy-dns/porkbun@v0.3.1" "dev.mediocregopher.com/mediocre-caddy-plugins.git@v0.0.0-20250308145011-421597d7c920" ]; - hash = "sha256-mv4tO+Lsp4Ls31bhWUGFYwc1kbWShwJuLgrpMxlMGkA="; + hash = "sha256-Z2ncEgDfbNRPbytiOlwwp2tXjt1CYSmo+e8t2c80CrU="; }; # Porkbun API keys environmentFile = "/etc/caddy/env";
• flake.lock
  • @@ -23,11 +23,11 @@
    }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": {
  • @@ -37,6 +37,22 @@
    "type": "github" } }, + "nixpkgs-krita": { + "locked": { + "lastModified": 1767247165, + "narHash": "sha256-A+JTaDM28nBnrDPE4iNHYfctvTSqpitm/xnEWcgj7pI=", + "owner": "sifmelcara", + "repo": "nixpkgs", + "rev": "32d50279fc52128ad2aae91a129a664eafa9179f", + "type": "github" + }, + "original": { + "owner": "sifmelcara", + "ref": "krita-experimental-qt6", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-old": { "locked": { "lastModified": 1762844143,
  • @@ -57,6 +73,7 @@
    "inputs": { "disko": "disko", "nixpkgs": "nixpkgs", + "nixpkgs-krita": "nixpkgs-krita", "nixpkgs-old": "nixpkgs-old" } }
• flake.nix
  • @@ -3,6 +3,8 @@
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # For Rnote fix nixpkgs-old.url = "github:NixOS/nixpkgs/9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4"; + # For krita6 + nixpkgs-krita.url = "github:sifmelcara/nixpkgs/krita-experimental-qt6"; # For building an image for XVM # https://lantian.pub/en/article/modify-computer/nixos-low-ram-vps.lantian/ # https://unnamed.website/posts/nixvm/
  • @@ -21,7 +23,10 @@
    nixosConfigurations = { # Very creative name, I know ThinkPad-X1-Yoga-Gen-6 = nixpkgs.lib.nixosSystem { - specialArgs.pkgs-old = import inputs.nixpkgs-old { inherit system; }; + specialArgs = { + pkgs-old = import inputs.nixpkgs-old { inherit system; }; + pkgs-krita = import inputs.nixpkgs-krita { inherit system; }; + }; modules = [ ./configuration.nix ./ThinkPad-X1-Yoga-Gen-6