diff --git a/flake.nix b/flake.nix index 66d7be1..9c8c84f 100644 --- a/flake.nix +++ b/flake.nix @@ -108,7 +108,6 @@ "reg" = mkSystem "x86_64-linux" nixpkgs ./machines/reg/configuration.nix; "ray" = mkSystem "x86_64-linux" nixpkgs ./machines/ray/configuration.nix; "nat" = mkSystem "aarch64-linux" nixpkgs ./machines/nat/configuration.nix; - "neetdev" = mkSystem "x86_64-linux" nixpkgs ./machines/neet.dev/configuration.nix; "liza" = mkSystem "x86_64-linux" nixpkgs ./machines/liza/configuration.nix; "ponyo" = mkSystem "x86_64-linux" nixpkgs ./machines/ponyo/configuration.nix; "s0" = mkSystem "aarch64-linux" nixpkgs-unstable ./machines/storage/s0/configuration.nix; diff --git a/machines/neet.dev/configuration.nix b/machines/neet.dev/configuration.nix deleted file mode 100644 index 609e4b9..0000000 --- a/machines/neet.dev/configuration.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - imports =[ - ./hardware-configuration.nix - ]; - - # wt6nczjfvtba6pvjt2qtevwjpq4gcbz46bwjz4hboehgecyqmzqgwnqd.onion - - firmware.x86_64.enable = true; - bios = { - enable = true; - device = "/dev/sda"; - }; - - luks = { - enable = true; - device.path = "/dev/disk/by-uuid/06f6b0bf-fe79-4b89-a549-b464c2b162a1"; - }; - - networking.hostName = "neetdev"; - - system.autoUpgrade.enable = true; - - networking.interfaces.eno1.useDHCP = true; - - services.nginx.enable = true; - security.acme.acceptTerms = true; - security.acme.email = "letsencrypt+5@tar.ninja"; - - services.thelounge = { - enable = true; - port = 9000; - fileUploadBaseUrl = "https://files.neet.cloud/irc/"; - host = "irc.neet.dev"; - fileHost = { - host = "files.neet.cloud"; - path = "/irc"; - }; - }; - - services.murmur = { - enable = true; - port = 23563; - domain = "voice.neet.space"; - }; -} diff --git a/machines/neet.dev/hardware-configuration.nix b/machines/neet.dev/hardware-configuration.nix deleted file mode 100644 index a076c24..0000000 --- a/machines/neet.dev/hardware-configuration.nix +++ /dev/null @@ -1,38 +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 = [ "ahci" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/35ca3392-548a-45ef-9e72-392cddfcea1b"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/35ca3392-548a-45ef-9e72-392cddfcea1b"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/d1d3cc19-980f-42ea-9784-a223ea71f435"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/86fdcded-3f0e-4ee0-81bc-c1c92cb96ab1"; } - ]; - - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; -} diff --git a/machines/ponyo/configuration.nix b/machines/ponyo/configuration.nix index 0ea8a10..b4a4a2d 100644 --- a/machines/ponyo/configuration.nix +++ b/machines/ponyo/configuration.nix @@ -22,6 +22,23 @@ services.zerotierone.enable = true; + services.thelounge = { + enable = true; + port = 9000; + fileUploadBaseUrl = "https://files.neet.cloud/irc/"; + host = "irc.neet.dev"; + fileHost = { + host = "files.neet.cloud"; + path = "/irc"; + }; + }; + + services.murmur = { + enable = true; + port = 23563; + domain = "voice.neet.space"; + }; + services.nginx.enable = true; services.nginx.virtualHosts."jellyfin.neet.cloud" = { enableACME = true;