Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: inline lists comments #122

Merged
merged 1 commit into from
Feb 17, 2022
Merged

feat: inline lists comments #122

merged 1 commit into from
Feb 17, 2022

Conversation

kamadorueda
Copy link
Owner

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 8a03c53d3..ae783fe2f 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -34,10 +34,8 @@ in
 
     testPipe = {
       expr = pipe 2 [
-        (x: x + 2)
-        # 2 + 2 = 4
-        (x: x * 2)
-        # 4 * 2 = 8
+        (x: x + 2) # 2 + 2 = 4
+        (x: x * 2) # 4 * 2 = 8
       ];
       expected = 8;
     };
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 4ebf70a79..2ff87eee0 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -31,8 +31,7 @@ with lib; rec {
           (import ../modules/module-list.nix)
           ++ [
             ../modules/virtualisation/qemu-vm.nix
-            ../modules/testing/test-instrumentation.nix
-            # !!! should only get added for automated test runs
+            ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
             {
               key = "no-manual";
               documentation.nixos.enable = false;
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index f06214388..e8803e930 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -31,8 +31,7 @@ with lib; let
     [
       pkgs.dejavu_fonts
       pkgs.freefont_ttf
-      pkgs.gyre-fonts
-      # TrueType substitutes for standard PostScript fonts
+      pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
       pkgs.liberation_ttf
       pkgs.unifont
       pkgs.noto-fonts-emoji
diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index 08d18bc81..05938bb0c 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -28,8 +28,7 @@
         # with the `parted' command.
         nano
         zile
-        texinfo
-        # for the stand-alone Info reader
+        texinfo # for the stand-alone Info reader
       ]
       ++ lib.optional (!stdenv.isAarch32) grub2;
 
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index dc982d12f..ff03f5e75 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -11,8 +11,7 @@ with lib; let
   [
     pkgs.acl
     pkgs.attr
-    pkgs.bashInteractive
-    # bash with ncurses support
+    pkgs.bashInteractive # bash with ncurses support
     pkgs.bzip2
     pkgs.coreutils-full
     pkgs.cpio
@@ -143,8 +142,7 @@ in {
         "/etc/xdg"
         "/etc/gtk-2.0"
         "/etc/gtk-3.0"
-        "/lib"
-        # FIXME: remove and update debug-info.nix
+        "/lib" # FIXME: remove and update debug-info.nix
         "/sbin"
         "/share/emacs"
         "/share/hunspell"
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 5a4a9d7a7..1cf219136 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -25,14 +25,10 @@ with lib; let
     || !(
       lib.elem hash
       [
-        null
-        # password login disabled
-        "!"
-        # password login disabled
-        "!!"
-        # a variant of "!"
-        "*"
-        # password unset
+        null # password login disabled
+        "!" # password login disabled
+        "!!" # a variant of "!"
+        "*" # password unset
       ]
     );

@kamadorueda kamadorueda merged commit ba78351 into main Feb 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant