From 26b0313bcd8a0d69ee3b45ceadf38dddacdf50ea Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 6 Sep 2023 09:25:23 +0200
Subject: [PATCH] Update IP for maddy and enable zram

---
 flake.lock                                 |  8 ++++----
 home/nki-x1c1.nix                          | 16 ++++++++++++++++
 nki-personal-do/configuration.nix          |  2 +-
 nki-personal-do/hardware-configuration.nix |  3 ++-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7683d17..dd0eb38 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1027,11 +1027,11 @@
         "flake-utils": "flake-utils_7"
       },
       "locked": {
-        "lastModified": 1686133200,
-        "narHash": "sha256-AkpX/qKyYZAql7aif3mGe2noBpVWhCWnTsLWSIy1BCI=",
+        "lastModified": 1693981285,
+        "narHash": "sha256-7TXp5nKRs3BgSHEg7uBbTBAQKlM7vKji+IVLAy78VCc=",
         "ref": "refs/heads/master",
-        "rev": "29b56eb8daa86334d9e2744d527dfb02b147a381",
-        "revCount": 7,
+        "rev": "824bff0a5dfbf69e6694b30f0f863f2008fcce56",
+        "revCount": 8,
         "type": "git",
         "url": "ssh://git@github.com/natsukagami/nix-deploy-secrets"
       },
diff --git a/home/nki-x1c1.nix b/home/nki-x1c1.nix
index 2c0a365..235f8ce 100644
--- a/home/nki-x1c1.nix
+++ b/home/nki-x1c1.nix
@@ -72,6 +72,22 @@
       )
     ];
   };
+  ## Virtual keyboard
+  systemd.user.services.wvkbd = {
+    Unit = {
+      Description = "Wayland virtual keyboard";
+    };
+    Install.WantedBy = [ "waybar.service" ];
+    Service = {
+      Type = "simple";
+      ExecStart = "${pkgs.wvkbd}/bin/wvkbd-mobintl -l simple,special,emoji --landscape-layers simple,special,emoji --hidden";
+    };
+  };
+  wayland.windowManager.sway.extraConfig = ''
+    bindswitch tablet:on exec systemctl --user kill --signal SIGUSR2 wvkbd
+    bindswitch tablet:off exec systemctl --user kill --signal SIGUSR1 wvkbd
+  '';
+
   # input-remapping
   xdg.configFile."autostart/input-remapper-autoload.desktop".source =
     "${pkgs.input-remapper}/share/applications/input-remapper-autoload.desktop";
diff --git a/nki-personal-do/configuration.nix b/nki-personal-do/configuration.nix
index a555858..5a343db 100644
--- a/nki-personal-do/configuration.nix
+++ b/nki-personal-do/configuration.nix
@@ -147,7 +147,7 @@
   cloud.mail = {
     enable = true;
     debug = true;
-    # local_ip = (builtins.elemAt config.networking.interfaces.eth0.ipv4.addresses 0).address;
+    local_ip = config.secrets.ipAddresses."nki.personal";
     tls.certFile = "${config.cloud.traefik.certsDumper.destination}/${config.cloud.mail.hostname}/certificate.crt";
     tls.keyFile = "${config.cloud.traefik.certsDumper.destination}/${config.cloud.mail.hostname}/privatekey.key";
     usersFile = config.sops.secrets.mail-users.path;
diff --git a/nki-personal-do/hardware-configuration.nix b/nki-personal-do/hardware-configuration.nix
index f0d5593..f2a2b10 100644
--- a/nki-personal-do/hardware-configuration.nix
+++ b/nki-personal-do/hardware-configuration.nix
@@ -6,7 +6,8 @@
   boot.initrd.kernelModules = [ "nvme" ];
   fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
   # swap
-  swapDevices = [{ device = "/var/swapfile"; size = 4 * 1024; }];
+  swapDevices = [{ device = "/var/swapfile"; size = 4 * 1024; priority = 1024; }];
+  zramSwap.enable = true;
   # volumes
   fileSystems.data = {
     device = "/dev/disk/by-id/scsi-0HC_Volume_31812942";