Compare commits
No commits in common. "049b0399354cba5dbe15395fda9c799b99b6d090" and "d4b1433b5f26610d3de2f45a12aaab5803f4b448" have entirely different histories.
049b039935
...
d4b1433b5f
7 changed files with 4 additions and 81 deletions
|
|
@ -89,13 +89,6 @@
|
||||||
];
|
];
|
||||||
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,4 +15,5 @@
|
||||||
|
|
||||||
networking.hostName = "apollo";
|
networking.hostName = "apollo";
|
||||||
networking.hostId = "40ced703";
|
networking.hostId = "40ced703";
|
||||||
|
networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
|
||||||
}
|
}
|
||||||
|
|
@ -38,11 +38,7 @@
|
||||||
};
|
};
|
||||||
homebrew = {
|
homebrew = {
|
||||||
enable = true;
|
enable = true;
|
||||||
onActivation = {
|
onActivation.cleanup = "zap"; # Cleans packages not defined here
|
||||||
autoUpdate = true;
|
|
||||||
upgrade = true; # This ensures brew bundle upgrade runs
|
|
||||||
cleanup = "zap";
|
|
||||||
};
|
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
taps = [
|
taps = [
|
||||||
"homebrew/core"
|
"homebrew/core"
|
||||||
|
|
@ -55,9 +51,6 @@
|
||||||
"openjdk@21"
|
"openjdk@21"
|
||||||
"openjdk@25"
|
"openjdk@25"
|
||||||
"swiftly"
|
"swiftly"
|
||||||
"gtk4"
|
|
||||||
"gtk+3"
|
|
||||||
"pkgconf"
|
|
||||||
];
|
];
|
||||||
casks = [
|
casks = [
|
||||||
"steam"
|
"steam"
|
||||||
|
|
|
||||||
|
|
@ -35,10 +35,7 @@
|
||||||
networking.hostName = lib.mkDefault "nixos";
|
networking.hostName = lib.mkDefault "nixos";
|
||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager = {
|
networking.networkmanager = { enable = true; };
|
||||||
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";
|
||||||
|
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
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"; }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
# 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,6 +76,7 @@
|
||||||
# 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