tweak: trying out let-bound user declarations
This commit is contained in:
parent
917296389c
commit
2c1ea58ff7
4 changed files with 117 additions and 12 deletions
|
|
@ -29,6 +29,7 @@
|
||||||
#virtualisation
|
#virtualisation
|
||||||
|
|
||||||
# users to include on host
|
# users to include on host
|
||||||
|
user-options
|
||||||
serenity
|
serenity
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
81
modules/system/user-options.nix
Normal file
81
modules/system/user-options.nix
Normal file
|
|
@ -0,0 +1,81 @@
|
||||||
|
# User Options Module
|
||||||
|
#
|
||||||
|
# This module defines the core user-level configuration options that are used
|
||||||
|
# throughout the system. These options provide a centralized way to configure
|
||||||
|
# user-specific settings without modifying individual modules.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# Set these options in your host configuration (e.g., hosts/Desktop/modules/userOptions.nix):
|
||||||
|
#
|
||||||
|
# config.userOptions = {
|
||||||
|
# username = "myuser";
|
||||||
|
# hostName = "myhost";
|
||||||
|
# browser = "firefox";
|
||||||
|
# colorScheme = "kanagawa";
|
||||||
|
# wallpaper = "kanagawa.png";
|
||||||
|
# dots = "/home/myuser/.dotfiles";
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# These options are then accessible throughout all modules via `config.userOptions.*`
|
||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
# user options module declaration
|
||||||
|
flake.nixosModules.user-options =
|
||||||
|
{ lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
# list of per user options available
|
||||||
|
options.userOptions = {
|
||||||
|
|
||||||
|
# currently unused
|
||||||
|
colorScheme = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = ''
|
||||||
|
The base16 color scheme name for Stylix theming.
|
||||||
|
This will be used to theme all compatible applications system-wide.
|
||||||
|
|
||||||
|
Available schemes: https://github.com/tinted-theming/schemes
|
||||||
|
Popular options: "kanagawa", "catppuccin-macchiato", "tokyo-night", "gruvbox-dark-medium", "nord"
|
||||||
|
'';
|
||||||
|
example = "kanagawa";
|
||||||
|
};
|
||||||
|
|
||||||
|
# where config is stored
|
||||||
|
dots = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = ''
|
||||||
|
The absolute path to the dotfiles repository (flake root).
|
||||||
|
Used by various modules to reference assets and configuration files.
|
||||||
|
'';
|
||||||
|
example = "/home/user/.dotfiles";
|
||||||
|
};
|
||||||
|
|
||||||
|
# username to use
|
||||||
|
username = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = ''
|
||||||
|
The primary user's username for this system.
|
||||||
|
This is used throughout the configuration for Home Manager and user-specific settings.
|
||||||
|
'';
|
||||||
|
example = "myuser";
|
||||||
|
};
|
||||||
|
|
||||||
|
# wallpaper to use
|
||||||
|
wallpaper = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = ''
|
||||||
|
The wallpaper filename (without path).
|
||||||
|
The file should be located in the assets/ directory of this repository.
|
||||||
|
Stylix will use this wallpaper and can optionally generate colors from it.
|
||||||
|
'';
|
||||||
|
example = "kanagawa.png";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,21 +1,18 @@
|
||||||
{ self, inputs, ... }:
|
{ self, inputs, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
# configure user here
|
|
||||||
user = "serenity";
|
|
||||||
avatar = "../../assets/media/avatar.png";
|
|
||||||
wallpaper = "../../assets/media/wallpapers/mimaKirigoe.jpg";
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
# user module declaration
|
# user module declaration
|
||||||
flake.nixosModules.${user} =
|
flake.nixosModules.serenity =
|
||||||
|
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
username = config.user-options.username;
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -23,13 +20,23 @@ in
|
||||||
# necessary for home manager function
|
# necessary for home manager function
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
|
||||||
|
# necessary for multi-user functionality
|
||||||
|
#self.nixosModules.user-options
|
||||||
|
|
||||||
# select user theme
|
# select user theme
|
||||||
self.nixosModules.theme-autogen
|
self.nixosModules.theme-autogen
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# configure user here
|
||||||
|
config.user-options = {
|
||||||
|
username = "serenity";
|
||||||
|
dots = "/home/serenity/SerenityOS";
|
||||||
|
# see `modules/features/stylix.nix` for theme declared above
|
||||||
|
};
|
||||||
|
|
||||||
# nixos user declaration
|
# nixos user declaration
|
||||||
users.users.${user} = {
|
users.users.${username} = {
|
||||||
|
|
||||||
# remember to change this
|
# remember to change this
|
||||||
initialPassword = "password";
|
initialPassword = "password";
|
||||||
|
|
@ -58,7 +65,7 @@ in
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
|
|
||||||
# home manager user declaration
|
# home manager user declaration
|
||||||
users.${user} = {
|
users.${username} = {
|
||||||
home.stateVersion = "24.11";
|
home.stateVersion = "24.11";
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
16
modules/users/userOptions.nix
Normal file
16
modules/users/userOptions.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
flake.nixosModules.hostDesktopModulesUserOptions =
|
||||||
|
{ config, ... }:
|
||||||
|
{
|
||||||
|
config.userOptions = {
|
||||||
|
browser = "brave";
|
||||||
|
colorScheme = "gruvbox-dark-hard";
|
||||||
|
discordClient = "legcord";
|
||||||
|
dots = "/home/${config.userOptions.username}/dotfiles";
|
||||||
|
hostName = "Desktop";
|
||||||
|
username = "v3rm1n";
|
||||||
|
wallpaper = "rocket.png";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue