From 90d56d059fae64ae0f1c1e3f6552ad4b335385cd Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <depasquale+git@giugl.io>
Date: Thu, 1 Jul 2021 06:26:22 +0200
Subject: [PATCH] beautification

---
 hosts/gAluminum/configuration.nix | 130 ++++++++++++++----------------
 1 file changed, 60 insertions(+), 70 deletions(-)

diff --git a/hosts/gAluminum/configuration.nix b/hosts/gAluminum/configuration.nix
index 5ac188a..03dd178 100644
--- a/hosts/gAluminum/configuration.nix
+++ b/hosts/gAluminum/configuration.nix
@@ -1,49 +1,78 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./hardware-configuration.nix ];
+  imports = [ configuration.nix ];
 
   nixpkgs.config.allowUnfree = true;
-  networking.hostName = "gAluminum";
 
-  time.timeZone = "Europe/London";
+  time.timeZone = "Europe/Rome";
 
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
+  fileSystems."/tmp" = {
+    device = "tmpfs";
+    fsType = "tmpfs";
+    options = ["size=2G"];
   };
 
-  # Xserver
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
+  fileSystems."/home/giulio/Downloads" = {
+    device = "tmpfs";
+    fsType = "tmpfs";
+    options = ["size=3G"];
+  };
 
-  # Configure keymap in X11
-  services.xserver.layout = "us";
-  services.xserver.xkbOptions = "eurosign:e";
+  boot = {
+    loader.efi.canTouchEfiVariables = true;
+    loader.efi.efiSysMountPoint = "/boot/efi";
+
+    loader.systemd-boot.enable = true;
+
+    initrd.luks.devices = {
+      root = {
+        device = "/dev/disk/by-uuid/c2bac3a6-0999-4e1d-a676-bf4bcafee2d4";
+        preLVM = true;
+        allowDiscards = true;
+      };
+    };
+  };
+
+  networking = {
+    hostName = "gAluminum";
+    wg-quick.interfaces = {
+      giupi = {
+        address = ["10.3.0.2/32"];
+        privateKeyFile = "/etc/wireguard/giupi.key";
+        dns = ["10.3.0.1"];
+        peers = [
+          {
+            publicKey = "I4glUMvIGjjhvQMKhwGc8copPl2t9Us/YYRjT0BKuiw=";
+            allowedIPs = ["0.0.0.0/0"];
+            endpoint = "giugl.io:1194";
+            persistentKeepalive = 25;
+          }
+        ];
+      };
+    };
+  };
+
+  services = {
+
+    xserver = {
+      enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+      libinput.enable = true;
+      layout = "us";
+      xkbOptions = "eurosign:e";
+    };
+
+    printing.enable = true;
+    dbus.packages = with pkgs; [ gnome3.dconf ];
+    udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; 
+  };
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
 
-  # Enable sound.
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.giulio = {
-    description = "Giulio De Pasquale";
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    extraGroups = [ "wheel" "docker" "networkmanager" ];
-  };
-  programs.zsh.enableCompletion = true;  
-  programs.zsh.enableBashCompletion = true;
-  services.dbus.packages = with pkgs; [ gnome3.dconf ];
-  services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; 
   environment.systemPackages = with pkgs; [
     wget
     git
@@ -70,44 +99,5 @@
 
   security.pam.services.gdm.enableGnomeKeyring = true;
 
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-
-  boot.loader.systemd-boot.enable = true;
-  boot.initrd.luks.devices = {
-    root = {
-      device = "/dev/disk/by-uuid/c2bac3a6-0999-4e1d-a676-bf4bcafee2d4";
-      preLVM = true;
-      allowDiscards = true;
-    };
-  };
-
-  networking.wg-quick.interfaces = {
-    giupi = {
-      address = ["10.3.0.2/32"];
-      privateKeyFile = "/etc/wireguard/giupi.key";
-      dns = ["10.3.0.1"];
-      peers = [
-        {
-          publicKey = "I4glUMvIGjjhvQMKhwGc8copPl2t9Us/YYRjT0BKuiw=";
-          allowedIPs = ["0.0.0.0/0"];
-          endpoint = "giugl.io:1194";
-          persistentKeepalive = 25;
-        }
-      ];
-    };
-  };
-
-  fileSystems."/tmp" = {
-    device = "tmpfs";
-    fsType = "tmpfs";
-    options = ["size=2G"];
-  };
-
-  fileSystems."/home/giulio/Downloads" = {
-    device = "tmpfs";
-    fsType = "tmpfs";
-    options = ["size=3G"];
-  };
 }