diff --git a/config/schemes.nix b/config/schemes.nix index c22a91c..e48f93a 100644 --- a/config/schemes.nix +++ b/config/schemes.nix @@ -1,5 +1,6 @@ -{ pkgs }: +{ pkgs, inputs }: let + inherit (inputs) wallpapers; mkScheme = { color ? null, @@ -26,12 +27,12 @@ in name = "mocha"; color = "brown"; polarity = "dark"; - image = ../wallpapers/la_fragua_de_vulcano.jpg; + image = "${wallpapers}/la_fragua_de_vulcano.jpg"; }; who = mkScheme { name = "catppuccin-frappe"; polarity = "dark"; - image = ../wallpapers/Nikolay_Kasatkin_Who.jpeg; + image = "${wallpapers}/Nikolay_Kasatkin_Who.jpeg"; iconPackage = pkgs.catppuccin-papirus-folders.override { flavor = "frappe"; accent = "peach"; @@ -41,25 +42,25 @@ in name = "solarflare"; color = "darkcyan"; polarity = "dark"; - image = ../wallpapers/space.jpg; + image = "${wallpapers}/space.jpg"; }; jesus = mkScheme { color = "red"; name = "equilibrium-light"; polarity = "light"; - image = ../wallpapers/jesus.png; + image = "${wallpapers}/jesus.png"; }; ballerinas = mkScheme { color = "brown"; name = "mocha"; polarity = "dark"; - image = ../wallpapers/Waay-Ballerinas.jpeg; + image = "${wallpapers}/Waay-Ballerinas.jpeg"; }; paul = mkScheme { color = "green"; name = "valua"; polarity = "light"; - image = ../wallpapers/paul1.jpg; + image = "${wallpapers}/paul1.jpg"; base16Scheme = { base00 = "#1a1f16"; # dark forest floor (was deep green-black) base01 = "#23291a"; # bark shadow @@ -83,7 +84,7 @@ in color = "yellow"; name = "equilibrium-light"; polarity = "light"; - image = ../wallpapers/cheems.png; + image = "${wallpapers}/cheems.png"; base16Scheme = { base00 = "#f5f0e9"; # very light cream base01 = "#e8ddd4"; # light beige diff --git a/config/stylix.nix b/config/stylix.nix index a11eb1c..c6154aa 100644 --- a/config/stylix.nix +++ b/config/stylix.nix @@ -2,10 +2,13 @@ pkgs, lib, config, + inputs, ... }: let - schemesFile = import ./schemes.nix { inherit pkgs; }; + schemesFile = import ./schemes.nix { + inherit pkgs inputs; + }; scheme = schemesFile.schemes.cheems; cfg = config.my.stylix; in diff --git a/environments/hyprland.nix b/environments/hyprland.nix index 473cbed..1abdd05 100644 --- a/environments/hyprland.nix +++ b/environments/hyprland.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, ... }: diff --git a/flake.lock b/flake.lock index 7dd6a04..949c9d2 100644 --- a/flake.lock +++ b/flake.lock @@ -655,11 +655,11 @@ "rev": "64a81ca78d03816ddcbbdc8a7b6186c975c6653a", "revCount": 104, "type": "git", - "url": "https://git.servidos.lat/lebubu/scripts.git" + "url": "https://git.servidos.lat/jawz/scripts.git" }, "original": { "type": "git", - "url": "https://git.servidos.lat/lebubu/scripts.git" + "url": "https://git.servidos.lat/jawz/scripts.git" } }, "nix-gaming": { @@ -922,7 +922,8 @@ "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", - "ucodenix": "ucodenix" + "ucodenix": "ucodenix", + "wallpapers": "wallpapers" } }, "sops-nix": { @@ -1178,6 +1179,22 @@ "type": "github" } }, + "wallpapers": { + "flake": false, + "locked": { + "lastModified": 1759117171, + "narHash": "sha256-Oyp4MKcld+tlZISm2HvuRErgHUb2mztpOH6v3g8B9uA=", + "ref": "refs/heads/main", + "rev": "0bc27e282a4c13d43139c4794e80a5951e4787b8", + "revCount": 1, + "type": "git", + "url": "https://git.servidos.lat/jawz/wallpapers.git" + }, + "original": { + "type": "git", + "url": "https://git.servidos.lat/jawz/wallpapers.git" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index c927a8e..33d7261 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,13 @@ inputs.nixpkgs.follows = ""; }; jawz-scripts = { - url = "git+https://git.servidos.lat/lebubu/scripts.git"; + url = "git+https://git.servidos.lat/jawz/scripts.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + wallpapers = { + url = "git+https://git.servidos.lat/jawz/wallpapers.git"; + flake = false; + }; nur = { url = "github:nix-community/nur"; inputs.nixpkgs.follows = "nixpkgs";