From 9fc14abee9d38ffe91a5dd9ff9a36b1cc7cbd813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Fri, 20 Mar 2026 10:23:45 +0100 Subject: [PATCH] lock flake fix unlocked flake error on new install --- configuration.nix | 7 +++++-- home/themes/catppuccin/default.nix | 7 +++++-- home/themes/catppuccin/hyprlock.nix | 7 ++++--- home/themes/images/default.nix | 16 ++++++++++++++++ home/themes/wallpaper.nix | 7 +++++-- 5 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 home/themes/images/default.nix diff --git a/configuration.nix b/configuration.nix index 688a643..dc8b32a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,5 +1,8 @@ -{ inputs, pkgs, ... }: +{ pkgs, ... }: +let + images = pkgs.callPackage ./home/themes/images { }; +in { # Importing necessary setup for Steam & Printing & Flutter. imports = [ @@ -101,7 +104,7 @@ accent = "pink"; font = "Fira Code"; fontSize = "9"; - background = "${inputs.images}/lockpaper.png"; + background = "${images.lock}"; loginBackground = true; userIcon = true; }) diff --git a/home/themes/catppuccin/default.nix b/home/themes/catppuccin/default.nix index 90e0d3c..3fc1778 100644 --- a/home/themes/catppuccin/default.nix +++ b/home/themes/catppuccin/default.nix @@ -1,8 +1,11 @@ { - inputs, + pkgs, ... }: +let + images = pkgs.callPackage ../images { }; +in { imports = [ ./cursor.nix @@ -36,5 +39,5 @@ }; # ── Icon for Lock & Loginscreen ─────────────────────────────────────── - xdg.configFile.".face.icon".source = inputs.images + /face.icon; + xdg.configFile.".face.icon".source = "${images.face}"; } diff --git a/home/themes/catppuccin/hyprlock.nix b/home/themes/catppuccin/hyprlock.nix index aa18b36..2f6c3e7 100644 --- a/home/themes/catppuccin/hyprlock.nix +++ b/home/themes/catppuccin/hyprlock.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ pkgs, ... }: let variables = { @@ -12,6 +12,7 @@ let yellow = "rgb(f9e2af)"; font = "Fira Code"; }; + images = pkgs.callPackage ../images { }; in { # ── Hyprlock ────────────────────────────────────────────────────────── @@ -24,7 +25,7 @@ in background = { monitor = ""; - path = "${inputs.images}/lockpaper.png"; + path = "${images.lock}"; blur_passes = 0; color = variables.base; }; @@ -69,7 +70,7 @@ in image = { monitor = ""; - path = "${inputs.images}/face.icon"; + path = "${images.face}"; size = 100; border_color = variables.accent; position = "0, 75"; diff --git a/home/themes/images/default.nix b/home/themes/images/default.nix new file mode 100644 index 0000000..859ccf1 --- /dev/null +++ b/home/themes/images/default.nix @@ -0,0 +1,16 @@ +{ ... }: + +{ + lock = builtins.path { + path = ./lockpaper.png; + name = "lockpaper"; + }; + face = builtins.path { + path = ./face.icon; + name = "face"; + }; + background = builtins.path { + path = ./wallpaper.jpeg; + name = "wallpaper"; + }; +} diff --git a/home/themes/wallpaper.nix b/home/themes/wallpaper.nix index 6ffbd83..0364062 100644 --- a/home/themes/wallpaper.nix +++ b/home/themes/wallpaper.nix @@ -1,9 +1,12 @@ -{ inputs, ... }: +{ pkgs, ... }: +let + images = pkgs.callPackage ./images { }; +in { services.wpaperd = { enable = true; - settings.any.path = "${inputs.images}/wallpaper.jpeg"; # TODO: change wallpaper / make automatic pull from some website? -> animals and fallback to something if no iternet + settings.any.path = "${images.background}"; # TODO: change wallpaper / make automatic pull from some website? -> animals and fallback to something if no iternet }; }