deleted generated files
This commit is contained in:
+60
-27
@@ -1071,14 +1071,14 @@ settings = {
|
||||
** =generated/modules/desktop/wayland.nix=
|
||||
This file sets up wayland
|
||||
#+BEGIN_SRC nix :tangle generated/modules/desktop/wayland.nix :noweb tangle :mkdirp yes :eval never-html
|
||||
{ lib, config, ... }:
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
|
||||
let
|
||||
# --- Program definition ---
|
||||
programName = "wayland";
|
||||
programName = "stylix";
|
||||
|
||||
# Assets (optional, kept for consistency with template)
|
||||
programAssets = ../../../assets/system/conf/${programName};
|
||||
# Assets (theme + wallpaper)
|
||||
programAssets = "${flakeRoot}/assets/system/theming/${programName}";
|
||||
programFiles =
|
||||
if builtins.pathExists programAssets
|
||||
then builtins.readDir programAssets
|
||||
@@ -1087,16 +1087,53 @@ let
|
||||
src = "${programAssets}/${name}";
|
||||
});
|
||||
|
||||
# Enable toggle (must match option name)
|
||||
enableProgram = config.enableWayland or true;
|
||||
# Enable toggle (must match option)
|
||||
enableProgram = config.enableStylix or true;
|
||||
|
||||
# Resolve user safely (outside mkIf)
|
||||
user = config.defaultUser or "henrov";
|
||||
|
||||
# --- Stylix configuration (self-contained) ---
|
||||
stylixCfg = {
|
||||
enable = true;
|
||||
|
||||
base16Scheme =
|
||||
"${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
|
||||
|
||||
image =
|
||||
"${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg";
|
||||
|
||||
polarity = "dark";
|
||||
|
||||
cursor = {
|
||||
package = pkgs.phinger-cursors;
|
||||
name = "phinger-cursors-light";
|
||||
size = 24;
|
||||
};
|
||||
|
||||
fonts = {
|
||||
monospace = {
|
||||
package = pkgs.nerd-fonts.fira-code;
|
||||
name = "Fira Code Nerd Font";
|
||||
};
|
||||
sansSerif = {
|
||||
package = pkgs.lato;
|
||||
name = "Lato";
|
||||
};
|
||||
};
|
||||
|
||||
icons = {
|
||||
enable = true;
|
||||
package = pkgs.papirus-icon-theme;
|
||||
dark = "Papirus-Dark";
|
||||
light = "Papirus-Light";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
# --- Option ---
|
||||
options.enableWayland =
|
||||
lib.mkEnableOption "Enable Wayland + portals";
|
||||
options.enableStylix =
|
||||
lib.mkEnableOption "Enable Stylix system theming";
|
||||
|
||||
# --- Config ---
|
||||
config = lib.mkIf enableProgram {
|
||||
@@ -1108,29 +1145,25 @@ in
|
||||
files = files;
|
||||
inherit user;
|
||||
|
||||
# Wayland-specific metadata
|
||||
portals = [ "hyprland" ];
|
||||
theme = "catppuccin-mocha";
|
||||
polarity = "dark";
|
||||
};
|
||||
|
||||
# --- Actual system wiring ---
|
||||
home-manager.users.${user} = {
|
||||
# --- Stylix theming ---
|
||||
stylix = stylixCfg;
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
# --- Optional: wallpaper helper (kept dendritic) ---
|
||||
myApps.wallpaper = {
|
||||
enable = true;
|
||||
packages = [ "feh" "st" ];
|
||||
};
|
||||
|
||||
# pkgs is unavoidable here (real package dependency)
|
||||
extraPortals = [
|
||||
config.pkgs.xdg-desktop-portal-hyprland
|
||||
];
|
||||
|
||||
config.hyprland = {
|
||||
"org.freedesktop.impl.portal.Screencast" = [ "hyprland" ];
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
config.pkgs.uwsm
|
||||
];
|
||||
# --- Cursor environment variables ---
|
||||
home-manager.users.${user}.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