feat: Export formatter and lxc configuration from flake

This commit is contained in:
UGA Innovation Factory
2025-12-10 14:52:34 +00:00
committed by Hunter Halloran
parent faf4afcd3b
commit 01d1a36650
23 changed files with 742 additions and 308 deletions

57
flake.lock generated
View File

@@ -95,6 +95,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@@ -393,7 +411,8 @@
"lazyvim-nixvim": "lazyvim-nixvim", "lazyvim-nixvim": "lazyvim-nixvim",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-old-kernel": "nixpkgs-old-kernel" "nixpkgs-old-kernel": "nixpkgs-old-kernel",
"vscode-server": "vscode-server"
} }
}, },
"systems": { "systems": {
@@ -411,6 +430,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -432,6 +466,27 @@
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
},
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1753541826,
"narHash": "sha256-foGgZu8+bCNIGeuDqQ84jNbmKZpd+JvnrL2WlyU4tuU=",
"owner": "nix-community",
"repo": "nixos-vscode-server",
"rev": "6d5f074e4811d143d44169ba4af09b20ddb6937d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-vscode-server",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -30,8 +30,26 @@
# Neovim configuration # Neovim configuration
lazyvim-nixvim.url = "github:azuwis/lazyvim-nixvim"; lazyvim-nixvim.url = "github:azuwis/lazyvim-nixvim";
# VS Code server for remote development
vscode-server = {
url = "github:nix-community/nixos-vscode-server";
inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ self, nixpkgs, nixpkgs-old-kernel, home-manager, disko, lazyvim-nixvim, nixos-hardware,... }: { };
outputs =
inputs@{
self,
nixpkgs,
nixpkgs-old-kernel,
home-manager,
disko,
lazyvim-nixvim,
nixos-hardware,
vscode-server,
...
}:
{
# Formatter for 'nix fmt' # Formatter for 'nix fmt'
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;

View File

@@ -47,7 +47,10 @@
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
mountOptions = [ "umask=0077" ]; mountOptions = [ "umask=0077" ];
extraArgs = [ "-n" "BOOT" ]; extraArgs = [
"-n"
"BOOT"
];
}; };
}; };
@@ -56,7 +59,9 @@
name = "swap"; name = "swap";
label = "swap"; label = "swap";
size = config.host.filesystem.swapSize; size = config.host.filesystem.swapSize;
content = { type = "swap"; }; content = {
type = "swap";
};
}; };
# Root Partition (takes remaining space) # Root Partition (takes remaining space)
@@ -68,7 +73,10 @@
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/"; mountpoint = "/";
extraArgs = [ "-L" "ROOT" ]; extraArgs = [
"-L"
"ROOT"
];
}; };
}; };
}; };

View File

