Working on reshuffling
This commit is contained in:
+30
-22
@@ -593,25 +593,17 @@ This sets the XDG implementation
|
|||||||
** =generated/modules/desktop/stylix.nix=
|
** =generated/modules/desktop/stylix.nix=
|
||||||
This sets the stylix implementation
|
This sets the stylix implementation
|
||||||
#+BEGIN_SRC nix :tangle generated/modules/desktop/stylix.nix :noweb tangle :mkdirp yes :eval never-html
|
#+BEGIN_SRC nix :tangle generated/modules/desktop/stylix.nix :noweb tangle :mkdirp yes :eval never-html
|
||||||
{ flakeRoot, config, lib, pkgs, ... }:
|
{ lib, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.mySystem.desktop.stylix;
|
username = "henrov";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
|
flake.nixosModules.stylix = { config, pkgs, lib, ... }:
|
||||||
|
|
||||||
options.mySystem.desktop.stylix.enable =
|
let
|
||||||
lib.mkEnableOption "Stylix System Theming";
|
# --- Default stylix config ---
|
||||||
|
stylixCfg = {
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
|
|
||||||
mySystem = {
|
|
||||||
apps.wallpaper = {
|
|
||||||
enable = true;
|
|
||||||
packages = [ "feh" "st" ]; # just symbolic names
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
stylix = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
|
base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
|
||||||
|
|
||||||
@@ -629,7 +621,6 @@ in {
|
|||||||
package = pkgs.nerd-fonts.fira-code;
|
package = pkgs.nerd-fonts.fira-code;
|
||||||
name = "Fira Code Nerd Font";
|
name = "Fira Code Nerd Font";
|
||||||
};
|
};
|
||||||
|
|
||||||
sansSerif = {
|
sansSerif = {
|
||||||
package = pkgs.lato;
|
package = pkgs.lato;
|
||||||
name = "Lato";
|
name = "Lato";
|
||||||
@@ -643,12 +634,29 @@ in {
|
|||||||
light = "Papirus-Light";
|
light = "Papirus-Light";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.mySystem.desktop.stylix.enable =
|
||||||
|
lib.mkEnableOption "Enable Stylix System Theming";
|
||||||
|
|
||||||
home-manager.users.henrov.home.sessionVariables = {
|
config = lib.mkIf (stylixCfg.enable or false) {
|
||||||
XCURSOR_THEME = config.stylix.cursor.name;
|
|
||||||
XCURSOR_SIZE = toString config.stylix.cursor.size;
|
# --- Desktop / wallpaper packages ---
|
||||||
HYPRCURSOR_THEME = config.stylix.cursor.name;
|
mySystem.apps.wallpaper = {
|
||||||
HYPRCURSOR_SIZE = toString config.stylix.cursor.size;
|
enable = true;
|
||||||
|
packages = [ "feh" "st" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# --- Stylix theming ---
|
||||||
|
stylix = stylixCfg;
|
||||||
|
|
||||||
|
# --- Home session variables ---
|
||||||
|
home-manager.users.${username}.home.sessionVariables = {
|
||||||
|
XCURSOR_THEME = stylixCfg.cursor.name;
|
||||||
|
XCURSOR_SIZE = toString stylixCfg.cursor.size;
|
||||||
|
HYPRCURSOR_THEME = stylixCfg.cursor.name;
|
||||||
|
HYPRCURSOR_SIZE = toString stylixCfg.cursor.size;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,14 @@
|
|||||||
{ flakeRoot, config, lib, pkgs, ... }:
|
{ lib, pkgs, flakeRoot, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.mySystem.desktop.stylix;
|
username = "henrov";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
|
flake.nixosModules.stylix = { config, pkgs, lib, ... }:
|
||||||
|
|
||||||
options.mySystem.desktop.stylix.enable =
|
let
|
||||||
lib.mkEnableOption "Stylix System Theming";
|
# --- Default stylix config ---
|
||||||
|
stylixCfg = {
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
|
|
||||||
mySystem = {
|
|
||||||
apps.wallpaper = {
|
|
||||||
enable = true;
|
|
||||||
packages = [ "feh" "st" ]; # just symbolic names
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
stylix = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
|
base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
|
||||||
|
|
||||||
@@ -34,7 +26,6 @@ in {
|
|||||||
package = pkgs.nerd-fonts.fira-code;
|
package = pkgs.nerd-fonts.fira-code;
|
||||||
name = "Fira Code Nerd Font";
|
name = "Fira Code Nerd Font";
|
||||||
};
|
};
|
||||||
|
|
||||||
sansSerif = {
|
sansSerif = {
|
||||||
package = pkgs.lato;
|
package = pkgs.lato;
|
||||||
name = "Lato";
|
name = "Lato";
|
||||||
@@ -48,12 +39,29 @@ in {
|
|||||||
light = "Papirus-Light";
|
light = "Papirus-Light";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.mySystem.desktop.stylix.enable =
|
||||||
|
lib.mkEnableOption "Enable Stylix System Theming";
|
||||||
|
|
||||||
home-manager.users.henrov.home.sessionVariables = {
|
config = lib.mkIf (stylixCfg.enable or false) {
|
||||||
XCURSOR_THEME = config.stylix.cursor.name;
|
|
||||||
XCURSOR_SIZE = toString config.stylix.cursor.size;
|
# --- Desktop / wallpaper packages ---
|
||||||
HYPRCURSOR_THEME = config.stylix.cursor.name;
|
mySystem.apps.wallpaper = {
|
||||||
HYPRCURSOR_SIZE = toString config.stylix.cursor.size;
|
enable = true;
|
||||||
|
packages = [ "feh" "st" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# --- Stylix theming ---
|
||||||
|
stylix = stylixCfg;
|
||||||
|
|
||||||
|
# --- Home session variables ---
|
||||||
|
home-manager.users.${username}.home.sessionVariables = {
|
||||||
|
XCURSOR_THEME = stylixCfg.cursor.name;
|
||||||
|
XCURSOR_SIZE = toString stylixCfg.cursor.size;
|
||||||
|
HYPRCURSOR_THEME = stylixCfg.cursor.name;
|
||||||
|
HYPRCURSOR_SIZE = toString stylixCfg.cursor.size;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user