diff --git a/home/common/default.nix b/home/common/default.nix index 54b2a99..56fc479 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -4,7 +4,6 @@ _: ./core.nix ./automount.nix ./mime.nix - ./gnome ./shell ./programs ]; diff --git a/home/common/gnome/default.nix b/home/common/gnome/default.nix deleted file mode 100644 index 2f11cfb..0000000 --- a/home/common/gnome/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ pkgs, ... }: -{ - stylix.targets.gtk.enable = false; - dconf = { - enable = true; - settings = { - "org/gnome/shell" = { - disable-user-extensions = false; # enables user extensions - enabled-extensions = [ - pkgs.gnomeExtensions.appindicator.extensionUuid - ]; - }; - "org/gnome/desktop/input-sources" = { - xkb-options = [ "compose:ralt" ]; - }; - }; - }; - home.packages = with pkgs.gnomeExtensions; [ - appindicator - ]; - programs.gnome-terminal = { - enable = true; - showMenubar = false; - profile = { - "4621184a-b921-42cf-80a0-7784516606f2" = { - default = true; - audibleBell = false; - allowBold = true; - visibleName = "nezia"; - font = "IntoneMono NF 14"; - }; - }; - }; -} - diff --git a/modules/gnome.nix b/modules/gnome.nix index 7915755..fb0e055 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, username, ... }: let cfg = config.modules.gnome; stylixEnabled = config.modules.stylix.enable or false; @@ -31,8 +31,11 @@ in gnome-power-manager ]; stylix = lib.mkIf stylixEnabled { - # disable plymouth to look more consistent with a gtk desktop - targets.plymouth.enable = false; + targets = { + plymouth.enable = false; + gtk.enable = false; + gnome.enable = false; + }; fonts = { sansSerif = { package = pkgs.inter; @@ -41,6 +44,41 @@ in serif = config.stylix.fonts.sansSerif; }; }; + home-manager.users.${username} = { + stylix = lib.mkIf stylixEnabled { + targets.gtk.enable = false; + }; + dconf = { + enable = true; + settings = { + "org/gnome/shell" = { + disable-user-extensions = false; # enables user extensions + enabled-extensions = [ + pkgs.gnomeExtensions.appindicator.extensionUuid + ]; + }; + "org/gnome/desktop/input-sources" = { + xkb-options = [ "compose:ralt" ]; + }; + }; + }; + home.packages = with pkgs.gnomeExtensions; [ + appindicator + ]; + programs.gnome-terminal = { + enable = true; + showMenubar = false; + profile = { + "4621184a-b921-42cf-80a0-7784516606f2" = { + default = true; + audibleBell = false; + allowBold = true; + visibleName = "${username}"; + font = "IntoneMono NF 14"; + }; + }; + }; + }; }; }