diff --git a/groups/yezelhlev/programs.nix b/groups/yezelhlev/programs.nix
index 3f139ff..c179b7c 100644
--- a/groups/yezelhlev/programs.nix
+++ b/groups/yezelhlev/programs.nix
@@ -12,6 +12,7 @@
   environment.systemPackages = with upkgs; [
     # CLI tools
     git
+    lazygit
     wget
     unzip
     p7zip
@@ -36,6 +37,8 @@
 
     # window management
     wayland
+    waywall
+    pipewire
 
     # programs 
     vivaldi # TODO: switch to zen later
diff --git a/homes/modules/wm/mango.conf b/homes/modules/wm/mango.conf
new file mode 100644
index 0000000..ab4bd54
--- /dev/null
+++ b/homes/modules/wm/mango.conf
@@ -0,0 +1,39 @@
+# Monitors
+# main monitor
+# monitorrule = name:
+
+# Startup
+# exec-once waybar
+# exec-once awww-daemon
+
+exec-once = playerctld daemon
+
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=wlroots PATH
+
+# Keyboard/mouse
+repeat_rate = 20
+repeat_delay = 200
+
+xkb_rules_layout = us
+xkb_rules_variant = basic
+
+trackpad_natural_scrolling = 0
+scroll_method = 1
+disable_while_typing = 0
+
+mouse_natural_scrolling = 0
+accel_profile = 0
+
+# https://github.com/fcitx/fcitx5 (chinese pinyin)
+env=GTK_IM_MODULE,fcitx
+env=QT_IM_MODULE,fcitx
+env=QT_IM_MODULES,wayland;fcitx
+env=SDL_IM_MODULE,fcitx
+env=XMODIFIERS,@im=fcitx
+env=GLFW_IM_MODULE,ibus
+
+# Screenshare
+# TODO: pipewire, pipewire-pulse, xdg-desktop-portal-wlr
+#
+# #source=
+
diff --git a/homes/modules/wm/mangowc/default.nix b/homes/modules/wm/mangowc/default.nix
index e78901f..d5928f6 100644
--- a/homes/modules/wm/mangowc/default.nix
+++ b/homes/modules/wm/mangowc/default.nix
@@ -8,7 +8,7 @@
   systemd = {
     enable = true;
     xdgAutostart = true;
-  }
+  };
   
   settings = builtins.readFile ./mango.conf; 
 }
diff --git a/nixpkgs.nix b/nixpkgs.nix
index 46b6e92..161619b 100644
--- a/nixpkgs.nix
+++ b/nixpkgs.nix
@@ -3,9 +3,11 @@
   system,
   ...
 } @ args: {
-  nixpkgs.channels = {
-    default = {
+  nixpkgs.channels = rec {
+    base = spkgs;
+    spkgs= {
       inherit system;
+      source = inputs.nixpkgs;
       overlays = [
         (import ./overlays args)
       ];