Update formatter

configurations/camelot/default.nix

@@ -1,6 +1,18 @@
-{ pkgs, config, lib, ... }:
 {
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+{
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -45,7 +57,7 @@
 
   hwAccelerationGPU = "intel";
 
-  /* System secrets */
+  # System secrets
   sops = {
     gnupg.sshKeyPaths = [ ];
     age = {

configurations/camelot/jellyfin.nix

@@ -66,8 +66,14 @@
 
   systemd.services.deluged-proxy = {
     description = "Proxy for deluge-web to deluged in network namespace";
-    requires = [ "deluged.service" "deluged-proxy.socket" ];
+    requires = [
-    after = [ "deluged.service" "deluged-proxy.socket" ];
+      "deluged.service"
+      "deluged-proxy.socket"
+    ];
+    after = [
+      "deluged.service"
+      "deluged-proxy.socket"
+    ];
     unitConfig.JoinsNamespaceOf = "deluged.service";
     serviceConfig = {
       User = "deluge";

configurations/camelot/wireguard.nix

@@ -1,10 +1,13 @@
-{ config, pkgs, extraInfo, ... }:
 {
-  networking.firewall.allowedUDPPorts = [
+  config,
-    51821
+  pkgs,
-  ];
+  extraInfo,
+  ...
+}:
+{
+  networking.firewall.allowedUDPPorts = [ 51821 ];
 
-  /* Wireguard */
+  # Wireguard
   networking.wireguard.interfaces.wg0 = {
     ips = [ "10.100.0.6/8" ];
 
@@ -52,7 +55,6 @@
       ip netns exec wg1ns ip link set lo up
     '';
 
-
     postShutdown = ''
       ip netns del wg1ns
     '';

configurations/london/default.nix

@@ -1,16 +1,27 @@
-{ pkgs, config, lib, extraInfo, ... }:
 {
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
+  pkgs,
+  config,
+  lib,
+  extraInfo,
+  ...
+}:
+{
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+  ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  /* Meta */
+  # Meta
   isProfessional = false;
 
-  /* Volumes */
+  # Volumes
   luksDevices = [
     {
       name = "crypted-nixos";
@@ -47,25 +58,24 @@
 
   swapDeviceUUID = "5fe5e76b-df3d-43ce-abf9-d2b63078df09";
 
-
+  # Linux kernel
-  /* Linux kernel */
   useLatestKernel = true;
 
-  /* Custom udev rules for Nucleo's stlink interface  */
+  # Custom udev rules for Nucleo's stlink interface
   services.udev.extraRules = ''
     ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b",MODE="660",GROUP="dialout",TAG+="uaccess"
     ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748",MODE="660",GROUP="dialout",TAG+="uaccess"
   '';
 
-  /* Nix */
+  # Nix
   allowUnfreePackages = true;
 
-  /* Hardware acceleration */
+  # Hardware acceleration
   hwAccelerationGPU = "amd";
 
   keymap = "fr";
 
-  /* System secrets */
+  # System secrets
   sops = {
     gnupg.sshKeyPaths = [ ];
     age = {
@@ -76,7 +86,7 @@
     secrets.wg0_private = { };
   };
 
-  /* Wireguard */
+  # Wireguard
   networking.wg-quick.interfaces.wg0 = {
     address = [ "10.100.0.4/8" ];
     dns = [ "10.100.0.1" ];
@@ -103,11 +113,20 @@
     ];
   };
 
-  /* User config */
+  # User config
   machineUsers = {
     dala = {
       description = "Dala";
-      groups = [ "wheel" "video" "audio" "seat" "keys" "lp" "dialout" "network" ];
+      groups = [
+        "wheel"
+        "video"
+        "audio"
+        "seat"
+        "keys"
+        "lp"
+        "dialout"
+        "network"
+      ];
       uid = 1000;
       shell = pkgs.fish;
       enableHomeManagerProfile = true;

flake.nix

@@ -23,18 +23,24 @@
     extra-config.url = "git+ssh://git@git.sr.ht/~dala/extra-config";
   };
 
-  outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager, sops-nix, flake-utils, extra-config }:
+  outputs =
+    {
+      self,
+      nixpkgs-unstable,
+      nixpkgs-stable,
+      home-manager,
+      sops-nix,
+      flake-utils,
+      extra-config,
+    }:
     let
       machines = import ./machines.nix;
     in
     {
-      nixosConfigurations = builtins.mapAttrs
+      nixosConfigurations = builtins.mapAttrs (
-        (name: value:
+        name: value:
         let
-            nixpkgs =
+          nixpkgs = if value.nixpkgsUnstable then nixpkgs-unstable else nixpkgs-stable;
-              if value.nixpkgsUnstable
-              then nixpkgs-unstable
-              else nixpkgs-stable;
         in
         nixpkgs.lib.nixosSystem {
           system = value.system;
@@ -52,26 +58,24 @@
           modules = [
             ./configurations/${name}
             ./modules/common
-              (if (value.machineType == "workstation")
+            (if (value.machineType == "workstation") then ./modules/workstation else ./modules/server)
-              then ./modules/workstation
+            (
-              else ./modules/server)
+              if (value.machineType == "workstation" && value.enableHomeManager) then
-              (if (value.machineType == "workstation" && value.enableHomeManager)
+                home-manager.nixosModules.home-manager
-              then home-manager.nixosModules.home-manager
+              else
-              else { })
+                { }
+            )
             sops-nix.nixosModules.sops
           ];
         }
-        )
+      ) machines;
-        machines;
 
-      formatter = builtins.listToAttrs (map
+      formatter = builtins.listToAttrs (
-        (system:
+        map (system: {
-          {
           name = system;
-            value = nixpkgs-unstable.legacyPackages.${system}.nixpkgs-fmt;
+          value = nixpkgs-unstable.legacyPackages.${system}.nixfmt-rfc-style;
-          }
+        }) flake-utils.lib.defaultSystems
-        )
+      );
-        flake-utils.lib.defaultSystems);
 
       hydraJobs = {
         nixos = builtins.mapAttrs (_: cfg: cfg.config.system.build.toplevel) self.nixosConfigurations;

modules/common/boot.nix

@@ -46,15 +46,15 @@ in
   };
 
   config = {
-    boot.initrd.luks.devices = builtins.listToAttrs (map
+    boot.initrd.luks.devices = builtins.listToAttrs (
-      (fs: {
+      map (fs: {
         name = fs.name;
         value = {
           device = "/dev/disk/by-uuid/${fs.deviceUUID}";
           preLVM = fs.isPreLVM;
         };
-      })
+      }) config.luksDevices
-      config.luksDevices);
+    );
 
     boot.loader.systemd-boot.enable = config.enableDefaultSystemdBoot;
     boot.loader.efi.canTouchEfiVariables = true;

modules/common/default.nix

@@ -1,4 +1,11 @@
-{ lib, config, pkgs, machineInfos, modulesPath, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  machineInfos,
+  modulesPath,
+  ...
+}:
 with lib;
 {
   imports = [
@@ -13,7 +20,10 @@ with lib;
   ];
 
   options.machineType = mkOption {
-    type = types.enum [ "workstation" "server" ];
+    type = types.enum [
+      "workstation"
+      "server"
+    ];
     default = "workstation";
     example = "server";
     description = ''
@@ -46,7 +56,9 @@ with lib;
     virtualisation.docker.enable = config.enableDocker;
 
     # Only enable fish shell if there is at least one user using it.
-    programs.fish.enable = builtins.any (user: user.shell == pkgs.fish) (builtins.attrValues config.machineUsers);
+    programs.fish.enable = builtins.any (user: user.shell == pkgs.fish) (
+      builtins.attrValues config.machineUsers
+    );
 
     # We always want to disable the X server as only workstation use windows manager
     # and they always use wayland.

modules/common/filesystem.nix

@@ -24,7 +24,6 @@ let
           The volume filesystem.
         '';
       };
-
     };
   };
 in
@@ -50,15 +49,15 @@ in
   };
 
   config = {
-    fileSystems = builtins.listToAttrs (map
+    fileSystems = builtins.listToAttrs (
-      (fs: {
+      map (fs: {
         name = fs.mountpoint;
         value = {
           device = "/dev/disk/by-uuid/${fs.deviceUUID}";
           fsType = fs.fsType;
         };
-      })
+      }) config.filesystems
-      config.filesystems);
+    );
 
     swapDevices = mkIf (config.swapDeviceUUID != null) [
       { device = "/dev/disk/by-uuid/${config.swapDeviceUUID}"; }

modules/common/hardware.nix

@@ -1,8 +1,19 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
 {
   options.hwAccelerationGPU = mkOption {
-    type = types.nullOr (types.enum [ "nvidia" "intel" "amd" ]);
+    type = types.nullOr (
+      types.enum [
+        "nvidia"
+        "intel"
+        "amd"
+      ]
+    );
     default = null;
     example = "nvidia";
     description = ''
@@ -11,9 +22,7 @@ with lib;
   };
 
   config = {
-    boot.kernelParams = mkIf (config.hwAccelerationGPU == "intel") [
+    boot.kernelParams = mkIf (config.hwAccelerationGPU == "intel") [ "i915.enable_guc=2" ];
-      "i915.enable_guc=2"
-    ];
 
     hardware.opengl = {
       enable = config.hwAccelerationGPU != null;
@@ -30,8 +39,6 @@ with lib;
       ];
     };
 
-    services.xserver.videoDrivers = mkIf (config.hwAccelerationGPU == "nvidia") [
+    services.xserver.videoDrivers = mkIf (config.hwAccelerationGPU == "nvidia") [ "nouveau" ];
-      "nouveau"
-    ];
   };
 }

modules/common/linux.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
 {
   options.useLatestKernel = mkOption {

modules/common/nix.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 with lib;
 {
   options.allowUnfreePackages = mkOption {

modules/common/users.nix

@@ -3,48 +3,34 @@ with lib;
 let
   userModule = types.submodule {
     options = {
-      description = mkOption {
+      description = mkOption { type = types.str; };
-        type = types.str;
-      };
 
-      groups = mkOption {
+      groups = mkOption { type = types.listOf types.str; };
-        type = types.listOf types.str;
-      };
 
-      uid = mkOption {
+      uid = mkOption { type = types.nullOr types.int; };
-        type = types.nullOr types.int;
-      };
 
-      shell = mkOption {
+      shell = mkOption { type = types.package; };
-        type = types.package;
-      };
 
       enableHomeManagerProfile = mkOption {
         type = types.bool;
         default = false;
       };
 
-      homeManagerConfig = mkOption {
+      homeManagerConfig = mkOption { default = { }; };
-        default = { };
-      };
     };
   };
 in
 {
-  options.machineUsers = mkOption {
+  options.machineUsers = mkOption { type = types.attrsOf userModule; };
-    type = types.attrsOf userModule;
-  };
 
   config = {
-    users.users = builtins.mapAttrs
+    users.users = builtins.mapAttrs (name: value: {
-      (name: value: {
       isNormalUser = true;
       home = "/home/${name}";
       description = value.description;
       extraGroups = value.groups;
       shell = value.shell;
       uid = mkIf (value.uid != null) value.uid;
-      })
+    }) config.machineUsers;
-      config.machineUsers;
   };
 }

modules/workstation/default.nix

@@ -1,4 +1,11 @@
-{ lib, config, pkgs, machineInfos, sopsHmModule, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  machineInfos,
+  sopsHmModule,
+  ...
+}:
 with lib;
 {
 
@@ -30,18 +37,20 @@ with lib;
       keymap = config.keymap;
       nvidiaGPU = (config.hwAccelerationGPU == "nvidia");
     };
-    home-manager.users = builtins.mapAttrs
+    home-manager.users = builtins.mapAttrs (
-      (name: value:
+      name: value:
-        mkIf value.enableHomeManagerProfile ({
+      mkIf value.enableHomeManagerProfile (
+        {
           home.username = name;
           home.homeDirectory = "/home/${name}";
           home.stateVersion = machineInfos.stateVersion;
           programs.home-manager.enable = true;
           enableFishShell = value.shell == pkgs.fish;
           isProfessional = config.isProfessional;
-        } // value.homeManagerConfig)
+        }
+        // value.homeManagerConfig
       )
-      config.machineUsers;
+    ) config.machineUsers;
 
     programs.dconf.enable = true;
     security.polkit.enable = true;

modules/workstation/desktop.nix

@@ -1,11 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 let
-  usersHasSway = builtins.any
+  usersHasSway = builtins.any (user: config.home-manager.users.${user}.desktop.enableSwayStack) (
-    (user:
+    builtins.attrNames config.machineUsers
-      config.home-manager.users.${user}.desktop.enableSwayStack
+  );
-    )
-    (builtins.attrNames config.machineUsers);
 in
 {
   programs.sway = mkIf usersHasSway {

modules/workstation/home-manager/communication.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 with lib;
 {
   options = {
@@ -28,9 +33,7 @@ with lib;
   };
 
   config.home.packages = with pkgs; [
-    (mkIf config.communication.discord.enable (discord.override {
+    (mkIf config.communication.discord.enable (discord.override { nss = nss_latest; }))
-      nss = nss_latest;
-    }))
     (mkIf config.communication.slack.enable slack)
     (mkIf config.communication.weechat.enable weechat)
     (mkIf config.communication.matrix.enable element)

modules/workstation/home-manager/default.nix

@@ -18,7 +18,6 @@ let
     yubico-pam
     yubikey-manager
   ];
-
 in
 {
   imports = [
@@ -33,15 +32,15 @@ in
     ./helix.nix
   ];
 
-  options.isProfessional = mkOption {
+  options.isProfessional = mkOption { type = types.bool; };
-    type = types.bool;
-  };
 
   config = {
 
     fonts.fontconfig.enable = true;
 
-    home.packages = with pkgs; [
+    home.packages =
+      with pkgs;
+      [
         htop
         firefox
         autojump
@@ -53,7 +52,8 @@ in
         zathura
         lazygit
         easyeffects
-    ] ++ multimediaPackages
+      ]
+      ++ multimediaPackages
       ++ soundPackages
       ++ yubikeyTools;
 
@@ -70,5 +70,4 @@ in
       "text/html" = "firefox.desktop";
     };
   };
-
 }

modules/workstation/home-manager/desktop/default.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
 let
   desktopPackages = with pkgs; [

modules/workstation/home-manager/desktop/sway.nix

@@ -1,4 +1,11 @@
-{ config, pkgs, lib, keymap, nvidiaGPU, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  keymap,
+  nvidiaGPU,
+  ...
+}:
 with lib;
 let
   isQwerty = keymap == "us";
@@ -6,26 +13,16 @@ let
   rendererLine = if nvidiaGPU then "export WLR_RENDERER=vulkan" else "";
   monitorModule = types.submodule {
     options = {
-      name = mkOption {
+      name = mkOption { type = types.str; };
-        type = types.str;
+      resolution = mkOption { type = types.str; };
-      };
+      position = mkOption { type = types.str; };
-      resolution = mkOption {
+      defaultWorkspace = mkOption { type = types.int; };
-        type = types.str;
-      };
-      position = mkOption {
-        type = types.str;
-      };
-      defaultWorkspace = mkOption {
-        type = types.int;
-      };
     };
   };
 in
 {
   options = {
-    desktop.monitors = mkOption {
+    desktop.monitors = mkOption { type = types.listOf monitorModule; };
-      type = types.listOf monitorModule;
-    };
   };
 
   config.wayland.windowManager.sway = mkIf config.desktop.enableSwayStack {
@@ -65,24 +62,23 @@ in
           "xcursor_theme" = "Nordzy-cursors";
         };
       };
-      output = builtins.listToAttrs
+      output =
-        (builtins.map
+        builtins.listToAttrs (
-          (monitor: {
+          builtins.map (monitor: {
             name = monitor.name;
             value = {
               resolution = monitor.resolution;
               position = monitor.position;
             };
-          })
+          }) config.desktop.monitors
-          config.desktop.monitors) // {
+        )
+        // {
           "*".bg = "/home/dala/Perso/wallpapers/tanuki.jpg fill";
         };
-      workspaceOutputAssign = map
+      workspaceOutputAssign = map (monitor: {
-        (monitor: {
         output = monitor.name;
         workspace = builtins.toString monitor.defaultWorkspace;
-        })
+      }) config.desktop.monitors;
-        config.desktop.monitors;
       startup = [
         {
           command = ''
@@ -134,9 +130,7 @@ in
         modifier = "${modifier} normal";
       };
 
-      bars = [{
+      bars = [ { command = "${pkgs.waybar}/bin/waybar"; } ];
-        command = "${pkgs.waybar}/bin/waybar";
-      }];
 
       keybindings = {
         "${modifier}+Return" = "exec ${terminal}";

modules/workstation/home-manager/desktop/waybar.nix

@@ -5,7 +5,8 @@ with lib;
     enable = true;
     #systemd.enable = false;
 
-    settings = [{
+    settings = [
+      {
         layer = "top";
         position = "top";
         height = 30;
@@ -15,9 +16,7 @@ with lib;
           "sway/mode"
         ];
 
-      modules-center = [
+        modules-center = [ "sway/window" ];
-        "sway/window"
-      ];
 
         modules-right = [
           "memory"
@@ -134,7 +133,8 @@ with lib;
           "format-alt" = "{:%A, %B %d}";
           "tooltip-format" = "<big>{:%Y %B}</big>\n<tt>{calendar}</tt>";
         };
-    }];
+      }
+    ];
 
     style = ''
       @keyframes blink-warning {

modules/workstation/home-manager/desktop/wofi.nix

@@ -1,4 +1,9 @@
-{ pkgs, config, lib, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 with lib;
 {
   programs.wofi = mkIf config.desktop.enableSwayStack {

modules/workstation/home-manager/development/default.nix

@@ -1,9 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 {
-  imports = [
+  imports = [ ./embedded.nix ];
-    ./embedded.nix
-  ];
 
   options.development.enableGit = mkOption {
     type = types.bool;

modules/workstation/home-manager/development/embedded.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
 {
   options.development.embedded.enableTools = mkOption {

modules/workstation/home-manager/fish.nix

@@ -1,9 +1,12 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 with lib;
 {
-  options.enableFishShell = mkOption {
+  options.enableFishShell = mkOption { type = types.bool; };
-    type = types.bool;
-  };
 
   config.programs.fish = mkIf config.enableFishShell {
     enable = true;

modules/workstation/home-manager/gpg.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 {
   options.enableGPGKeyring = mkOption {

modules/workstation/home-manager/helix.nix

@@ -1,7 +1,5 @@
 { lib, config, ... }:
 with lib;
 {
-  programs.helix.settings = mkIf config.programs.helix.enable {
+  programs.helix.settings = mkIf config.programs.helix.enable { theme = "nord"; };
-    theme = "nord";
-  };
 }

modules/workstation/home-manager/mail.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 with lib;
 let
   mailAccountModule = types.submodule {
@@ -7,21 +12,13 @@ let
       default = false;
     };
 
-    mailAddress = mkOption {
+    mailAddress = mkOption { type = types.str; };
-      type = types.str;
-    };
 
-    mailPasswdEval = mkOption {
+    mailPasswdEval = mkOption { type = types.str; };
-      type = types.str;
-    };
 
-    imapHost = mkOption {
+    imapHost = mkOption { type = types.str; };
-      type = types.str;
-    };
 
-    smtpHost = mkOption {
+    smtpHost = mkOption { type = types.str; };
-      type = types.str;
-    };
   };
 
   defaultExtraMailboxes = [
@@ -50,8 +47,7 @@ in
 
   config = mkIf (!hasNoAddress) {
 
-    accounts.email.accounts = builtins.mapAttrs
+    accounts.email.accounts = builtins.mapAttrs (name: value: {
-      (name: value: {
       primary = value.isPrimary;
       address = value.mailAddress;
       userName = value.mailAddress;
@@ -74,15 +70,12 @@ in
       neomutt = {
         enable = true;
         mailboxName = "${name}/Inbox";
-          extraMailboxes = map
+        extraMailboxes = map (mb: {
-            (mb: {
           mailbox = mb;
           name = "${name}/${mb}";
-            })
+        }) defaultExtraMailboxes;
-            defaultExtraMailboxes;
       };
-      })
+    }) config.communication.mailAccounts;
-      config.communication.mailAccounts;
 
     services.mbsync.enable = true;
     programs.mbsync.enable = true;

modules/workstation/home-manager/neovim/default.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
 {
   options.desktop.enableNeovim = mkOption {

modules/workstation/home-manager/termux.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 with lib;
 let
   tmuxExtraConfig = ''