From b514d8ddd33b16f25e873634fbbdd64721744a6e Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 12 Sep 2024 03:49:40 -0700 Subject: home: pywal-nix --- flake.lock | 24 ++++++++++++++++++++++++ flake.nix | 6 ++++++ home/default.nix | 8 +------- home/ebisu/default.nix | 1 + home/ebisu/fortune/desktop/mako.nix | 5 ++++- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index c67fbff..f0860f7 100644 --- a/flake.lock +++ b/flake.lock @@ -1085,6 +1085,29 @@ "type": "github" } }, + "pywal-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1726137809, + "narHash": "sha256-XJpyjx58s9Nqb8ViVjbnLDavyBtk9htHYD9OHAYa5+w=", + "owner": "Fuwn", + "repo": "pywal-nix", + "rev": "836627860d532e986a82e4fc62744850a19cde62", + "type": "github" + }, + "original": { + "owner": "Fuwn", + "repo": "pywal-nix", + "type": "github" + } + }, "root": { "inputs": { "chaotic": "chaotic", @@ -1102,6 +1125,7 @@ "omnix": "omnix", "pia": "pia", "pre-commit-hooks": "pre-commit-hooks_2", + "pywal-nix": "pywal-nix", "spicetify-nix": "spicetify-nix", "systems": "systems_3", "tailray": "tailray" diff --git a/flake.nix b/flake.nix index 0d84492..1a7ecfd 100644 --- a/flake.nix +++ b/flake.nix @@ -125,5 +125,11 @@ url = "github:pyt0xic/hyprfocus"; inputs.hyprland.follows = "hyprland"; }; + + pywal-nix = { + url = "github:Fuwn/pywal-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; + }; }; } diff --git a/home/default.nix b/home/default.nix index 01c167a..27e137e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -19,12 +19,6 @@ in ((import ../lib/systems.nix { inherit lib systems; }) ( system: import inputs.nixpkgs { inherit system; } ))."${builtins.currentSystem}"; - - colourscheme = import ../lib/pywal { - inherit pkgs; - - wallpaper = ./${username}/wallpaper.png; - }; in inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs; @@ -32,6 +26,7 @@ in modules = [ ./${username} inputs.chaotic.homeManagerModules.default + inputs.pywal-nix.${pkgs.system}.homeManagerModules.default ]; extraSpecialArgs = { @@ -42,7 +37,6 @@ in secrets username flakeDirectory - colourscheme ; }; }; diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix index 0aa5bd5..820b67c 100644 --- a/home/ebisu/default.nix +++ b/home/ebisu/default.nix @@ -13,6 +13,7 @@ programs.home-manager.enable = true; nix.package = pkgs.nix; + pywal-nix.wallpaper = ./wallpaper.png; home = { inherit username; diff --git a/home/ebisu/fortune/desktop/mako.nix b/home/ebisu/fortune/desktop/mako.nix index 615dd1a..a4e8d26 100644 --- a/home/ebisu/fortune/desktop/mako.nix +++ b/home/ebisu/fortune/desktop/mako.nix @@ -1,4 +1,7 @@ -{ colourscheme, ... }: +{ config, ... }: +let + inherit (config.pywal-nix) colourscheme; +in { services.mako.enable = true; -- cgit v1.2.3