cez/wayland: dwl -> sway

5 files changed, 9 insertions, 45 deletions

diff --git a/common.nix b/common.nix
index 58a0ccd..a34dee2 100644
--- a/common.nix
+++ b/common.nix
@@ -82,10 +82,7 @@ in
     "flakes"
     "nix-command"
   ];
-  nixpkgs.overlays = [
-    (import ./overlays/dwl-sinan.nix)
-    (import ./pkgs)
-  ];
+  nixpkgs.overlays = [ (import ./pkgs) ];
 
   # sops
   sops = {
diff --git a/hosts/cez/configuration.nix b/hosts/cez/configuration.nix
index 31cde1a..05e7dd6 100644
--- a/hosts/cez/configuration.nix
+++ b/hosts/cez/configuration.nix
@@ -12,10 +12,6 @@ in
     ../../common.nix
   ];
 
-  nixpkgs.overlays = [
-    (import ./overlays/wmenu.nix)
-  ];
-
   boot = {
     initrd.luks.reusePassphrases = true;
     consoleLogLevel = 3;
diff --git a/hosts/cez/modules/wayland.nix b/hosts/cez/modules/wayland.nix
index 524b1fc..69e738a 100644
--- a/hosts/cez/modules/wayland.nix
+++ b/hosts/cez/modules/wayland.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   user = config.userdata.user;
@@ -6,32 +6,30 @@ in
 {
   # pkgs
   environment.systemPackages = with pkgs; [
-    dwl-sinan
-    wmenu
-    pinentry-gnome
+    bemenu
+    sway
+    i3status
+    pinentry-bemenu
     swaylock
     swayidle
     swaybg
     foot
     wl-clipboard
     mako
-    wayland
     xdg-utils
     libnotify
-    wob
-    wlr-randr
   ];
   users.users.${user}.packages = with pkgs; [
     zathura
     mpv
     imv
     wtype
-    tor-browser-bundle-bin
     qemu
     OVMFFull
-    element-desktop-wayland
     grim
     slurp
+    tor-browser-bundle-bin
+    element-desktop-wayland
   ];
 
   # font
@@ -61,10 +59,9 @@ in
   };
 
   programs = {
-    xwayland.enable = true;
     gnupg.agent = {
       enable = true;
-      pinentryFlavor = "gnome3";
+      settings.pinentry-program = lib.mkForce "${pkgs.pinentry-bemenu}/bin/pinentry-bemenu";
     };
     firefox = {
       enable = true;
diff --git a/hosts/cez/overlays/wmenu.nix b/hosts/cez/overlays/wmenu.nix
deleted file mode 100644
index cad340b..0000000
--- a/hosts/cez/overlays/wmenu.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-final: prev:
-
-{
-  wmenu = prev.wmenu.overrideAttrs (finalAttrs: prevAttrs:
-    {
-      pname = prevAttrs.pname + "-sinan";
-      postPatch = ''
-        sed 's/monospace 10/monospace 13/g' -i main.c
-      '';
-    }
-  );
-}
diff --git a/overlays/dwl-sinan.nix b/overlays/dwl-sinan.nix
deleted file mode 100644
index ff5c999..0000000
--- a/overlays/dwl-sinan.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-final: prev:
-
-{
-  dwl-sinan = prev.dwl.overrideAttrs (finalAttrs: prevAttrs:
-    {
-      pname = prevAttrs.pname + "-sinan";
-      src = prev.fetchgit {
-        url = "https://git.sinanmohd.com/dwl";
-        rev = "cadde97ee92381bfc2222bf18cd876526ab8c948";
-        hash = "sha256-H2HgOQnQ5Eltz8/OVpKlS2U89aaivg5t63Ie4fembw8=";
-      };
-    }
-  );
-}