diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 2d31018..a9ddc9b 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,26 +1,36 @@ -inputs: { +inputs: +{ config, pkgs, lib, ... -}: let - packages = import ../packages.nix {inherit pkgs lib; exclude_packages = config.omarchy.exclude_packages;}; +}: +let + packages = import ../packages.nix { + inherit pkgs lib; + exclude_packages = config.omarchy.exclude_packages; + }; themes = import ../themes.nix; # Handle theme selection - either predefined or generated - selectedTheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") - then null - else themes.${config.omarchy.theme}; + selectedTheme = + if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") then + null + else + themes.${config.omarchy.theme}; # Generate color scheme from wallpaper for generated themes - generatedColorScheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") - then (inputs.nix-colors.lib.contrib { inherit pkgs; }).colorSchemeFromPicture { - path = config.omarchy.theme_overrides.wallpaper_path; - variant = if config.omarchy.theme == "generated_light" then "light" else "dark"; - } - else null; -in { + generatedColorScheme = + if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") then + (inputs.nix-colors.lib.contrib { inherit pkgs; }).colorSchemeFromPicture { + path = config.omarchy.theme_overrides.wallpaper_path; + variant = if config.omarchy.theme == "generated_light" then "light" else "dark"; + } + else + null; +in +{ imports = [ (import ./hyprland.nix inputs) (import ./hyprlock.nix inputs) @@ -36,6 +46,7 @@ in { (import ./zoxide.nix) (import ./pyprland.nix) (import ./bat.nix) + (import ./wob.nix) ]; home.file = { @@ -44,15 +55,17 @@ in { recursive = true; }; ".local/share/omarchy/sounds" = { - source = ../../sounds; - recursive = true; + source = ../../sounds; + recursive = true; }; }; home.packages = packages.homePackages; - colorScheme = if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") - then generatedColorScheme - else inputs.nix-colors.colorSchemes.${selectedTheme.base16-theme}; + colorScheme = + if (config.omarchy.theme == "generated_light" || config.omarchy.theme == "generated_dark") then + generatedColorScheme + else + inputs.nix-colors.colorSchemes.${selectedTheme.base16-theme}; gtk = { enable = true;