2 files changed, 79 insertions, 49 deletions

diff --git a/nix/hosts/lampadas/configuration.nix b/nix/hosts/lampadas/configuration.nix
index 748164c..48df5d9 100644
--- a/nix/hosts/lampadas/configuration.nix
+++ b/nix/hosts/lampadas/configuration.nix
@@ -4,17 +4,18 @@
 
 { pkgs, ... }:
 
-let 
+let
   emile_keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPZi43zHEsoWaQomLGaftPE5k0RqVrZyiTtGqZlpWsew emile@caladan"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzLZ56SEgwZZ0OusTdSDDhpMlxSg1zPNdRLuxKOfrR5 emile@chusuk"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMoHWyC9r0LVk6UlkhBWAJph0F6KHYHh83EI5U9wtfq2 shortcuts@ginaz"
   ];
-in {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+in
+{
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
 
   boot = {
     loader = {
@@ -30,7 +31,7 @@ in {
         ssh = {
           enable = true;
           port = 22;
-          hostKeys = ["/initrd_ssh_host_key_ed25519"];
+          hostKeys = [ "/initrd_ssh_host_key_ed25519" ];
           authorizedKeys = emile_keys;
         };
         postCommands = ''
@@ -38,17 +39,20 @@ in {
         '';
       };
       luks.devices = {
-      	# unsure why luksdata1 is recognized and added to the
-      	# hardware-configuration.nix automatically, but luksdata2 isn't 
+        # unsure why luksdata1 is recognized and added to the
+        # hardware-configuration.nix automatically, but luksdata2 isn't 
         "luksdata2".device = "/dev/disk/by-uuid/e94d7f32-26ef-41e1-b3f3-9e63e4858001";
       };
     };
   };
 
   fileSystems = {
-    "/".options = ["compress=zstd"];
-    "/home".options = ["compress=zstd"];
-    "/nix".options = ["compress=zstd" "noatime"];
+    "/".options = [ "compress=zstd" ];
+    "/home".options = [ "compress=zstd" ];
+    "/nix".options = [
+      "compress=zstd"
+      "noatime"
+    ];
   };
 
   networking = {
@@ -59,7 +63,11 @@ in {
     firewall.allowedTCPPorts = [ 5201 ];
     firewall.allowedUDPPorts = [ 5201 ];
 
-    nameservers = [ "8.8.8.8" "8.8.4.4" "1.1.1.1"];
+    nameservers = [
+      "8.8.8.8"
+      "8.8.4.4"
+      "1.1.1.1"
+    ];
   };
 
   time.timeZone = "Europe/Berlin";
@@ -78,7 +86,10 @@ in {
       };
       emile = {
         isNormalUser = true;
-        extraGroups = [ "wheel" "samba-guest" ];
+        extraGroups = [
+          "wheel"
+          "samba-guest"
+        ];
         openssh.authorizedKeys.keys = emile_keys;
       };
       samba-guest = {
@@ -91,7 +102,7 @@ in {
       };
     };
   };
-  users.groups.samba-guest = {};
+  users.groups.samba-guest = { };
 
   systemd.tmpfiles.rules = [
     "d /data 0755 root root"
@@ -101,8 +112,12 @@ in {
   ];
 
   environment.systemPackages = with pkgs; [
-    vim tailscale
-    nmap ffuf git unzip
+    vim
+    tailscale
+    nmap
+    ffuf
+    git
+    unzip
   ];
 
   programs.mosh.enable = true;
@@ -194,7 +209,7 @@ in {
           "public" = "no";
           "writeable" = "yes";
           "valid users" = "emile";
-          "force user" = "emile"; 
+          "force user" = "emile";
           "fruit:aapl" = "yes";
           "fruit:time machine" = "yes";
           "fruit:delete_empty_adfiles" = "yes";
@@ -220,7 +235,10 @@ in {
   };
 
   nix = {
-    settings.experimental-features = [ "nix-command" "flakes" ];
+    settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
     gc = {
       automatic = true;
       dates = "weekly";
@@ -231,4 +249,3 @@ in {
     };
   };
 }
-
diff --git a/nix/hosts/lampadas/hardware-configuration.nix b/nix/hosts/lampadas/hardware-configuration.nix
index e07fadc..77af5be 100644
--- a/nix/hosts/lampadas/hardware-configuration.nix
+++ b/nix/hosts/lampadas/hardware-configuration.nix
@@ -1,50 +1,63 @@
 # 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, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/ad228603-254e-4b2b-bc43-d8bb8bea02b5";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/ad228603-254e-4b2b-bc43-d8bb8bea02b5";
+    fsType = "btrfs";
+    options = [ "subvol=root" ];
+  };
 
   boot.initrd.luks.devices."luksroot1".device = "/dev/disk/by-uuid/aacddcd3-c861-4a43-8a59-473b2a42e52e";
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/ad228603-254e-4b2b-bc43-d8bb8bea02b5";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/ad228603-254e-4b2b-bc43-d8bb8bea02b5";
+    fsType = "btrfs";
+    options = [ "subvol=home" ];
+  };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/ad228603-254e-4b2b-bc43-d8bb8bea02b5";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/ad228603-254e-4b2b-bc43-d8bb8bea02b5";
+    fsType = "btrfs";
+    options = [ "subvol=nix" ];
+  };
 
-  fileSystems."/data" =
-    { device = "/dev/mapper/luksdata1";
-      fsType = "btrfs";
-    };
+  fileSystems."/data" = {
+    device = "/dev/mapper/luksdata1";
+    fsType = "btrfs";
+  };
 
   boot.initrd.luks.devices."luksdata1".device = "/dev/disk/by-uuid/0737dc4a-a320-4468-a0e1-0db9a1d16b4c";
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DE69-5562";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/DE69-5562";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];