project-wide: nixdirfmt

hosts/athame/meta.nix

@@ -90,19 +90,19 @@ with config.resources; {
   #  cname.target = "athame.kittywit.ch.";
   #};
 
-    #    connection = {
+  #    connection = {
-    #      host = athame.refAttr "ipv4_address";
+  #      host = athame.refAttr "ipv4_address";
-    #      port = 62954;
+  #      port = 62954;
-    #    };
+  #    };
 
-    #triggers.switch = lib.mapAttrs (name: record:
+  #triggers.switch = lib.mapAttrs (name: record:
-    #  {
+  #  {
-    #    A = config.lib.tf.terraformExpr
+  #    A = config.lib.tf.terraformExpr
-    #      ''join(",", ${record.out.resource.namedRef}.addresses)'';
+  #      ''join(",", ${record.out.resource.namedRef}.addresses)'';
-    #    AAAA = config.lib.tf.terraformExpr
+  #    AAAA = config.lib.tf.terraformExpr
-    #      ''join(",", ${record.out.resource.namedRef}.addresses)'';
+  #      ''join(",", ${record.out.resource.namedRef}.addresses)'';
-    #    CNAME = record.out.resource.refAttr "cname";
+  #    CNAME = record.out.resource.refAttr "cname";
-    #    SRV = record.out.resource.refAttr "id";
+  #    SRV = record.out.resource.refAttr "id";
-    #  }.${record.out.type}) config.dns.records;
+  #  }.${record.out.type}) config.dns.records;
 
 }

hosts/samhain/nixos/default.nix

