diff --git a/custom/default.nix b/custom/default.nix index dfa695e..50e07f6 100644 --- a/custom/default.nix +++ b/custom/default.nix @@ -5,6 +5,7 @@ let cocktail-bar-cli = pkgs.callPackage ./cocktail-bar-cli { }; lockscreen = pkgs.callPackage ./lockscreen { }; sddm-theme-clairvoyance = pkgs.callPackage ./sddm-theme-clairvoyance { }; + sddm-sugar-dark = pkgs.callPackage ./sddm-sugar-dark { }; update-background = pkgs.callPackage ./update-background { }; vital-synth = pkgs.callPackage ./vital-synth { }; }; diff --git a/custom/sddm-sugar-dark/default.nix b/custom/sddm-sugar-dark/default.nix new file mode 100644 index 0000000..84d8150 --- /dev/null +++ b/custom/sddm-sugar-dark/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, sddm, qt5 }: +stdenv.mkDerivation { + pname = "sddm-sugar-dark"; + version = "2023-02-17"; + + src = fetchFromGitHub { + owner = "MarianArlt"; + repo = "sddm-sugar-dark"; + rev = "ceb2c455663429be03ba62d9f898c571650ef7fe"; + sha256 = "sha256-flOspjpYezPvGZ6b4R/Mr18N7N3JdytCSwwu6mf4owQ="; + }; + + buildInputs = [ + qt5.qtgraphicaleffects + qt5.qtquickcontrols2 + qt5.qtsvg + qt5.wrapQtAppsHook + sddm + ]; + + installPhase = '' + mkdir -p $out/usr/share/sddm/themes/ + ln -s $src $out/usr/share/sddm/themes/sugar-dark + '' + # + optionalString (wallpaper != null) '' + # cp ${wallpaper} $out/usr/share/sddm/themes/clairvoyance/Assets/Background.jpg + # '' + ; + + meta = { + description = "Clairvoyance theme for SDDM"; + homepage = "https://github.com/marianarlt/sddm-sugar-dark"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.bertof ]; + platforms = lib.platforms.all; + }; +} + diff --git a/custom/sddm-theme-clairvoyance/default.nix b/custom/sddm-theme-clairvoyance/default.nix index 213b20e..bf58b66 100644 --- a/custom/sddm-theme-clairvoyance/default.nix +++ b/custom/sddm-theme-clairvoyance/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fira-mono, wallpaper ? null }: with lib; -stdenv.mkDerivation rec { - pname = "materia-kde-theme"; +stdenv.mkDerivation { + pname = "sddm-theme-clairvoyance"; version = "20190530"; src = fetchFromGitHub { diff --git a/flake.nix b/flake.nix index 338132f..4f19531 100644 --- a/flake.nix +++ b/flake.nix @@ -87,6 +87,7 @@ self.callPackage ./custom/sddm-theme-clairvoyance { wallpaper = ./wallpapers/comfy_waves.jpg; }; + sddm-sugar-dark = self.callPackage ./custom/sddm-sugar-dark { }; google-chrome = self.google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; }; diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index 759e3f1..a9fc79f 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -69,6 +69,13 @@ with lib; { xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; libinput.enable = true; + + displayManager.sddm = { + enable = true; + autoNumlock = true; + theme = + "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; + }; }; # Enable CUPS to print documents. diff --git a/odin/configuration-intel.nix b/odin/configuration-intel.nix index a2f65f8..4b7b99d 100644 --- a/odin/configuration-intel.nix +++ b/odin/configuration-intel.nix @@ -15,14 +15,5 @@ ##### disable nvidia for a very nice battery life. hardware.nvidiaOptimus.disable = true; - services.xserver = { - videoDrivers = [ "intel" ]; - displayManager.sddm = { - enable = true; - autoNumlock = true; - theme = - "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; - }; - }; - + services.xserver.videoDrivers = [ "intel" ]; } diff --git a/odin/configuration-nvidia.nix b/odin/configuration-nvidia.nix index 9a5fddd..be6ec57 100644 --- a/odin/configuration-nvidia.nix +++ b/odin/configuration-nvidia.nix @@ -29,13 +29,5 @@ }; }; - services.xserver = { - videoDrivers = [ "nvidia" ]; - displayManager.sddm = { - enable = true; - autoNumlock = true; - theme = - "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; - }; - }; + services.xserver.videoDrivers = [ "nvidia" ]; }