Reformat using nixpkgs-fmt

default.nix

@@ -12,7 +12,7 @@ rec {
 
   hosts = import ./hosts;
 
-  tubslatex = callPackage ./pkgs/tubslatex {};
+  tubslatex = callPackage ./pkgs/tubslatex { };
-  keys = callPackage ./pkgs/keys {};
+  keys = callPackage ./pkgs/keys { };
-  homePage = callPackage ./pkgs/homePage {};
+  homePage = callPackage ./pkgs/homePage { };
 }

hosts/ifrit/default.nix

@@ -7,7 +7,8 @@ let
     "media.local"
   ];
   backups = "/mnt/storage/backup";
-in {
+in
+{
   imports = [
     ../../modules/profiles/base
   ];
@@ -107,13 +108,22 @@ in {
     allowPing = true;
     allowedTCPPorts = [
       22 # SSH
-      80 443 # HTTP(S)
+      80
-      111 2049 # NFS
+      443 # HTTP(S)
-      137 138 139 445 # SMB
+      111
+      2049 # NFS
+      137
+      138
+      139
+      445 # SMB
     ];
     allowedUDPPorts = [
-      137 138 139 445 # SMB
+      137
-      111 2049 # NFS
+      138
+      139
+      445 # SMB
+      111
+      2049 # NFS
       51234 # Wireguard
     ];
   };

hosts/surgat/default.nix

@@ -2,7 +2,8 @@
 let
   hostName = "surgat";
   this = import ../.. { inherit pkgs; };
-in {
+in
+{
   imports = [ this.profiles.base ];
 
   networking.hostName = hostName;
@@ -43,7 +44,8 @@ in {
     allowPing = true;
     allowedTCPPorts = [
       22 # SSH
-      80 443 # HTTPS
+      80
+      443 # HTTPS
     ];
     allowedUDPPorts = [
       51234 # Wireguard
@@ -60,10 +62,10 @@ in {
   boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sda";
 
-  networking.interfaces."ens3".ipv6.addresses = [ {
+  networking.interfaces."ens3".ipv6.addresses = [{
     address = "2a01:4f8:c17:1d70::";
     prefixLength = 64;
-  } ];
+  }];
 
   networking.defaultGateway6 = {
     address = "fe80::1";

modules/admin.nix

@@ -3,13 +3,14 @@
 with lib;
 let
   cfg = config.dadada.admin;
-in {
+in
+{
   options.dadada.admin = {
     enable = mkEnableOption "Enable admin access";
 
     users = mkOption {
       type = with types; attrsOf (listOf path);
-      default = [];
+      default = [ ];
       description = ''
         List of admin users with root access to all the machine.
       '';
@@ -32,12 +33,14 @@ in {
 
     users.mutableUsers = false;
 
-    users.users = mapAttrs (user: keys: (
+    users.users = mapAttrs
+      (user: keys: (
         {
           extraGroups = [ "wheel" ];
           isNormalUser = true;
           openssh.authorizedKeys.keyFiles = keys;
-      })) cfg.users;
+        }))
+      cfg.users;
 
     networking.firewall.allowedTCPPorts = [ 22 ];
 
@@ -49,9 +52,8 @@ in {
     services.tor.hiddenServices = {
       "rat" = mkIf cfg.rat.enable {
         name = "rat";
-        map = [ { port = 22; } ];
+        map = [{ port = 22; }];
       };
     };
   };
 }
-

modules/backup.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ...}:
+{ config, pkgs, lib, ... }:
 with lib;
 let
   backupExcludes = [
@@ -20,7 +20,8 @@ let
     "/var/tmp"
   ];
   cfg = config.dadada.backupClient;
-in {
+in
+{
   options.dadada.backupClient = {
     enable = mkEnableOption "Enable backup client";
     gs = mkEnableOption "Enable backup to GS location";
@@ -63,7 +64,7 @@ in {
       ];
     };
 
-    services.borgbackup.jobs.bs = mkIf cfg.bs{
+    services.borgbackup.jobs.bs = mkIf cfg.bs {
       paths = "/";
       exclude = backupExcludes;
       repo = "borg@media.dadada.li:/mnt/storage/backup/${config.networking.hostName}";

modules/element.nix

@@ -1,7 +1,8 @@
 { config, pkgs, lib, ... }:
 let
   cfg = config.dadada.element;
-in {
+in
+{
   options.dadada.element = {
     enable = lib.mkEnableOption "Enable element webapp";
   };

modules/fido2.nix

@@ -3,7 +3,8 @@ with lib;
 let
   luks = config.dadada.luks;
   fido2 = config.dadada.fido2;
-in {
+in
+{
 
   options = {
     dadada.luks = {

modules/fileShare.nix

@@ -6,7 +6,8 @@ let
   ipv6 = "fd42:dead:beef::/48";
   ipv4 = "192.168.42.0/24";
   allow = "192.168.42.0 fd42:dead:beef::";
-in {
+in
+{
   options.dadada.fileShare = {
     enable = mkEnableOption "Enable file share server";
   };
@@ -47,4 +48,3 @@ in {
     };
   };
 }
-

modules/gitea.nix

@@ -1,7 +1,8 @@
 { config, pkgs, lib, ... }:
 let
   cfg = config.dadada.gitea;
-in {
+in
+{
   options.dadada.gitea = {
     enable = lib.mkEnableOption "Enable gitea";
   };

modules/home/fish.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.fish;
-in {
+in
+{
   options.dadada.home.fish = {
     enable = mkEnableOption "Enable fish config";
   };

modules/home/gpg.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.gpg;
-in {
+in
+{
   options.dadada.home.gpg = {
     enable = mkEnableOption "Enable GnuPG config";
   };

modules/home/keyring.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.keyring;
-in {
+in
+{
   options.dadada.home.keyring = {
     enable = mkEnableOption "Enable keyring config";
   };

modules/home/kitty/default.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.kitty;
-in {
+in
+{
   options.dadada.home.kitty = {
     enable = mkEnableOption "Enable kitty config";
   };

modules/home/mako.nix

@@ -1,8 +1,9 @@
-{ config, lib, pkgs, colors, ...}:
+{ config, lib, pkgs, colors, ... }:
 with lib;
 let
   cfg = config.dadada.home.mako;
-in {
+in
+{
   options.dadada.home.mako = {
     enable = mkEnableOption "Enable mako config";
   };

modules/home/session.nix

@@ -2,13 +2,14 @@
 with lib;
 let
   cfg = config.dadada.home.session;
-in {
+in
+{
   options.dadada.home.session = {
     enable = mkEnableOption "Enable session variable management";
     sessionVars = mkOption {
       description = "Session variables";
       type = types.attrs;
-      default = {};
+      default = { };
       example = ''
         EDITOR = "vim";
         PAGER = "less";

modules/home/ssh.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.ssh;
-in {
+in
+{
   options.dadada.home.ssh = {
     enable = mkEnableOption "Enable SSH config";
   };

modules/home/sway/default.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, lib, colors, ...}:
+{ config, pkgs, lib, colors, ... }:
 with lib;
 let
   cfg = config.dadada.home.sway;
-in {
+in
+{
   options.dadada.home.sway = {
     enable = mkEnableOption "Enable Sway config";
   };

modules/home/syncthing.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.syncthing;
-in {
+in
+{
   options.dadada.home.syncthing = {
     enable = mkEnableOption "Enable Syncthing config";
   };

modules/home/termite.nix

@@ -1,14 +1,14 @@
-{
+{ config
-  config,
+, lib
-  lib,
+, pkgs
-  pkgs,
+, colors ? ../../lib/colors.nix
-  colors ? ../../lib/colors.nix,
+, ...
-  ...
 }:
 with lib;
 let
   cfg = config.dadada.home.termite;
-in {
+in
+{
   options.dadada.home.termite = {
     enable = mkEnableOption "Enable termite config";
   };

modules/home/tmux.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.tmux;
-in {
+in
+{
   options.dadada.home.tmux = {
     enable = mkEnableOption "Enable tmux config";
   };

modules/home/vim/default.nix

@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.dadada.home.vim;
-  vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins {};
+  vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { };
 in
 {
   options.dadada.home.vim = {
@@ -32,6 +32,9 @@ in
         #pkgs.vimPlugins.clang_complete
       ];
     };
-    home.packages = [ pkgs.languagetool ];
+    home.packages = with pkgs; [
+      languagetool
+      nixpkgs-fmt
+    ];
   };
 }

modules/home/xdg.nix

@@ -19,7 +19,8 @@ let
     "application/pdf" = "org.pwmt.zathura.desktop";
   };
   cfg = config.dadada.home.xdg;
-in {
+in
+{
   options.dadada.home.xdg = {
     enable = mkEnableOption "Enable XDG config";
   };
@@ -32,9 +33,9 @@ in {
         defaultApplications = apps;
       };
       userDirs = {
-        download ="\$HOME/tmp";
+        download = "\$HOME/tmp";
         music = "\$HOME/lib/music";
-        videos ="\$HOME/lib/videos";
+        videos = "\$HOME/lib/videos";
         pictures = "\$HOME/lib/pictures";
         documents = "\$HOME/lib";
         desktop = "$HOME/tmp";

modules/home/zsh.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.home.zsh;
-in {
+in
+{
   options.dadada.home.zsh = {
     enable = mkEnableOption "Enable ZSH config";
   };

modules/homepage.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
-
 let
   cfg = config.dadada.homePage;
-in with lib; {
+in
+with lib; {
   options.dadada.homePage = {
     enable = mkEnableOption "Enable home page";
   };

modules/networking.nix

@@ -1,14 +1,15 @@
-{ config, pkgs, lib, ...}:
+{ config, pkgs, lib, ... }:
 with lib;
 let
   cfg = config.dadada.networking;
-in {
+in
+{
   options.dadada.networking = {
     useLocalResolver = mkEnableOption "Enable local caching name server";
     wanInterfaces = mkOption {
       type = with types; listOf str;
       description = "WAN network interfaces";
-      default = [];
+      default = [ ];
     };
     vpnExtension = mkOption {
       type = with types; nullOr str;

modules/share.nix

@@ -3,7 +3,8 @@
 with lib;
 let
   cfg = config.dadada.share;
-in {
+in
+{
   options.dadada.share = {
     enable = mkEnableOption "Enable file share";
   };
@@ -27,4 +28,3 @@ in {
     };
   };
 }
-

modules/steam.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.steam;
-in {
+in
+{
   options.dadada.steam = {
     enable = mkEnableOption "Enable Steam config";
   };

modules/update.nix

@@ -2,7 +2,8 @@
 with lib;
 let
   cfg = config.dadada.autoUpgrade;
-in {
+in
+{
 
   options.dadada.autoUpgrade = {
     enable = mkEnableOption "Enable automatic upgrades";

modules/vpnServer.nix

@@ -21,13 +21,14 @@ let
       };
     };
   };
-in {
+in
+{
   options.dadada.vpnServer = {
     enable = mkEnableOption "Enable wireguard gateway";
     peers = mkOption {
       description = "Set of extensions and public keys of peers";
       type = with types; attrsOf (submodule wgPeer);
-      default = {};
+      default = { };
     };
   };
   config = mkIf cfg.enable {
@@ -37,11 +38,13 @@ in {
       privateKeyFile = "/var/lib/wireguard/wg0-key";
       ips = [ "fd42:dead:beef:1337::0/64" ];
       listenPort = 51234;
-      peers = map (peer: (
+      peers = map
+        (peer: (
           {
             allowedIPs = [ "fd42:dead:beef:1337::${peer.id}/128" ];
             publicKey = peer.key;
-        })) (attrValues cfg.peers);
+          }))
+        (attrValues cfg.peers);
     };
   };
 }

modules/weechat.nix

@@ -3,7 +3,8 @@
 with lib;
 let
   cfg = config.dadada.weechat;
-in {
+in
+{
   options.dadada.weechat = {
     enable = mkEnableOption "Enable weechat relay";
   };
@@ -55,4 +56,3 @@ in {
     };
   };
 }
-

overlay.nix

@@ -1,11 +1,10 @@
 self: super:
-
 let
   isReserved = n: n == "lib" || n == "overlays" || n == "modules";
   nameValuePair = n: v: { name = n; value = v; };
   attrs = import ./default.nix { pkgs = super; };
 in
-  builtins.listToAttrs
+builtins.listToAttrs
   (map (n: nameValuePair n attrs.${n})
     (builtins.filter (n: !isReserved n)
       (builtins.attrNames attrs)))

overlays/tubslatex.nix

@@ -1,10 +1,12 @@
 self: super:
 {
   # Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87
-  tubslatex = super.lib.overrideDerivation (super.texlive.combine {
+  tubslatex = super.lib.overrideDerivation
+    (super.texlive.combine {
       inherit (super.texlive) scheme-full;
-    tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex {}) ];
+      tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex { }) ];
-  }) (oldAttrs: {
+    })
+    (oldAttrs: {
       postBuild = ''
         # Save the udpmap.cfg because texlive.combine removes it.
         cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1
@@ -22,4 +24,3 @@ self: super:
     });
 
 }
-

pkgs/vimPlugins/filetype/ftplugin/nix.vim

@@ -1,3 +1,5 @@
 setlocal expandtab
 setlocal shiftwidth=2
 setlocal softtabstop=2
+
+let b:ale_fixers = [ 'nixpkgs-fmt', 'remove_trailing_lines', 'trim_whitespace']