From bd20b7622d208bcafa9fa2a9d6e56079afd84282 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 24 Feb 2023 11:40:43 -0800
Subject: [PATCH] update nixos

---
 common-gui.nix      | 6 +++---
 common-headless.nix | 4 ++--
 common-sw.nix       | 5 +++--
 flake.lock          | 6 +++---
 gnome3.nix          | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common-gui.nix b/common-gui.nix
index 9435fb7..38d7fde 100644
--- a/common-gui.nix
+++ b/common-gui.nix
@@ -6,8 +6,8 @@
   ];
 
   i18n.inputMethod = {
-    enabled = "fcitx";
-    fcitx.engines = with pkgs.fcitx-engines; [ mozc anthy table-other m17n ];
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-table-other fcitx5-m17n fcitx5-rime rime-data ];
   };
 
   fonts = {
@@ -69,7 +69,7 @@
   ];
 
   # prevent satanic torture
-  qt5.platformTheme = "qt5ct";
+  qt.platformTheme = "qt5ct";
 
   hardware.uinput.enable = true;
   users.extraUsers.gebner.extraGroups = [ "input" "tty" "audio" "video" "uinput" ];
diff --git a/common-headless.nix b/common-headless.nix
index ad5ee06..4278213 100644
--- a/common-headless.nix
+++ b/common-headless.nix
@@ -27,8 +27,8 @@
   # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
-    permitRootLogin = "no";
-    passwordAuthentication = false;
+    settings.PermitRootLogin = "no";
+    settings.PasswordAuthentication = false;
   };
   programs.ssh.startAgent = false;
 
diff --git a/common-sw.nix b/common-sw.nix
index 6c0364f..f1ccb1d 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -104,7 +104,8 @@
   programs.adb.enable = true;
   users.extraUsers.gebner.extraGroups = [ "adbusers" ];
 
-  # nixpkgs.config.packageOverrides = pkgs: with pkgs; {
-  # };
+  nixpkgs.config.packageOverrides = pkgs: with pkgs; {
+    khal = pkgs.khal.overridePythonAttrs (_: { doCheck = false; });
+  };
 
 }
diff --git a/flake.lock b/flake.lock
index af381a7..be488fd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1669320964,
-        "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=",
+        "lastModified": 1677063315,
+        "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877",
+        "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
         "type": "github"
       },
       "original": {
diff --git a/gnome3.nix b/gnome3.nix
index eee419d..b2f82b0 100644
--- a/gnome3.nix
+++ b/gnome3.nix
@@ -63,7 +63,7 @@
   };
 
   # prevent satanic torture
-  qt5.platformTheme = "qt5ct";
+  qt.platformTheme = "qt5ct";
 
   hardware.uinput.enable = true;
   users.extraUsers.gebner.extraGroups = [ "input" "tty" "audio" "video" "uinput" ];