diff --git a/home/gtk.nix b/home/gtk.nix index f753cdb..58e63ef 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -9,10 +9,8 @@ }; iconTheme = { - name = "Newaita-reborn"; - package = pkgs.newaita-reborn.override { - flavour = "dracula"; - }; + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme.override {color = "black";}; }; cursorTheme = { diff --git a/packages/default.nix b/packages/default.nix index d317174..23c8d22 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,7 +1,6 @@ self: super: { adi1090x-plymouth = super.callPackage ./adi1090x-plymouth {}; dracula-gtk = super.callPackage ./dracula-gtk {}; - newaita-reborn = super.callPackage ./newaita-reborn {}; scripts = super.callPackage ./scripts {}; rofi-bluetooth = super.callPackage ./rofi-bluetooth {}; } diff --git a/packages/dracula-gtk/default.nix b/packages/dracula-gtk/default.nix index e9fec8f..3e69436 100644 --- a/packages/dracula-gtk/default.nix +++ b/packages/dracula-gtk/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { downloadPage = "https://github.com/dracula/gtk"; homepage = "https://draculatheme.com/gtk"; license = licenses.gpl3; - maintainers = with maintainers; [ adtya ]; + maintainers = with maintainers; [adtya]; platforms = platforms.linux; }; } diff --git a/packages/newaita-reborn/default.nix b/packages/newaita-reborn/default.nix deleted file mode 100644 index 4a81164..0000000 --- a/packages/newaita-reborn/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - gtk3, - gnome, - gnome-icon-theme, - hicolor-icon-theme, - flavour ? "", -}: -stdenvNoCC.mkDerivation { - pname = "newaita-icon-theme"; - version = "unstable-2022-03-18"; - - src = fetchFromGitHub { - owner = "cbrnix"; - repo = "Newaita-reborn"; - rev = "5b19f46a4ca918585038547b27810502a5997401"; - hash = "sha256-nA0l+xH9BlxID0lsXkojKvQRZgkJulSWsRinDre0oW8="; - }; - - nativeBuildInputs = [gtk3]; - - propagatedBuildInputs = [ - gnome.adwaita-icon-theme - gnome-icon-theme - hicolor-icon-theme - ]; - - dontDropIconThemeCache = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/icons/Newaita-reborn{,-dark} - - FLAVOUR="${flavour}" - if [ -n ''$FLAVOUR ]; then - FLAVOUR="-''$FLAVOUR" - fi - - cp -ra Newaita-reborn''$FLAVOUR/{actions,apps,categories,devices,emblems,mimetypes,status,panel,places,index.theme} $out/share/icons/Newaita-reborn/ - cp -ra Newaita-reborn''$FLAVOUR-dark/{actions,apps,categories,devices,emblems,mimetypes,status,panel,places,index.theme} $out/share/icons/Newaita-reborn-dark/ - - runHook postInstall - ''; - - postFixup = "gtk-update-icon-cache $out/share/icons/Newaita-reborn{,-dark}"; - - meta = with lib; { - description = "Remaster Newaita icon theme"; - homepage = "https://github.com/cbrnix/Newaita-reborn"; - platforms = platforms.linux; - }; -}