From a63bd773b9dfce7d71a5a87d167755a22ccf0c3c Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Fri, 9 Feb 2024 01:36:39 +0300
Subject: 2024-02-09

---
 modules/nixos/alertmanager.nix  | 4 ++--
 modules/nixos/common/locale.nix | 4 ++--
 modules/nixos/lxc.nix           | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'modules/nixos')

diff --git a/modules/nixos/alertmanager.nix b/modules/nixos/alertmanager.nix
index 9c8d60a..4d7f2ec 100644
--- a/modules/nixos/alertmanager.nix
+++ b/modules/nixos/alertmanager.nix
@@ -67,7 +67,7 @@ in {
               name = my.username;
               webhook_configs = [
                 {
-                  url = with config.pinpox.services.alertmanager-ntfy; "http://${httpAddress}:${httpPort}";
+                  url = with config.services.alertmanager-ntfy; "http://${httpAddress}:${httpPort}";
                 }
               ];
             }
@@ -76,7 +76,7 @@ in {
       };
     };
 
-    pinpox.services.alertmanager-ntfy = {
+    services.alertmanager-ntfy = {
       enable = true;
       httpAddress = "127.0.0.1";
       httpPort = toString (config.nixfiles.modules.ntfy.port + 1);
diff --git a/modules/nixos/common/locale.nix b/modules/nixos/common/locale.nix
index 09e0686..76186bc 100644
--- a/modules/nixos/common/locale.nix
+++ b/modules/nixos/common/locale.nix
@@ -23,9 +23,9 @@ with lib; {
     };
   };
 
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "us";
-    xkbOptions = concatStringsSep "," [
+    options = concatStringsSep "," [
       "caps:escape"
       "compose:menu"
       "terminate:ctrl_alt_bksp"
diff --git a/modules/nixos/lxc.nix b/modules/nixos/lxc.nix
index bfdab8f..1306497 100644
--- a/modules/nixos/lxc.nix
+++ b/modules/nixos/lxc.nix
@@ -9,7 +9,10 @@ in {
   options.nixfiles.modules.lxc.enable = mkEnableOption "LXC/Incus";
 
   config = mkIf cfg.enable {
+    ark.directories = ["/var/lib/incus"];
+
     virtualisation.incus.enable = true;
+
     my.extraGroups = ["incus-admin"];
   };
 }
-- 
cgit v1.2.3