diff --git a/flake.nix b/flake.nix index f9e0b32..89f7d46 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,15 @@ (import ./systems/mom-laptop inputs) ]; }; + notbuntu = unstable.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit self;}; + modules = [ + (import ./systems/notbuntu inputs) + (import ./modules/nix.nix inputs) + (import ./modules/unfree.nix inputs) + ]; + }; }; } // flake-utils.lib.eachDefaultSystem ( diff --git a/systems/gerg-desktop/containers.nix b/systems/gerg-desktop/containers.nix index 9fa3aff..8bc8df0 100644 --- a/systems/gerg-desktop/containers.nix +++ b/systems/gerg-desktop/containers.nix @@ -1,11 +1,4 @@ _: {...}: { - networking = { - firewall = { - # allowedUDPPorts = [25565]; - # allowedTCPPorts = [25565]; - }; - }; - containers."minecraft" = { privateNetwork = true; hostBridge = "bridge0"; diff --git a/systems/notbuntu/default.nix b/systems/notbuntu/default.nix new file mode 100644 index 0000000..15ae4e3 --- /dev/null +++ b/systems/notbuntu/default.nix @@ -0,0 +1,93 @@ +_: {pkgs, ...}: { + networking = { + hostName = "notbuntu"; + useDHCP = true; + firewall = { + allowPing = true; + allowedTCPPorts = [25565]; + }; + }; + programs = { + mtr.enable = true; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + }; + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "yes"; + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; + }; + + time.timeZone = "America/New_York"; + services = { + timesyncd = { + enable = true; + servers = [ + "time.cloudflare.com" + ]; + }; + }; + i18n.defaultLocale = "en_US.UTF-8"; + environment.systemPackages = with pkgs; [ + neovim + gitMinimal + ]; + users.users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8 gerg@gerg-desktop" + ]; + system.stateVersion = "23.05"; + + boot = { + kernelPackages = pkgs.linuxPackages_latest; + kernelParams = ["net.ifnames=0" "biosdevname=0"]; + cleanTmpDir = true; + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + initrd = { + availableKernelModules = ["ata_piix" "uhci_hcd" "sd_mod" "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio"]; + kernelModules = ["virtio_balloon" "virtio_console" "virtio_rng"]; + }; + kernelModules = ["kvm-intel"]; + extraModulePackages = []; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/dc14282f-28a2-4858-919e-60948f60d6f0"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/0A33-1923"; + fsType = "vfat"; + }; + }; + + hardware = { + enableRedistributableFirmware = true; + cpu.intel.updateMicrocode = true; + }; + nixpkgs.hostPlatform = "x86_64-linux"; + + services.nginx = { + enable = true; + + eventsConfig = '' + worker_connections 768; + ''; + appendConfig = '' + stream { + server { + listen 0.0.0.0:25565 reuseport; + proxy_pass [2605:59c8:2500:5394:cdc3:3ace:9d30:f8bc]:25565; + } + } + ''; + }; +}