Nixfmt: Enable strict formatting.

.treefmt.toml

@@ -12,4 +12,5 @@
 
 [formatter.nixfmt-rfc-style]
 command  = "nixfmt"
+options  = [ "-s" ]
 includes = [ "*.nix" ]

container/Change.nix

@@ -32,9 +32,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.change = container.mkContainer cfg {
       bindMounts = {

container/Cloud.nix

@@ -36,9 +36,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.cloud = container.mkContainer cfg {
       bindMounts = {

container/Ddns.nix

@@ -24,9 +24,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.ddns = container.mkContainer cfg {
       bindMounts = {

container/Dns.nix

@@ -30,9 +30,7 @@ in
       config =
         { ... }:
         container.mkContainerConfig cfg {
-          environment.systemPackages = [
+          environment.systemPackages = [ pkgs.cloudflared ];
-            pkgs.cloudflared
-          ];
 
           systemd.services.cloudflared = {
             description = "Cloudflare DoH server.";
@@ -96,9 +94,7 @@ in
                     "https://raw.githubusercontent.com/AssoEchap/stalkerware-indicators/master/generated/hosts"
                     "https://urlhaus.abuse.ch/downloads/hostfile/"
                   ];
-                  other = [
+                  other = [ "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" ];
-                    "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser"
-                  ];
                 };
                 # whiteLists = {
                 #   other = [

container/Download.nix

@@ -36,9 +36,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.download = container.mkContainer cfg {
       enableTun = true;

container/Frkn.nix

@@ -40,9 +40,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.frkn = container.mkContainer cfg {
       bindMounts = {

container/Git.nix

@@ -37,9 +37,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.git = container.mkContainer cfg {
       bindMounts = {

container/Hdd.nix

@@ -34,9 +34,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.hdd = container.mkContainer cfg {
       # bindMounts = let

container/Iot.nix

@@ -33,9 +33,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.iot = container.mkContainer cfg {
       bindMounts = {

container/Jobber.nix

@@ -31,9 +31,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.jobber = container.mkContainer cfg {
       bindMounts = {
@@ -58,11 +56,7 @@ in
             ]);
         in
         container.mkContainerConfig cfg {
-          networking = lib.mkForce {
+          networking = lib.mkForce { nameservers = [ "10.30.218.2" ]; };
-            nameservers = [
-              "10.30.218.2"
-            ];
-          };
 
           systemd.services.jobber = {
             description = "My job is pushing the button.";

container/Mail.nix

@@ -193,9 +193,7 @@ in
                 ru
               ];
               hostName = cfg.domain;
-              plugins = [
+              plugins = [ "managesieve" ];
-                "managesieve"
-              ];
               extraConfig = ''
                 # starttls needed for authentication, so the fqdn required to match
                 # the certificate

container/Office.nix

@@ -38,9 +38,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.office = container.mkContainer cfg {
       bindMounts = {

container/Paper.nix

@@ -34,9 +34,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.paper = container.mkContainer cfg {
       bindMounts = {

container/Pass.nix

@@ -32,9 +32,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.pass = container.mkContainer cfg {
       bindMounts = {

container/Postgres.nix

@@ -29,9 +29,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.postgres = container.mkContainer cfg {
       bindMounts = {

container/Print.nix

@@ -40,9 +40,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.print = container.mkContainer cfg {
       bindMounts = {

container/Rabbitmq.nix

@@ -30,9 +30,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.rabbitmq = container.mkContainer cfg {
       bindMounts = {

container/Read.nix

@@ -33,9 +33,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.read = container.mkContainer cfg {
       bindMounts = {

container/Status.nix

@@ -32,9 +32,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.status = container.mkContainer cfg {
       bindMounts = {
@@ -48,9 +46,7 @@ in
         { lib, ... }:
         container.mkContainerConfig cfg {
           networking = {
-            nameservers = mkForce [
+            nameservers = mkForce [ config.container.module.dns.address ];
-              config.container.module.dns.address
-            ];
           };
 
           services.uptime-kuma = {

container/Stock.nix

@@ -32,9 +32,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = container.mkContainerDir cfg [
+    systemd.tmpfiles.rules = container.mkContainerDir cfg [ "data" ];
-      "data"
-    ];
 
     containers.stock = container.mkContainer cfg {
       bindMounts = {

container/proxy/host/Camera.nix

@@ -1,8 +1,4 @@
-{
+{ config, container, ... }:
-  config,
-  container,
-  ...
-}:
 let
   domain = "camera.${config.container.domain}";
   address = "192.168.2.249";

container/proxy/host/Hdd.nix

@@ -1,8 +1,4 @@
-{
+{ container, config, ... }:
-  container,
-  config,
-  ...
-}:
 let
   cfg = config.container.module.hdd;
   name = "hdd";

container/proxy/host/Home.nix

@@ -1,8 +1,4 @@
-{
+{ config, container, ... }:
-  config,
-  container,
-  ...
-}:
 let
   cfg = config.container.module.home;
   name = "home";

container/proxy/host/Iot.nix

@@ -1,8 +1,4 @@
-{
+{ container, config, ... }:
-  container,
-  config,
-  ...
-}:
 let
   cfg = config.container.module.iot;
   name = "iot";

container/proxy/host/Search.nix

@@ -1,8 +1,4 @@
-{
+{ container, config, ... }:
-  container,
-  config,
-  ...
-}:
 let
   cfg = config.container.module.search;
   name = "search";

flake.nix

@@ -231,11 +231,7 @@
                 };
             };
 
-          mkSystem = system: hostname: {
+          mkSystem = system: hostname: { "${hostname}" = mkHost { inherit system hostname; }; };
-            "${hostname}" = mkHost {
-              inherit system hostname;
-            };
-          };
         in
         nixpkgs.lib.foldl' (acc: h: acc // h) { } (
           map (

home/config/template/Latex.nix

@@ -50,9 +50,7 @@
     {
       devShells.${system} = {
         default = pkgs.mkShell rec {
-          nativeBuildInputs = with pkgs; [
+          nativeBuildInputs = with pkgs; [ tex ];
-            tex
-          ];
           buildInputs = with pkgs; [ ];
           SOURCE_DATE_EPOCH = "${toString self.lastModified}";
         };

home/config/waybar/config/default.nix

@@ -24,9 +24,7 @@ in
       "sway/scratchpad"
       "mpris"
     ];
-    modules-center = [
+    modules-center = [ "sway/workspaces" ];
-      "sway/workspaces"
-    ];
     modules-right = [
       "sway/language"
       "pulseaudio"

home/user/Dasha.nix

@@ -1,8 +1,4 @@
-{
+{ lib, config, ... }:
-  lib,
-  config,
-  ...
-}:
 with lib;
 let
   cfg = config.user.dasha;

host/x86_64-linux/work/Fprint.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }:
 {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ fprintd ];
-    fprintd
-  ];
 
   services.fprintd = {
     enable = true;

lib/Container.nix

@@ -10,9 +10,7 @@
     cfg: extra:
     lib.recursiveUpdate {
       # Allow nested containers.
-      additionalCapabilities = [
+      additionalCapabilities = [ ''all" --system-call-filter="add_key keyctl bpf" --capability="all'' ];
-        ''all" --system-call-filter="add_key keyctl bpf" --capability="all''
-      ];
       enableTun = true;
 
       # Start containers with the system by default.
@@ -71,11 +69,7 @@
   mkContainerDir = cfg: dirs: map (path: "d '${cfg.storage}/${path}' 1777 root root - -") dirs;
 
   # Common configuration for Nginx server.
-  mkServer =
+  mkServer = cfg: lib.recursiveUpdate { forceSSL = false; } cfg;
-    cfg:
-    lib.recursiveUpdate {
-      forceSSL = false;
-    } cfg;
 
   # Attach the host media directory to container.
   # They will be added to /type/{0..9}

module/AmdCompute.nix

@@ -15,11 +15,7 @@ in
 
   config = mkIf cfg.enable {
     nixpkgs.config.rocmSupport = true;
-    systemd.tmpfiles.rules = [
+    systemd.tmpfiles.rules = [ "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}" ];
-      "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
+    hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
-    ];
-    hardware.graphics.extraPackages = with pkgs; [
-      rocmPackages.clr.icd
-    ];
   };
 }

module/Brightness.nix

@@ -8,7 +8,5 @@ in
     module.desktop.brightness.enable = mkEnableOption "Brightness.";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable { programs.light.enable = true; };
-    programs.light.enable = true;
-  };
 }

module/IntelCpu.nix

@@ -22,9 +22,7 @@ in
   };
 
   config = mkIf cfg.enable (mkMerge [
-    {
+    { boot.kernelModules = [ "kvm-intel" ]; }
-      boot.kernelModules = [ "kvm-intel" ];
-    }
     (mkIf cfg.powersave {
       module.powersave = {
         enable = true;

module/Kernel.nix

@@ -85,12 +85,8 @@ in
       };
     })
 
-    (mkIf cfg.hotspotTtlBypass {
+    (mkIf cfg.hotspotTtlBypass { boot.kernel.sysctl."net.ipv4.ip_default_ttl" = 65; })
-      boot.kernel.sysctl."net.ipv4.ip_default_ttl" = 65;
-    })
 
-    (mkIf cfg.latest {
+    (mkIf cfg.latest { boot.kernelPackages = pkgs.linuxPackages_latest; })
-      boot.kernelPackages = pkgs.linuxPackages_latest;
-    })
   ]);
 }

module/Package.nix

@@ -60,9 +60,7 @@ in
     })
 
     # Desktop apps.
-    (mkIf cfg.desktop.enable {
+    (mkIf cfg.desktop.enable { environment.systemPackages = package.desktop; })
-      environment.systemPackages = package.desktop;
-    })
 
     # Gaming.
     (mkIf cfg.gaming.enable {
@@ -86,18 +84,12 @@ in
     })
 
     # Creative.
-    (mkIf cfg.creative.enable {
+    (mkIf cfg.creative.enable { environment.systemPackages = package.creative; })
-      environment.systemPackages = package.creative;
-    })
 
     # Development.
-    (mkIf cfg.dev.enable {
+    (mkIf cfg.dev.enable { environment.systemPackages = package.dev; })
-      environment.systemPackages = package.dev;
-    })
 
     # Extras.
-    (mkIf cfg.extra.enable {
+    (mkIf cfg.extra.enable { environment.systemPackages = package.extra; })
-      environment.systemPackages = package.extra;
-    })
   ];
 }

module/Polkit.nix

@@ -17,9 +17,7 @@ in
   config = mkIf cfg.enable {
     security.polkit.enable = true;
     systemd = {
-      packages = with pkgs; [
+      packages = with pkgs; [ polkit-kde-agent ];
-        polkit-kde-agent
-      ];
       user = {
         services.plasma-polkit-agent = {
           serviceConfig = {

module/Portal.nix

@@ -17,9 +17,7 @@ in
   config = mkIf cfg.enable {
     xdg.portal = {
       enable = true;
-      extraPortals = with pkgs; [
+      extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
-        xdg-desktop-portal-gtk
-      ];
       config = {
         common = {
           default = [

module/Sway.nix

@@ -41,9 +41,7 @@ in
         base = true;
         gtk = true;
       };
-      extraPackages = with pkgs; [
+      extraPackages = with pkgs; [ swaykbdd ];
-        swaykbdd
-      ];
     };
   };
 }

module/Waybar.nix

@@ -15,7 +15,5 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ waybar ]; };
-    environment.systemPackages = with pkgs; [ waybar ];
-  };
 }

package/homer/Config.nix

@@ -47,9 +47,7 @@ let
         dark = colors;
       };
 
-    links = [
+    links = [ (mkLink "Status" "fa-heartbeat" "https://${config.container.module.status.domain}") ];
-      (mkLink "Status" "fa-heartbeat" "https://${config.container.module.status.domain}")
-    ];
 
     services = [
       (mkGroup "App" "fa-server" [