diff --git a/config/login.nix b/config/login.nix index 08c68e2..4618a93 100644 --- a/config/login.nix +++ b/config/login.nix @@ -1,28 +1,31 @@ { config, lib, pkgs, tokyo-night-sddm-src, ... }: let - tokyo-night-sddm = pkgs.stdenv.mkDerivation { + tokyo-night-sddm = pkgs.stdenvNoCC.mkDerivation { name = "tokyo-night-sddm"; src = tokyo-night-sddm-src; + + dontWrapQtApps = true; + buildInputs = with pkgs.qt6Packages; [ + qtbase + qtsvg + ]; + installPhase = '' - cp -f ${./tokyo-night-sddm/theme.conf} ./theme.conf + cp -f ${./sddm/theme.conf} ./theme.conf cp -f ${../assets/background/bg_lock.png} Backgrounds/background.png - mkdir -p $out/share/sddm/themes/tokyo-night-sddm - mv * $out/share/sddm/themes/tokyo-night-sddm + mkdir -p $out/share/sddm/themes/tokyo-night + mv * $out/share/sddm/themes/tokyo-night ''; }; in lib.mkIf (config.machine != "air") { - environment.systemPackages = with pkgs.libsForQt5; [ + environment.systemPackages = [ tokyo-night-sddm # Theme - qtbase - qtsvg - qtquickcontrols2 - qtgraphicaleffects ]; services.displayManager.defaultSession = "hyprland"; services.displayManager.sddm = { enable = true; wayland.enable = true; - theme = "tokyo-night-sddm"; + theme = "${tokyo-night-sddm}/share/sddm/themes/tokyo-night"; }; } diff --git a/config/tokyo-night-sddm/theme.conf b/config/sddm/theme.conf similarity index 100% rename from config/tokyo-night-sddm/theme.conf rename to config/sddm/theme.conf diff --git a/flake.lock b/flake.lock index d92f96e..4975017 100644 --- a/flake.lock +++ b/flake.lock @@ -169,17 +169,15 @@ "tokyo-night-sddm-src": { "flake": false, "locked": { - "lastModified": 1686823900, - "narHash": "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=", - "owner": "rototrash", - "repo": "tokyo-night-sddm", - "rev": "320c8e74ade1e94f640708eee0b9a75a395697c6", - "type": "github" + "lastModified": 1770872200, + "narHash": "sha256-6U2cC7e3NtxDHm+6rTC+/JIL9afMldxp0SYitOnx84s=", + "rev": "2d21c0fb19ab4232f2e42847f96f95cffcd7cec0", + "type": "tarball", + "url": "https://git.tokinanpa.dev/api/v1/repos/toki/tokyo-night-sddm/archive/2d21c0fb19ab4232f2e42847f96f95cffcd7cec0.tar.gz" }, "original": { - "owner": "rototrash", - "repo": "tokyo-night-sddm", - "type": "github" + "type": "tarball", + "url": "https://git.tokinanpa.dev/toki/tokyo-night-sddm/archive/main.tar.gz" } } }, diff --git a/flake.nix b/flake.nix index f15af77..730d7d1 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ inputs = { quickshell-toki-night.inputs.nixpkgs.follows = "nixpkgs"; quickshell-toki-night.inputs.systems.url = "github:nix-systems/x86_64-linux"; - tokyo-night-sddm-src.url = "github:rototrash/tokyo-night-sddm"; + tokyo-night-sddm-src.url = "https://git.tokinanpa.dev/toki/tokyo-night-sddm/archive/main.tar.gz"; tokyo-night-sddm-src.flake = false; macos-hyprcursor-src.url = "github:driedpampas/macOS-hyprcursor"; macos-hyprcursor-src.flake = false;