update and merge conflicts

2024-10-13 15:20:26 +02:00
parent 5701b5fd20
commit 13cf1e25aa
9 changed files with 158 additions and 107 deletions
@@ -95,7 +95,7 @@

    blueman.enable = true;

-    printing.enable = true; # Enable CUPS to print documents.
+    # printing.enable = true; # Enable CUPS to print documents.
    gvfs.enable = true;

    auto-cpufreq.enable = true;