@@ -1,4 +1,8 @@
{ inputs, hosts ? import ../inventory.nix, ... }: {
inputs,
hosts ? import ../inventory.nix,
...
}:
# ============================================================================ # ============================================================================
# Host Generator # Host Generator
@@ -25,7 +29,10 @@ let
disko.nixosModules.disko disko.nixosModules.disko
{ {
system.stateVersion = "25.11"; system.stateVersion = "25.11";
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# Automatic Garbage Collection # Automatic Garbage Collection
nix.gc = { nix.gc = {
@@ -40,7 +47,12 @@ let
]; ];
# Helper to create a single NixOS system configuration # Helper to create a single NixOS system configuration
mkHost = { hostName, system ? "x86_64-linux", extraModules ? [ ] }: mkHost =
{
hostName,
system ? "x86_64-linux",
extraModules ? [ ],
}:
let let
# Load users.nix to find external user flakes # Load users.nix to find external user flakes
# We use legacyPackages to evaluate the simple data structure of users.nix # We use legacyPackages to evaluate the simple data structure of users.nix
@@ -49,7 +61,8 @@ let
accounts = usersData.modules.users.accounts or { }; accounts = usersData.modules.users.accounts or { };
# Extract flakeUrls and convert to modules # Extract flakeUrls and convert to modules
userFlakeModules = lib.mapAttrsToList (name: user: userFlakeModules = lib.mapAttrsToList (
name: user:
if (user ? flakeUrl && user.flakeUrl != "") then if (user ? flakeUrl && user.flakeUrl != "") then
(builtins.getFlake user.flakeUrl).nixosModules.default (builtins.getFlake user.flakeUrl).nixosModules.default
else else
@@ -71,48 +84,77 @@ let
}; };
# Function to generate a set of hosts based on inventory count and overrides # Function to generate a set of hosts based on inventory count and overrides
mkHostGroup = { prefix, count, system ? "x86_64-linux", extraModules ? [], deviceOverrides ? {} }: mkHostGroup =
lib.listToAttrs (map (i: { {
name = "${prefix}${toString i}"; prefix,
value = count,
system ? "x86_64-linux",
extraModules ? [ ],
deviceOverrides ? { },
}:
lib.listToAttrs (
lib.concatMap (
i:
let let
defaultName = "${prefix}${toString i}";
devConf = deviceOverrides.${toString i} or { }; devConf = deviceOverrides.${toString i} or { };
hasOverride = builtins.hasAttr (toString i) deviceOverrides; hasOverride = builtins.hasAttr (toString i) deviceOverrides;
hostName =
if hasOverride && (builtins.hasAttr "hostname" devConf) then devConf.hostname else defaultName;
# Extract flakeUrl if it exists # Extract flakeUrl if it exists
externalFlake = if hasOverride && (builtins.hasAttr "flakeUrl" devConf) externalFlake =
then builtins.getFlake devConf.flakeUrl if hasOverride && (builtins.hasAttr "flakeUrl" devConf) then
else null; builtins.getFlake devConf.flakeUrl
else
null;
# Module from external flake # Module from external flake
externalModule = if externalFlake != null externalModule = if externalFlake != null then externalFlake.nixosModules.default else { };
then externalFlake.nixosModules.default
else {};
# Config override module (filesystem, users) # Config override module (filesystem, users)
overrideModule = { ... }: overrideModule =
{ ... }:
let let
# Remove special keys that are not filesystem options # Remove special keys that are not filesystem options
fsConf = builtins.removeAttrs devConf [ "extraUsers" "flakeUrl" ]; fsConf = builtins.removeAttrs devConf [
in lib.mkIf hasOverride { "extraUsers"
"flakeUrl"
"hostname"
];
in
lib.mkIf hasOverride {
host.filesystem = fsConf; host.filesystem = fsConf;
modules.users.enabledUsers = devConf.extraUsers or [ ]; modules.users.enabledUsers = devConf.extraUsers or [ ];
}; };
in
mkHost { config = mkHost {
hostName = "${prefix}${toString i}"; hostName = hostName;
inherit system; inherit system;
extraModules = extraModules ++ [ overrideModule ] ++ (lib.optional (externalFlake != null) externalModule); extraModules =
extraModules ++ [ overrideModule ] ++ (lib.optional (externalFlake != null) externalModule);
}; };
}) (lib.range 1 count));
aliasNames = lib.optional (hostName != defaultName) hostName;
names = lib.unique ([ defaultName ] ++ aliasNames);
in
lib.map (name: {
inherit name;
value = config;
}) names
) (lib.range 1 count)
);
# Generate host groups based on the input hosts configuration # Generate host groups based on the input hosts configuration
hostGroups = lib.mapAttrsToList (type: config: hostGroups = lib.mapAttrsToList (
type: config:
let let
typeFile = ./types + "/${type}.nix"; typeFile = ./types + "/${type}.nix";
modules = if builtins.pathExists typeFile modules =
then import typeFile { inherit inputs; } if builtins.pathExists typeFile then
else throw "Host type '${type}' not found in hosts/types/"; import typeFile { inherit inputs; }
else
throw "Host type '${type}' not found in hosts/types/";
in in
mkHostGroup { mkHostGroup {
prefix = type; prefix = type;

View File

@@ -1,8 +1,22 @@
{ inputs, ... }: [ { inputs, ... }:
({ config, lib, modulesPath, ... }: { [
(
{
config,
lib,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@@ -19,6 +33,10 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}) }
{ modules.sw.enable = true; modules.sw.type = "desktop"; } )
{
modules.sw.enable = true;
modules.sw.type = "desktop";
}
] ]

View File

@@ -1,8 +1,23 @@
{ inputs, ... }: [ { inputs, ... }:
({ config, lib, modulesPath, ... }: { [
(
{
config,
lib,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"nvme"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@@ -32,6 +47,10 @@
HandleLidSwitchDocked = "ignore"; HandleLidSwitchDocked = "ignore";
}; };
}; };
}) }
{ modules.sw.enable = true; modules.sw.type = "desktop"; } )
{
modules.sw.enable = true;
modules.sw.type = "desktop";
}
] ]

40
hosts/types/nix-lxc.nix Normal file
View File

@@ -0,0 +1,40 @@
{ inputs, ... }:
[
inputs.vscode-server.nixosModules.default
(
{
config,
lib,
modulesPath,
...
}:
{
nix.settings.trusted-users = [
"root"
"engr-ugaif"
];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
imports = [
"${modulesPath}/virtualisation/proxmox-lxc.nix"
];
boot.isContainer = true;
boot.loader.systemd-boot.enable = lib.mkForce false;
disko.enableConfig = lib.mkForce false;
console.enable = true;
systemd.services."getty@".unitConfig.ConditionPathExists = [
""
"/dev/%I"
];
systemd.suppressedSystemUnits = [
"dev-mqueue.mount"
"sys-kernel-debug.mount"
"sys-fs-fuse-connections.mount"
];
services.vscode-server.enable = true;
system.stateVersion = "25.11";
}
)
]

View File

@@ -1,5 +1,13 @@
{ inputs, ... }: [ { inputs, ... }:
({ config, lib, pkgs, modulesPath, ... }: [
(
{
config,
lib,
pkgs,
modulesPath,
...
}:
let let
refSystem = inputs.nixpkgs-old-kernel.lib.nixosSystem { refSystem = inputs.nixpkgs-old-kernel.lib.nixosSystem {
system = pkgs.stdenv.hostPlatform.system; system = pkgs.stdenv.hostPlatform.system;
@@ -10,7 +18,13 @@
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@@ -34,7 +48,11 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}) }
)
inputs.nixos-hardware.nixosModules.microsoft-surface-go inputs.nixos-hardware.nixosModules.microsoft-surface-go
{ modules.sw.enable = true; modules.sw.type = "kiosk"; } {
modules.sw.enable = true;
modules.sw.type = "kiosk";
}
] ]

View File

@@ -1,4 +1,9 @@
{ pkgs, config, lib, ... }: {
pkgs,
config,
lib,
...
}:
# ============================================================================ # ============================================================================
# User Configuration Module # User Configuration Module
@@ -11,19 +16,63 @@ let
# Submodule defining the structure of a user account # Submodule defining the structure of a user account
userSubmodule = lib.types.submodule { userSubmodule = lib.types.submodule {
options = { options = {
isNormalUser = lib.mkOption { type = lib.types.bool; default = true; }; isNormalUser = lib.mkOption {
description = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; }; type = lib.types.bool;
extraGroups = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; }; default = true;
hashedPassword = lib.mkOption { type = lib.types.str; default = "!"; }; };
extraPackages = lib.mkOption { type = lib.types.listOf lib.types.package; default = []; }; description = lib.mkOption {
excludePackages = lib.mkOption { type = lib.types.listOf lib.types.package; default = []; }; type = lib.types.nullOr lib.types.str;
homePackages = lib.mkOption { type = lib.types.listOf lib.types.package; default = []; }; default = null;
extraImports = lib.mkOption { type = lib.types.listOf lib.types.path; default = []; }; };
flakeUrl = lib.mkOption { type = lib.types.str; default = ""; description = "URL of a flake to import Home Manager configuration from (e.g. github:user/dotfiles)."; }; extraGroups = lib.mkOption {
opensshKeys = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; description = "List of SSH public keys for the user."; }; type = lib.types.listOf lib.types.str;
shell = lib.mkOption { type = lib.types.nullOr lib.types.package; default = null; description = "The shell for this user."; }; default = [ ];
useZshTheme = lib.mkOption { type = lib.types.bool; default = true; description = "Whether to apply the system Zsh theme."; }; };
useNvimPlugins = lib.mkOption { type = lib.types.bool; default = true; description = "Whether to apply the system Neovim configuration."; }; hashedPassword = lib.mkOption {
type = lib.types.str;
default = "!";
};
extraPackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
};
excludePackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
};
homePackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
};
extraImports = lib.mkOption {
type = lib.types.listOf lib.types.path;
default = [ ];
};
flakeUrl = lib.mkOption {
type = lib.types.str;
default = "";
description = "URL of a flake to import Home Manager configuration from (e.g. github:user/dotfiles).";
};
opensshKeys = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
description = "List of SSH public keys for the user.";
};
shell = lib.mkOption {
type = lib.types.nullOr lib.types.package;
default = null;
description = "The shell for this user.";
};
useZshTheme = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether to apply the system Zsh theme.";
};
useNvimPlugins = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether to apply the system Neovim configuration.";
};
}; };
}; };
in in
@@ -48,14 +97,20 @@ in
config = { config = {
# Default enabled users (always present) # Default enabled users (always present)
modules.users.enabledUsers = [ "root" "engr-ugaif" ]; modules.users.enabledUsers = [
"root"
"engr-ugaif"
];
# Generate NixOS users # Generate NixOS users
users.users = users.users =
let let
enabledAccounts = lib.filterAttrs (name: _: lib.elem name config.modules.users.enabledUsers) config.modules.users.accounts; enabledAccounts = lib.filterAttrs (
name: _: lib.elem name config.modules.users.enabledUsers
) config.modules.users.accounts;
in in
lib.mapAttrs (name: user: lib.mapAttrs (
name: user:
let let
isPlasma6 = config.services.desktopManager.plasma6.enable; isPlasma6 = config.services.desktopManager.plasma6.enable;
defaultPackages = lib.optionals (isPlasma6 && name != "root") [ pkgs.kdePackages.kate ]; defaultPackages = lib.optionals (isPlasma6 && name != "root") [ pkgs.kdePackages.kate ];
@@ -74,26 +129,34 @@ in
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { osConfig = config; }; extraSpecialArgs = {
osConfig = config;
};
users = users =
let let
enabledAccounts = lib.filterAttrs (name: _: lib.elem name config.modules.users.enabledUsers) config.modules.users.accounts; enabledAccounts = lib.filterAttrs (
name: _: lib.elem name config.modules.users.enabledUsers
) config.modules.users.accounts;
in in
lib.mapAttrs (name: user: { ... }: lib.mapAttrs (
name: user:
{ ... }:
let let
isExternal = user.flakeUrl != ""; isExternal = user.flakeUrl != "";
# Common imports based on flags # Common imports based on flags
commonImports = commonImports =
lib.optional user.useZshTheme ../sw/theme.nix lib.optional user.useZshTheme ../sw/theme.nix ++ lib.optional user.useNvimPlugins ../sw/nvim.nix;
++ lib.optional user.useNvimPlugins ../sw/nvim.nix;
in in
if isExternal then { if isExternal then
{
# External users: Only apply requested system modules. # External users: Only apply requested system modules.
# The external flake is responsible for home.username, home.packages, etc. # The external flake is responsible for home.username, home.packages, etc.
imports = commonImports; imports = commonImports;
} else { }
else
{
# Local users: Apply full configuration. # Local users: Apply full configuration.
imports = user.extraImports ++ commonImports; imports = user.extraImports ++ commonImports;
home.username = name; home.username = name;

View File

@@ -26,8 +26,12 @@
# "2" = { swapSize = "64G"; }; # "2" = { swapSize = "64G"; };
# Enable specific users for this device index # Enable specific users for this device index
"1" = { extraUsers = [ "hdh20267" ]; }; "1" = {
"2" = { extraUsers = [ "hdh20267" ]; }; extraUsers = [ "hdh20267" ];
};
"2" = {
extraUsers = [ "hdh20267" ];
};
# Example of using an external flake for system configuration: # Example of using an external flake for system configuration:
# "2" = { flakeUrl = "github:user/system-flake"; }; # "2" = { flakeUrl = "github:user/system-flake"; };
@@ -41,4 +45,14 @@
# Surface Tablet Configuration (Kiosk Mode) # Surface Tablet Configuration (Kiosk Mode)
# Base specs: eMMC drive, 8G Swap # Base specs: eMMC drive, 8G Swap
nix-surface.count = 3; nix-surface.count = 3;
# LXC Container Configuration
nix-lxc = {
count = 1;
devices = {
"1" = {
hostname = "nix-builder";
};
};
};
} }

View File

@@ -1,4 +1,10 @@
{ config, lib, pkgs, inputs, ... }: {
config,
lib,
pkgs,
inputs,
...
}:
# ============================================================================ # ============================================================================
# Software Module Entry Point # Software Module Entry Point
@@ -22,7 +28,10 @@ in
enable = mkEnableOption "Standard Workstation Configuration"; enable = mkEnableOption "Standard Workstation Configuration";
type = mkOption { type = mkOption {
type = types.enum [ "desktop" "kiosk" ]; type = types.enum [
"desktop"
"kiosk"
];
default = "desktop"; default = "desktop";
description = "Type of system configuration: 'desktop' for normal OS, 'kiosk' for tablet/kiosk mode."; description = "Type of system configuration: 'desktop' for normal OS, 'kiosk' for tablet/kiosk mode.";
}; };
@@ -53,7 +62,9 @@ in
programs.zsh.enable = true; programs.zsh.enable = true;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
environment.systemPackages = with pkgs; subtractLists cfg.excludePackages [ environment.systemPackages =
with pkgs;
subtractLists cfg.excludePackages [
htop htop
binutils binutils
zsh zsh
@@ -79,7 +90,25 @@ in
]; ];
} }
# Import Desktop or Kiosk modules based on type # Import Desktop or Kiosk modules based on type
(mkIf (cfg.type == "desktop") (import ./desktop { inherit config lib pkgs inputs; })) (mkIf (cfg.type == "desktop") (
(mkIf (cfg.type == "kiosk") (import ./kiosk { inherit config lib pkgs inputs; })) import ./desktop {
inherit
config
lib
pkgs
inputs
;
}
))
(mkIf (cfg.type == "kiosk") (
import ./kiosk {
inherit
config
lib
pkgs
inputs
;
}
))
]); ]);
} }

