From fbbe1fa50efbaa51b90e0bb007cfcb4619ae64b9 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Fri, 12 Nov 2021 19:23:28 -0500
Subject: Update pincer config

---
 machines/x1-pincer.nix | 33 +++++++++++++++++++++++++++++++++
 modules/desktop.nix    |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix
index 67d557b..ba3e5c3 100644
--- a/machines/x1-pincer.nix
+++ b/machines/x1-pincer.nix
@@ -9,6 +9,8 @@ let ports = {
   orbekk.simple-firewall.allowedTCPPorts = [ ports.minecraft 631 5353 ]; # socks proxy
   orbekk.login.enable = true;
 
+  orbekk.pms7003-exporter.enable = true;
+
   services.printing.enable = true;
   services.printing.drivers = with pkgs; [ gutenprint brlaser ];
 
@@ -21,6 +23,37 @@ let ports = {
     '';
   };
 
+  programs.xwayland.enable = true;
+  programs.dconf.enable = true;
+  environment.systemPackages = with pkgs; [ river ];
+
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true; # so that gtk works properly
+    extraPackages = with pkgs; [
+      grim
+      swaylock
+      swayidle
+      wl-clipboard
+      mako # notification daemon
+      alacritty # Alacritty is the default terminal in the config
+      dmenu # Dmenu is the default in the config but i recommend wofi since its wayland native
+      foot
+    ];
+  };
+  services.xserver.displayManager.session = [
+      {
+        manage = "window";
+        name = "river";
+        start = ''
+          XKB_DEFAULT_LAYOUT="us(dvorak)"
+	  XKB_DEFAULT_OPTIONS="caps:ctrl_modifier,compose:ralt"
+	  ${pkgs.river}/bin/river &
+          waitPID=$!
+        '';
+      }
+    ];
+
   # services.displayManager.slim.enable = lib.mkForce false;
   # services.xserver.desktopManager.kodi.enable = true;
 
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 4ccc776..94b50ca 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -129,7 +129,7 @@ in {
           extraPackages = hpkgs: [ hpkgs.xmobar hpkgs.split ];
         };
 
-        displayManager.lightdm.enable = true;
+        displayManager.sddm.enable = true;
         libinput.enable = true;
       };
 
-- 
cgit v1.2.3