diff --git a/packaging/nix/flake.nix b/packaging/nix/flake.nix
index 916271de6..b8c8dad38 100644
--- a/packaging/nix/flake.nix
+++ b/packaging/nix/flake.nix
@@ -47,7 +47,7 @@
   } @ inputs: let
     inherit (nixpkgs) lib;
 
-    # add separateDebugInfo to a derivation
+    # Add separateDebugInfo to a derivation
     addSeparateDebugInfo = d:
       d.overrideAttrs {
         separateDebugInfo = true;
@@ -72,7 +72,7 @@
         overlays = with self.overlays; [default];
       };
 
-    # initialize nixpkgs for cross-compiling from `system` to `crossSystem`
+    # Initialize nixpkgs for cross-compiling from `system` to `crossSystem`
     crossPkgsFor = system: crossSystem:
       (import nixpkgs {
         inherit system;
@@ -84,14 +84,14 @@
       .pkgsCross
       .${crossSystem};
 
-    # initialize development nixpkgs for the specified `system`
+    # Initialize development nixpkgs for the specified `system`
     devPkgsFor = system:
       import nixpkgs {
         inherit system;
         overlays = with self.overlays; [default debug];
       };
 
-    # build villas and its dependencies for the specified `pkgs`
+    # Build villas and its dependencies for the specified `pkgs`
     packagesWith = pkgs: rec {
       default = villas;
 
diff --git a/packaging/nix/villas.nix b/packaging/nix/villas.nix
index a3de2c3e8..0973436df 100644
--- a/packaging/nix/villas.nix
+++ b/packaging/nix/villas.nix
@@ -7,14 +7,14 @@
   withAllFormats ? false,
   withAllHooks ? false,
   withAllNodes ? false,
-  # extras
+  # Extra features
   withExtraConfig ? withAllExtras,
   withExtraGraphviz ? withAllExtras,
-  # formats
+  # Format-types
   withFormatProtobuf ? withAllFormats,
-  # hooks
+  # Hook-types
   withHookLua ? withAllHooks,
-  # nodes
+  # Node-types
   withNodeAmqp ? withAllNodes,
   withNodeComedi ? withAllNodes,
   withNodeFpga ? withAllNodes,