add base configs to base module

This commit is contained in:
Tyler Starr 2025-04-13 16:41:27 -07:00
parent 7d466e2b63
commit 58aae74b83
17 changed files with 79 additions and 88 deletions

View File

@ -15,6 +15,7 @@
# Modules
modules = {
base-plus.enable = true;
physical.enable = true;
desktop = {
enable = true;
gnome.enable = true;

View File

@ -6,9 +6,7 @@ in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager jovian-nixos; };
modules = [
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # bulwark specific
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default

View File

@ -1,51 +0,0 @@
{ config, pkgs, user, lib, inputs, ... }:
{
nix = {
package = pkgs.nixVersions.stable;
extraOptions = "experimental-features = nix-command flakes";
settings.auto-optimise-store = true;
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
};
# Add user age key to identity path
age.identityPaths = [
"/home/${user}/.ssh/keys/age"
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_rsa_key"
];
# Add non-free packages
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = import ../../lib/overlays.nix;
# Set your time zone.
time.timeZone = "America/Los_Angeles";
i18n.defaultLocale = "en_US.UTF-8";
environment.systemPackages = with pkgs; [
inputs.agenix.packages.x86_64-linux.default
];
# Define user account.
users.users.${user} = {
isNormalUser = true;
extraGroups = [ "dialout" "wheel" "docker" "libvirtd" ];
shell = pkgs.bash;
};
# Did you read the comment?
system.stateVersion = "23.11";
home-manager.users.${user} = {
home.username = "${user}";
home.homeDirectory = "/home/${user}";
programs.home-manager.enable = true;
# Did you read the comment?
home.stateVersion = "23.11";
};
}

View File

@ -1,15 +0,0 @@
{ config, pkgs, user, lib, inputs, ... }:
{
nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" "openssl-1.1.1w" ];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
home-manager.users.${user} = {
programs.vscode = {
enable = true;
package = pkgs.vscode.fhs;
};
};
}

View File

@ -11,6 +11,7 @@
# Modules
modules = {
base-plus.enable = true;
physical.enable = true;
desktop = {
enable = true;
gnome.enable = true;

View File

@ -6,9 +6,7 @@ in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager; };
modules = [
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # htpc specific
./configuration.nix
../../modules
/etc/nixos/hardware-configuration.nix
agenix.nixosModules.default

View File

@ -33,6 +33,7 @@
# Modules
modules = {
base-plus.enable = true;
physical.enable = true;
desktop = {
enable = true;
gnome.enable = true;

View File

@ -6,9 +6,7 @@ in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager; };
modules = [
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # kestrel specific
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default

View File

@ -29,6 +29,7 @@
# Modules
modules = {
base-plus.enable = true;
physical.enable = true;
desktop = {
enable = true;
gnome.enable = true;

View File

@ -6,9 +6,7 @@ in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager; };
modules = [
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # osprey specific
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default

View File

@ -15,6 +15,7 @@
# Modules
modules = {
base-plus.enable = true;
physical.enable = true;
desktop = {
enable = true;
gnome.enable = true;

View File

@ -6,9 +6,7 @@ in {
inherit system;
specialArgs = { inherit user inputs home-manager; };
modules = [
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # shivan specific
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default

View File

@ -98,6 +98,7 @@
# Modules
modules = {
base-plus.enable = true;
physical.enable = true;
services = {
ssh.enable = true;
syncthing = {

View File

@ -6,9 +6,7 @@ in {
inherit system;
specialArgs = { inherit user hostname inputs home-manager; };
modules = [
../default # shared by all configs
../default/physical/configuration.nix # shared by physical machines
./configuration.nix # torus specific
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default

View File

@ -6,8 +6,7 @@ in {
inherit system;
specialArgs = { inherit user hostname inputs nixos-wsl home-manager; };
modules = [
../default # shared by all configs
./configuration.nix # wsl specific
./configuration.nix
../../modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {

View File

@ -1,10 +1,63 @@
{ ... }:
{ config, lib, inputs, pkgs, user, home-manager, ... }:
{
imports = [
./terminal.nix
./plus
../programs/chezmoi.nix
../programs/git.nix
../programs/nvim.nix
./physical.nix
./plus
];
# base nix options
nix = {
package = pkgs.nixVersions.stable;
extraOptions = "experimental-features = nix-command flakes";
settings.auto-optimise-store = true;
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
};
# Add user age key to identity path
age.identityPaths = [
"/home/${user}/.ssh/keys/age"
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_rsa_key"
];
# Add non-free packages
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = import ../../lib/overlays.nix;
# Set your time zone.
time.timeZone = "America/Los_Angeles";
i18n.defaultLocale = "en_US.UTF-8";
# system packages
environment.systemPackages = with pkgs; [
inputs.agenix.packages.x86_64-linux.default
];
# define user account.
users.users.${user} = {
isNormalUser = true;
extraGroups = [ "dialout" "wheel" "docker" "libvirtd" ];
shell = pkgs.bash;
};
# Did you read the comment?
system.stateVersion = "23.11";
# base home manager config
home-manager.users.${user} = {
home.username = "${user}";
home.homeDirectory = "/home/${user}";
programs.home-manager.enable = true;
# Did you read the comment?
home.stateVersion = "23.11";
};
}

View File

@ -0,0 +1,11 @@
{ config, pkgs, user, lib, inputs, ... }:
let cfg = config.modules.physical;
in {
options.modules.physical.enable = lib.mkEnableOption "physical";
config = lib.mkIf cfg.enable {
# use the systemd-boot EFI boot loader
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
};
}