From 63b1a690aa07383e969841b8ed03159c2a1dbd57 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sat, 16 Nov 2024 16:36:15 +1000 Subject: [PATCH] updated themes and user import sequence --- home/desktop/default.nix | 2 +- home/users/default.nix | 10 ++-------- home/users/u-serenity.nix | 17 ++++++----------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 07c8b62..346c696 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -5,7 +5,7 @@ imports = [ ## Import themes and scripts - ./themes + #./themes #./scripts ## Import common desktop configs diff --git a/home/users/default.nix b/home/users/default.nix index 68a0f1a..979ecf0 100644 --- a/home/users/default.nix +++ b/home/users/default.nix @@ -1,16 +1,10 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: +{ self, inputs, outputs, lib, config, pkgs, ... }: { imports = [ inputs.home-manager.nixosModules.default + ../desktop/resources/themes/default.nix ]; users.users = { diff --git a/home/users/u-serenity.nix b/home/users/u-serenity.nix index 54eac51..5445ca4 100644 --- a/home/users/u-serenity.nix +++ b/home/users/u-serenity.nix @@ -1,19 +1,14 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{ self, inputs, outputs, lib, config, pkgs, ... }: + +{ imports = [ - ../common - ../common/themes/SerenityOS.nix + ## Import user theme + ../desktop/resources/themes/SerenityOS.nix ]; home = { - + ## Declare user specific packages packages = with pkgs; [ ];