updated home/desktop

This commit is contained in:
serenity-F 2024-12-27 17:13:02 +10:00
parent 29040fdbb8
commit a8c4c650bf
3 changed files with 6 additions and 12 deletions

View file

@ -123,19 +123,13 @@
inherit (self) outputs; inherit (self) outputs;
## Universal variable declarations ## Universal variable declarations
primaryUser = "serenity"; # used for admin purposes primaryUser = "serenity"; # used for admin purposes
homeDir = "/home/${primaryUser}"; # for easy configuration homeDir = "/home/${primaryUser}"; # for easy configuration
disksPath = "${homeDir}/Disks/"; disksPath = "${homeDir}/Disks/";
flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake
#flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release #flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release
in { in {
## Installer for easy nuke-n-paves ## Installer for easy nuke-n-paves

View file

@ -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.file
## https://nix-community.github.io/home-manager/options.xhtml#opt-home.activation ## https://nix-community.github.io/home-manager/options.xhtml#opt-home.activation
{ disksPath, ... }: { flakePath, disksPath, ... }:
{ {

View file

@ -1,4 +1,4 @@
{ inputs, outputs, config, pkgs, flakePath, disksPath, primaryUser, ... }: { inputs, outputs, config, pkgs, flakePath, disksPath, primaryUser, homeDir, ... }:
let let
hostname = "${config.networking.hostName}"; hostname = "${config.networking.hostName}";
@ -13,7 +13,7 @@ in
#../../home # home-manager configuration #../../home # home-manager configuration
## Users ## Users
#./u-serenity.nix #./u-username.nix
## User themes - ## User themes -
## to set a different theme for a user, ## to set a different theme for a user,
@ -51,9 +51,9 @@ in
verbose = true; # enables verbose output on activation verbose = true; # enables verbose output on activation
extraSpecialArgs = { # passes in specialArgs from flake.nix extraSpecialArgs = { # passes in specialArgs from flake.nix
inherit inputs outputs; inherit inputs outputs;
inherit primaryUser;
inherit hostname;
inherit flakePath disksPath; inherit flakePath disksPath;
inherit primaryUser homeDir;
inherit hostname;
}; };
users = { users = {
${primaryUser} = { ${primaryUser} = {
@ -69,7 +69,7 @@ in
]; ];
home = { home = {
username = "${primaryUser}"; username = "${primaryUser}";
homeDirectory = "/home/${primaryUser}"; homeDirectory = "${homeDir}";
}; };
}; };
}; };