From 689149d00449c02cf491416f233bc7b30b990d3f Mon Sep 17 00:00:00 2001 From: serenity-F Date: Thu, 17 Sep 2026 21:25:07 +1000 Subject: [PATCH] fix: inputs moment --- modules/features/desktop/niri.nix | 4 +- modules/features/desktop/noctalia.nix | 10 ++-- modules/hosts/hades/default.nix | 2 +- modules/system/core.nix | 6 +-- modules/users/options.nix | 69 --------------------------- modules/users/serenity.nix | 14 +++--- 6 files changed, 17 insertions(+), 88 deletions(-) delete mode 100644 modules/users/options.nix diff --git a/modules/features/desktop/niri.nix b/modules/features/desktop/niri.nix index b98af00..cfd5564 100644 --- a/modules/features/desktop/niri.nix +++ b/modules/features/desktop/niri.nix @@ -11,7 +11,7 @@ let - username = config.userOptions.username; + #username = config.userOptions.username; in @@ -48,7 +48,7 @@ }; # niri settings - home-manager.users.${username} = { + home-manager.users.serenity = { programs.niri = { settings = { diff --git a/modules/features/desktop/noctalia.nix b/modules/features/desktop/noctalia.nix index c2a2716..79ce72a 100644 --- a/modules/features/desktop/noctalia.nix +++ b/modules/features/desktop/noctalia.nix @@ -4,16 +4,16 @@ { config, lib, ... }: let - username = config.userOptions.username; - hostName = config.userOptions.hostName; - wallpaper = config.userOptions.wallpaper; + #username = config.userOptions.username; + #hostName = config.userOptions.hostName; + #wallpaper = config.userOptions.wallpaper; in { # for home manager functionality imports = [ inputs.home-manager.nixosModules.home-manager ]; - home-manager.users.${username} = { + home-manager.users.serenity = { imports = [ inputs.noctalia.homeModules.default ]; programs.noctalia-shell = { @@ -29,7 +29,7 @@ location = { }; - colorSchemes.predefinedscheme = "foobar"; + #colorSchemes.predefinedscheme = "foobar"; dock = { enabled = false; diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index aae3328..4bf229e 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -13,7 +13,7 @@ hadesHardware # user defined options - userOptions + #userOptions # users to include on host serenity diff --git a/modules/system/core.nix b/modules/system/core.nix index 0dbcb46..1778ad5 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -13,10 +13,10 @@ let # flakepath for QoL - flakePath = config.userOptions.flakePath; + #flakePath = config.userOptions.flakePath; # username - username = config.userOptions.username; + #username = config.userOptions.username; in @@ -66,7 +66,7 @@ backupFileExtension = ".bak"; useGlobalPkgs = true; useUserPackages = true; - users.${username} = { + users.serenity = { home.stateversion = "24.11"; nixpkgs.config.allowUnfree = true; }; diff --git a/modules/users/options.nix b/modules/users/options.nix deleted file mode 100644 index 460998a..0000000 --- a/modules/users/options.nix +++ /dev/null @@ -1,69 +0,0 @@ -# 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"; -# colorScheme = "kanagawa"; -# wallpaper = "kanagawa.png"; -# dots = "/home/myuser/.dotfiles"; -# }; -# -# These options are then accessible throughout all modules via `config.userOptions.*` -{ ... }: -{ - - flake.nixosModules.userOptions = - { lib, ... }: - - { - options.userOptions = { - - 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"; - }; - - flakePath = 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 = 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 = 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"; - }; - }; - }; -} diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix index e4bf12c..9853bc9 100644 --- a/modules/users/serenity.nix +++ b/modules/users/serenity.nix @@ -5,7 +5,12 @@ # user module declaration flake.nixosModules.serenity = - { config, pkgs, ... }: + { + inputs, + config, + pkgs, + ... + }: let @@ -19,13 +24,6 @@ # necessary for home manager function imports = [ inputs.home-manager.nixosModules.home-manager ]; - config.userOptions = { - username = "${user}"; - flakePath = "/home/${user}/SerenityOS"; - wallpaper = "attunement.png"; - colorScheme = "SerenityOS"; - }; - # user declaration users.users.${user} = {