migrate to nixos modules

common/boot/bios.nix

@@ -1,12 +1,28 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+with lib;
+let
+  cfg = config.bios;
+in {
+  options.bios = {
+    enable = mkEnableOption "enable bios boot";
+    device = mkOption {
+      type = types.str;
+    };
+  };
+
+  config = mkIf cfg.enable {
     # Use GRUB 2 for BIOS
-  boot.loader.grub = {
+    boot.loader = {
+      timeout = 2;
+      grub = {
         enable = true;
+        device = cfg.device;
         version = 2;
         useOSProber = true;
         configurationLimit = 20;
         theme = pkgs.nixos-grub2-theme;
       };
+    };
+  };
 }

common/boot/efi.nix

@@ -1,9 +1,18 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+with lib;
+let
+  cfg = config.efi;
+in {
+  options.efi = {
+    enable = mkEnableOption "enable efi boot";
+  };
+
+  config = mkIf cfg.enable {
     # Use GRUB2 for EFI
     boot.loader = {
       efi.canTouchEfiVariables = true;
+      timeout = 2;
       grub = {
         enable = true;
         device = "nodev";
@@ -15,4 +24,5 @@
         theme = pkgs.nixos-grub2-theme;
       };
     };
+  };
 }

common/boot/luks.nix

@@ -1,17 +1,58 @@
 { config, pkgs, lib, ... }:
 
-{
+let
-  # Unlock LUKS disk over ssh
+  cfg = config.luks;
-  boot.initrd.network.enable = true;
+in {
-  boot.initrd.kernelModules = [ "e1000" "e1000e" "virtio_pci" "r8169" ];
+  options.luks = {
-  boot.initrd.network.ssh = {
+    enable = lib.mkEnableOption "enable luks root remote decrypt over ssh/tor";
-    enable = true;
+    device = {
-    port = 22;
+      name = lib.mkOption {
-    hostKeys = [
+        type = lib.types.str;
+        default = "enc-pv";
+      };
+      path = lib.mkOption {
+        type = lib.types.either lib.types.str lib.types.path;
+      };
+      allowDiscards = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+      };
+    };
+    sshHostKeys = lib.mkOption {
+      type = lib.types.listOf (lib.types.either lib.types.str lib.types.path);
+      default = [
         "/secret/ssh_host_rsa_key"
         "/secret/ssh_host_ed25519_key"
       ];
-    authorizedKeys = config.users.users.googlebot.openssh.authorizedKeys.keys;
+    };
+    sshAuthorizedKeys = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = config.users.users.googlebot.openssh.authorizedKeys.keys;
+    };
+    onionConfig = lib.mkOption {
+      type = lib.types.path;
+      default = /secret/onion;
+    };
+    kernelModules = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ "e1000" "e1000e" "virtio_pci" "r8169" ];
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot.initrd.luks.devices.${cfg.device.name} = {
+      device = cfg.device.path;
+      allowDiscards = cfg.device.allowDiscards;
+    };
+
+    # Unlock LUKS disk over ssh
+    boot.initrd.network.enable = true;
+    boot.initrd.kernelModules = cfg.kernelModules;
+    boot.initrd.network.ssh = {
+      enable = true;
+      port = 22;
+      hostKeys = cfg.sshHostKeys;
+      authorizedKeys = cfg.sshAuthorizedKeys;
     };
 
     boot.initrd.postDeviceCommands = ''
@@ -22,7 +63,7 @@
 
     # Make machine accessable over tor for boot unlock
     boot.initrd.secrets = {
-    "/etc/tor/onion/bootup" = /secret/onion;
+      "/etc/tor/onion/bootup" = cfg.onionConfig;
     };
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.tor}/bin/tor
@@ -56,4 +97,5 @@
       tor -f ${torRc} --verify-config
       tor -f ${torRc} &
     '';
+  };
 }

common/common.nix

@@ -4,11 +4,18 @@
   imports = [
     ./flakes.nix
     ./boot/firmware.nix
+    ./boot/efi.nix
+    ./boot/bios.nix
+    ./boot/luks.nix
+    ./server/nginx.nix
+    ./server/thelounge.nix
+    ./server/mumble.nix
+    ./pc/de.nix
   ];
 
   system.stateVersion = "20.09";
 
-  boot.loader.timeout = 2;
+  networking.useDHCP = false;
 
   time.timeZone = "America/New_York";
   i18n.defaultLocale = "en_US.UTF-8";

common/pc/audio.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     # Audio
     sound.enable = true;
 
@@ -25,4 +28,5 @@
 
     # bt headset support
     hardware.bluetooth.enable = true;
