Optimized some specialArgs and module argument use

This commit is contained in:
Emmet 2024-01-18 15:36:52 -06:00
parent 2d75530b6d
commit 18c8365f40
76 changed files with 282 additions and 284 deletions

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, lib, pkgs, blocklist-hosts, username, name, hostname, timezone, locale, wm, theme, ... }:
{ pkgs, lib, systemSettings, userSettings, ... }:
{
imports =
[ ../../system/hardware-configuration.nix
@ -16,6 +16,7 @@
(./. + "../../../system/wm"+("/"+wm)+".nix") # My window manager
../../system/app/flatpak.nix
../../system/app/virtualization.nix
( import ../../system/app/docker.nix {storageDriver = "btrfs"; inherit userSettings lib;} )
../../system/security/doas.nix
../../system/security/gpg.nix
../../system/security/blocklist.nix
@ -50,28 +51,28 @@
boot.loader.efi.efiSysMountPoint = "/boot/efi";
# Networking
networking.hostName = hostname; # Define your hostname.
networking.hostName = systemSettings.hostname; # Define your hostname.
networking.networkmanager.enable = true; # Use networkmanager
# Timezone and locale
time.timeZone = timezone; # time zone
i18n.defaultLocale = locale;
time.timeZone = systemSettings.timezone; # time zone
i18n.defaultLocale = systemSettings.locale;
i18n.extraLocaleSettings = {
LC_ADDRESS = locale;
LC_IDENTIFICATION = locale;
LC_MEASUREMENT = locale;
LC_MONETARY = locale;
LC_NAME = locale;
LC_NUMERIC = locale;
LC_PAPER = locale;
LC_TELEPHONE = locale;
LC_TIME = locale;
LC_ADDRESS = systemSettings.locale;
LC_IDENTIFICATION = systemSettings.locale;
LC_MEASUREMENT = systemSettings.locale;
LC_MONETARY = systemSettings.locale;
LC_NAME = systemSettings.locale;
LC_NUMERIC = systemSettings.locale;
LC_PAPER = systemSettings.locale;
LC_TELEPHONE = systemSettings.locale;
LC_TIME = systemSettings.locale;
};
# User account
users.users.${username} = {
users.users.${userSettings.username} = {
isNormalUser = true;
description = name;
description = userSettings.name;
extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [];
uid = 1000;

View file

@ -1,17 +1,17 @@
{ config, lib, pkgs, stdenv, fetchurl, nix-doom-emacs, stylix, username, email, dotfilesDir, theme, wm, browser, editor, spawnEditor, term, ... }:
{ config, pkgs, nix-doom-emacs, stylix, userSettings, ... }:
{
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = username;
home.homeDirectory = "/home/"+username;
home.username = userSettings.username;
home.homeDirectory = "/home/"+userSettings.username;
programs.home-manager.enable = true;
imports = [
nix-doom-emacs.hmModule
(if ((userSettings.editor == "emacs") || (userSettings.editor == "emacsclient")) then nix-doom-emacs.hmModule else null)
stylix.homeManagerModules.stylix
(./. + "../../../user/wm"+("/"+wm+"/"+wm)+".nix") # My window manager selected from flake
(./. + "../../../user/wm"+("/"+userSettings.wm+"/"+userSettings.wm)+".nix") # My window manager selected from flake
../../user/shell/sh.nix # My zsh and bash config
../../user/shell/cli-collection.nix # Useful CLI apps
../../user/bin/phoenix.nix # My nix command wrapper
@ -19,13 +19,13 @@
../../user/app/ranger/ranger.nix # My ranger file manager config
../../user/app/git/git.nix # My git config
../../user/app/keepass/keepass.nix # My password manager
(./. + "../../../user/app/browser"+("/"+browser)+".nix") # My default browser selected from flake
(./. + "../../../user/app/browser"+("/"+userSettings.browser)+".nix") # My default browser selected from flake
../../user/app/virtualization/virtualization.nix # Virtual machines
../../user/app/flatpak/flatpak.nix # Flatpaks
../../user/style/stylix.nix # Styling and themes for my apps
../../user/lang/cc/cc.nix # C and C++ tools
../../user/lang/godot/godot.nix # Game development
../../user/pkgs/blockbench.nix # Blockbench
#../../user/pkgs/blockbench.nix # Blockbench ## marked as insecure
../../user/hardware/bluetooth.nix # Bluetooth
];
@ -146,10 +146,10 @@
};
home.sessionVariables = {
EDITOR = editor;
SPAWNEDITOR = spawnEditor;
TERM = term;
BROWSER = browser;
EDITOR = userSettings.editor;
SPAWNEDITOR = userSettings.spawnEditor;
TERM = userSettings.term;
BROWSER = userSettings.browser;
};
}