From 911b8e67fac04c3981cd07cfd5220b9703996d00 Mon Sep 17 00:00:00 2001
From: sils <sils@sils.li>
Date: Sat, 6 May 2023 15:48:38 +0200
Subject: Feat(treewide): Get river working

---
 hosts/thinklappi/default.nix    | 15 ++++++---------
 sys/desktop/river/default.nix   |  4 ++--
 sys/users/default.nix           |  2 +-
 users/sils/packages/default.nix |  5 +++++
 users/sils/swaylock/default.nix |  6 ++++++
 5 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 users/sils/swaylock/default.nix

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;
diff --git a/sys/desktop/river/default.nix b/sys/desktop/river/default.nix
index fa2720b..72fb3e2 100644
--- a/sys/desktop/river/default.nix
+++ b/sys/desktop/river/default.nix
@@ -1,8 +1,8 @@
 {pkgs, ...}: {
   services.xserver = {
-    enable = true;
+    enable = false;
     displayManager = {
-      lightdm.enable = true;
+      lightdm.enable = false;
       defaultSession = "river";
       session = [
         {
diff --git a/sys/users/default.nix b/sys/users/default.nix
index b4f7cfe..c5f2d3d 100644
--- a/sys/users/default.nix
+++ b/sys/users/default.nix
@@ -15,7 +15,7 @@
     };
   };
   services.xserver.displayManager.autoLogin = {
-    enable = true;
+    enable = false;
     user = "sils";
   };
   programs.zsh.enable = true;
diff --git a/users/sils/packages/default.nix b/users/sils/packages/default.nix
index 96d0b51..57fafa7 100644
--- a/users/sils/packages/default.nix
+++ b/users/sils/packages/default.nix
@@ -74,5 +74,10 @@
     cmatrix # hacker tool
 
     bottles # run windows software
+
+    # windowmanager
+    river
+    yambar
+    swaylock
   ];
 }
diff --git a/users/sils/swaylock/default.nix b/users/sils/swaylock/default.nix
new file mode 100644
index 0000000..a3e2ca2
--- /dev/null
+++ b/users/sils/swaylock/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  programs.swaylock = {
+    enable = true;
+    # TODO maybe add settings
+  };
+}
-- 
cgit 1.4.1