View File

@@ -1,5 +1,25 @@
{ config, lib, pkgs, inputs, ... }: {
config,
lib,
pkgs,
inputs,
...
}:
lib.mkMerge [ lib.mkMerge [
(import ./programs.nix { inherit config lib pkgs inputs; }) (import ./programs.nix {
(import ./services.nix { inherit config lib pkgs inputs; }) inherit
config
lib
pkgs
inputs
;
})
(import ./services.nix {
inherit
config
lib
pkgs
inputs
;
})
] ]

View File

@@ -1,4 +1,10 @@
{ config, lib, pkgs, inputs, ... }: {
config,
lib,
pkgs,
inputs,
...
}:
with lib; with lib;
@@ -15,7 +21,8 @@ let
teams-for-linux teams-for-linux
wpsoffice wpsoffice
]; ];
in { in
{
environment.systemPackages = subtractLists cfg.excludePackages (basePackages ++ cfg.extraPackages); environment.systemPackages = subtractLists cfg.excludePackages (basePackages ++ cfg.extraPackages);
programs.mtr.enable = true; programs.mtr.enable = true;

View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
modules.sw.python.enable = lib.mkDefault true; modules.sw.python.enable = lib.mkDefault true;

View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
# ============================================================================ # ============================================================================
# Ghostty Terminfo Module # Ghostty Terminfo Module

View File

@@ -1,6 +1,33 @@
{ config, lib, pkgs, inputs, ... }: {
config,
lib,
pkgs,
inputs,
...
}:
lib.mkMerge [ lib.mkMerge [
(import ./programs.nix { inherit config lib pkgs inputs; }) (import ./programs.nix {
(import ./services.nix { inherit config lib pkgs inputs; }) inherit
(import ./gsettings.nix { inherit config lib pkgs inputs; }) config
lib
pkgs
inputs
;
})
(import ./services.nix {
inherit
config
lib
pkgs
inputs
;
})
(import ./gsettings.nix {
inherit
config
lib
pkgs
inputs
;
})
] ]

View File

@@ -1,12 +1,19 @@
{ config, lib, inputs, ... }: {
config,
lib,
inputs,
...
}:
let let
cfg = config.modules.sw; cfg = config.modules.sw;
in { in
{
programs.dconf = { programs.dconf = {
enable = true; enable = true;
profiles.user = { profiles.user = {
databases = [{ databases = [
{
settings = { settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
color-scheme = "prefer-dark"; color-scheme = "prefer-dark";
@@ -44,7 +51,8 @@ in {
screen-keyboard-enabled = true; screen-keyboard-enabled = true;
}; };
}; };
}]; }
];
}; };
}; };
} }