+  };
 }

common/pc/chromium.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     # chromium with specific extensions + settings
     programs.chromium = {
       enable = true;
@@ -37,4 +40,5 @@
       ];
       extraPackages32 = with pkgs.pkgsi686Linux; [ vaapiIntel ];
     };
+  };
 }

common/pc/de.nix

@@ -1,7 +1,8 @@
 { config, pkgs, lib, ... }:
 
-{
+let
-  # General
+  cfg = config.de;
+in {
   imports = [
     ./kde.nix
     ./xfce.nix
@@ -14,8 +15,14 @@
     ./vscodium.nix
     ./discord.nix
     ./steam.nix
+    ./touchpad.nix
   ];
 
+  options.de = {
+    enable = lib.mkEnableOption "enable desktop environment";
+  };
+
+  config = lib.mkIf cfg.enable {
     # allow specific unfree packages
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
       "tigervnc" "font-bh-lucidatypewriter" # tigervnc
@@ -42,4 +49,5 @@
     # Security
     services.gnome3.gnome-keyring.enable = true;
     security.pam.services.googlebot.enableGnomeKeyring = true;
+  };
 }

common/pc/discord.nix

@@ -1,7 +1,11 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     users.users.googlebot.packages = [
       pkgs.discord
     ];
+  };
 }

common/pc/firefox.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 #
 # Sort of private firefox
@@ -12,6 +12,8 @@
 #
 
 let
+  cfg = config.de;
+
   somewhatPrivateFF = pkgs.firefox-unwrapped.override {
     privacySupport = true;
     webrtcSupport = true; # mostly private ;)
@@ -87,5 +89,7 @@ let
   };
 in
 {
+  config = lib.mkIf cfg.enable {
     users.users.googlebot.packages = [ firefox ];
+  };
 }

common/pc/kde.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     # kde plasma
     services.xserver = {
       enable = true;
@@ -13,4 +16,5 @@
     users.users.googlebot.packages = with pkgs; [
       akonadi kmail plasma5Packages.kmail-account-wizard
     ];
+  };  
 }

