diff --git a/flake.nix b/flake.nix index 59b399f..5e05aeb 100644 --- a/flake.nix +++ b/flake.nix @@ -89,13 +89,6 @@ ]; 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 3c538f1..d7713b4 100644 --- a/hosts/apollo/default.nix +++ b/hosts/apollo/default.nix @@ -15,4 +15,5 @@ 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/artemis/homebrew.nix b/hosts/artemis/homebrew.nix index 275f512..808ef27 100644 --- a/hosts/artemis/homebrew.nix +++ b/hosts/artemis/homebrew.nix @@ -38,11 +38,7 @@ }; homebrew = { enable = true; - onActivation = { - autoUpdate = true; - upgrade = true; # This ensures brew bundle upgrade runs - cleanup = "zap"; - }; + onActivation.cleanup = "zap"; # Cleans packages not defined here enableZshIntegration = true; taps = [ "homebrew/core" @@ -55,9 +51,6 @@ "openjdk@21" "openjdk@25" "swiftly" - "gtk4" - "gtk+3" - "pkgconf" ]; casks = [ "steam" diff --git a/hosts/base.nix b/hosts/base.nix index bea630f..a4d6a4d 100644 --- a/hosts/base.nix +++ b/hosts/base.nix @@ -35,10 +35,7 @@ networking.hostName = lib.mkDefault "nixos"; # Enable networking - networking.networkmanager = { - enable = true; - insertNameservers = [ "10.5.0.1" "1.1.1.1" ]; - }; + networking.networkmanager = { enable = true; }; 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 deleted file mode 100644 index 85b55f7..0000000 --- a/hosts/servers/dionysus/default.nix +++ /dev/null @@ -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"; } - ]; -} diff --git a/hosts/servers/dionysus/hardware.nix b/hosts/servers/dionysus/hardware.nix deleted file mode 100644 index 29db94d..0000000 --- a/hosts/servers/dionysus/hardware.nix +++ /dev/null @@ -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? -} diff --git a/hosts/servers/poseidon/old/default.nix b/hosts/servers/poseidon/old/default.nix index 951752e..cda5c55 100644 --- a/hosts/servers/poseidon/old/default.nix +++ b/hosts/servers/poseidon/old/default.nix @@ -76,6 +76,7 @@ # 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;