Merge branch 'ci/automatic-update-2023-09-19'

rake5k · Sep 19, 2023 · e31bf2c · e31bf2c
2 parents 0d223a4 + 00cc111
commit e31bf2c
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 36 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/programs/davmail/default.nix b/home/programs/davmail/default.nix
@@ -76,9 +76,11 @@ in
         smtpPort = 1025;
       };
       log4j = {
-        logger.davmail = mkDefault "WARN";
-        logger.httpclient.wire = mkDefault "WARN";
-        logger.org.apache.commons.httpclient = mkDefault "WARN";
+        logger = {
+          davmail = mkDefault "WARN";
+          httpclient.wire = mkDefault "WARN";
+          org.apache.commons.httpclient = mkDefault "WARN";
+        };
         rootLogger = mkDefault "WARN";
       };
     };

diff --git a/home/programs/spectrwm/default.nix b/home/programs/spectrwm/default.nix
@@ -240,7 +240,7 @@ in
             # region = screen[1]:1280x1024+1280+0
             
             # Launch applications in a workspace of choice
-            ${concatStringsSep "\n" ([ ] ++ mapAttrsToList mkAutorun cfg.autoruns)}
+            ${concatStringsSep "\n" (mapAttrsToList mkAutorun cfg.autoruns)}
             
             # Customize workspace layout at start
             # format: ws[idx]:master_grow:master_add:stack_inc:always_raise:stack_mode

diff --git a/hosts/nixos-vm/hardware/configuration.nix b/hosts/nixos-vm/hardware/configuration.nix
@@ -9,14 +9,17 @@
       (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  boot.initrd.luks.devices.root = {
-    device = "/dev/sda2";
-    preLVM = true;
+  boot = {
+    initrd = {
+      availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ];
+      kernelModules = [ "dm-snapshot" ];
+      luks.devices.root = {
+        device = "/dev/sda2";
+        preLVM = true;
+      };
+    };
+    kernelModules = [ ];
+    extraModulePackages = [ ];
   };
 
   fileSystems."/" =

diff --git a/nixos/roles/desktop/mobile/default.nix b/nixos/roles/desktop/mobile/default.nix
@@ -17,9 +17,11 @@ in
 
   config = mkIf cfg.enable {
     services = {
-      logind.lidSwitch = "suspend-then-hibernate";
-      logind.lidSwitchExternalPower = "lock";
-      logind.lidSwitchDocked = "ignore";
+      logind = {
+        lidSwitch = "suspend-then-hibernate";
+        lidSwitchDocked = "ignore";
+        lidSwitchExternalPower = "lock";
+      };
       upower.enable = true;
     };