@@ -96,7 +96,7 @@ in {
   networking.useDHCP = false;
   networking.useNetworkd = true;
   networking.firewall.allowPing = true;
- 
+
   systemd.network = {
     networks.enp34s0 = {
       matchConfig.Name = "enp34s0";

hosts/yule/nixos/default.nix

@@ -23,7 +23,7 @@
   networking.useDHCP = false;
   networking.interfaces.enp1s0.useDHCP = true;
   networking.interfaces.wlp2s0.useDHCP = true;
-  
+
   hexchen.network = {
     enable = true;
     pubkey = "9779fd6b5bdba6b9e0f53c96e141f4b11ce5ef749d1b9e77a759a3fdbd33a653";

modules/nixos/tf-glue/default.nix

@@ -27,13 +27,17 @@ in {
       out.set = removeAttrs cfg cfg.attrs;
     };
 
-    deploy.tf.deploy.systems."${config.networking.hostName}" = with tf.resources; {
+    deploy.tf.deploy.systems."${config.networking.hostName}" =
-      isRemote = (config.networking.hostName != builtins.getEnv "HOME_HOSTNAME");
+      with tf.resources; {
-      nixosConfig = config;
+        isRemote =
-      connection = tf.resources.${config.networking.hostName}.connection.set;
+          (config.networking.hostName != builtins.getEnv "HOME_HOSTNAME");
-      triggers.copy."${config.networking.hostName}" = tf.resources.${config.networking.hostName}.refAttr "id";
+        nixosConfig = config;
-      triggers.secrets."${config.networking.hostName}" = tf.resources.${config.networking.hostName}.refAttr "id";
+        connection = tf.resources.${config.networking.hostName}.connection.set;
-    };
+        triggers.copy."${config.networking.hostName}" =
+          tf.resources.${config.networking.hostName}.refAttr "id";
+        triggers.secrets."${config.networking.hostName}" =
+          tf.resources.${config.networking.hostName}.refAttr "id";
+      };
 
     deploy.tf.dns.records."kittywitch_net_${config.networking.hostName}" =
       mkIf (config.hexchen.network.enable) {

pkgs/default.nix

@@ -2,63 +2,68 @@
 
 let
   pkgs = import sources.nixpkgs { inherit config; };
-  overlay = self: super: rec {
+  overlay = self: super:
-    dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
+    rec {
-      inherit (super) dino;
-    };
 
-    discord = super.discord.override { nss = self.nss; };
+      /* dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
+         inherit (super) dino;
+         };
+      */
 
-    ncmpcpp = super.ncmpcpp.override {
+      discord = super.discord.override { nss = self.nss; };
-      visualizerSupport = true;
-      clockSupport = true;
-    };
 
-    waybar = super.waybar.override { pulseSupport = true; };
+      ncmpcpp = super.ncmpcpp.override {
-
+        visualizerSupport = true;
-    notmuch = super.callPackage ./notmuch { inherit (super) notmuch; };
+        clockSupport = true;
-
-    unstable = import sources.nixpkgs-unstable { inherit (self) config; };
-    nur = import sources.NUR {
-      nurpkgs = self;
-      pkgs = self;
-    };
-
-    screenstub = super.callPackage ./screenstub { };
-
-    buildFirefoxXpiAddon = { pname, version, addonId, url, sha256, meta, ... }:
-      pkgs.stdenv.mkDerivation {
-        name = "${pname}-${version}";
-
-        inherit meta;
-
-        src = builtins.fetchurl { inherit url sha256; };
-
-        preferLocalBuild = true;
-        allowSubstitutes = false;
-
-        buildCommand = ''
-          dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-          mkdir -p "$dst"
-          install -v -m644 "$src" "$dst/${addonId}.xpi"
-        '';
       };
 
-    obs-studio = super.obs-studio.override { pipewireSupport = true; };
+      waybar = super.waybar.override { pulseSupport = true; };
 
-    ff-sponsorblock = super.callPackage ./ff-sponsorblock { };
+      notmuch = super.callPackage ./notmuch { inherit (super) notmuch; };
 
-    kat-glauca-dns = super.callPackage ./kat-glauca-dns { };
+      unstable = import sources.nixpkgs-unstable { inherit (self) config; };
+      nur = import sources.NUR {
+        nurpkgs = self;
+        pkgs = self;
+      };
 
-    kat-website = super.callPackage ./kat-website { };
+      screenstub = super.callPackage ./screenstub { };
 
-    kat-weather = super.callPackage ./kat-weather { };
+      buildFirefoxXpiAddon =
+        { pname, version, addonId, url, sha256, meta, ... }:
+        pkgs.stdenv.mkDerivation {
+          name = "${pname}-${version}";
 
-    kat-gpg-status = super.callPackage ./kat-gpg-status { };
+          inherit meta;
 
-    kat-tw-export = super.callPackage ./kat-tw-export { };
+          src = builtins.fetchurl { inherit url sha256; };
 
-    kat-scrot = super.callPackage ./kat-scrot { };
+          preferLocalBuild = true;
-  } // super.lib.optionalAttrs (builtins.pathExists ../private/pkgs) (import ../private/pkgs { inherit super self; });
+          allowSubstitutes = false;
+
+          buildCommand = ''
+            dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+            mkdir -p "$dst"
+            install -v -m644 "$src" "$dst/${addonId}.xpi"
+          '';
+        };
+
+      obs-studio = super.obs-studio.override { pipewireSupport = true; };
+
+      ff-sponsorblock = super.callPackage ./ff-sponsorblock { };
+
+      kat-glauca-dns = super.callPackage ./kat-glauca-dns { };
+
+      kat-website = super.callPackage ./kat-website { };
+
+      kat-weather = super.callPackage ./kat-weather { };
+
+      kat-gpg-status = super.callPackage ./kat-gpg-status { };
+
+      kat-tw-export = super.callPackage ./kat-tw-export { };
+
+      kat-scrot = super.callPackage ./kat-scrot { };
+    } // super.lib.optionalAttrs (builtins.pathExists ../private/pkgs)
+    (import ../private/pkgs { inherit super self; });
 
 in (pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend overlay

shell.nix

@@ -1,4 +1,4 @@
-with (import <nixpkgs> {});
+with (import <nixpkgs> { });
 
 mkShell {
   shellHook = ''