Compare commits

..

3 commits

Author SHA1 Message Date
Geir Okkenhaug Jerstad
07903ac9e3 Remove duplicate hardware module import 2025-06-12 21:18:55 +02:00
Geir Okkenhaug Jerstad
fc26b3f7f2 Fix lib import in hardware-co.nix 2025-06-12 21:18:20 +02:00
Geir Okkenhaug Jerstad
253b05b45e Renamed hardware and disk configuration files for congenital-optimist 2025-06-12 21:17:44 +02:00
4 changed files with 16 additions and 19 deletions

View file

@ -6,10 +6,14 @@
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
};
outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs:
let
outputs = {
self,
nixpkgs,
nixpkgs-unstable,
...
} @ inputs: let
system = "x86_64-linux";
# Create unstable package set
unstable = import nixpkgs-unstable {
inherit system;
@ -20,17 +24,15 @@
specialArgs = {
inherit inputs unstable;
};
in {
# NixOS system configurations
nixosConfigurations = {
# congenital-optimist - AMD Threadripper workstation
congenital-optimist = nixpkgs.lib.nixosSystem {
inherit system specialArgs;
modules = [
./machines/congenital-optimist/configuration.nix
./machines/congenital-optimist/hardware-configuration.nix
./machines/congenital-optimist/hardware-co.nix
./modules/common/nix.nix
./modules/common/base.nix
./modules/common/tty.nix
@ -75,8 +77,8 @@
};
# Custom packages for the home lab
packages.${system} = import ./packages {
pkgs = nixpkgs.legacyPackages.${system};
packages.${system} = import ./packages {
pkgs = nixpkgs.legacyPackages.${system};
};
# Development shells for different projects
@ -147,4 +149,4 @@
# Formatter for Nix files
formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
};
}
}

View file

@ -6,7 +6,8 @@
...
}: {
imports = [
./hardware-configuration.nix
./hardware-co.nix
./disk-ram-co.nix
./network-congenital-optimist.nix
# Security modules
@ -18,9 +19,6 @@
# Services
../../modules/services/nfs-client.nix
# Hardware modules
../../modules/hardware/amd-workstation.nix
# Desktop environments
../../modules/desktop/common.nix
../../modules/desktop/gnome.nix

View file

@ -1,6 +1,7 @@
{
config,
pkgs,
lib,
...
}: {
# AMD GPU configuration
@ -16,12 +17,8 @@
powerOnBoot = true;
};
# ZRAM swap configuration
zramSwap = {
enable = true;
algorithm = "zstd";
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# Audio system (PipeWire)
services.pipewire = {
enable = true;