diff --git a/extra-packages/default.nix b/extra-packages/default.nix index ce1bd70..00f60c8 100644 --- a/extra-packages/default.nix +++ b/extra-packages/default.nix @@ -1,5 +1,4 @@ final: prev: { - dracula-gtk = prev.callPackage ./dracula-gtk { }; misc-scripts = prev.callPackage ./scripts/misc { }; getpaper = prev.callPackage ./scripts/getpaper { }; youtube = prev.callPackage ./scripts/youtube { }; diff --git a/extra-packages/dracula-gtk/default.nix b/extra-packages/dracula-gtk/default.nix deleted file mode 100644 index 4188b34..0000000 --- a/extra-packages/dracula-gtk/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gtk-engine-murrine -, -}: -stdenvNoCC.mkDerivation { - pname = "dracula-gtk"; - version = "unstable-2023-10-14"; - - src = fetchFromGitHub { - owner = "dracula"; - repo = "gtk"; - rev = "3478e48925f33af411393adaa4043193f03a4e9a"; - hash = "sha256-/7/zJXk1LLZKWOpYbrFWBfhFcyddU1y0IwT+RXyyP1M="; - }; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/themes/Dracula - cp -ra assets cinnamon gnome-shell gtk-2.0 gtk-3.0 gtk-3.20 gtk-4.0 metacity-1 unity xfwm4 index.theme $out/share/themes/Dracula/ - - runHook postInstall - ''; - meta = with lib; { - description = "Dracula GTK theme"; - downloadPage = "https://github.com/dracula/gtk"; - homepage = "https://draculatheme.com/gtk"; - license = licenses.gpl3; - maintainers = with maintainers; [ adtya ]; - platforms = platforms.linux; - }; -} diff --git a/home/gtk.nix b/home/gtk.nix index 5515175..355bbd5 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,19 +1,17 @@ -{ pkgs -, ... -}: +{ pkgs, ...}: let - gtkTheme = { + theme = { name = "Dracula"; - package = pkgs.dracula-gtk; + package = pkgs.dracula-theme; }; iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme.override { color = "black"; }; + name = "Dracula"; + package = pkgs.dracula-icon-theme; }; cursorTheme = { - name = "Bibata-Modern-Classic"; + name = "Bibata-Modern-Amber"; package = pkgs.bibata-cursors; }; in @@ -21,9 +19,7 @@ in home.pointerCursor = cursorTheme // { gtk.enable = true; size = 24; x11.enable = true; }; gtk = { enable = true; - theme = gtkTheme; - inherit cursorTheme; - inherit iconTheme; + inherit theme cursorTheme iconTheme; gtk3.extraConfig = { gtk-application-prefer-dark-theme = true; }; @@ -32,11 +28,11 @@ in }; }; - home.sessionVariables.GTK_THEME = gtkTheme.name; + home.sessionVariables.GTK_THEME = theme.name; xdg.configFile = { - "gtk-4.0/assets".source = "${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/assets"; - "gtk-4.0/gtk.css".source = "${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk.css"; - "gtk-4.0/gtk-dark.css".source = "${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css"; + "gtk-4.0/assets".source = "${theme.package}/share/themes/${theme.name}/gtk-4.0/assets"; + "gtk-4.0/gtk.css".source = "${theme.package}/share/themes/${theme.name}/gtk-4.0/gtk.css"; + "gtk-4.0/gtk-dark.css".source = "${theme.package}/share/themes/${theme.name}/gtk-4.0/gtk-dark.css"; }; dconf.settings = {