switch to newaita-reborn

home/gtk.nix

@@ -9,10 +9,9 @@
   };
 
   iconTheme = {
-    name = "Newaita-dark";
+    name = "Newaita-reborn";
-    package = pkgs.newaita-icon-theme.override {
+    package = pkgs.newaita-reborn.override {
-      panel = "dark";
+      flavour = "dracula";
-      folder = "bluegray";
     };
   };
 

packages/default.nix

@@ -1,7 +1,7 @@
 self: super: {
   adi1090x-plymouth = super.callPackage ./adi1090x-plymouth {};
   dracula-gtk = super.callPackage ./dracula-gtk {};
-  newaita-icon-theme = super.callPackage ./newaita-icon-theme {};
+  newaita-reborn = super.callPackage ./newaita-reborn {};
   scripts = super.callPackage ./scripts {};
   rofi-bluetooth = super.callPackage ./rofi-bluetooth {};
 }

packages/newaita-icon-theme/default.nix

@@ -1,63 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  gtk3,
-  gnome,
-  gnome-icon-theme,
-  hicolor-icon-theme,
-  panel ? "dark",
-  folder ? "default",
-}:
-stdenvNoCC.mkDerivation {
-  pname = "newaita-icon-theme";
-  version = "latest";
-
-  src = fetchFromGitHub {
-    owner = "cbrnix";
-    repo = "Newaita";
-    rev = "c2b596b097a83be23833dc7bc40b5d07a63315e3";
-    hash = "sha256-tqtjUy8RjvOu0NaK+iE0R1g7/eqCpmhbdxuNGd/YfSI=";
-  };
-
-  nativeBuildInputs = [gtk3];
-
-  propagatedBuildInputs = [
-    gnome.adwaita-icon-theme
-    gnome-icon-theme
-    hicolor-icon-theme
-  ];
-
-  dontDropIconThemeCache = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    PANEL_DIR=".DP"
-    if [ "${panel}" != "dark" ]; then
-      PANEL_DIR=".LP"
-    fi
-
-    FOLDER_DIR=".places-${folder}"
-
-    mkdir -p $out/share/icons/Newaita{,-dark}
-    cp -ra Newaita/{actions,apps,categories,devices,emblems,mimetypes,status,icon-theme.cache,index.theme} $out/share/icons/Newaita/
-    cp -ra Newaita-dark/{actions,apps,categories,devices,emblems,mimetypes,status,icon-theme.cache,index.theme} $out/share/icons/Newaita-dark/
-
-    cp -ra Newaita/''$PANEL_DIR $out/share/icons/Newaita/panel
-    cp -ra Newaita-dark/''$PANEL_DIR $out/share/icons/Newaita-dark/panel
-
-    cp -ra Newaita/''$FOLDER_DIR $out/share/icons/Newaita/places
-    cp -ra Newaita-dark/''$FOLDER_DIR $out/share/icons/Newaita-dark/places
-
-    runHook postInstall
-  '';
-
-  postFixup = "gtk-update-icon-cache $out/share/icons/Newaita{,-dark}";
-
-  meta = with lib; {
-    description = "Newaita icon theme";
-    homepage = "https://github.com/cbrnix/Newaita";
-    platforms = platforms.linux;
-  };
-}

packages/newaita-reborn/default.nix

@@ -0,0 +1,55 @@
+{
+  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;
+  };
+}