diff --git a/home/jonas@comfy-station.nix b/home/jonas@comfy-station.nix index e828384..3765728 100644 --- a/home/jonas@comfy-station.nix +++ b/home/jonas@comfy-station.nix @@ -13,6 +13,7 @@ }; # hive modules + hive.themes.layan.enable = true; hive.hyprland.enable = true; hive.swaync.enable = true; hive.waybar.enable = true; diff --git a/modules/default.nix b/modules/default.nix index fb3d4ee..ae366c4 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -43,5 +43,6 @@ ./home/plasma.nix ./home/ssh.nix ./home/yubikey.nix + ./home/themes/layan.nix ]; } diff --git a/modules/home/plasma/layan-kde.nix b/modules/home/plasma/layan-kde.nix deleted file mode 100644 index 86050ae..0000000 --- a/modules/home/plasma/layan-kde.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - kdeclarative, - plasma-framework, - plasma-workspace, - gitUpdater, -}: -stdenv.mkDerivation rec { - pname = "layan-kde"; - version = "2025-02-13"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = "ace0b1d93e5f08c650630c146b2d637e1e2e6cd1"; - hash = "sha256-T69bGjfZeOsJLmOZKps9N2wMv5VKYeo1ipGEsLAS+Sg="; - }; - - # Propagate sddm theme dependencies to user env otherwise sddm does - # not find them. Putting them in buildInputs is not enough. - propagatedUserEnvPkgs = [ - kdeclarative.bin - plasma-framework - plasma-workspace - ]; - - postPatch = '' - patchShebangs install.sh - - substituteInPlace install.sh \ - --replace '$HOME/.local' $out \ - --replace '$HOME/.config' $out/share - ''; - - installPhase = '' - runHook preInstall - - name= ./install.sh --dest $out/share/themes - - mkdir -p $out/share/sddm/themes - - runHook postInstall - ''; - - passthru.updateScript = gitUpdater {}; - - meta = with lib; { - description = "Flat Design theme for KDE Plasma desktop"; - homepage = "https://github.com/vinceliuice/Layan-kde"; - license = licenses.gpl3Only; - platforms = platforms.all; - }; -} diff --git a/modules/home/themes/layan.nix b/modules/home/themes/layan.nix new file mode 100644 index 0000000..498437f --- /dev/null +++ b/modules/home/themes/layan.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + ... +}: let + cfg = config.hive.themes.layan; +in { + options.hive.themes.layan = { + enable = lib.mkEnableOption "Layan theme configuration"; + kvantum = lib.mkEnableOption "Kvantum theme variant of layan"; + }; + + config = lib.mkIf cfg.enable { + # provide kvantum and nord theme + home.packages = [ + pkgs.kdePackages.qtstyleplugin-kvantum + pkgs.layan-kde + pkgs.unstable.layan-cursors + pkgs.layan-gtk-theme + pkgs.qt6ct + pkgs.tela-circle-icon-theme + ]; + + # use kvantum theme + qt.enable = true; + qt.style.name = "kvantum"; + home.sessionVariables = { + QT_STYLE_OVERRIDE = "kvantum"; + }; + + # add nord like gtk theme + gtk = { + enable = true; + cursorTheme = { + package = pkgs.unstable.layan-cursors; + name = "Layan-cursors"; + }; + theme = { + package = pkgs.layan-gtk-theme; + name = "Layan"; + }; + iconTheme = { + package = pkgs.tela-circle-icon-theme; + name = "Tela-circle-dark"; + }; + }; + }; +}