View File

@@ -1,4 +1,10 @@
{ config, lib, pkgs, inputs, ... }: {
config,
lib,
pkgs,
inputs,
...
}:
with lib; with lib;
@@ -13,7 +19,8 @@ let
phoc phoc
gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
in { in
{
environment.systemPackages = subtractLists cfg.excludePackages (basePackages ++ cfg.extraPackages); environment.systemPackages = subtractLists cfg.excludePackages (basePackages ++ cfg.extraPackages);
programs.chromium = { programs.chromium = {

View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
services.xserver = { services.xserver = {
@@ -36,9 +41,10 @@
GDK_DPI_SCALE = "0.5"; GDK_DPI_SCALE = "0.5";
# Make GLib / gsettings actually see schemas # Make GLib / gsettings actually see schemas
XDG_DATA_DIRS = [ "/run/current-system/sw/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ]; XDG_DATA_DIRS = [
GSETTINGS_SCHEMA_DIR = "/run/current-system/sw/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
"/run/current-system/sw/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas"; ];
GSETTINGS_SCHEMA_DIR = "/run/current-system/sw/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas";
}; };
environment.etc."machine-info".text = '' environment.etc."machine-info".text = ''

View File

@@ -11,10 +11,13 @@
let let
parsers = pkgs.symlinkJoin { parsers = pkgs.symlinkJoin {
name = "treesitter-parsers"; name = "treesitter-parsers";
paths = (pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: with plugins; [ paths =
(pkgs.vimPlugins.nvim-treesitter.withPlugins (
plugins: with plugins; [
c c
lua lua
])).dependencies; ]
)).dependencies;
}; };
in in
"${parsers}/parser"; "${parsers}/parser";

View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
# ============================================================================ # ============================================================================
# Python Environment # Python Environment
@@ -11,7 +16,8 @@ with lib;
let let
cfg = config.modules.sw.python; cfg = config.modules.sw.python;
in { in
{
options.modules.sw.python = { options.modules.sw.python = {
enable = mkEnableOption "Python development tools (pixi, uv)"; enable = mkEnableOption "Python development tools (pixi, uv)";
}; };

View File

@@ -1,4 +1,10 @@
{ pkgs, config, osConfig, lib, ... }: {
pkgs,
config,
osConfig,
lib,
...
}:
# ============================================================================ # ============================================================================
# Shell Theme Configuration # Shell Theme Configuration

View File

@@ -16,13 +16,23 @@
}; };
engr-ugaif = { engr-ugaif = {
description = "UGA Innovation Factory"; description = "UGA Innovation Factory";
extraGroups = [ "networkmanager" "wheel" "video" "input" ]; extraGroups = [
"networkmanager"
"wheel"
"video"
"input"
];
hashedPassword = "$6$El6e2NhPrhVFjbFU$imlGZqUiizWw5fMP/ib0CeboOcFhYjIVb8oR1V1dP2NjDeri3jMoUm4ZABOB2uAF8UEDjAGHhFuZxhtbHg647/"; hashedPassword = "$6$El6e2NhPrhVFjbFU$imlGZqUiizWw5fMP/ib0CeboOcFhYjIVb8oR1V1dP2NjDeri3jMoUm4ZABOB2uAF8UEDjAGHhFuZxhtbHg647/";
opensshKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBC7xzHxY2BfFUybMvG4wHSF9oEAGzRiLTFEndLvWV/X hdh20267@engr733847d.engr.uga.edu" ]; opensshKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBC7xzHxY2BfFUybMvG4wHSF9oEAGzRiLTFEndLvWV/X hdh20267@engr733847d.engr.uga.edu"
];
}; };
hdh20267 = { hdh20267 = {
description = "Hunter Halloran"; description = "Hunter Halloran";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [
"networkmanager"
"wheel"
];
homePackages = [ pkgs.ghostty ]; homePackages = [ pkgs.ghostty ];
shell = pkgs.zsh; shell = pkgs.zsh;
# Example of using an external flake for configuration: # Example of using an external flake for configuration: