From 8b3a2fab0ee40ac80f19da0521977970d4984125 Mon Sep 17 00:00:00 2001 From: Christian Harke Date: Tue, 19 Sep 2023 01:53:03 +0000 Subject: [PATCH 1/2] flake.inputs: automatic update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 7cfc6e6e..ba93796d 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1690228878, - "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", + "lastModified": 1694793763, + "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", "owner": "ryantm", "repo": "agenix", - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", + "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1694393725, - "narHash": "sha256-Dj31h6M4Zi2YGrQnigP3Rpk4SDsMrhs+xv+GZb5/wbM=", + "lastModified": 1694825640, + "narHash": "sha256-sMTR1IQTy2b1TMU7soZ/SZsLT+YW96mOqevyYjFVraA=", "owner": "rake5k", "repo": "flake-commons", - "rev": "e0de4bcbb96907d26f2649a497ea5f035adfb0d9", + "rev": "d308b31c90fbeaa5ff6b4def243d3c9afaa9d93f", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1694430658, - "narHash": "sha256-8+OZ98kD63e/GaOiJimXHR/VYiTYwr25jTYGEHHOfq4=", + "lastModified": 1694921880, + "narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "9a5c4996d0918a151269600dfdf6ad3b3748f6a4", + "rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694304580, - "narHash": "sha256-5tIpNodDpEKT8mM/F5zCzWEAnidOg8eb1/x3SRaaBLs=", + "lastModified": 1694937365, + "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c8cf44c5b9481a4f093f1df3b8b7ba997a7c760", + "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694183432, - "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", + "lastModified": 1694959747, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nur": { "locked": { - "lastModified": 1694480663, - "narHash": "sha256-KC4dFqABfzbCnUuthihK70aeAKDisNtKH5Kv19RQ6xY=", + "lastModified": 1695076089, + "narHash": "sha256-OcCwDYZYErSz8QCtLvqMQkJufByS4r74SCTL9N3YGBk=", "owner": "nix-community", "repo": "NUR", - "rev": "c0d9af1523be67c13921a4f1d625c35dff1539c3", + "rev": "1152aa48c3e88af00f2a3b2ff8af9d3c14cf5d72", "type": "github" }, "original": { From 00cc111336af77be70f6324e8ec2ec5242b20e76 Mon Sep 17 00:00:00 2001 From: Christian Harke Date: Tue, 19 Sep 2023 07:46:18 +0200 Subject: [PATCH 2/2] Fix statix issues --- home/programs/davmail/default.nix | 8 +++++--- home/programs/spectrwm/default.nix | 2 +- hosts/nixos-vm/hardware/configuration.nix | 19 +++++++++++-------- nixos/roles/desktop/mobile/default.nix | 8 +++++--- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/home/programs/davmail/default.nix b/home/programs/davmail/default.nix index c1cdb639..6bb8bfd3 100644 --- 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 index e276cb1f..8a160184 100644 --- 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 index 75202133..73455a70 100644 --- 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 index c0707864..7bdd3da3 100644 --- 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; };