diff --git a/docs/src/installation.md b/docs/src/installation.md
index 6c1df874..1bae6a83 100644
--- a/docs/src/installation.md
+++ b/docs/src/installation.md
@@ -41,7 +41,7 @@ will be unavailable.
## nix-darwin
You can install Stylix into your nix-darwin configuration in a similar fashion
-to NixOS via [Flakes][nix-flakes].
+to NixOS via [Flakes][nix-flakes].
```nix
{
diff --git a/docs/src/tricks.md b/docs/src/tricks.md
index 32e918d3..e6c1c522 100644
--- a/docs/src/tricks.md
+++ b/docs/src/tricks.md
@@ -24,7 +24,7 @@ in
## Dynamic wallpaper generation based on selected theme
-With imagemagick, you can also dynamically generate wallpapers based on the selected theme.
+With imagemagick, you can also dynamically generate wallpapers based on the selected theme.
Similarly, you can use a template image and repaint it for the current theme.
```nix
diff --git a/modules/avizo/hm.nix b/modules/avizo/hm.nix
index 07ff3194..e5403315 100644
--- a/modules/avizo/hm.nix
+++ b/modules/avizo/hm.nix
@@ -21,6 +21,6 @@ in
image-opacity = aviOpacity;
};
};
- };
+ };
});
}
diff --git a/modules/feh/hm.nix b/modules/feh/hm.nix
index 2eb30d0b..2c702ece 100644
--- a/modules/feh/hm.nix
+++ b/modules/feh/hm.nix
@@ -4,10 +4,10 @@
options.stylix.targets.feh.enable =
config.lib.stylix.mkEnableTarget
"the desktop background using Feh"
- (with config.xsession.windowManager; bspwm.enable
+ (with config.xsession.windowManager; bspwm.enable
|| herbstluftwm.enable
- || i3.enable
- || spectrwm.enable
+ || i3.enable
+ || spectrwm.enable
|| xmonad.enable);
config.xsession.initExtra =
diff --git a/modules/gnome/hm.nix b/modules/gnome/hm.nix
index e66d6741..ff2f3f5d 100644
--- a/modules/gnome/hm.nix
+++ b/modules/gnome/hm.nix
@@ -14,7 +14,7 @@ with lib;
picture-uri = "file://${config.stylix.image}";
picture-uri-dark = "file://${config.stylix.image}";
};
-
+
"org/gnome/desktop/interface" = with config.stylix.fonts ; {
# We show the same colours regardless of this setting, and the quick
# settings tile is removed. The value is still used by Epiphany to
diff --git a/modules/gnome/nixos.nix b/modules/gnome/nixos.nix
index 7d3bb51a..02fbaa7b 100644
--- a/modules/gnome/nixos.nix
+++ b/modules/gnome/nixos.nix
@@ -1,6 +1,6 @@
{ pkgs, config, ... }@args:
-let
+let
# We use this imported lib instead of the one from the module arguments
# to avoid infinite loops if the lib in arguments depends on nixpkgs.overlays
lib = (builtins.getFlake "github:nix-community/nixpkgs.lib/174d7dc67189bc4a53f1bffb4fb9d0f13b79cd3c").lib;
@@ -12,7 +12,7 @@ in {
lib.mkOption {
description = lib.mdDoc "Whether to style GNOME and GDM";
type = lib.types.bool;
- default = config.stylix.autoEnable
+ default = config.stylix.autoEnable
&& config.services.xserver.desktopManager.gnome.enable;
};
diff --git a/modules/gnome/shell_colors.patch b/modules/gnome/shell_colors.patch
index 7dc1c5db..d7816d16 100644
--- a/modules/gnome/shell_colors.patch
+++ b/modules/gnome/shell_colors.patch
@@ -15,7 +15,7 @@ index 5b117ea71..67e7ce756 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -168,9 +168,9 @@ stage {
-
+
// tooltip
%tooltip {
- background-color: transparentize(black, 0.1);
@@ -24,7 +24,7 @@ index 5b117ea71..67e7ce756 100644
+ background-color: transparentize($bg_color, 0.1);
+ border: 1px solid transparentize($base_color, 0.9);
+ color: $fg_color;
-
+
border-radius: 99px;
padding: $base_padding $base_padding * 2;
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
@@ -34,10 +34,10 @@ index 404c4dc81..f006b9347 100644
@@ -143,7 +143,7 @@
//
// since buttons are all flat an borderless now the mixin is simpler
-
+
-@mixin button($t, $tc:$fg_color, $c:$bg_color, $flat: false, $osd: false) {
+@mixin button($t, $tc:$fg_color, $c:$base_color, $flat: false, $osd: false) {
-
+
$button_bg_color: mix($tc, $c, $button_mix_factor);
transition-duration: 100ms;
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -51,7 +51,7 @@ index fc054da38..8e31741c1 100644
+
+ color: $fg_color !important;
}
-
+
/* Calendar */
@@ -220,7 +222,7 @@
.weather-forecast-time {
@@ -69,17 +69,17 @@ index 6e7b3be14..3f37fdef5 100644
@@ -1,11 +1,11 @@
/* Top Bar */
// a.k.a. the panel
-
+
-$privacy_indicator_color: $orange_3;
+$privacy_indicator_color: $warning_color;
-
+
-$panel_bg_color: if($variant == 'light', $light_3, $dark_5);
-$panel_fg_color: if($variant == 'light', $fg_color, darken($fg_color, 5%));
-$panel_border_color: if($variant == 'light', darken($panel_bg_color, 2%), $panel_bg_color);
+$panel_bg_color: $base_color;
+$panel_fg_color: $fg_color;
+$panel_border_color: transparentize($panel_bg_color, 0.9);
-
+
$panel_system_fg_color: $system_fg_color; // always light for lockscreen, overview and other transparent panels
$panel_height: 2.2em;
diff --git a/data/theme/gnome-shell-sass/widgets/_quick-settings.scss b/data/theme/gnome-shell-sass/widgets/_quick-settings.scss
@@ -101,5 +101,5 @@ index 723afe7db..b23062294 100644
+ background-color: $bg_color;
+ color: $fg_color;
}
-
+
& .title {
diff --git a/modules/mako/hm.nix b/modules/mako/hm.nix
index f3847a21..dc2f9a05 100644
--- a/modules/mako/hm.nix
+++ b/modules/mako/hm.nix
@@ -28,6 +28,6 @@ in {
border-color=${base0D}
text-color=${base08}
'';
- };
+ };
});
}
diff --git a/stylix/fromos.nix b/stylix/fromos.nix
index 05db258c..b9ee8869 100644
--- a/stylix/fromos.nix
+++ b/stylix/fromos.nix
@@ -2,7 +2,7 @@
path: default:
if ( args ? "osConfig"
- && args.osConfig ? "stylix"
+ && args.osConfig ? "stylix"
&& args.osConfig.stylix.homeManagerIntegration.followSystem)
then lib.attrByPath path default args.osConfig.stylix
else default
diff --git a/stylix/palette.html.mustache b/stylix/palette.html.mustache
index 0b5f9323..778ca742 100644
--- a/stylix/palette.html.mustache
+++ b/stylix/palette.html.mustache
@@ -65,4 +65,4 @@
Each color should be used as described in this table.
See the Stylix documentation for how to apply these colors on NixOS.
-