Changes
4 changed files (+7/-64)
-
-
@@ -3,7 +3,6 @@lib, pkgs, pkgs-old, pkgs-krita, ... }:
-
@@ -13,9 +12,6 @@./hardware-configuration.nix ]; # Overlays! Fixed points! nixpkgs.overlays = [ (import ./overlays.nix) ]; hardware = { # Auto screen rotation in tablet mode sensor.iio.enable = true;
-
@@ -102,18 +98,15 @@kdePackages.tokodon keepassxc kile # TODO: Wait for the Krita 6 PR to be merged # https://github.com/NixOS/nixpkgs/pull/487214 # krita (mpv.override { scripts = with pkgs.mpvScripts; [ mpris visualizer ]; }) # TODO: Wait for this to be merged # https://github.com/NixOS/nixpkgs/pull/487214 (pkgs-krita.krita.overrideAttrs (old: { buildCommand = (lib.strings.removeSuffix "\n\n" old.buildCommand) + " \\\n --set QT_QPA_PLATFORM wayland"; })) # TODO: Rnote in nixos-unstable is broken due to gtk4 # I could replace only gtk4 in the buildInputs which would shrink the closure, but that requires compiling Rnote # https://github.com/flxzt/rnote/issues/1543
-
-
ThinkPad-X1-Yoga-Gen-6/overlays.nix (deleted)
-
@@ -1,27 +0,0 @@final: prev: { # Overriding a second-level package is annoying kdePackages = prev.kdePackages.overrideScope ( kdeFinal: kdePrev: { libquotient = kdePrev.libquotient.overrideAttrs (old: { patches = old.patches ++ [ # Patch to fix that ergregious NeoChat edit message bug # TODO: Remove once libQuotient gets a release with this patch (prev.fetchpatch { url = "https://github.com/quotient-im/libQuotient/commit/97e34f4e789c8157eeffe8aaf46a104b9a957c38.patch"; hash = "sha256-CqD3rXKTjRUaU0n7QvQ/zozrokIaBeIUXSNlrwOZRO4="; }) ]; }); # Specify languages for Spectacle OCR # Unfortunately this recompiles Spectacle bweh # https://github.com/NixOS/nixpkgs/issues/491913 spectacle = kdePrev.spectacle.override { tesseractLanguages = [ "equ" "osd" "eng" ]; }; } ); }
-
-
-
@@ -23,11 +23,11 @@}, "nixpkgs": { "locked": { "lastModified": 1772198003, "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "lastModified": 1772963539, "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": {
-
@@ -37,22 +37,6 @@"type": "github" } }, "nixpkgs-krita": { "locked": { "lastModified": 1771742160, "narHash": "sha256-Ec8MWuQP0hZe4N4hEFDYlVbfDFQz09qXLIz6PyXzgbM=", "owner": "K900", "repo": "nixpkgs", "rev": "465d530f928128aef1054cf289b326f5734b0f74", "type": "github" }, "original": { "owner": "K900", "ref": "krita6", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-old": { "locked": { "lastModified": 1762844143,
-
@@ -73,7 +57,6 @@"inputs": { "disko": "disko", "nixpkgs": "nixpkgs", "nixpkgs-krita": "nixpkgs-krita", "nixpkgs-old": "nixpkgs-old" } }
-
-
-
@@ -3,9 +3,6 @@nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # For Rnote fix nixpkgs-old.url = "github:NixOS/nixpkgs/9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4"; # For krita6 # Seems easier to use a flake input instead of patching nixpkgs or an overlay, which also prevents excessive recompiling at the expense of extra disk usage nixpkgs-krita.url = "github:K900/nixpkgs/krita6"; # For building an image for XVM # https://lantian.pub/en/article/modify-computer/nixos-low-ram-vps.lantian/ # https://unnamed.website/posts/nixvm/
-
@@ -24,10 +21,7 @@nixosConfigurations = { # Very creative name, I know ThinkPad-X1-Yoga-Gen-6 = nixpkgs.lib.nixosSystem { specialArgs = { pkgs-old = import inputs.nixpkgs-old { inherit system; }; pkgs-krita = import inputs.nixpkgs-krita { inherit system; }; }; specialArgs.pkgs-old = import inputs.nixpkgs-old { inherit system; }; modules = [ ./configuration.nix ./ThinkPad-X1-Yoga-Gen-6
-