mirror of
https://github.com/librephoenix/nixos-config
synced 2025-04-21 01:34:34 +05:30
System-level + home-manager stylix works now!
This commit is contained in:
parent
f7c2b21b09
commit
b752902ef4
|
@ -74,10 +74,12 @@
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
./system/configuration.nix
|
./system/configuration.nix
|
||||||
# stylix.nixosModules.stylix # complains that home-manager is not defined
|
./system/style/stylix.nix
|
||||||
|
stylix.nixosModules.stylix
|
||||||
];
|
];
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
myTheme = theme;
|
myTheme = theme;
|
||||||
|
myThemePolarity = themePolarity;
|
||||||
myBackgroundUrl = backgroundUrl;
|
myBackgroundUrl = backgroundUrl;
|
||||||
myBackgroundSha256 = backgroundSha256;
|
myBackgroundSha256 = backgroundSha256;
|
||||||
};
|
};
|
||||||
|
|
|
@ -110,12 +110,6 @@
|
||||||
displayManager = {
|
displayManager = {
|
||||||
lightdm.enable = true;
|
lightdm.enable = true;
|
||||||
defaultSession = "none+xmonad";
|
defaultSession = "none+xmonad";
|
||||||
lightdm.greeters.slick.enable = true;
|
|
||||||
lightdm.background = pkgs.fetchurl {
|
|
||||||
url = myBackgroundUrl;
|
|
||||||
sha256 = myBackgroundSha256;
|
|
||||||
};
|
|
||||||
lightdm.greeters.slick.theme.name = "Adwaita-dark";
|
|
||||||
};
|
};
|
||||||
libinput = {
|
libinput = {
|
||||||
touchpad.disableWhileTyping = true;
|
touchpad.disableWhileTyping = true;
|
||||||
|
|
|
@ -1,33 +1,43 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, myTheme, myThemePolarity, myBackgroundUrl, myBackgroundSha256, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
myFont = "Inconsolata";
|
myFont = "Inconsolata";
|
||||||
myFontPkg = pkgs.inconsolata;
|
myFontPkg = pkgs.inconsolata;
|
||||||
|
myThemePath = "../../../themes/"+myTheme+"/"+myTheme+".yaml";
|
||||||
|
myLightDMTheme = if myThemePolarity == "light" then "Adwaita" else "Adwaita-dark";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#stylix.autoEnable = false;
|
stylix.autoEnable = false;
|
||||||
#stylix.polarity = "dark";
|
stylix.polarity = myThemePolarity;
|
||||||
# stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-dark-night.yaml";
|
stylix.image = pkgs.fetchurl {
|
||||||
#stylix.fonts = {
|
url = myBackgroundUrl;
|
||||||
# monospace = {
|
sha256 = myBackgroundSha256;
|
||||||
# name = myFont;
|
};
|
||||||
# package = myFontPkg;
|
stylix.base16Scheme = ./. + myThemePath;
|
||||||
# };
|
stylix.fonts = {
|
||||||
# serif = {
|
monospace = {
|
||||||
# name = myFont;
|
name = myFont;
|
||||||
# package = myFontPkg;
|
package = myFontPkg;
|
||||||
# };
|
};
|
||||||
# sansSerif = {
|
serif = {
|
||||||
# name = myFont;
|
name = myFont;
|
||||||
# package = myFontPkg;
|
package = myFontPkg;
|
||||||
# };
|
};
|
||||||
# emoji = {
|
sansSerif = {
|
||||||
# name = "Noto Color Emoji";
|
name = myFont;
|
||||||
# package = pkgs.noto-fonts-emoji-blob-bin;
|
package = myFontPkg;
|
||||||
# };
|
};
|
||||||
#};
|
emoji = {
|
||||||
#
|
name = "Noto Color Emoji";
|
||||||
# stylix.targets.grub.enable = true;
|
package = pkgs.noto-fonts-emoji-blob-bin;
|
||||||
# stylix.targets.lightdm.enable = true;
|
};
|
||||||
# stylix.targets.console.enable = true;
|
};
|
||||||
|
|
||||||
|
stylix.targets.lightdm.enable = true;
|
||||||
|
services.xserver.displayManager.lightdm = {
|
||||||
|
greeters.slick.enable = true;
|
||||||
|
greeters.slick.theme.name = myLightDMTheme;
|
||||||
|
};
|
||||||
|
stylix.targets.console.enable = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue