From a8c4c650bf3558e40ec183ad8c415373e678b590 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Fri, 27 Dec 2024 17:13:02 +1000 Subject: [PATCH] updated `home/desktop` --- flake.nix | 6 ------ home/scripts/automount/default.nix | 2 +- home/users/default.nix | 10 +++++----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index fc79bf7..2fcdd83 100755 --- a/flake.nix +++ b/flake.nix @@ -123,19 +123,13 @@ inherit (self) outputs; - ## Universal variable declarations - primaryUser = "serenity"; # used for admin purposes homeDir = "/home/${primaryUser}"; # for easy configuration - disksPath = "${homeDir}/Disks/"; flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake #flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release - - - in { ## Installer for easy nuke-n-paves diff --git a/home/scripts/automount/default.nix b/home/scripts/automount/default.nix index 00ce6c6..346d039 100755 --- a/home/scripts/automount/default.nix +++ b/home/scripts/automount/default.nix @@ -2,7 +2,7 @@ ## https://nix-community.github.io/home-manager/options.xhtml#opt-home.file ## https://nix-community.github.io/home-manager/options.xhtml#opt-home.activation -{ disksPath, ... }: +{ flakePath, disksPath, ... }: { diff --git a/home/users/default.nix b/home/users/default.nix index e253681..af2cb17 100755 --- a/home/users/default.nix +++ b/home/users/default.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, config, pkgs, flakePath, disksPath, primaryUser, ... }: +{ inputs, outputs, config, pkgs, flakePath, disksPath, primaryUser, homeDir, ... }: let hostname = "${config.networking.hostName}"; @@ -13,7 +13,7 @@ in #../../home # home-manager configuration ## Users - #./u-serenity.nix + #./u-username.nix ## User themes - ## to set a different theme for a user, @@ -51,9 +51,9 @@ in verbose = true; # enables verbose output on activation extraSpecialArgs = { # passes in specialArgs from flake.nix inherit inputs outputs; - inherit primaryUser; - inherit hostname; inherit flakePath disksPath; + inherit primaryUser homeDir; + inherit hostname; }; users = { ${primaryUser} = { @@ -69,7 +69,7 @@ in ]; home = { username = "${primaryUser}"; - homeDirectory = "/home/${primaryUser}"; + homeDirectory = "${homeDir}"; }; }; };