diff --git a/misc/nixos.png b/misc/nixos.png deleted file mode 100644 index d958f82..0000000 Binary files a/misc/nixos.png and /dev/null differ diff --git a/misc/recursion.png b/misc/recursion.png deleted file mode 100644 index f3062d4..0000000 Binary files a/misc/recursion.png and /dev/null differ diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index d1a3b02..3c327ba 100644 --- a/modules/DE/dwm.nix +++ b/modules/DE/dwm.nix @@ -19,7 +19,7 @@ in { enable = true; displayManager = { sessionCommands = '' - ${pkgs.feh}/bin/feh --bg-center ${self + /misc/recursion.png} + ${pkgs.feh}/bin/feh --bg-center ${self.packages.${pkgs.system}.images + /recursion.png} ${pkgs.numlockx}/bin/numlockx ${pkgs.picom}/bin/picom & ''; diff --git a/modules/DM/lightDM.nix b/modules/DM/lightDM.nix index f3686ed..d24f5b3 100644 --- a/modules/DM/lightDM.nix +++ b/modules/DM/lightDM.nix @@ -2,6 +2,7 @@ config, lib, self, + pkgs, ... }: let cfg = config.localModules.DM.lightdm; @@ -14,7 +15,7 @@ in { displayManager = { lightdm = { enable = true; - background = self + /misc/recursion.png; + background = self.packages.${pkgs.system}.images + /recursion.png; extraConfig = "minimum-vt=1"; greeters.mini = { enable = true; diff --git a/pkgs/images.nix b/pkgs/images.nix new file mode 100644 index 0000000..5299441 --- /dev/null +++ b/pkgs/images.nix @@ -0,0 +1,21 @@ +{ + fetchurl, + runCommand, + imagemagick, +}: +runCommand "my-example" { + recursion = fetchurl { + url = "https://github.com/NixOS/nixos-artwork/raw/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-recursive.png"; + sha256 = "sha256-YvFrlysNGMwJ7eMFOoz0KI8AjoPN3ao+AVOgnVZzkFE="; + }; + logo = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/376ed4ba8dc2e611b7e8a62fdc680967ead5bd87/logo/nix-snowflake.svg"; + sha256 = "sha256-SCuQlSPB14GFTq4XvExJ0QEuK2VIbrd5YYKHLRG/q5I="; + }; + buildInputs = [imagemagick]; +} +'' + mkdir -p $out + cp $recursion $out/recursion.png + convert -background none -size 512x512 $logo $out/logo.png +'' diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix index 8a1764d..1a929c3 100644 --- a/systems/gerg-desktop/default.nix +++ b/systems/gerg-desktop/default.nix @@ -98,7 +98,6 @@ }; #user managment sops.secrets = { - root.neededForUsers = true; gerg.neededForUsers = true; }; users = {