From 83b535e171be22b4a954e64c1bad4194ccb3720c Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Mon, 22 Jan 2024 23:46:45 -0600 Subject: [PATCH] Changing to and testing new sddm theme derivation --- config/home/files.nix | 3 ++- config/pkgs/sddm-tokyo-night.nix | 33 ++++++++++++++++++++++++++++++++ config/system/displaymanager.nix | 12 +++++++++--- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 config/pkgs/sddm-tokyo-night.nix diff --git a/config/home/files.nix b/config/home/files.nix index 7cc438f..9a88e76 100644 --- a/config/home/files.nix +++ b/config/home/files.nix @@ -5,7 +5,8 @@ home.file.".config/zaney-stinger.mov".source = ./files/media/zaney-stinger.mov; home.file.".emoji".source = ./files/emoji; home.file.".base16-themes".source = ./files/base16-themes; - home.file.".face".source = ./files/face.jpg; + home.file.".face".source = ./files/face.jpg; # For GDM + home.file.".face.icon".source = ./files/face.jpg; # For SDDM home.file.".config/rofi/rofi.jpg".source = ./files/rofi.jpg; home.file.".config/starship.toml".source = ./files/starship.toml; home.file.".local/share/fonts" = { diff --git a/config/pkgs/sddm-tokyo-night.nix b/config/pkgs/sddm-tokyo-night.nix new file mode 100644 index 0000000..af61d51 --- /dev/null +++ b/config/pkgs/sddm-tokyo-night.nix @@ -0,0 +1,33 @@ +{ lib, qtbase, qtsvg +, qtgraphicaleffects +, qtquickcontrols2 +, wrapQtAppsHook +, stdenvNoCC +, fetchFromGitHub +}: +stdenvNoCC.mkDerivation rec { + pname = "tokyo-night-sddm"; + version = "1..0"; + dontBuild = true; + src = fetchFromGitHub { + owner = "rototrash"; + repo = "tokyo-night-sddm"; + rev = "320c8e74ade1e94f640708eee0b9a75a395697c6"; + sha256 = "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0="; + }; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + + propagatedUserEnvPkgs = [ + qtbase + qtsvg + qtgraphicaleffects + qtquickcontrols2 + ]; + + installPhase = '' + mkdir -p $out/share/sddm/themes + cp -aR $src $out/share/sddm/themes/tokyo-night-sddm + ''; +} diff --git a/config/system/displaymanager.nix b/config/system/displaymanager.nix index a303a4d..1b33a8a 100644 --- a/config/system/displaymanager.nix +++ b/config/system/displaymanager.nix @@ -10,11 +10,17 @@ enable = true; autoNumlock = true; wayland.enable = true; - theme = "sugar-dark"; + theme = "tokyo-night-sddm"; }; }; - environment.systemPackages = let themes = pkgs.callPackage ../pkgs/sddm-sugar-dark.nix {}; in [ - themes.sddm-sugar-dark + environment.systemPackages = +let + sugar = pkgs.callPackage ../pkgs/sddm-sugar-dark.nix {}; + tokyo-night = pkgs.libsForQt5.callPackage ../pkgs/sddm-tokyo-night.nix {}; +in [ + sugar.sddm-sugar-dark # Name: sugar-dark + tokyo-night # Name: tokyo-night-sddm + pkgs.libsForQt5.qt5.qtgraphicaleffects ]; }