Merge Dev with main #21

Merged
Peritia-System merged 57 commits from Dev into main 2026-02-07 10:56:52 +01:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit 941b1bffe5 - Show all commits

View file

@ -7,7 +7,7 @@ in {
wallpaper = lib.mkOption { wallpaper = lib.mkOption {
description = "The wallpaper to use"; description = "The wallpaper to use";
type = lib.types.path; type = lib.types.path;
default = "${inputs.self}/Ressources/Images/Wallpapers/Wallpaper-1.png"; default = ../Ressources/Images/Wallpapers/Wallpaper-1.png;
}; };
}; };

View file

@ -1,14 +1,14 @@
{ inputs, config, lib, pkgs, ... }: let { inputs, config, lib, pkgs, ... }: let
cfg = config.nixos95; cfg = config.nixos95;
theme_dir = "${inputs.self}/Ressources/Themes"; root = ../.;
baseTheme = { baseTheme = {
name = "Chicago95"; name = "Chicago95";
package = pkgs.callPackage "${theme_dir}/Chicago95/chicago95.nix" { }; package = pkgs.callPackage "${root}/Ressources/Themes/Chicago95/chicago95.nix" { };
}; };
iconTheme = { iconTheme = {
name = "Win95_plus"; name = "Win95_plus";
package = pkgs.callPackage "${theme_dir}/Win95_plus/win95_plus.nix" { }; package = pkgs.callPackage "${root}/Ressources/Themes/Win95_plus/win95_plus.nix" { };
}; };
in lib.mkIf cfg.enable { in lib.mkIf cfg.enable {