diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/default.nix | 13 | ||||
| -rw-r--r-- | home/ebisu/fortune/desktop/mako.nix | 29 |
2 files changed, 23 insertions, 19 deletions
diff --git a/home/default.nix b/home/default.nix index 1475f01..01c167a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -14,13 +14,21 @@ in username = "ebisu"; flakeDirectory = ".nixos-config"; systems = import inputs.systems; - in - inputs.home-manager.lib.homeManagerConfiguration { + pkgs = ((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; + modules = [ ./${username} inputs.chaotic.homeManagerModules.default @@ -34,6 +42,7 @@ in secrets username flakeDirectory + colourscheme ; }; }; diff --git a/home/ebisu/fortune/desktop/mako.nix b/home/ebisu/fortune/desktop/mako.nix index 836541c..615dd1a 100644 --- a/home/ebisu/fortune/desktop/mako.nix +++ b/home/ebisu/fortune/desktop/mako.nix @@ -1,9 +1,4 @@ -{ config, ... }: -let - colourScheme = builtins.fromJSON ( - builtins.readFile "${config.home.homeDirectory}/.cache/wal/colors.json" - ); -in +{ colourscheme, ... }: { services.mako.enable = true; @@ -33,26 +28,26 @@ in border-color=#00000040 border-size=1 - background-color=${colourScheme.colors.color0} - text-color=${colourScheme.colors.color15} + background-color=${colourscheme.colour0} + text-color=${colourscheme.colour15} # [urgency=low] - # border-color=${colourScheme.colors.color2} - # background-color=${colourScheme.colors.color4} - # text-color=${colourScheme.colors.color6} + # border-color=${colourscheme.colour2} + # background-color=${colourscheme.colour4} + # text-color=${colourscheme.colour6} # [urgency=normal] - # border-color=${colourScheme.colors.color1} - # background-color=${colourScheme.colors.color3} - # text-color=${colourScheme.colors.color5} + # border-color=${colourscheme.colour1} + # background-color=${colourscheme.colour3} + # text-color=${colourscheme.colour5} # default-timeout=10000 # ignore-timeout=1 # [urgency=high] # font=Sauce Code Pro 16 - # border-color=${colourScheme.colors.color1} - # background-color=${colourScheme.colors.color2} - # text-color=${colourScheme.colors.color6} + # border-color=${colourscheme.colour1} + # background-color=${colourscheme.colour2} + # text-color=${colourscheme.colour6} # default-timeout=0 # ignore-timeout=1 ''; |