From dcd5ef19aff4e718553b3aab62592bbba8ed22ef Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Thu, 8 Oct 2026 18:10:43 -0500 Subject: [PATCH 1/2] fix homebrew updates --- hosts/artemis/homebrew.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hosts/artemis/homebrew.nix b/hosts/artemis/homebrew.nix index 808ef27..275f512 100644 --- a/hosts/artemis/homebrew.nix +++ b/hosts/artemis/homebrew.nix @@ -38,7 +38,11 @@ }; homebrew = { 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; taps = [ "homebrew/core" @@ -51,6 +55,9 @@ "openjdk@21" "openjdk@25" "swiftly" + "gtk4" + "gtk+3" + "pkgconf" ]; casks = [ "steam" From 049b0399354cba5dbe15395fda9c799b99b6d090 Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Thu, 8 Oct 2026 18:41:06 -0500 Subject: [PATCH 2/2] add dionysus --- flake.nix | 7 +++++ hosts/apollo/default.nix | 1 - hosts/base.nix | 5 +++- hosts/servers/dionysus/default.nix | 25 +++++++++++++++++ hosts/servers/dionysus/hardware.nix | 37 ++++++++++++++++++++++++++ hosts/servers/poseidon/old/default.nix | 1 - 6 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 hosts/servers/dionysus/default.nix create mode 100644 hosts/servers/dionysus/hardware.nix diff --git a/flake.nix b/flake.nix index 5e05aeb..59b399f 100644 --- a/flake.nix +++ b/flake.nix @@ -89,6 +89,13 @@ ]; specialArgs = { inherit inputs; }; }; + dionysus = nixpkgs.lib.nixosSystem { + modules = [ + ./hosts/base.nix + ./hosts/servers/dionysus + ]; + specialArgs = { inherit inputs; }; + }; nixos = nixpkgs.lib.nixosSystem { modules = [ ./hosts/base.nix diff --git a/hosts/apollo/default.nix b/hosts/apollo/default.nix index d7713b4..3c538f1 100644 --- a/hosts/apollo/default.nix +++ b/hosts/apollo/default.nix @@ -15,5 +15,4 @@ networking.hostName = "apollo"; networking.hostId = "40ced703"; - networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ]; } \ No newline at end of file diff --git a/hosts/base.nix b/hosts/base.nix index a4d6a4d..bea630f 100644 --- a/hosts/base.nix +++ b/hosts/base.nix @@ -35,7 +35,10 @@ networking.hostName = lib.mkDefault "nixos"; # Enable networking - networking.networkmanager = { enable = true; }; + networking.networkmanager = { + enable = true; + insertNameservers = [ "10.5.0.1" "1.1.1.1" ]; + }; networking.enableIPv6 = false; # Set your time zone. time.timeZone = "America/Chicago"; diff --git a/hosts/servers/dionysus/default.nix b/hosts/servers/dionysus/default.nix new file mode 100644 index 0000000..85b55f7 --- /dev/null +++ b/hosts/servers/dionysus/default.nix @@ -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"; } + ]; +} diff --git a/hosts/servers/dionysus/hardware.nix b/hosts/servers/dionysus/hardware.nix new file mode 100644 index 0000000..29db94d --- /dev/null +++ b/hosts/servers/dionysus/hardware.nix @@ -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? +} diff --git a/hosts/servers/poseidon/old/default.nix b/hosts/servers/poseidon/old/default.nix index cda5c55..951752e 100644 --- a/hosts/servers/poseidon/old/default.nix +++ b/hosts/servers/poseidon/old/default.nix @@ -76,7 +76,6 @@ # per server networking options networking.hostName = "poseidon"; networking.hostId = "1f2d79e1"; - networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ]; # Mounts boot.zfs.forceImportRoot = false;