about summary refs log tree commit diff
path: root/users/wpcarro/nixos
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-01-30T16·06+0300
committertazjin <tazjin@tvl.su>2022-01-31T16·11+0000
commitaa122cbae78ce97d60c0c98ba14df753d97e40b1 (patch)
tree12b98d85c4b18fe870feb26de70db9ba61837bd7 /users/wpcarro/nixos
parent2d10d60fac0fd00a71b65cfdcb9fba0477b2086c (diff)
style: format entire depot with nixpkgs-fmt r/3723
This CL can be used to compare the style of nixpkgs-fmt against other
formatters (nixpkgs, alejandra).

Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: cynthia <cynthia@tvl.fyi>
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: eta <tvl@eta.st>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/wpcarro/nixos')
-rw-r--r--users/wpcarro/nixos/diogenes/default.nix13
-rw-r--r--users/wpcarro/nixos/marcus/default.nix3
-rw-r--r--users/wpcarro/nixos/marcus/hardware.nix4
3 files changed, 11 insertions, 9 deletions
diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix
index d1246de4f34f..f92de19d18bf 100644
--- a/users/wpcarro/nixos/diogenes/default.nix
+++ b/users/wpcarro/nixos/diogenes/default.nix
@@ -4,7 +4,8 @@ let
   inherit (depot.users) wpcarro;
   name = "diogenes";
   domainName = "billandhiscomputer.com";
-in wpcarro.terraform.googleCloudVM {
+in
+wpcarro.terraform.googleCloudVM {
   project = "wpcarros-infrastructure";
   name = "diogenes";
   region = "us-central1";
@@ -23,7 +24,7 @@ in wpcarro.terraform.googleCloudVM {
       type = "A";
       ttl = 300; # 5m
       managed_zone = "\${google_dns_managed_zone.${name}.name}";
-      rrdatas = ["\${google_compute_instance.${name}.network_interface[0].access_config[0].nat_ip}"];
+      rrdatas = [ "\${google_compute_instance.${name}.network_interface[0].access_config[0].nat_ip}" ];
     };
 
     resource.google_compute_instance."${name}" = {
@@ -43,7 +44,7 @@ in wpcarro.terraform.googleCloudVM {
       type = "A";
       ttl = 300; # 5m
       managed_zone = "\${google_dns_managed_zone.monsterpoker.name}";
-      rrdatas = ["\${google_compute_instance.${name}.network_interface[0].access_config[0].nat_ip}"];
+      rrdatas = [ "\${google_compute_instance.${name}.network_interface[0].access_config[0].nat_ip}" ];
     };
   };
 
@@ -54,9 +55,9 @@ in wpcarro.terraform.googleCloudVM {
 
     networking = {
       firewall.allowedTCPPorts = [
-        22   # ssh
-        80   # http
-        443  # https
+        22 # ssh
+        80 # http
+        443 # https
         6698 # quassel
       ];
       firewall.allowedUDPPortRanges = [
diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix
index 1de320f10c20..a84d33ead75b 100644
--- a/users/wpcarro/nixos/marcus/default.nix
+++ b/users/wpcarro/nixos/marcus/default.nix
@@ -13,7 +13,8 @@ let
     enableDaemon = false;
     monolithic = false;
   };
-in {
+in
+{
   imports = [
     (depot.path + "/users/wpcarro/nixos/marcus/hardware.nix")
     "${pkgs.home-manager.src}/nixos"
diff --git a/users/wpcarro/nixos/marcus/hardware.nix b/users/wpcarro/nixos/marcus/hardware.nix
index a5735bc8e22b..cd80685abe13 100644
--- a/users/wpcarro/nixos/marcus/hardware.nix
+++ b/users/wpcarro/nixos/marcus/hardware.nix
@@ -6,9 +6,9 @@
   ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [];
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/b8b911ee-e9b9-40ea-89d6-551f11350e7b";