From 9f081ee5edb84b085317e45e68288568f22a917e Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Thu, 6 Jun 2024 11:23:29 +0200
Subject: [PATCH] Update option namings after nix update

---
 flake.nix                                      |  5 +----
 homes/x86_64-linux/julian@kardorf/packages.nix |  2 +-
 systems/x86_64-linux/kardorf/default.nix       | 14 +++++++-------
 systems/x86_64-linux/nix-builder/default.nix   |  4 ++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6b8a833..5163cc0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,10 +53,7 @@
         nvidia.acceptLicense = true;
 
         # Allow certain insecure packages
-        # permittedInsecurePackages = [ "firefox-100.0.0" ];
-        # permittedInsecurePackages = [ "electron-24.8.6" ];
-        permittedInsecurePackages =
-          [ "schildichat-web-1.11.30-sc.2" "electron-25.9.0" ];
+        permittedInsecurePackages = [ ];
 
         # Additional configuration for specific packages.
         config = {
diff --git a/homes/x86_64-linux/julian@kardorf/packages.nix b/homes/x86_64-linux/julian@kardorf/packages.nix
index 121f5d3..893af9f 100644
--- a/homes/x86_64-linux/julian@kardorf/packages.nix
+++ b/homes/x86_64-linux/julian@kardorf/packages.nix
@@ -155,7 +155,7 @@ with pkgs; [
 
   # lf
   rustdesk
-  realvnc-vnc-viewer
+  # realvnc-vnc-viewer
   calibre
 
   audible-cli
diff --git a/systems/x86_64-linux/kardorf/default.nix b/systems/x86_64-linux/kardorf/default.nix
index e695305..a34a2d5 100644
--- a/systems/x86_64-linux/kardorf/default.nix
+++ b/systems/x86_64-linux/kardorf/default.nix
@@ -98,14 +98,14 @@
       enableXfwm = false;
     };
   };
-  services.xserver.displayManager.defaultSession = "none+i3";
+  services.displayManager.defaultSession = "none+i3";
   services.xserver.windowManager.i3.enable = true;
   services.xserver.windowManager.i3.package = pkgs.i3-gaps;
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "de";
-    xkbVariant = "";
+    xkb.layout = "de";
+    xkb.variant = "";
   };
 
   # Configure console keymap
@@ -146,7 +146,7 @@
     uid = 1000;
     group = "julian";
     shell = pkgs.fish;
-    extraGroups = [ "networkmanager" "wheel" "docker" "vboxusers" ];
+    extraGroups = [ "networkmanager" "wheel" "docker" ];
     packages = with pkgs; [ ]; # Using home-manager instead
   };
 
@@ -207,9 +207,9 @@
   virtualisation.docker.enable = true;
 
   virtualisation.virtualbox.host.enable = true;
-  virtualisation.virtualbox.host.enableExtensionPack = true;
-  virtualisation.virtualbox.guest.enable = true;
-  virtualisation.virtualbox.guest.x11 = true;
+  # virtualisation.virtualbox.host.enableExtensionPack = true;
+  # virtualisation.virtualbox.guest.enable = true;
+  # virtualisation.virtualbox.guest.x11 = true;
   users.extraGroups.vboxusers.members = [ "julian" ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/systems/x86_64-linux/nix-builder/default.nix b/systems/x86_64-linux/nix-builder/default.nix
index 3a61c3d..80e12f4 100644
--- a/systems/x86_64-linux/nix-builder/default.nix
+++ b/systems/x86_64-linux/nix-builder/default.nix
@@ -43,8 +43,8 @@
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "de";
-    xkbVariant = "";
+    xkb.layout = "de";
+    xkb.variant = "";
   };
 
   # Configure console keymap