Feat(treewide): Get river working

1 files changed, 6 insertions, 9 deletions

diff --git a/hosts/thinklappi/default.nix b/hosts/thinklappi/default.nix
index ba379a8..4f0145a 100644
--- a/hosts/thinklappi/default.nix
+++ b/hosts/thinklappi/default.nix
@@ -2,11 +2,7 @@
   config,
   pkgs,
   ...
-}: let
-  compiledLayout = pkgs.runCommand "keyboard-layout" {} ''
-    ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../../files/neoqwertz.xkb} $out
-  '';
-in {
+}: {
   imports = [
     ./basesystem.nix
     ../../sys
@@ -16,9 +12,7 @@ in {
     printing.enable = true;
     xserver = {
       layout = "de";
-      #xkbVariant = ",neo";
       xkbOptions = "grp:win_space_toggle";
-      displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
     };
     pipewire = {
       enable = true;
@@ -30,10 +24,14 @@ in {
   };
 
   hardware = {
+    opengl.enable = true;
     bluetooth.enable = true;
     pulseaudio.enable = false;
   };
-  security.rtkit.enable = true;
+  security = {
+    rtkit.enable = true;
+    pam.services.swaylock = {};
+  };
 
   environment.systemPackages = [pkgs.xorg.xkbcomp];
 
@@ -53,7 +51,6 @@ in {
   console = {
     font = "Lat2-Terminus16";
     keyMap = "de";
-    #useXkbConfig = true; # use xkbOptions in tty.
   };
 
   programs.ssh.startAgent = true;