Commit c1ffad6588c7

@@ -108,7 +108,7 @@ in
       keybindings =
         let
           mod = config.wayland.windowManager.sway.config.modifier;
-          inherit (config.wayland.windowManager.sway.config) left down up right menu terminal;
+          inherit (config.wayland.windowManager.sway.config) terminal;
         in
         {
           "${mod}+Return" = "exec ${terminal}";
@@ -176,34 +176,52 @@ in
           };
         }
         {
-          criteria = { title = "Save File"; };
+          criteria = {
+            title = "Save File";
+          };
           command = "floating enable, resize set width 600px height 800px";
         }
         {
-          criteria = { class = "pwvucontrol"; };
+          criteria = {
+            class = "pwvucontrol";
+          };
           command = "floating enable";
         }
         {
-          criteria = { title = "(Sharing Indicator)"; };
+          criteria = {
+            title = "(Sharing Indicator)";
+          };
           command = "inhibit_idle visible, floating enable";
         }
         {
           # browser zoom|meet|bluejeans
-          criteria = { title = "(Blue Jeans)|(Meet)|(Zoom Meeting)"; };
+          criteria = {
+            title = "(Blue Jeans)|(Meet)|(Zoom Meeting)";
+          };
           command = "inhibit_idle visible";
         }
         # for_window [app_id="^chrome-.*"] shortcuts_inhibitor disable
         {
-          criteria = { app_id = "^chrome-.*"; };
+          criteria = {
+            app_id = "^chrome-.*";
+          };
           command = "shortcuts_inhibitor disable";
         }
       ];
       startup = [
-        { command = "dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY DBUS_SESSION_BUS_ADDRESS SWAYSOCK XDG_SESSION_TYPE XDG_SESSION_DESKTOP XDG_CURRENT_DESKTOP"; } #workaround
+        {
+          command = "dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY DBUS_SESSION_BUS_ADDRESS SWAYSOCK XDG_SESSION_TYPE XDG_SESSION_DESKTOP XDG_CURRENT_DESKTOP";
+        } # workaround
         # Make sure we update systemd service env variables with the current ones. This is required for dbus to work properly.
         { command = "dbus-update-activation-environment --systemd --all"; }
-        { command = "systemctl --user restart kanshi"; always = true; }
-        { command = "${pkgs.pa-notify}/bin/pa-notify -u0"; always = true; }
+        {
+          command = "systemctl --user restart kanshi";
+          always = true;
+        }
+        {
+          command = "${pkgs.pa-notify}/bin/pa-notify -u0";
+          always = true;
+        }
         # Probably put a condition here.
         { command = "emacs --fg-daemon"; }
         { command = "i3-back"; }
@@ -214,7 +232,7 @@ in
     extraConfig =
       let
         mod = config.wayland.windowManager.sway.config.modifier;
-        inherit (config.wayland.windowManager.sway.config) left down up right menu terminal;
+        inherit (config.wayland.windowManager.sway.config) menu;
       in
       ''
         bindcode ${mod}+33 exec "${menu}"

@@ -6,15 +6,30 @@ _: {
       {
         profile.name = "aomi";
         profile.outputs = [
-          { criteria = "eDP-1"; status = "disable"; }
-          { criteria = "DP-1"; status = "enable"; position = "0,0"; mode = "3440x1440"; scale = 1.0; }
+          {
+            criteria = "eDP-1";
+            status = "disable";
+          }
+          {
+            criteria = "DP-1";
+            status = "enable";
+            position = "0,0";
+            mode = "3440x1440";
+            scale = 1.0;
+          }
         ];
       }
       {
         profile.name = "home-undocked";
         profile.outputs = [
           # Output eDP-1 'AU Optronics 0xD291 Unknown'
-          { criteria = "eDP-1"; status = "enable"; position = "0,0"; mode = "1920x1200"; scale = 1.0; }
+          {
+            criteria = "eDP-1";
+            status = "enable";
+            position = "0,0";
+            mode = "1920x1200";
+            scale = 1.0;
+          }
         ];
       }
       {
@@ -24,9 +39,21 @@ _: {
           # Output eDP-1 'Unknown 0xD291 Unknown'
           # Output DP-5 'LG Electronics LG ULTRAWIDE 0x0005D10C' (focused)
           # { criteria = "LG Electronics LG ULTRAWIDE 0x0000D50C"; status = "enable"; position = "0,0"; mode = "3440x1440"; scale = 1.0; }
-          { criteria = "DP-5"; status = "enable"; position = "0,0"; mode = "3440x1440"; scale = 1.0; }
+          {
+            criteria = "DP-5";
+            status = "enable";
+            position = "0,0";
+            mode = "3440x1440";
+            scale = 1.0;
+          }
           # Use it as a "shareable" screen when needed
-          { criteria = "eDP-1"; status = "enable"; position = "1460,1440"; mode = "1920x1200"; scale = 1.0; }
+          {
+            criteria = "eDP-1";
+            status = "enable";
+            position = "1460,1440";
+            mode = "1920x1200";
+            scale = 1.0;
+          }
         ];
       }
     ];

@@ -1,5 +1,4 @@
-_:
-{
+_: {
   services.mako = {
     enable = true;
     font = "JetBrains Mono 12";

@@ -7,8 +7,14 @@
   services.swayidle = {
     enable = true;
     events = [
-      { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen"; }
-      { event = "lock"; command = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen"; }
+      {
+        event = "before-sleep";
+        command = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen";
+      }
+      {
+        event = "lock";
+        command = "${pkgs.swaylock}/bin/swaylock --daemonize -i $HOME/desktop/pictures/lockscreen";
+      }
     ];
     timeouts = [
       {

@@ -29,7 +29,7 @@ _: {
       "shift+down" = "neighboring_window down";
     };
     themeFile = "Tango_Light";
-    # action_alias mkh kitten hints --alphabet asdfghjklqwertyuiopzxcvbnmASDFGHJKLQWERTYUIOPZXCVBNM 
+    # action_alias mkh kitten hints --alphabet asdfghjklqwertyuiopzxcvbnmASDFGHJKLQWERTYUIOPZXCVBNM
     # map kitty_mod+n    mkh --type=linenum emacsclient -c -nw +{line} {path}
   };
 }

@@ -1,76 +1,92 @@
-{ config, pkgs, hostname, ... }:
+{ pkgs, hostname, ... }:
 {
   accounts.email = {
     maildirBasePath = "desktop/mails";
-    accounts = {
-      "icloud" = {
-        primary = true;
-        address = "vincent@demeester.fr";
-        userName = "vdemeester@icloud.com";
-        realName = "Vincent Demeester";
-        passwordCommand = "${pkgs.passage}/bin/passage show mails/icloud/vdemeester";
-        imap.host = "imap.mail.me.com";
-        smtp.host = "smtp.mail.me.com";
-        smtp.port = 587;
-        mbsync = {
-          enable = true;
-          create = "both";
-          expunge = "both";
-          extraConfig = {
-            channel = {
-              Sync = "All";
+    accounts =
+      {
+        "icloud" = {
+          primary = true;
+          address = "vincent@demeester.fr";
+          userName = "vdemeester@icloud.com";
+          realName = "Vincent Demeester";
+          passwordCommand = "${pkgs.passage}/bin/passage show mails/icloud/vdemeester";
+          imap.host = "imap.mail.me.com";
+          smtp.host = "smtp.mail.me.com";
+          smtp.port = 587;
+          mbsync = {
+            enable = true;
+            create = "both";
+            expunge = "both";
+            extraConfig = {
+              channel = {
+                Sync = "All";
+              };
+              account = {
+                Timeout = 120;
+                PipelineDepth = 1;
+              };
             };
-            account = {
-              Timeout = 120;
-              PipelineDepth = 1;
+          };
+          mu.enable = true;
+          msmtp = {
+            enable = true;
+            extraConfig = {
+              tls_starttls = "on";
             };
           };
         };
-        mu.enable = true;
-        msmtp = {
-          enable = true;
-          extraConfig = {
-            tls_starttls = "on";
-          };
-        };
-      };
-    } // (if (hostname == "kyushu") then {
-      # Work emails
-      "redhat" = {
-        # primary = true; # because it's work, but it's really just for notmuch
-        address = "vdemeest@redhat.com";
-        userName = "vdemeest@redhat.com";
-        realName = "Vincent Demeester";
-        passwordCommand = "${pkgs.passage}/bin/passage show mails/gmail/redhat";
-        imap.host = "imap.gmail.com";
-        smtp.host = "smtp.gmail.com";
-        flavor = "gmail.com";
-        mbsync = {
-          enable = true;
-          create = "both";
-          expunge = "both";
-          # Sync everything *but* "[Gmail] All Mail" to get the "organized" view.
-          patterns = [ "*" "!area/github" "!memo-list" "![Gmail]*" "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/Trash" "[Gmail]/Drafts" ];
-          extraConfig = {
-            channel = {
-              Sync = "All";
+      }
+      // (
+        if (hostname == "kyushu") then
+          {
+            # Work emails
+            "redhat" = {
+              # primary = true; # because it's work, but it's really just for notmuch
+              address = "vdemeest@redhat.com";
+              userName = "vdemeest@redhat.com";
+              realName = "Vincent Demeester";
+              passwordCommand = "${pkgs.passage}/bin/passage show mails/gmail/redhat";
+              imap.host = "imap.gmail.com";
+              smtp.host = "smtp.gmail.com";
+              flavor = "gmail.com";
+              mbsync = {
+                enable = true;
+                create = "both";
+                expunge = "both";
+                # Sync everything *but* "[Gmail] All Mail" to get the "organized" view.
+                patterns = [
+                  "*"
+                  "!area/github"
+                  "!memo-list"
+                  "![Gmail]*"
+                  "[Gmail]/Sent Mail"
+                  "[Gmail]/Starred"
+                  "[Gmail]/Trash"
+                  "[Gmail]/Drafts"
+                ];
+                extraConfig = {
+                  channel = {
+                    Sync = "All";
+                  };
+                  account = {
+                    Timeout = 120;
+                    PipelineDepth = 1;
+                  };
+                };
+              };
+              mu.enable = true;
+              # aerc.enable = true;
+              msmtp = {
+                enable = true;
+                # extraConfig = {
+                #   tls_starttls = "on";
+                # };
+              };
             };
-            account = {
-              Timeout = 120;
-              PipelineDepth = 1;
-            };
-          };
-        };
-        mu.enable = true;
-        # aerc.enable = true;
-        msmtp = {
-          enable = true;
-          # extraConfig = {
-          #   tls_starttls = "on";
-          # };
-        };
-      };
-    } else { });
+          }
+        else
+          { }
+      );
   };
 
   programs.mbsync.enable = true;

@@ -6,6 +6,9 @@
       hwdec = "auto";
       osc = "no";
     };
-    scripts = [ pkgs.mpvScripts.mpris pkgs.mpvScripts.modernz ];
+    scripts = [
+      pkgs.mpvScripts.mpris
+      pkgs.mpvScripts.modernz
+    ];
   };
 }

@@ -83,8 +83,15 @@ in
         genericName = "Web Browser";
         exec = "firefox %U";
         terminal = false;
-        categories = [ "Application" "Network" "WebBrowser" ];
-        mimeType = [ "text/html" "text/xml" ];
+        categories = [
+          "Application"
+          "Network"
+          "WebBrowser"
+        ];
+        mimeType = [
+          "text/html"
+          "text/xml"
+        ];
       };
     };
   };

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     # containers
     oras
@@ -27,13 +28,14 @@
     # build
     dagger
     # google
-    (google-cloud-sdk.withExtraComponents
-      (with google-cloud-sdk.components; [
+    (google-cloud-sdk.withExtraComponents (
+      with google-cloud-sdk.components;
+      [
         gke-gcloud-auth-plugin
         gcloud-man-pages
         cloud-run-proxy
         terraform-tools
-      ])
-    )
+      ]
+    ))
   ];
 }

@@ -1,6 +1,7 @@
-{ lib
-, desktop
-, ...
+{
+  lib,
+  desktop,
+  ...
 }:
 {
   imports = [

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   capture = pkgs.writeScriptBin "capture" ''
     #!${pkgs.stdenv.shell}
@@ -12,145 +17,146 @@ let
     #!${pkgs.stdenv.shell}
     emacsclient --create-frame $@
   '';
-  myExtraPackages = epkgs: with epkgs; [
-    ace-window
-    adoc-mode
-    age
-    aggressive-indent
-    aidermacs
-    alert
-    async
-    avy
-    beginend
-    cape
-    casual
-    casual-avy
-    conner
-    consult
-    consult-dir
-    consult-denote
-    consult-project-extra
-    consult-vc-modified-files
-    copilot
-    copilot-chat
-    corfu
-    corfu-candidate-overlay
-    dape
-    dash
-    denote
-    denote-org
-    denote-journal
-    denote-sequence # maybe ?
-    denote-menu
-    devdocs
-    diff-hl
-    dired-collapse
-    dired-narrow
-    dired-rsync
-    diredfl
-    dockerfile-mode
-    doom-modeline
-    easy-kill
-    eat
-    edit-indirect
-    editorconfig
-    eldoc-box
-    pr-review
-    embark
-    embark-consult
-    emms
-    envrc
-    eshell-atuin
-    eshell-prompt-extras
-    esup
-    flimenu
-    flymake-yamllint
-    git-modes
-    go-mode
-    gotest
-    gotest-ts
-    gptel
-    hardhat
-    helpful
-    highlight
-    highlight-indentation
-    htmlize
-    ibuffer-vc
-    indent-bars
-    jinx
-    json-mode
-    kubed
-    ligature
-    macrostep
-    magit
-    magit-popup
-    marginalia
-    markdown-mode
-    minions
-    modus-themes
-    multi-vterm
-    mu4e
-    mwim
-    nix-mode
-    nix-ts-mode
-    nixpkgs-fmt
-    no-littering
-    noether
-    # notmuch
-    ob-async
-    ob-go
-    ob-http
-    orderless # TODO configure this
-    org
-    org-contrib
-    org-download
-    org-modern
-    org-nix-shell
-    org-ql
-    org-review
-    org-rich-yank
-    org-tree-slide
-    org-web-tools
-    orgalist
-    orgit
-    outline-indent
-    ox-pandoc
-    pandoc-mode
-    # password-store
-    # pkgs.bookmatrk-plus # Do I use it ?
-    popper
-    project-rootfile
-    rg
-    run-command # Try this out instead of conner, might be even better
-    scopeline
-    scratch
-    shr-tag-pre-highlight
-    sideline
-    sideline-eglot
-    sideline-flymake
-    smartparens
-    substitute
-    surround
-    symbol-overlay
-    tempel
-    tempel-collection
-    topsy
-    trashed
-    treesit-fold
-    treesit-grammars.with-all-grammars # see how much it weight
-    typescript-mode
-    vc-jj
-    verb
-    vertico
-    visual-fill-column
-    visual-regexp
-    vterm
-    vundo
-    web-mode
-    wgrep
-    with-editor
-    xterm-color
-  ];
+  myExtraPackages =
+    epkgs: with epkgs; [
+      ace-window
+      adoc-mode
+      age
+      aggressive-indent
+      aidermacs
+      alert
+      async
+      avy
+      beginend
+      cape
+      casual
+      casual-avy
+      conner
+      consult
+      consult-dir
+      consult-denote
+      consult-project-extra
+      consult-vc-modified-files
+      copilot
+      copilot-chat
+      corfu
+      corfu-candidate-overlay
+      dape
+      dash
+      denote
+      denote-org
+      denote-journal
+      denote-sequence # maybe ?
+      denote-menu
+      devdocs
+      diff-hl
+      dired-collapse
+      dired-narrow
+      dired-rsync
+      diredfl
+      dockerfile-mode
+      doom-modeline
+      easy-kill
+      eat
+      edit-indirect
+      editorconfig
+      eldoc-box
+      pr-review
+      embark
+      embark-consult
+      emms
+      envrc
+      eshell-atuin
+      eshell-prompt-extras
+      esup
+      flimenu
+      flymake-yamllint
+      git-modes
+      go-mode
+      gotest
+      gotest-ts
+      gptel
+      hardhat
+      helpful
+      highlight
+      highlight-indentation
+      htmlize
+      ibuffer-vc
+      indent-bars
+      jinx
+      json-mode
+      kubed
+      ligature
+      macrostep
+      magit
+      magit-popup
+      marginalia
+      markdown-mode
+      minions
+      modus-themes
+      multi-vterm
+      mu4e
+      mwim
+      nix-mode
+      nix-ts-mode
+      nixpkgs-fmt
+      no-littering
+      noether
+      # notmuch
+      ob-async
+      ob-go
+      ob-http
+      orderless # TODO configure this
+      org
+      org-contrib
+      org-download
+      org-modern
+      org-nix-shell
+      org-ql
+      org-review
+      org-rich-yank
+      org-tree-slide
+      org-web-tools
+      orgalist
+      orgit
+      outline-indent
+      ox-pandoc
+      pandoc-mode
+      # password-store
+      # pkgs.bookmatrk-plus # Do I use it ?
+      popper
+      project-rootfile
+      rg
+      run-command # Try this out instead of conner, might be even better
+      scopeline
+      scratch
+      shr-tag-pre-highlight
+      sideline
+      sideline-eglot
+      sideline-flymake
+      smartparens
+      substitute
+      surround
+      symbol-overlay
+      tempel
+      tempel-collection
+      topsy
+      trashed
+      treesit-fold
+      treesit-grammars.with-all-grammars # see how much it weight
+      typescript-mode
+      vc-jj
+      verb
+      vertico
+      visual-fill-column
+      visual-regexp
+      vterm
+      vundo
+      web-mode
+      wgrep
+      with-editor
+      xterm-color
+    ];
 in
 {
   home.file.".config/emacs" = {
@@ -180,7 +186,14 @@ in
     enable = true;
     # FIXME: choose depending on the enabled modules
     #package = (pkgs.emacs29.override { withTreeSitter = true; withNativeCompilation = true; withPgtk = true; withWebP = true; withGTK3 = true; withSQLite3 = true; });
-    package = (pkgs.emacs-unstable.override { withTreeSitter = true; withNativeCompilation = true; withPgtk = true; withWebP = true; withGTK3 = true; withSQLite3 = true; });
+    package = pkgs.emacs-unstable.override {
+      withTreeSitter = true;
+      withNativeCompilation = true;
+      withPgtk = true;
+      withWebP = true;
+      withGTK3 = true;
+      withSQLite3 = true;
+    };
     extraPackages = myExtraPackages;
   };
   # services.emacs = {

@@ -1,62 +1,40 @@
-{ config
-, lib
-, pkgs
-, outputs
-, ...
-}:
+_:
 let
-  isCurrentHost = n: v: n != config.networking.hostName;
   # Folders list
   folders = [
-    { label = "sync"; id = "7dshg-r8zr6"; } # TODO maybe deprecate for documents
-    { label = "documents"; id = "oftdb-t5anv"; }
-    { label = "org"; id = "sjpsr-xfwdu"; }
-    { label = "screenshots"; id = "prpsz-azlz9"; }
-    { label = "wallpapers"; id = "wpiah-ydwwx"; }
-    { label = "photos"; id = "uetya-ypa3d"; }
-    { label = "music"; id = "kcyrf-mugzt"; }
+    {
+      label = "sync";
+      id = "7dshg-r8zr6";
+    } # TODO maybe deprecate for documents
+    {
+      label = "documents";
+      id = "oftdb-t5anv";
+    }
+    {
+      label = "org";
+      id = "sjpsr-xfwdu";
+    }
+    {
+      label = "screenshots";
+      id = "prpsz-azlz9";
+    }
+    {
+      label = "wallpapers";
+      id = "wpiah-ydwwx";
+    }
+    {
+      label = "photos";
+      id = "uetya-ypa3d";
+    }
+    {
+      label = "music";
+      id = "kcyrf-mugzt";
+    }
   ];
-  getSyncthingFolders = c:
-    if builtins.hasAttr "syncthingFolders" c._module.specialArgs
-    then
-      c._module.specialArgs.syncthingFolders
-    else
-      [ ];
-  deviceHasFolder = folder: n: v: lib.lists.any (s: s == folder) (getSyncthingFolders v);
-  devicesForFolder = folder: lib.attrsets.filterAttrs (deviceHasFolder folder) outputs.nixosConfigurations;
   # outputs.nixosConfigurations.$.syncthingFolders will contains the folders for a host
   # FIXME: we could use another file, and a "configuration" so that I don't import it ? or in the flake, but not in makeHost
 
   # non-nixos syncthing machines
-  extras = [
-    # NAS
-    {
-      name = "aion";
-      id = "YORNSGU-UC4IAG5-IWJCD7T-MVPIU7O-AYM36UK-LEHF7AP-CBC4L6C-ZWKUYQF";
-      addresses = [ "tcp://aion.home" "tcp://aion.vpn" "tcp://aion.sbr.pm" ];
-      folders = [ "org" "documents" "sync" "screenshots" "wallpapers" "photos" "videos" ];
-    }
-    # Macbook
-    {
-      name = "honshu";
-      id = "RGIR34D-3SH3GZK-CYPNNFI-5M5I2K4-HVTUS56-72GJTLH-SDMOY4I-I7AURQR";
-      addresses = [ "tcp://honshu.home" "tcp://honshu.sbr.pm" ];
-      folders = [ ];
-    }
-    # Windows Gaming machine
-    {
-      name = "okinawa";
-      id = "2RWT47Z-UGSH4QO-G4W6XN7-3XY722R-ZKGDN5U-4MDGHMA-6SM26QM-7VCQIAZ";
-      addresses = [ "tcp://okinawa.home" "tcp://okinawa.vpn" "tcp://okinawa.sbr.pm" ];
-      folder = [ ];
-    }
-    # iPhone
-    {
-      name = "hokkaido";
-      id = "XD4XYNZ-DT3PJEY-UJYBHWX-6OQPPUI-HTW752L-FYTX3TW-GVHDTKW-PT336QV";
-      folders = [ "org" "music" "documents" "sync" ];
-    }
-  ];
 in
 {
   services.syncthing = {
@@ -65,57 +43,105 @@ in
     # guiAddress = cfg.guiAddress;
     # TODO This is only for kyushu, will need to migrate this later
     settings = {
+      # FIXME this doesn't work, I wish it did.
+      # defaults = {
+      #   ignores = { lines = [ "(?d).DS_Store" "**" ]; };
+      # };
       devices = {
         aomi = {
           id = "XCR6WWB-OZUDGFB-LQPFW73-MV5SPJK-4IGOMA4-IAXON3I-C6OFETL-TPK5FQS";
-          addresses = [ "tcp://aomi.vpn" "tcp://aomi.light" "tcp://aomi.sbr.pm" ];
+          addresses = [
+            "tcp://aomi.vpn"
+            "tcp://aomi.light"
+            "tcp://aomi.sbr.pm"
+          ];
         };
         sakhalin = {
           id = "4TYYG7V-A67D5SN-HMEJCI7-POOZRLL-RNCIE4U-ZYVGTOB-JQ5DOSV-ZCGWUAL";
-          addresses = [ "tcp://sakhalin.light" "tcp://sakhalin.vpn" "tcp://sakhalin.sbr.pm" ];
+          addresses = [
+            "tcp://sakhalin.light"
+            "tcp://sakhalin.vpn"
+            "tcp://sakhalin.sbr.pm"
+          ];
         };
         shikoku = {
           id = "KZMMXRR-UINDQTS-H3TV2W7-EIGOUDI-3LW4ZDG-7PRKDFV-MJ5KUTJ-YG5Y5AI";
-          addresses = [ "tcp://shikoku.light" "tcp://shikoku.vpn" "tcp://shikoku.sbr.pm" ];
+          addresses = [
+            "tcp://shikoku.light"
+            "tcp://shikoku.vpn"
+            "tcp://shikoku.sbr.pm"
+          ];
         };
         kerkouane = {
           id = "IFVRRQ7-KMIOQXP-5YDJXQU-UJXUKHB-7THCSY6-B3NHRNA-ED7IRI7-2JPPKQY";
-          addresses = [ "tcp://10.100.0.1" "tcp://kerkouane.vpn" ];
+          addresses = [
+            "tcp://10.100.0.1"
+            "tcp://kerkouane.vpn"
+          ];
         };
         aion = {
           id = "YORNSGU-UC4IAG5-IWJCD7T-MVPIU7O-AYM36UK-LEHF7AP-CBC4L6C-ZWKUYQF";
-          addresses = [ "tcp://aion.light" "tcp://aion.vpn" "tcp://aion.sbr.pm" ];
+          addresses = [
+            "tcp://aion.light"
+            "tcp://aion.vpn"
+            "tcp://aion.sbr.pm"
+          ];
         };
       };
       folders = {
         "/home/vincent/sync" = {
           label = "sync";
           id = "7dshg-r8zr6";
-          devices = [ "aomi" "aion" "shikoku" "sakhalin" ];
+          devices = [
+            "aomi"
+            "aion"
+            "shikoku"
+            "sakhalin"
+          ];
           rescanIntervalS = 3600 * 6;
         };
         "/home/vincent/desktop/org" = {
           label = "org";
           id = "sjpsr-xfwdu";
-          devices = [ "aomi" "aion" "shikoku" "sakhalin" ];
+          devices = [
+            "aomi"
+            "aion"
+            "shikoku"
+            "sakhalin"
+          ];
           rescanIntervalS = 3600 * 6;
         };
         "/home/vincent/desktop/documents" = {
           label = "documents";
           id = "oftdb-t5anv";
-          devices = [ "aomi" "aion" "shikoku" "sakhalin" ];
+          devices = [
+            "aomi"
+            "aion"
+            "shikoku"
+            "sakhalin"
+          ];
           rescanIntervalS = 3600 * 6;
         };
         "/home/vincent/desktop/pictures/screenshots" = {
           label = "screenshots";
           id = "prpsz-azlz9";
-          devices = [ "aomi" "aion" "shikoku" "sakhalin" ];
+          devices = [
+            "aomi"
+            "aion"
+            "shikoku"
+            "sakhalin"
+          ];
           rescanIntervalS = 3600 * 6;
         };
         "/home/vincent/desktop/pictures/wallpapers" = {
           label = "wallpapers";
           id = "wpiah-ydwwx";
-          devices = [ "aomi" "aion" "shikoku" "sakhalin" ];
+          devices = [
+            "aomi"
+            "aion"
+            "shikoku"
+            "sakhalin"
+          ];
           rescanIntervalS = 3600 * 6;
         };
       };

@@ -1,5 +1,4 @@
-{ ... }:
-{
+_: {
   programs.atuin = {
     enable = true;
     enableZshIntegration = true;

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, hostname, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  hostname,
+  ...
+}:
 let
   redhat_folders = [
     "src/github.com/containers"
@@ -25,11 +31,11 @@ let
     kyushu = "${pkgs.writeText "yubikey5-c1" "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGHMa4rHuBbQQYv+8jvlkFCD2VYRGA4+5fnZAhLx8iDirzfEPqHB60UJWcDeixnJCUlpJjzFbS4crNOXhfCTCTE="}";
   };
   defaultSSHKey = sshkeyPerHost.kyushu;
-  getSSHKeyForHost = h: if builtins.hasAttr h sshkeyPerHost then sshkeyPerHost."${h}" else defaultSSHKey;
+  getSSHKeyForHost =
+    h: if builtins.hasAttr h sshkeyPerHost then sshkeyPerHost."${h}" else defaultSSHKey;
 in
 {
-  xdg.configFile."git/allowed_signers".text = ''
-  '';
+  xdg.configFile."git/allowed_signers".text = '''';
   home.packages = with pkgs; [
     git-lfs
     gh
@@ -45,7 +51,7 @@ in
     userName = "Vincent Demeester";
     userEmail = "vincent@sbr.pm";
 
-    includes = [ ] ++ lib.lists.forEach redhat_folders (x: {
+    includes = lib.lists.forEach redhat_folders (x: {
       condition = "gitdir:${config.home.homeDirectory}/${x}/**";
       contents.users.email = "vdemeest@redhat.com";
     });

@@ -2,20 +2,29 @@
 {
   programs.htop = {
     enable = true;
-    settings = {
-      delay = 10;
-    } // (with config.lib.htop; leftMeters [
-      (bar "AllCPUs2")
-      (bar "Memory")
-      (bar "Swap")
-    ]) // (with config.lib.htop; rightMeters [
-      (text "Clock")
-      (text "Hostname")
-      (text "Tasks")
-      (text "LoadAverage")
-      (text "Uptime")
-      (text "Battery")
-      (text "Systemd")
-    ]);
+    settings =
+      {
+        delay = 10;
+      }
+      // (
+        with config.lib.htop;
+        leftMeters [
+          (bar "AllCPUs2")
+          (bar "Memory")
+          (bar "Swap")
+        ]
+      )
+      // (
+        with config.lib.htop;
+        rightMeters [
+          (text "Clock")
+          (text "Hostname")
+          (text "Tasks")
+          (text "LoadAverage")
+          (text "Uptime")
+          (text "Battery")
+          (text "Systemd")
+        ]
+      );
   };
 }

@@ -1,8 +1,10 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   home.file."${config.programs.zsh.dotDir}/completion.zsh".source = ./zsh/completion.zsh;
   home.file."${config.programs.zsh.dotDir}/prompt.zsh".source = ./zsh/prompt.zsh;
   home.file."${config.programs.zsh.dotDir}/functions/j".source = ./zsh/j;
-  home.file."${config.programs.zsh.dotDir}/auto-expanding-aliases.zsh".source = ./zsh/auto-expanding-aliases.zsh;
+  home.file."${config.programs.zsh.dotDir}/auto-expanding-aliases.zsh".source =
+    ./zsh/auto-expanding-aliases.zsh;
 
   home.packages = with pkgs; [
     nix-zsh-completions
@@ -96,7 +98,9 @@
         exec dbus-run-session sway
       fi
     '';
-    sessionVariables = { RPROMPT = ""; };
+    sessionVariables = {
+      RPROMPT = "";
+    };
 
     shellAliases = {
       mkdir = ''mkdir --parents --verbose'';

@@ -1,29 +1,26 @@
-{ config
-, desktop
-, hostname
-, syncthingFolders
-, lib
-, pkgs
-, outputs
-, stateVersion
-, username
-, inputs
-, ...
+{
+  config,
+  desktop,
+  hostname,
+  syncthingFolders,
+  lib,
+  outputs,
+  stateVersion,
+  username,
+  inputs,
+  ...
 }:
 {
-  imports = [
-    ./common/shell
-  ]
-  ++ lib.optional (builtins.isString desktop) ./common/desktop
-  ++ lib.optional
-    (builtins.pathExists (
-      ./. + "/common/users/${username}"
-    )) ./common/users/${username}
-  ++ lib.optional
-    (builtins.pathExists (
+  imports =
+    [
+      ./common/shell
+    ]
+    ++ lib.optional (builtins.isString desktop) ./common/desktop
+    ++ lib.optional (builtins.pathExists (./. + "/common/users/${username}")) ./common/users/${username}
+    ++ lib.optional (builtins.pathExists (
       ../systems/. + "/${hostname}/home.nix"
     )) ../systems/${hostname}/home.nix
-  ++ lib.optional ((builtins.length syncthingFolders) > 0) ./common/services/syncthing.nix;
+    ++ lib.optional ((builtins.length syncthingFolders) > 0) ./common/services/syncthing.nix;
 
   home = {
     inherit username stateVersion;

@@ -1,17 +1,18 @@
-{ self
-, inputs
-, outputs
-, stateVersion
-, ...
+{
+  self,
+  inputs,
+  outputs,
+  stateVersion,
+  ...
 }:
 {
   # Function for generating home-manage configs
   mkHome =
-    { hostname
-    , user
-    , desktop ? null
-    , system ? "x86_64-linux"
-    ,
+    {
+      hostname,
+      user,
+      desktop ? null,
+      system ? "x86_64-linux",
     }:
     inputs.home-manager.lib.homeManagerConfiguration {
       pkgs = inputs.nixpkgs.legacyPackages.${system};
@@ -33,13 +34,13 @@
 
   # Function for generating host configs
   mkHost =
-    { hostname
-    , desktop ? null
-    , syncthingFolders ? [ ]
-    , system ? "x86_64-linux"
-    , pkgsInput ? inputs.nixpkgs
-    , homeInput ? inputs.home-manager
-    ,
+    {
+      hostname,
+      desktop ? null,
+      syncthingFolders ? [ ],
+      system ? "x86_64-linux",
+      pkgsInput ? inputs.nixpkgs,
+      homeInput ? inputs.home-manager,
     }:
     let
       specialArgs = {
@@ -57,7 +58,7 @@
     in
     pkgsInput.lib.nixosSystem {
       inherit specialArgs;
-      system = system;
+      inherit system;
       modules = [
         self.nixosModules.wireguard-client
         inputs.agenix.nixosModules.default
@@ -70,9 +71,8 @@
 
   # Function to create a system manager
   mkSystemManager =
-    { hostname
-    , system ? "x86_64-linux"
-    ,
+    {
+      system ? "x86_64-linux",
     }:
     inputs.system-manager.lib-makeSystemConfig {
       modules = [

@@ -1,6 +1,17 @@
-{ config, options, lib, pkgs, ... }:
+{
+  config,
+  options,
+  lib,
+  pkgs,
+  ...
+}:
 let
-  inherit (lib) mkEnableOption mkIf mkOption types;
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    types
+    ;
   cfg = config.services.wireguard;
 in
 {
@@ -61,12 +72,12 @@ in
     networking.wireguard.enable = true;
     networking.wireguard.interfaces = {
       wg0 = {
-        ips = cfg.ips;
+        inherit (cfg) ips;
         privateKeyFile = "/etc/wireguard/private.key";
         peers = [
           {
             publicKey = cfg.endpointPublicKey;
-            allowedIPs = cfg.allowedIPs;
+            inherit (cfg) allowedIPs;
             endpoint = "${cfg.endpoint}:${toString cfg.endpointPort}";
             persistentKeepalive = 25;
           }

@@ -1,2 +1,1 @@
-{ pkgs, ... }:
-{ }
+_: { }

@@ -2,7 +2,7 @@ self: super:
 with super.lib;
 let
   # Load the system config and get the `nixpkgs.overlays` option
-  overlays = (import <nixpkgs/nixos> { }).config.nixpkgs.overlays;
+  inherit ((import <nixpkgs/nixos> { }).config.nixpkgs) overlays;
 in
 # Apply all overlays to the input of the current "main" overlay
 foldl' (flip extends) (_: super) overlays self

@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, emacs
-, name
-, src
-, buildInputs ? [ ]
-, patches ? [ ]
-, preBuild ? ""
+{
+  stdenv,
+  lib,
+  emacs,
+  name,
+  src,
+  buildInputs ? [ ],
+  patches ? [ ],
+  preBuild ? "",
 }:
 
 stdenv.mkDerivation {
@@ -28,7 +29,7 @@ stdenv.mkDerivation {
   '';
   meta = {
     description = "Emacs projects from the Internet that just compile .el files";
-    homepage = http://www.emacswiki.org;
+    homepage = "http://www.emacswiki.org";
     platforms = lib.platforms.all;
   };
 }

@@ -2,7 +2,7 @@
 {
   # FIXME: migrate to pkgs and overlays on root
   additions = final: _prev: import ../../pkgs { pkgs = final; };
-  modifications = _final: prev: {
+  modifications = _final: _prev: {
     # example = prev.example.overrideAttrs (oldAttrs: rec {
     # ...
     # });
@@ -36,7 +36,7 @@
     };
   };
   # tekton = final: prev: {
-  # 
+  #
   #   inherit (prev.callPackage ../packages/tkn { })
   #     tkn_0_17
   #     tkn_0_18

@@ -1,4 +1,4 @@
-self: super:
+_self: super:
 
 {
   systemd-email = super.callPackage ../packages/systemd-email { };

@@ -1,7 +1,9 @@
-self: super:
-with builtins; with self.lib;
+self: _super:
+with builtins;
+with self.lib;
 {
-  mkSecret = path:
+  mkSecret =
+    path:
     let
       name = baseNameOf (toString path);
       stub = toFile name "This is a stub!\n";

@@ -1,5 +1,4 @@
-final: prev:
-rec {
+_final: prev: rec {
 
   inherit (prev.callPackage ../packages/tkn { })
     tkn_0_17

@@ -1,10 +1,2 @@
-_: _:
-let
-  unstable = (import ../.).pkgs-unstable { };
-in
-{
-  inherit (unstable)
-    # cachix
-    #git
-    ;
+_: _: {
 }

@@ -19,8 +19,7 @@ pkgs.stdenv.mkDerivation rec {
     mkdir -p $out/share/plymouth/themes/
   '';
 
-  buildPhase = ''
-  '';
+  buildPhase = '''';
 
   installPhase = ''
     cp -r pack_1/cuts $out/share/plymouth/themes

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchgit }:
+{
+  lib,
+  buildGoModule,
+  fetchgit,
+}:
 
 buildGoModule rec {
   name = "ape-${version}";

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   name = "athens-${version}";

@@ -1,4 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, tzdata }:
+{
+  stdenv,
+  fetchFromGitHub,
+  tzdata,
+}:
 
 stdenv.mkDerivation rec {
   pname = "batzconverter";

@@ -1,5 +1,9 @@
 # https://github.com/chmouel/chmouzies/tree/master/kubernetes
-{ stdenv, fetchFromGitHub, python310 }:
+{
+  stdenv,
+  fetchFromGitHub,
+  python310,
+}:
 
 stdenv.mkDerivation rec {
   name = "chmouzies.kubernetes";

@@ -1,14 +1,15 @@
-{ stdenv, lib, buildFHSUserEnv }:
+{ buildFHSUserEnv }:
 
 buildFHSUserEnv {
   name = "fhs-std";
-  targetPkgs = pkgs: with pkgs; [
-    envsubst
-    # exa # TODO: switch to eza in 2024
-    git
-    gnumake
-    coreutils
-    zsh
-  ];
+  targetPkgs =
+    pkgs: with pkgs; [
+      envsubst
+      # exa # TODO: switch to eza in 2024
+      git
+      gnumake
+      coreutils
+      zsh
+    ];
   runScript = "/bin/zsh";
 }

@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{ buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   name = "gogo-protobuf-${version}";

@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoModule, fetchgit }:
+{ buildGoModule, fetchgit }:
 
 buildGoModule rec {
   pname = "govanityurl";

@@ -1,4 +1,8 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "kubernix";
@@ -17,7 +21,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "Single dependency Kubernetes clusters for local testing, experimenting and development";
-    homepage = https://github.com/saschagrunert/kubernix;
+    homepage = "https://github.com/saschagrunert/kubernix";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ saschagrunert ];
     platforms = platforms.linux;

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   name = "manifest-tool-${version}";
@@ -19,7 +23,7 @@ buildGoModule rec {
 
   meta = {
     description = "";
-    homepage = https://github.com/estesp/manifest-tool;
+    homepage = "https://github.com/estesp/manifest-tool";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ vdemeester ];
   };

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, git, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   name = "operator-tool-${version}";
@@ -15,7 +19,7 @@ buildGoModule rec {
 
   meta = {
     description = "Tooling for managing operator remote payload";
-    homepage = https://github.com/openshift-pipelines/operator-tooling;
+    homepage = "https://github.com/openshift-pipelines/operator-tooling";
     license = lib.licenses.asl20;
   };
 }

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   name = "prm-${version}";
@@ -6,7 +10,8 @@ buildGoModule rec {
   rev = "v${version}";
 
   ldflags =
-    let t = "github.com/ldez/prm/v3/meta";
+    let
+      t = "github.com/ldez/prm/v3/meta";
     in
     [
       "-X ${t}.Version=${version}"
@@ -23,7 +28,7 @@ buildGoModule rec {
 
   meta = {
     description = "Pull Request Manager for Maintainers";
-    homepage = https://github.com/ldez/prm;
+    homepage = "https://github.com/ldez/prm";
     license = lib.licenses.asl20;
   };
 }

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   name = "protobuild-unstable-${version}";
@@ -16,7 +20,7 @@ buildGoModule rec {
 
   meta = {
     description = "Build protobufs in Go, easily";
-    homepage = https://github.com/stevvooe/protobuild;
+    homepage = "https://github.com/stevvooe/protobuild";
     license = lib.licenses.asl20;
   };
 }

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchgit }:
+{
+  lib,
+  buildGoModule,
+  fetchgit,
+}:
 
 buildGoModule rec {
   name = "ram-${version}";

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   name = "rmapi-${version}";

@@ -1,4 +1,8 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   name = "sec-${version}";

@@ -1,4 +1,6 @@
-{ pkgs ? import <nixpkgs> { } }:
+{
+  pkgs ? import <nixpkgs> { },
+}:
 
 rec {
   # pre nur-packages import

@@ -1,9 +1,12 @@
 let
-  mapAttrs = f: set: builtins.listToAttrs (
-    map
-      (attr: { name = attr; value = f set.${attr}; })
-      (builtins.attrNames set)
-  );
+  mapAttrs =
+    f: set:
+    builtins.listToAttrs (
+      map (attr: {
+        name = attr;
+        value = f set.${attr};
+      }) (builtins.attrNames set)
+    );
   channels = {
     aardvark = "13.10";
     baboon = "14.04";
@@ -28,10 +31,6 @@ let
     unstable = "unstable";
   };
 in
-mapAttrs
-  (v:
-    import
-      (builtins.fetchTarball
-        "https://nixos.org/channels/nixos-${v}/nixexprs.tar.xz") { }
-  )
-  channels
+mapAttrs (
+  v: import (builtins.fetchTarball "https://nixos.org/channels/nixos-${v}/nixexprs.tar.xz") { }
+) channels

@@ -1,33 +1,28 @@
-{ nixpkgs
-, home-manager
-, system
-, specialArgs
-, nixos-modules
-,
+{
+  nixpkgs,
+  home-manager,
+  system,
+  specialArgs,
+  nixos-modules,
 }:
-let
-  username = specialArgs.username;
-in
 nixpkgs.lib.nixosSystem {
   inherit system specialArgs;
-  modules =
-    nixos-modules
-    // [
-      {
-        # make `nix run nixpkgs#nixpkgs` use the same nixpkgs as the one used by this flake.
-        nix.registry.nixpkgs.flake = nixpkgs;
+  modules = nixos-modules // [
+    {
+      # make `nix run nixpkgs#nixpkgs` use the same nixpkgs as the one used by this flake.
+      nix.registry.nixpkgs.flake = nixpkgs;
 
-        # make `nix repl '<nixpkgs>'` use the same nixpkgs as the one used by this flake.
-        environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";
-        nix.nixPath = [ "/etc/nix/inputs" ];
-      }
+      # make `nix repl '<nixpkgs>'` use the same nixpkgs as the one used by this flake.
+      environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";
+      nix.nixPath = [ "/etc/nix/inputs" ];
+    }
 
-      home-manager.nixosModules.home-manager
-      {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
+    home-manager.nixosModules.home-manager
+    {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
 
-        home-manager.extraSpecialArgs = specialArgs;
-      }
-    ];
+      home-manager.extraSpecialArgs = specialArgs;
+    }
+  ];
 }

@@ -1,8 +1,8 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # Build them using 'nix build .#example' or (legacy) 'nix-build -A example'
 
-{ pkgs ? (import ../nixpkgs.nix) { }
-,
+{
+  pkgs ? (import ../nixpkgs.nix) { },
 }:
 {
   # TODO: migrate things from nix/packages

@@ -1,9 +1,4 @@
 let
-  invert-suffix = ip:
-    let
-      elts = builtins.split "[\.]" ip;
-    in
-    "${builtins.elemAt elts 6}.${builtins.elemAt elts 4}";
   gpgRemoteForward = {
     bind.address = "/run/user/1000/gnupg/S.gpg-agent";
     host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
@@ -184,16 +179,32 @@ let
   };
 in
 {
-  home = home;
-  wireguard = wireguard;
+  inherit home;
+  inherit wireguard;
   wg = {
     allowedIPs = "10.100.0.0/24";
     listenPort = 51820;
     endpointIP = "167.99.17.238";
     persistentKeepalive = 25;
-    peers = [ wireguard.shikoku wireguard.wakasu wireguard.vincent wireguard.sakhalin wireguard.aomi wireguard.kyushu wireguard.ipad wireguard.hass wireguard.demeter wireguard.athena wireguard.aion wireguard.honshu wireguard.houbeb wireguard.houbeb-ipad wireguard.houbeb-iphone ]; # wireguard.hokkaido
+    peers = [
+      wireguard.shikoku
+      wireguard.wakasu
+      wireguard.vincent
+      wireguard.sakhalin
+      wireguard.aomi
+      wireguard.kyushu
+      wireguard.ipad
+      wireguard.hass
+      wireguard.demeter
+      wireguard.athena
+      wireguard.aion
+      wireguard.honshu
+      wireguard.houbeb
+      wireguard.houbeb-ipad
+      wireguard.houbeb-iphone
+    ]; # wireguard.hokkaido
   };
-  ssh = ssh;
+  inherit ssh;
   sshConfig = {
     "naruhodo.home" = {
       hostname = "${home.ips.naruhodo}";
@@ -203,74 +214,125 @@ in
     };
     "aomi.home" = {
       hostname = "${home.ips.aomi}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "aion.home" = {
       hostname = "${home.ips.aion}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "aion.vpn" = {
       hostname = "${wireguard.ips.aion}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "aomi.vpn" = {
       hostname = "${wireguard.ips.aomi}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "okinawa.home" = {
       hostname = "${home.ips.okinawa}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "okinawa.vpn" = {
       hostname = "${wireguard.ips.okinawa}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "sakhalin.home" = {
       hostname = "${home.ips.sakhalin}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "sakhalin.vpn" = {
       hostname = "${wireguard.ips.sakhalin}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "hokkaido.home" = {
       hostname = "${home.ips.hokkaido}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "hokkaido.vpn" = {
       hostname = "${wireguard.ips.hokkaido}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "wakasu.home" = {
       hostname = "${home.ips.wakasu}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "wakasu.vpn" = {
       hostname = "${wireguard.ips.wakasu}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "athena.home" = {
       hostname = "${home.ips.athena}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "athena.vpn" = {
       hostname = "${wireguard.ips.athena}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "demeter.home" = {
       hostname = "${home.ips.demeter}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "demeter.vpn" = {
       hostname = "${wireguard.ips.demeter}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
     "dev.home" = {
       hostname = "${home.ips.dev}";
     };
     "kerkouane.vpn" = {
       hostname = "${wireguard.ips.kerkouane}";
-      remoteForwards = [ gpgRemoteForward gpgSSHRemoteForward ];
+      remoteForwards = [
+        gpgRemoteForward
+        gpgSSHRemoteForward
+      ];
     };
   };
 }