diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/home-manager/personal/gui/x/i3/bar/default.nix | 19 | ||||
| -rw-r--r-- | modules/nixos/personal/gui.nix | 3 |
2 files changed, 11 insertions, 11 deletions
diff --git a/modules/home-manager/personal/gui/x/i3/bar/default.nix b/modules/home-manager/personal/gui/x/i3/bar/default.nix index 58d4bce..47754c7 100644 --- a/modules/home-manager/personal/gui/x/i3/bar/default.nix +++ b/modules/home-manager/personal/gui/x/i3/bar/default.nix @@ -4,21 +4,22 @@ let statusPackage = pkgs.personal.barista.override { i3statusGo = ./i3status.go; }; in { - xsession.windowManager.i3.config.bars = [{ - statusCommand = "${statusPackage}/bin/i3status"; - fonts = { - names = [ "roboto" ]; - size = 11.0; - }; - colors.background = "#111111"; - }]; + xsession.windowManager.i3.config.bars = [ + ({ + statusCommand = "${statusPackage}/bin/i3status"; + } // (config.lib.stylix.i3.bar or { colors.background = "#111111"; }) // { + fonts = { + names = [ "roboto" ]; + size = 11.0; + }; + }) + ]; home.packages = with pkgs; lib.optionals (config.xsession.enable && config.xsession.windowManager.i3.enable) [ material-design-icons roboto - # source-code-pro ]; # (Miscellaneous) Tray icons diff --git a/modules/nixos/personal/gui.nix b/modules/nixos/personal/gui.nix index 2838863..7ecf678 100644 --- a/modules/nixos/personal/gui.nix +++ b/modules/nixos/personal/gui.nix @@ -5,8 +5,7 @@ let wallpaper = pkgs.personal.static.wallpapers.nga-1973-68-1; importedStylix = extraArgs ? stylix; in { - imports = - lib.optional importedStylix extraArgs.stylix.nixosModules.stylix; + imports = lib.optional importedStylix extraArgs.stylix.nixosModules.stylix; options.personal.gui = { enable = lib.mkEnableOption "GUI"; |