diff --git a/hosts/default/home.nix b/hosts/default/home.nix index ae9ee7d..29b8c2a 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -56,6 +56,7 @@ mullvad-vpn easyeffects transmission_4-gtk + imagemagick ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage diff --git a/modules/home-manager/themes/basic-gtk.nix b/modules/home-manager/themes/basic-gtk.nix index 0612f14..6d6bc88 100644 --- a/modules/home-manager/themes/basic-gtk.nix +++ b/modules/home-manager/themes/basic-gtk.nix @@ -3,8 +3,8 @@ { gtk.enable = true; - gtk.theme.package = lib.mkForce pkgs.adw-gtk3; - gtk.theme.name = lib.mkForce "adw-gtk3-dark"; + gtk.theme.package = lib.mkDefault pkgs.adw-gtk3; + gtk.theme.name = lib.mkDefault "adw-gtk3-dark"; gtk.iconTheme.package = pkgs.tela-circle-icon-theme; gtk.iconTheme.name = "Tela-circle-dark"; diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index a0de3bb..934c9c9 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -2,25 +2,29 @@ { environment.systemPackages = with pkgs.gnomeExtensions; [ - arcmenu caffeine - blur-my-shell dash-to-dock + gnome-40-ui-improvements + media-controls + search-light ]; - environment.gnome.excludePackages = with pkgs.gnome; [ - baobab - cheese - eog - epiphany - simple-scan - totem - yelp - evince - geary - seahorse - gnome-contacts - gnome-maps - gnome-music + environment.gnome.excludePackages = with pkgs; [ + gnome-tour + gedit + + gnome.baobab + gnome.cheese + gnome.eog + gnome.epiphany + gnome.simple-scan + gnome.totem + gnome.yelp + gnome.evince + gnome.geary + gnome.seahorse + gnome.gnome-contacts + gnome.gnome-maps + gnome.gnome-music ]; } \ No newline at end of file diff --git a/modules/nixos/stylix/kuromi.nix b/modules/nixos/stylix/kuromi.nix index e90f548..a433ed7 100644 --- a/modules/nixos/stylix/kuromi.nix +++ b/modules/nixos/stylix/kuromi.nix @@ -1,7 +1,10 @@ { pkgs, ... }: { + stylix.homeManagerIntegration.followSystem = true; + stylix.enable = true; + stylix.autoEnable = true; stylix.image = ./wallpapers/kuromi.jpg; stylix.cursor.package = pkgs.bibata-cursors; @@ -20,20 +23,20 @@ package = pkgs.dejavu_fonts; name = "Dejavu Serif"; }; - }; - stylix.fonts.sizes = { - applications = 12; - terminal = 15; - desktop = 10; - popups = 10; + sizes = { + applications = 12; + terminal = 15; + desktop = 10; + popups = 10; + }; }; stylix.opacity = { - applications = 1.0; - terminal = 1.0; - desktop = 1.0; - popups = 1.0; + applications = 0.9; + terminal = 0.9; + desktop = 0.5; + popups = 0.9; }; stylix.polarity = "dark";