diff --git a/flake.nix b/flake.nix index dee9411..ddd5625 100644 --- a/flake.nix +++ b/flake.nix @@ -128,16 +128,6 @@ inherit self inputs username; }; }; - daisy = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/daisy) - ]; - specialArgs = { - host = "daisy"; - inherit self inputs username; - }; - }; }; }; } diff --git a/hosts/daisy/default.nix b/hosts/daisy/default.nix deleted file mode 100644 index f511347..0000000 --- a/hosts/daisy/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: -{ - imports = [ - ./hardware-configuration.nix - ./../../modules/core/default.server.nix - # ./../../modules/services/violet.nix - ]; - - networking = { - hostName = "daisy"; - networkmanager.enable = true; - firewall = { - allowedTCPPorts = [ - # 80 - # 443 - # 25565 - 9123 - ]; - }; - }; - - time.timeZone = "Europe/Amsterdam"; - - environment.systemPackages = with pkgs; [ - pkgs.kitty.terminfo - ]; - - boot = { - loader.grub = { - enable = true; - device = "/dev/sdb"; - useOSProber = true; - }; - kernelModules = [ "acpi_call" ]; - extraModulePackages = - with config.boot.kernelPackages; - [ - acpi_call - cpupower - ] - ++ [ pkgs.cpupower-gui ]; - }; -} diff --git a/hosts/daisy/hardware-configuration.nix b/hosts/daisy/hardware-configuration.nix deleted file mode 100644 index 4508655..0000000 --- a/hosts/daisy/hardware-configuration.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 = [ "ehci_pci" "ahci" "uhci_hcd" "hpsa" "mpt3sas" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/02aaca49-be45-42ad-ba44-6f5dbfe9032e"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/40aff86f-c371-4f7f-ab62-5665c4f1c071"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.eno2.useDHCP = lib.mkDefault true; - # networking.interfaces.eno3.useDHCP = lib.mkDefault true; - # networking.interfaces.eno4.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/modules/core/user.nix b/modules/core/user.nix index 8370132..eef3a74 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -26,10 +26,6 @@ [ ./../home/default.server.nix ] else if (host == "posy") then [ ./../home/default.server.nix ] - else if (host == "hazel") then - [ ./../home/default.server.nix ] - else if (host == "daisy") then - [ ./../home/default.server.nix ] # else if (host == "yoshino") then # [ ./../home/default.nix ] else diff --git a/roles/gui.nix b/roles/gui.nix index 387ed07..150c808 100644 --- a/roles/gui.nix +++ b/roles/gui.nix @@ -46,9 +46,6 @@ in # Gaming lunar-client - - # Not GUI but specific to GUI usage - sshuttle ]; }; }