From 6ff469e96f9a46ecb3c6822d4a8035d14776734d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 21 Apr 2021 10:30:05 +0200 Subject: [PATCH] home: themes: move options to my.themes --- home/themes/default.nix | 14 ++++++-------- home/x/i3.nix | 2 +- hosts/boreal/home.nix | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/home/themes/default.nix b/home/themes/default.nix index 3ea1897..0ee7404 100644 --- a/home/themes/default.nix +++ b/home/themes/default.nix @@ -10,17 +10,15 @@ let }; in { - options.my.home = { - theme = mkOption { + options.my.theme = mkOption { type = themeType; - }; - - themes = mkOption { - type = with types; attrsOf themeType; - }; }; - config.my.home.themes = { + options.my.themes = mkOption { + type = with types; attrsOf themeType; + }; + + config.my.themes = { solarizedLight = import ./solarizedLight; }; } diff --git a/home/x/i3.nix b/home/x/i3.nix index ba0c559..8930ea3 100644 --- a/home/x/i3.nix +++ b/home/x/i3.nix @@ -14,7 +14,7 @@ let logoutMode = "[L]ogout, [S]uspend, [P]oweroff, [R]eboot"; - i3Theme = config.my.home.theme.i3Theme; + i3Theme = config.my.theme.i3Theme; in { config = lib.mkIf isEnabled { diff --git a/hosts/boreal/home.nix b/hosts/boreal/home.nix index d2290df..722eb5f 100644 --- a/hosts/boreal/home.nix +++ b/hosts/boreal/home.nix @@ -5,6 +5,6 @@ my.home.x.enable = true; my.home.emacs.enable = true; my.home.tmux.enable = true; - my.home.theme = config.home-manager.users.alarsyo.my.home.themes.solarizedLight; + my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight; }; }