From 3689e04465ce81acffc024fe0319e7a6fc989db5 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sat, 15 Mar 2025 20:26:46 +1000 Subject: [PATCH] tweaked theme maybe hopefully it works --- flake.nix | 12 ++++++------ home/default.nix | 6 +++--- home/resources/themes/SerenityOS.nix | 10 ++++++---- home/scripts/startup.nix | 3 --- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index f1924e7..2d60402 100755 --- a/flake.nix +++ b/flake.nix @@ -134,8 +134,8 @@ disksPath = "${homeDir}/Disks/"; # for easy disk navigation flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake - unused #flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release - wallpaper = - "${flakePath}/home/resources/wallpapers/almondBlossoms-VanGogh.jpg"; + wallpapersPath = "${homeDir}/Pictures/Wallpapers"; + wallpaper = "${wallpapersPath}/almondBlossoms-VanGogh.jpg"; in { @@ -149,7 +149,7 @@ inherit label version; inherit flakePath disksPath; inherit primaryUser userDesc homeDir; - inherit wallpaper; + inherit wallpapersPath wallpaper; }; modules = [ sops-nix.nixosModules.sops @@ -166,7 +166,7 @@ inherit label version; inherit flakePath disksPath; inherit primaryUser userDesc homeDir; - inherit wallpaper; + inherit wallpapersPath wallpaper; }; modules = [ sops-nix.nixosModules.sops @@ -182,7 +182,7 @@ inherit label version; inherit flakePath disksPath; inherit primaryUser userDesc homeDir; - inherit wallpaper; + inherit wallpapersPath wallpaper; }; modules = [ sops-nix.nixosModules.sops @@ -204,7 +204,7 @@ inherit label version; inherit flakePath disksPath; inherit primaryUser userDesc homeDir; - inherit wallpaper; + inherit wallpapersPath wallpaper; }; modules = [ sops-nix.nixosModules.sops diff --git a/home/default.nix b/home/default.nix index acbd6a7..4bf9555 100755 --- a/home/default.nix +++ b/home/default.nix @@ -1,5 +1,5 @@ { inputs, outputs, config, pkgs, label, version, flakePath, disksPath -, primaryUser, userDesc, homeDir, wallpaper, ... }: +, primaryUser, userDesc, homeDir, wallpapersPath, wallpaper, ... }: let hostname = "${config.networking.hostName}"; @@ -53,7 +53,7 @@ in { inherit label version; inherit flakePath disksPath; inherit primaryUser homeDir; - inherit wallpaper; + inherit wallpapersPath wallpaper; inherit hostname; }; users = { @@ -74,7 +74,7 @@ in { ## Copies wallpapers from flake to ${homeDir} file."Wallpapers" = { source = ./resources/wallpapers; - target = "${homeDir}/Wallpapers"; + target = "${wallpapersPath}"; recursive = true; }; }; diff --git a/home/resources/themes/SerenityOS.nix b/home/resources/themes/SerenityOS.nix index daae536..33d3bdf 100755 --- a/home/resources/themes/SerenityOS.nix +++ b/home/resources/themes/SerenityOS.nix @@ -1,14 +1,16 @@ +{ config, wallpapersPath, wallpaper, ... }: + { imports = [ #./template.nix ]; theme = { - wallpaper = "../wallpapers/almondBlossoms-VanGogh.jpg"; - lockscreenWallpaper = "../wallpapers/attunement-HelveticaBlanc.png"; + wallpaper = "${wallpaper}"; + lockscreenWallpaper = "${wallpapersPath}/attunement-HelveticaBlanc.png"; waybar-transparent = true; - font-mono = "spleen 32x64"; - font = "spleen 32x64"; + font-mono = "Spleen-32x64"; + font = "Spleen-32x64"; rounding = 18; gaps-in = 4; gaps-out = 8; diff --git a/home/scripts/startup.nix b/home/scripts/startup.nix index dd495ee..064e956 100755 --- a/home/scripts/startup.nix +++ b/home/scripts/startup.nix @@ -2,7 +2,6 @@ let startup = pkgs.writeShellScriptBin "startup" '' - # Because HM enabling services suck. systemctl --user start sops-nix @@ -20,8 +19,6 @@ let easyeffects nicotine-plus - - vesktop ''; in { home.packages = [ startup startupExtra ]; }