Compare commits
2 commits
d4b1433b5f
...
049b039935
| Author | SHA1 | Date | |
|---|---|---|---|
| 049b039935 | |||
| dcd5ef19af |
7 changed files with 81 additions and 4 deletions
|
|
@ -89,6 +89,13 @@
|
||||||
];
|
];
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = { inherit inputs; };
|
||||||
};
|
};
|
||||||
|
dionysus = nixpkgs.lib.nixosSystem {
|
||||||
|
modules = [
|
||||||
|
./hosts/base.nix
|
||||||
|
./hosts/servers/dionysus
|
||||||
|
];
|
||||||
|
specialArgs = { inherit inputs; };
|
||||||
|
};
|
||||||
nixos = nixpkgs.lib.nixosSystem {
|
nixos = nixpkgs.lib.nixosSystem {
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/base.nix
|
./hosts/base.nix
|
||||||
|
|
|
||||||
|
|
@ -15,5 +15,4 @@
|
||||||
|
|
||||||
networking.hostName = "apollo";
|
networking.hostName = "apollo";
|
||||||
networking.hostId = "40ced703";
|
networking.hostId = "40ced703";
|
||||||
networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
|
|
||||||
}
|
}
|
||||||
|
|
@ -38,7 +38,11 @@
|
||||||
};
|
};
|
||||||
homebrew = {
|
homebrew = {
|
||||||
enable = true;
|
enable = true;
|
||||||
onActivation.cleanup = "zap"; # Cleans packages not defined here
|
onActivation = {
|
||||||
|
autoUpdate = true;
|
||||||
|
upgrade = true; # This ensures brew bundle upgrade runs
|
||||||
|
cleanup = "zap";
|
||||||
|
};
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
taps = [
|
taps = [
|
||||||
"homebrew/core"
|
"homebrew/core"
|
||||||
|
|
@ -51,6 +55,9 @@
|
||||||
"openjdk@21"
|
"openjdk@21"
|
||||||
"openjdk@25"
|
"openjdk@25"
|
||||||
"swiftly"
|
"swiftly"
|
||||||
|
"gtk4"
|
||||||
|
"gtk+3"
|
||||||
|
"pkgconf"
|
||||||
];
|
];
|
||||||
casks = [
|
casks = [
|
||||||
"steam"
|
"steam"
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,10 @@
|
||||||
networking.hostName = lib.mkDefault "nixos";
|
networking.hostName = lib.mkDefault "nixos";
|
||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager = { enable = true; };
|
networking.networkmanager = {
|
||||||
|
enable = true;
|
||||||
|
insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
|
||||||
|
};
|
||||||
networking.enableIPv6 = false;
|
networking.enableIPv6 = false;
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "America/Chicago";
|
time.timeZone = "America/Chicago";
|
||||||
|
|
|
||||||
25
hosts/servers/dionysus/default.nix
Normal file
25
hosts/servers/dionysus/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./hardware.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/c68b883a-7391-4433-ae9b-7f6db13d21c9";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/3EE8-2460";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-uuid/4fa1c768-3acb-4d75-b849-8712fa56eab3"; }
|
||||||
|
];
|
||||||
|
}
|
||||||
37
hosts/servers/dionysus/hardware.nix
Normal file
37
hosts/servers/dionysus/hardware.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
|
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||||
|
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
||||||
|
#
|
||||||
|
# Most users should NEVER change this value after the initial install, for any reason,
|
||||||
|
# even if you've upgraded your system to a new NixOS release.
|
||||||
|
#
|
||||||
|
# This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
|
||||||
|
# so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
|
||||||
|
# to actually do that.
|
||||||
|
#
|
||||||
|
# This value being lower than the current NixOS release does NOT mean your system is
|
||||||
|
# out of date, out of support, or vulnerable.
|
||||||
|
#
|
||||||
|
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
|
||||||
|
# and migrated your data accordingly.
|
||||||
|
#
|
||||||
|
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||||
|
system.stateVersion = "26.05"; # Did you read the comment?
|
||||||
|
}
|
||||||
|
|
@ -76,7 +76,6 @@
|
||||||
# per server networking options
|
# per server networking options
|
||||||
networking.hostName = "poseidon";
|
networking.hostName = "poseidon";
|
||||||
networking.hostId = "1f2d79e1";
|
networking.hostId = "1f2d79e1";
|
||||||
networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
|
|
||||||
|
|
||||||
# Mounts
|
# Mounts
|
||||||
boot.zfs.forceImportRoot = false;
|
boot.zfs.forceImportRoot = false;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue