From b6915ab9888cbb36f2627d36c5ffac337f7f5050 Mon Sep 17 00:00:00 2001 From: GarandPLG Date: Thu, 14 May 2026 19:15:41 +0200 Subject: [PATCH] Set default wallpaper to Attack-on-Titan-2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Updated host variables files to select Attack-on-Titan-2.jpg and added rating comments. - Simplified boot.nix by removing host‑specific imports and configuring limine via package, resolution, and branding color. - Added limine target support in stylix with color, image, and tile scaling options. - Removed the unused noctalia colors module and its import. - Adjusted noctalia wallpaper settings to use config.stylix.image instead of a host import. --- hosts/Garand-Desktop/variables.nix | 30 ++++++++--------- hosts/Garand-Laptop/variables.nix | 30 ++++++++--------- hosts/default/variables.nix | 30 ++++++++--------- modules/core/boot.nix | 21 ++++-------- modules/core/stylix.nix | 9 +++++ modules/home/noctalia/colors.nix | 33 ------------------- modules/home/noctalia/default.nix | 1 - modules/home/noctalia/settings/wallpapers.nix | 8 ++--- modules/home/stylix.nix | 2 +- 9 files changed, 64 insertions(+), 100 deletions(-) delete mode 100644 modules/home/noctalia/colors.nix diff --git a/hosts/Garand-Desktop/variables.nix b/hosts/Garand-Desktop/variables.nix index 2263a6b..8d69960 100644 --- a/hosts/Garand-Desktop/variables.nix +++ b/hosts/Garand-Desktop/variables.nix @@ -42,21 +42,21 @@ # This will set your color palette # Default background # Add new images to ~/garandos/wallpapers - stylixImage = "Attack-on-Titan-1.jpg"; - # stylixImage = "Attack-on-Titan-2.jpg"; - # stylixImage = "Attack-on-Titan-3.jpg"; - # stylixImage = "Avatar-1.jpg"; - # stylixImage = "Avatar-2.jpg"; - # stylixImage = "Avatar-3.png"; - # stylixImage = "Avatar-4.jpg"; - # stylixImage = "Edge-of-Tomorrow-1.jpg"; - # stylixImage = "Friren-1.jpg"; - # stylixImage = "Friren-2.jpg"; - # stylixImage = "Friren-3.jpg"; - # stylixImage = "Jablon.png"; - # stylixImage = "Song-of-the-Sea-1.jpg"; - # stylixImage = "Wolfwalkers-1.jpg"; - # stylixImage = "Wolfwalkers-2.jpg"; + # stylixImage = "Attack-on-Titan-1.jpg"; # og/10 + stylixImage = "Attack-on-Titan-2.jpg"; # 9/10 + # stylixImage = "Attack-on-Titan-3.jpg"; # 7.5/10 + # stylixImage = "Avatar-1.jpg"; # 5/10 + # stylixImage = "Avatar-2.jpg"; # 4/10 + # stylixImage = "Avatar-3.jpg"; # 2/10 + # stylixImage = "Avatar-4.jpg"; # 3/10 + # stylixImage = "Edge-of-Tomorrow-1.jpg"; # 2/10 + # stylixImage = "Friren-1.jpg"; # 6.5/10 + # stylixImage = "Friren-2.jpg"; # 2/10 + # stylixImage = "Friren-3.jpg"; # 4/10 + # stylixImage = "Jablon.png"; # 1/10 + # stylixImage = "Song-of-the-Sea-1.jpg"; # 3/10 + # stylixImage = "Wolfwalkers-1.jpg"; # 6/10 + # stylixImage = "Wolfwalkers-2.jpg"; # 5/10 # Set network hostId if required (needed for zfs) # Otherwise leave as-is diff --git a/hosts/Garand-Laptop/variables.nix b/hosts/Garand-Laptop/variables.nix index 7d16cd2..76d80dd 100644 --- a/hosts/Garand-Laptop/variables.nix +++ b/hosts/Garand-Laptop/variables.nix @@ -39,21 +39,21 @@ # This will set your color palette # Default background # Add new images to ~/garandos/wallpapers - stylixImage = "Attack-on-Titan-1.jpg"; - # stylixImage = "Attack-on-Titan-2.jpg"; - # stylixImage = "Attack-on-Titan-3.jpg"; - # stylixImage = "Avatar-1.jpg"; - # stylixImage = "Avatar-2.jpg"; - # stylixImage = "Avatar-3.png"; - # stylixImage = "Avatar-4.jpg"; - # stylixImage = "Edge-of-Tomorrow-1.jpg"; - # stylixImage = "Friren-1.jpg"; - # stylixImage = "Friren-2.jpg"; - # stylixImage = "Friren-3.jpg"; - # stylixImage = "Jablon.png"; - # stylixImage = "Song-of-the-Sea-1.jpg"; - # stylixImage = "Wolfwalkers-1.jpg"; - # stylixImage = "Wolfwalkers-2.jpg"; + # stylixImage = "Attack-on-Titan-1.jpg"; # og/10 + stylixImage = "Attack-on-Titan-2.jpg"; # 9/10 + # stylixImage = "Attack-on-Titan-3.jpg"; # 7.5/10 + # stylixImage = "Avatar-1.jpg"; # 5/10 + # stylixImage = "Avatar-2.jpg"; # 4/10 + # stylixImage = "Avatar-3.jpg"; # 2/10 + # stylixImage = "Avatar-4.jpg"; # 3/10 + # stylixImage = "Edge-of-Tomorrow-1.jpg"; # 2/10 + # stylixImage = "Friren-1.jpg"; # 6.5/10 + # stylixImage = "Friren-2.jpg"; # 2/10 + # stylixImage = "Friren-3.jpg"; # 4/10 + # stylixImage = "Jablon.png"; # 1/10 + # stylixImage = "Song-of-the-Sea-1.jpg"; # 3/10 + # stylixImage = "Wolfwalkers-1.jpg"; # 6/10 + # stylixImage = "Wolfwalkers-2.jpg"; # 5/10 # Set network hostId if required (needed for zfs) # Otherwise leave as-is diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index 2556541..2d3973e 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -48,21 +48,21 @@ # This will set your color palette # Default background # Add new images to ~/garandos/wallpapers - stylixImage = "Attack-on-Titan-1.jpg"; - # stylixImage = "Attack-on-Titan-2.jpg"; - # stylixImage = "Attack-on-Titan-3.jpg"; - # stylixImage = "Avatar-1.jpg"; - # stylixImage = "Avatar-2.jpg"; - # stylixImage = "Avatar-3.png"; - # stylixImage = "Avatar-4.jpg"; - # stylixImage = "Edge-of-Tomorrow-1.jpg"; - # stylixImage = "Friren-1.jpg"; - # stylixImage = "Friren-2.jpg"; - # stylixImage = "Friren-3.jpg"; - # stylixImage = "Jablon.png"; - # stylixImage = "Song-of-the-Sea-1.jpg"; - # stylixImage = "Wolfwalkers-1.jpg"; - # stylixImage = "Wolfwalkers-2.jpg"; + # stylixImage = "Attack-on-Titan-1.jpg"; # og/10 + stylixImage = "Attack-on-Titan-2.jpg"; # 9/10 + # stylixImage = "Attack-on-Titan-3.jpg"; # 7.5/10 + # stylixImage = "Avatar-1.jpg"; # 5/10 + # stylixImage = "Avatar-2.jpg"; # 4/10 + # stylixImage = "Avatar-3.jpg"; # 2/10 + # stylixImage = "Avatar-4.jpg"; # 3/10 + # stylixImage = "Edge-of-Tomorrow-1.jpg"; # 2/10 + # stylixImage = "Friren-1.jpg"; # 6.5/10 + # stylixImage = "Friren-2.jpg"; # 2/10 + # stylixImage = "Friren-3.jpg"; # 4/10 + # stylixImage = "Jablon.png"; # 1/10 + # stylixImage = "Song-of-the-Sea-1.jpg"; # 3/10 + # stylixImage = "Wolfwalkers-1.jpg"; # 6/10 + # stylixImage = "Wolfwalkers-2.jpg"; # 5/10 # Set network hostId if required (needed for zfs) # Otherwise leave as-is diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 897f989..c9810c7 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -1,12 +1,8 @@ { pkgs, - host, config, - lib, ... -}: let - inherit (import ../../hosts/${host}/variables.nix) stylixImage; -in { +}: { boot = { kernelPackages = pkgs.linuxPackages_zen; kernelModules = ["v4l2loopback"]; @@ -18,16 +14,11 @@ in { efi.canTouchEfiVariables = true; limine = { enable = true; - style = { - wallpapers = [ - ./../../wallpapers/${stylixImage} - ]; - wallpaperStyle = lib.mkForce "centered"; - backdrop = "${config.stylix.base16Scheme.base00}"; - interface = { - branding = "GarandOS Bootloader"; - resolution = "1920x1080"; - }; + package = pkgs.limine; + resolution = "1920x1080"; + style.interface = { + branding = "GarandOS Bootloader"; + brandingColor = "${config.stylix.base16Scheme.base01}"; }; }; }; diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix index 128f862..ad8032c 100644 --- a/modules/core/stylix.nix +++ b/modules/core/stylix.nix @@ -36,5 +36,14 @@ in { popups = 12; }; }; + targets.limine = { + enable = true; + colors.enable = true; + image.enable = true; + imageScalingMode = { + enable = true; + override = "tile"; + }; + }; }; } diff --git a/modules/home/noctalia/colors.nix b/modules/home/noctalia/colors.nix deleted file mode 100644 index c9f001f..0000000 --- a/modules/home/noctalia/colors.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - config, - lib, - ... -}: let - stylix = config.stylix.base16Scheme; -in { - programs.noctalia-shell.colors = lib.mkForce { - mPrimary = "#${stylix.base04}"; - mOnPrimary = "#${stylix.base00}"; - - mSecondary = "#${stylix.base05}"; - mOnSecondary = "#${stylix.base00}"; - - mTertiary = "#${stylix.base03}"; - mOnTertiary = "#${stylix.base00}"; - - mError = "#${stylix.base02}"; - mOnError = "#${stylix.base00}"; - - mSurface = "#${stylix.base01}"; - mOnSurface = "#${stylix.base0E}"; - - mSurfaceVariant = "#${stylix.base00}"; - mOnSurfaceVariant = "#${stylix.base0A}"; - - mOutline = "#${stylix.base08}"; - mShadow = "#${stylix.base00}"; - - mOnHover = "#${stylix.base0B}"; - mHover = "#${stylix.base00}"; - }; -} diff --git a/modules/home/noctalia/default.nix b/modules/home/noctalia/default.nix index a46fd62..ce1f386 100644 --- a/modules/home/noctalia/default.nix +++ b/modules/home/noctalia/default.nix @@ -14,7 +14,6 @@ imports = [ ./settings - ./colors.nix ./plugins.nix ]; } diff --git a/modules/home/noctalia/settings/wallpapers.nix b/modules/home/noctalia/settings/wallpapers.nix index 77b7aca..3c68e96 100644 --- a/modules/home/noctalia/settings/wallpapers.nix +++ b/modules/home/noctalia/settings/wallpapers.nix @@ -1,11 +1,9 @@ { lib, - host, + config, username, ... -}: let - inherit (import ../../../../hosts/${host}/variables.nix) stylixImage; -in { +}: { programs.noctalia-shell.settings.wallpaper = lib.mkForce { enabled = true; overviewEnabled = false; @@ -42,6 +40,6 @@ in { }; home.file.".cache/noctalia/wallpapers.json".text = lib.mkForce (builtins.toJSON { - defaultWallpaper = ../../../../wallpapers/${stylixImage}; + defaultWallpaper = config.stylix.image; }); } diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index 0ad4135..260b4fd 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -5,10 +5,10 @@ vscode.enable = false; zed.enable = false; vesktop.enable = false; + noctalia-shell.enable = true; qt = { enable = true; platform = "qtct"; }; - noctalia-shell.enable = true; }; }