common/pc/pithos.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [
       (self: super: {
         pithos = super.pithos.overrideAttrs (old: rec {
@@ -19,4 +22,5 @@
     users.users.googlebot.packages = with pkgs; [
       pithos
     ];
+  };
 }

common/pc/steam.nix

@@ -1,10 +1,14 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     programs.steam.enable = true;
     hardware.steam-hardware.enable = true; # steam controller
 
     users.users.googlebot.packages = [
       pkgs.steam
     ];
+  };
 }

common/pc/torbrowser.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [
       (self: super: {
         tor-browser-bundle-bin = super.tor-browser-bundle-bin.overrideAttrs (old: rec {
@@ -17,4 +20,5 @@
     users.users.googlebot.packages = with pkgs; [
       tor-browser-bundle-bin
     ];
+  };
 }

common/pc/touchpad.nix

@@ -1,6 +1,14 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de.touchpad;
+in {
+  options.de.touchpad = {
+    enable = lib.mkEnableOption "enable touchpad";
+  };
+
+  config = lib.mkIf cfg.enable {
     services.xserver.libinput.enable = true;
     services.xserver.libinput.touchpad.naturalScrolling = true;
+  };
 }

common/pc/vscodium.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 let
+  cfg = config.de;
+
   extensions = with pkgs.vscode-extensions; [
     bbenoist.Nix # nix syntax support
 #    arrterian.nix-env-selector  # nix dev envs
@@ -12,7 +14,9 @@ let
   };
 in
 {
+  config = lib.mkIf cfg.enable {
     users.users.googlebot.packages = [
       vscodium-with-extensions
     ];
+  };
 }

common/pc/xfce.nix

@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     services.xserver = {
       enable = true;
       desktopManager = {
@@ -13,4 +16,5 @@
     # xfce apps
     users.users.googlebot.packages = with pkgs; [
     ];
+  };
 }

common/pc/yubikey.nix

@@ -1,7 +1,11 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
-{
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
     # yubikey
     services.pcscd.enable = true;
     services.udev.packages = [ pkgs.yubikey-personalization ];
+  };
 }

common/server/mumble.nix

@@ -1,31 +1,34 @@
-{ config, ... }:
+{ lib, config, ... }:
 
 let
-  murmurPort = 23563;
+  cfg = config.services.murmur;
-  domain = "voice.neet.space";
   certs = config.security.acme.certs;
 in {
-  config.networking.firewall.allowedTCPPorts = [ murmurPort ];
+  options.services.murmur.domain = lib.mkOption {
-  config.networking.firewall.allowedUDPPorts = [ murmurPort ];
+    type = lib.types.str;
-
-  config.services.murmur = {
-    enable = true;
-    port = murmurPort;
-    sslCa = "${certs.${domain}.directory}/chain.pem";
-    sslKey = "${certs.${domain}.directory}/key.pem";
-    sslCert = "${certs.${domain}.directory}/fullchain.pem";
-    welcometext = "Welcome to ${domain}";
   };
 
-  config.services.nginx.virtualHosts."${domain}" = {
+  config = lib.mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [ cfg.port ];
+    networking.firewall.allowedUDPPorts = [ cfg.port ];
+
+    services.murmur = {
+      sslCa = "${certs.${cfg.domain}.directory}/chain.pem";
+      sslKey = "${certs.${cfg.domain}.directory}/key.pem";
+      sslCert = "${certs.${cfg.domain}.directory}/fullchain.pem";
+      welcometext = "Welcome to ${cfg.domain}";
+    };
+
+    services.nginx.virtualHosts."${cfg.domain}" = {
       enableACME = true;
       forceSSL = true;
     };
 
     # give mumble access to acme certs
-  config.security.acme.certs.${domain} = {
+    security.acme.certs.${cfg.domain} = {
       group = "murmur";
       postRun = "systemctl reload-or-restart murmur";
     };
-  config.users.users.nginx.extraGroups = [ "murmur" ];
+    users.users.nginx.extraGroups = [ "murmur" ];
+  };
 }

common/server/nginx.nix

@@ -1,8 +1,8 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
+  config = lib.mkIf config.services.nginx.enable {
     services.nginx = {
-    enable = true;
       recommendedGzipSettings = true;
       recommendedOptimisation = true;
       recommendedProxySettings = true;
@@ -11,4 +11,5 @@
 
     networking.firewall.allowedTCPPorts = [ 80 443 ];
     networking.firewall.allowedUDPPorts = [ 80 443 ];
+  };
 }

common/server/nsd.nix

@@ -1,95 +0,0 @@
-{ config, ... }:
-
-{
-  services.nsd = let
-    self = "142.4.210.222";
-    secondary = "167.114.154.31";
-  in {
-    enable = true;
-    interfaces = [ "0.0.0.0" ];
-    roundRobin = true;
-    ipTransparent = true;
-    zones.neet = rec {
-      provideXFR = [ "${secondary} NOKEY" ];
-      notify = provideXFR;
-      children = {
-        "neet.dev.".data = ''
-$TTL 300
-@   IN  SOA     ns1.neet.dev. contact.neet.dev. (
-        2011072000  ;Serial
-        300         ;Refresh
-        300         ;Retry
-        604800      ;Expire
-        300         ;Minimum TTL
-)
-
-@            IN  NS          ns1.neet.dev.
-@            IN  NS          ns2.neet.dev.
-
-@            IN  A           ${self}
-www          IN  A           ${self}
-irc          IN  A           ${self}
-wiki         IN  A           ${self}
-ns1          IN  A           ${self}
-ns2          IN  A           167.114.154.31
-ragnarok     IN  A           155.138.219.146
-coder        IN  A           ${self}
-git          IN  A           ${self}
-
-@            IN  TXT         "rizon_vhost=Googlebot"
-ownercheck   IN  TXT         "dc97b3fd"
-        '';
-        "neet.space.".data = ''
-$TTL 300
-@   IN  SOA     ns1.neet.dev. contact.neet.dev. (
-        2011071017  ;Serial
-        300         ;Refresh
-        300         ;Retry
-        604800      ;Expire
-        300         ;Minimum TTL
-)
-
-@                  IN  NS          ns1.neet.dev.
-@                  IN  NS          ns2.neet.dev.
-
-@                  IN  A           ${self}
-www                IN  A           ${self}
-voice              IN  A           ${self}
-stream             IN  A           ${self}
-radio              IN  A           ${self}
-tube               IN  A           ${self}
-sock.tube          IN  A           ${self}
-mural              IN  A           ${self}
-
-_minecraft._tcp    IN  SRV         0 5 23589 neet.space.
-_mumble._tcp       IN  SRV         0 5 23563 voice.neet.space.
-_mumble._tcp.voice IN  SRV         0 5 23563 voice.neet.space.
-
-@                  IN  TXT         "rizon_vhost=Googlebot"
-ownercheck         IN  TXT         "dc97b3fd"
-        '';
-        "neet.cloud.".data = ''
-$TTL 300
-@   IN  SOA     ns1.neet.dev. contact.neet.dev. (
-        2011071011  ;Serial
-        300         ;Refresh
-        300         ;Retry
-        604800      ;Expire
-        300         ;Minimum TTL
-)
-
-@            IN  NS          ns1.neet.dev.
-@            IN  NS          ns2.neet.dev.
-
-@            IN  A           ${self}
-www          IN  A           ${self}
-paste        IN  A           ${self}
-globie-info  IN  A           ${self}
-files        IN  A           ${self}
-
-ownercheck   IN  TXT         "dc97b3fd"
-        '';
-      };
-    };
-  };
-}

common/server/thelounge.nix

@@ -1,9 +1,28 @@
-{ config, ... }:
+{ lib, config, ... }:
 
-{
+let
+  cfg = config.services.thelounge;
+in {
+  options.services.thelounge = {
+    fileUploadBaseUrl = lib.mkOption {
+      type = lib.types.str;
+    };
+    host = lib.mkOption {
+      type = lib.types.str;
+      example = "example.com";
+    };
+    fileHost = {
+      host = lib.mkOption {
+        type = lib.types.str;
+      };
+      path = lib.mkOption {
+        type = lib.types.str;
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
     services.thelounge = {
-    enable = true;
-    port = 9000;
       private = true;
       extraConfig = {
         reverseProxy = true;
@@ -15,7 +34,7 @@
         fileUpload = {
           enable = true;
           maxFileSize = -1;
-        baseUrl = "https://files.neet.cloud/irc/";
+          baseUrl = cfg.fileUploadBaseUrl;
         };
         transports = [ "websocket" "polling" ];
         leaveMessage = "leaving";
@@ -24,7 +43,7 @@
     };
 
     # the lounge client
-  services.nginx.virtualHosts."irc.neet.dev" = {
+    services.nginx.virtualHosts.${cfg.host} = {
       enableACME = true;
       forceSSL = true;
       locations."/" = {
@@ -34,11 +53,12 @@
     };
 
     # the lounge files
-  services.nginx.virtualHosts."files.neet.cloud" = {
+    services.nginx.virtualHosts.${cfg.fileHost.host} = {
       enableACME = true;
       forceSSL = true;
-    locations."/irc" = {
+      locations.${cfg.fileHost.path} = {
         proxyPass = "http://localhost:${toString config.services.thelounge.port}/uploads";
       };
     };
+  };
 }

machines/mitty/configuration.nix

@@ -4,23 +4,27 @@
   imports =[
     ./hardware-configuration.nix
     ../../common/common.nix
-    ../../common/boot/bios.nix
-    ../../common/boot/luks.nix
-    ../../common/server/nginx.nix
   ];
 
   # cuxhh3ei2djpgf2zdkboceuhaxavgr3ipu3d7a2swx4giy2wosfxspyd.onion
 
-  boot.loader.grub.device = "/dev/vda";
+  nix.flakes.enable = true;
-  networking.hostName = "mitty";
+
-  boot.initrd.luks.devices.enc-pv.device = "/dev/disk/by-uuid/6dcf23ea-cb5e-4329-a88b-832209918c40";
+  bios = {
+    enable = true;
+    device = "/dev/vda";
+  };
+
+  luks = {
+    enable = true;
+    device.path = "/dev/disk/by-uuid/6dcf23ea-cb5e-4329-a88b-832209918c40";
+  };
+
+  networking.hostName = "mitty";
 
-  networking.wireless.enable = false;
-  networking.useDHCP = false;
   networking.interfaces.ens3.useDHCP = true;
 
   security.acme.acceptTerms = true;
   security.acme.email = "letsencrypt+5@tar.ninja";
 
-  nix.flakes.enable = true;
 }

machines/nanachi/configuration.nix

@@ -4,26 +4,30 @@
   imports =[
     ./hardware-configuration.nix
     ../../common/common.nix
-    ../../common/boot/bios.nix
-    ../../common/boot/luks.nix
-    ../../common/server/nginx.nix
   ];
 
   # uxzq63kr2uuwutpaqjna2sg4gnk3p65e5bkvedzx5dsxx2mvxhjm7fid.onion
 
-  boot.loader.grub.device = "/dev/vda";
+  nix.flakes.enable = true;
-  networking.hostName = "nanachi";
+
-  boot.initrd.luks.devices.enc-pv.device = "/dev/disk/by-uuid/e57ac752-bd99-421f-a3b9-0cfa9608a54e";
+  bios = {
+    enable = true;
+    device = "/dev/vda";
+  };
+
+  luks = {
+    enable = true;
+    device.path = "/dev/disk/by-uuid/e57ac752-bd99-421f-a3b9-0cfa9608a54e";
+  };
+
+  networking.hostName = "nanachi";
 
-  networking.wireless.enable = false;
-  networking.useDHCP = false;
   networking.interfaces.ens3.useDHCP = true;
 
   security.acme.acceptTerms = true;
   security.acme.email = "letsencrypt+5@tar.ninja";
 
-  nix.flakes.enable = true;
+  services.nginx.enable = true;
-
   services.nginx.virtualHosts."nanachi.neet.dev" = {
     enableACME = true;
     forceSSL = true;

machines/neet.dev/configuration.nix

@@ -4,12 +4,6 @@
   imports =[
     ./hardware-configuration.nix
     ../../common/common.nix
-    ../../common/boot/bios.nix
-    ../../common/boot/luks.nix
-#   ../../common/server/nsd.nix
-    ../../common/server/nginx.nix
-    ../../common/server/thelounge.nix
-    ../../common/server/mumble.nix
     ../../common/server/gitlab.nix
     ../../common/server/video-stream.nix
     ../../common/server/hydra.nix
@@ -17,30 +11,47 @@
 
   # wt6nczjfvtba6pvjt2qtevwjpq4gcbz46bwjz4hboehgecyqmzqgwnqd.onion
 
-  boot.loader.grub.device = "/dev/sda";
-  networking.hostName = "neetdev";
-  boot.initrd.luks.devices.enc-pv.device = "/dev/disk/by-uuid/06f6b0bf-fe79-4b89-a549-b464c2b162a1";
-
-  networking.wireless.enable = false;
-  networking.useDHCP = false;
-  networking.interfaces.eno1.useDHCP = true;
-
-  security.acme.acceptTerms = true;
-  security.acme.email = "letsencrypt+5@tar.ninja";
-
   nix.flakes.enable = true;
 
-  # tmp
+  bios = {
-  services.nginx.virtualHosts."tmp.neet.space" = {
+    enable = true;
-    enableACME = true;
+    device = "/dev/sda";
-    forceSSL = true;
-    root = "/var/www/tmp";
   };
 
+  luks = {
+    enable = true;
+    device.path = "/dev/disk/by-uuid/06f6b0bf-fe79-4b89-a549-b464c2b162a1";
+  };
+
+  networking.hostName = "neetdev";
+
+  networking.interfaces.eno1.useDHCP = true;
+
+  services.nginx.enable = true;
+  security.acme.acceptTerms = true;
+  security.acme.email = "letsencrypt+5@tar.ninja";
+
   # placeholder
   services.nginx.virtualHosts."radio.neet.space" = {
     enableACME = true;
     forceSSL = true;
   };
+
+  services.thelounge = {
+    enable = true;
+    port = 9000;
+    fileUploadBaseUrl = "https://files.neet.cloud/irc/";
+    host = "irc.neet.dev";
+    fileHost = {
+      host = "files.neet.cloud";
+      path = "/irc";
+    };
+  };
+
+  config.services.murmur = {
+    enable = true;
+    port = 23563;
+    domain = "voice.neet.space";
+  };
 }
 

machines/reg/configuration.nix

@@ -4,25 +4,27 @@
   imports = [
     ./hardware-configuration.nix
     ../../common/common.nix
-    ../../common/boot/efi.nix
-    ../../common/boot/luks.nix
-    ../../common/pc/de.nix
-    ../../common/pc/touchpad.nix
   ];
 
   # smcxui7kwoyxpswwage4fkcppxnqzpw33xcmxmlhxvk5gcp5s6lrtfad.onion
 
-  networking.hostName = "reg";
-  boot.initrd.luks.devices.enc-pv = {
-    device = "/dev/disk/by-uuid/975d8427-2c6a-440d-a1d2-18dd15ba5bc2";
-    allowDiscards = true;
-  };
-
   nix.flakes.enable = true;
 
-  networking.useDHCP = false;
+  efi.enable = true;
+
+  luks = {
+    enable = true;
+    device = {
+      path = "/dev/disk/by-uuid/975d8427-2c6a-440d-a1d2-18dd15ba5bc2";
+      allowDiscards = true;
+    };
+  };
+
+  networking.hostName = "reg";
+
+  de.enable = true;
+  de.touchpad.enable = true;
+
   networking.interfaces.enp57s0f1.useDHCP = true;
-  networking.interfaces.wlp0s20f3.useDHCP = true;
-  networking.interfaces.wwp0s20f0u2i12.useDHCP = true;
 }