From 9ca2817610ecf49d40d1771d18a5b7cedb954db8 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sun, 1 Jun 2025 16:15:50 +1000 Subject: [PATCH] tidied `home.nix` --- home/default.nix | 11 ++++++++--- home/resources/themes/default.nix | 25 +------------------------ 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/home/default.nix b/home/default.nix index 17cb146..724f5eb 100755 --- a/home/default.nix +++ b/home/default.nix @@ -68,9 +68,14 @@ in { ./home.nix ]; home = { - username = "${primaryUser}"; - homeDirectory = "${homeDir}"; - stateVersion = "24.11"; + username = "${primaryUser}"; # passes username from `flake.nix` + homeDirectory = "${homeDir}"; # passes homedir from `flake.nix` + file."Wallpapers" = { # copies wallpapers from flake to home directory + source = ../wallpapers; + target = "${wallpapersPath}"; + recursive = true; + }; + stateVersion = "24.11"; # IMPORTANT }; }; }; diff --git a/home/resources/themes/default.nix b/home/resources/themes/default.nix index d0969ea..7a8dc71 100755 --- a/home/resources/themes/default.nix +++ b/home/resources/themes/default.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, lib, config, flakePath, disksPath, primaryUser, homeDir, wallpapersPath, wallpaper, ... }: +{ lib, config, ... }: with lib; @@ -8,29 +8,6 @@ with lib; ./themepkgs.nix # imports declared theme packages ]; - home-manager = { - extraSpecialArgs = { - inherit inputs outputs; - inherit label version; - inherit flakePath disksPath; - inherit primaryUser homeDir; - inherit wallpapersPath wallpaper; - inherit hostname; - }; - users = { - ${primaryUser} = { - imports = [ ]; - home = { - file."Wallpapers" = { # copies wallpapers from flake to home directory - source = ../wallpapers; - target = "${wallpapersPath}"; - recursive = true; - }; - }; - }; - }; - }; - ## Configurable options for themes options.theme = {