diff --git a/common/overlays/default.nix b/common/overlays/default.nix index ca9d223..c3c046e 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -1,6 +1,5 @@ {nixpkgs-wayland, ...} @ inputs: [ (import ./dracula-theme inputs) - (import ./plymouth inputs) (import ./spotifywm inputs) (import ./squeekboard) diff --git a/common/overlays/plymouth/default.nix b/common/overlays/plymouth/default.nix deleted file mode 100644 index 0e4eb85..0000000 --- a/common/overlays/plymouth/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{plymouth-src, ...}: (final: prev: { - plymouth = prev.plymouth.overrideAttrs (o: { - version = plymouth-src.rev; - src = plymouth-src; - }); -}) diff --git a/flake.lock b/flake.lock index 49bec5a..5f07f87 100644 --- a/flake.lock +++ b/flake.lock @@ -1158,24 +1158,6 @@ "type": "github" } }, - "plymouth-src": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1707269358, - "narHash": "sha256-wwXw0gMYtX4fWgeU5S+LIKIiepuVL5mV9TYxV3emO2I=", - "owner": "plymouth", - "repo": "plymouth", - "rev": "5113860332a3c2d645cb1452e2a7f51f4744c06b", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "plymouth", - "repo": "plymouth", - "type": "gitlab" - } - }, "plymouth-theme-src": { "flake": false, "locked": { @@ -1273,7 +1255,6 @@ "pam-fprint-grosshack-src": "pam-fprint-grosshack-src", "pcsd": "pcsd", "persist-properties-src": "persist-properties-src", - "plymouth-src": "plymouth-src", "plymouth-theme-src": "plymouth-theme-src", "pointer-event-src": "pointer-event-src", "pokemon-colorscripts-src": "pokemon-colorscripts-src", diff --git a/flake.nix b/flake.nix index 85b7022..ee2613e 100644 --- a/flake.nix +++ b/flake.nix @@ -145,9 +145,6 @@ type = "github"; owner = "matt1432"; repo = "nixos-pcsd"; - - # FIXME: OCF resources break on latest - # inputs.nixpkgs.follows = "nixpkgs"; }; # Oksys inputs @@ -300,17 +297,8 @@ }; ## Overlays - plymouth-src = { - type = "gitlab"; - host = "gitlab.freedesktop.org"; - # Wait for https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/38964e5eafdfc7d8eccf29aa65056f303cad0b25 - # to reach https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/linux/plymouth/default.nix - owner = "plymouth"; - repo = "plymouth"; - flake = false; - }; - spotifywm-src = { + # FIXME: remove this input once this gets merged: https://github.com/NixOS/nixpkgs/pull/261501 type = "github"; owner = "dasJ"; repo = "spotifywm"; diff --git a/home/theme.nix b/home/theme.nix index 24bbdc9..db4cf2b 100644 --- a/home/theme.nix +++ b/home/theme.nix @@ -39,7 +39,7 @@ in { home.packages = with pkgs; [ libsForQt5.qtstyleplugin-kvantum - qt6Packages.qtstyleplugin-kvantum #FIXME: doesn't work with qt6ct + qt6Packages.qtstyleplugin-kvantum ]; qt = { enable = true; @@ -71,5 +71,6 @@ in { "Kvantum/kvantum.kvconfig".text = "[General]\ntheme=Dracula"; "qt5ct/qt5ct.conf".text = qtconf + "kvantum"; + "qt6ct/qt6ct.conf".text = qtconf + "kvantum"; }; }