This is like that one dream you don't know how to describe

1 files changed, 25 insertions, 59 deletions

diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index b47f7ca..7938c05 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -45,31 +45,11 @@ let
       smart-ghostty
     else
       config.beeMods.terminal.default;
-  settings-persist = pkgs.writeShellScript "settings-persist" ''
-    SETTINGS_FILE="$HOME/.config/beeSettings"
-
-    if [[ -f "$SETTINGS_FILE" ]]; then
-      IS_NIGHTMODE=$(${pkgs.ripgrep}/bin/rg "nightlight" "$SETTINGS_FILE" | cut -d"=" -f2)
-
-      if [[ "$IS_NIGHTMODE" == "on" ]]; then
-        ${pkgs.wlsunset}/bin/wlsunset -T 4500 &
-      fi
-    fi
-  '';
 in
 {
   imports =
-    if homeManager then
-      [
-        inputs.mango.hmModules.mango
-        ./waybar.nix
-        ./scripts.nix
-        ./swayidleNdLock.nix
-      ]
-    else
-      [
-        inputs.mango.nixosModules.mango
-      ];
+    if homeManager then [ inputs.mango.hmModules.mango ] else [ inputs.mango.nixosModules.mango ];
+
   options.${moduleNameSpace}.mango = {
     enable = lib.mkEnableOption "mango setup";
     animations = lib.mkEnableOption "Uiiiiiiiiiii";
@@ -107,7 +87,7 @@ in
           enable = true;
           systemd.enable = true;
           systemd.variables = [ "--all" ];
-          settings = ''
+          extraConfig = ''
             ${lib.optionalString (config.beeMods.matugen.enable) ''
               source=~/.config/mango/mango-colors.conf
             ''}
@@ -127,7 +107,7 @@ in
             layer_shadows = 0
             shadow_only_floating = 1
             shadows_size = 10
-            shadows_blur = 10
+            shadows_blur = 15
             shadows_position_x = 0
             shadows_position_y = 0
 
@@ -175,7 +155,7 @@ in
 
             # Scroller configuration
             scroller_structs=15
-            scroller_default_proportion=0.8
+            scroller_default_proportion=0.6
             scroller_focus_center=0
             scroller_prefer_center=0
             edge_scroller_pointer_focus=1
@@ -276,12 +256,11 @@ in
 
             bind=SUPER,Return,spawn,${terminal}
 
-            # bind=SUPER,v,spawn,clipvault list | rofi -dmenu -display-columns 2 | clipvault get | wl-copy
-            bind=SUPER,a,spawn,rofi -show drun
-            bind=SUPER,period,spawn,rofi -show emoji -modi emoji
-            bind=ALT,F4,spawn,rofi -show power-menu -modi power-menu:rofi-power-menu
-            bind=SUPER,y,spawn,beesettings wall
-            bind=SUPER,comma,spawn,beesettings settings
+            bind=SUPER,v,spawn,dms ipc call clipboard toggle
+            bind=SUPER,a,spawn,dms ipc call spotlight toggle
+            bind=ALT,F4,spawn,dms ipc call powermenu toggle
+            bind=SUPER,y,spawn,dms ipc call dankdash wallpaper
+            bind=SUPER,comma,spawn,dms ipc call settings focusOrToggle
 
             bind=SUPER,F12,spawn,gnome-calculator
             bind=SUPER,b,spawn,zen
@@ -326,7 +305,7 @@ in
 
             # switch layout
             # bind=SUPER,n,switch_layout
-            bind=SUPER,n,spawn,beesettings layout
+            bind=SUPER,n,spawn,dms ipc call notifications toggle
 
             # tag switch
             bind=SUPER,1,view,1,0
@@ -376,75 +355,62 @@ in
             bind=ALT,l,resizewin,+50,+0
 
             # Volume Control (using wpctl/Pipewire)
-            bind=NONE,XF86AudioRaiseVolume,spawn,volume-control up
-            bind=NONE,XF86AudioLowerVolume,spawn,volume-control down
-            bind=NONE,XF86AudioMute,spawn,volume-control mute
+            bind=NONE,XF86AudioRaiseVolume,spawn,wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+
+            bind=NONE,XF86AudioLowerVolume,spawn,wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+            bind=NONE,XF86AudioMute,spawn,wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 
             bind=NONE,XF86AudioPlay,spawn,playerctl play-pause
             bind=NONE,XF86AudioNext,spawn,playerctl next
             bind=NONE,XF86AudioPrev,spawn,playerctl previous
             bind=NONE,XF86AudioStop,spawn,playerctl stop
 
-            # Mic Control
-            bind=NONE,XF86AudioMicMute,spawn,mic-control toggle
+            bind=NONE,XF86AudioMicMute,spawn,wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
 
-            # Brightness Control (using brightnessctl)
-            bind=NONE,XF86MonBrightnessUp,spawn,brightness-control up
-            bind=NONE,XF86MonBrightnessDown,spawn,brightness-control down
+            bind=NONE,XF86MonBrightnessUp,spawn,brightnessctl set +5%
+            bind=NONE,XF86MonBrightnessDown,spawn,brightnessctl set 5%-
 
-            # Mouse Button Bindings
-            # NONE mode key only work in ov mode
             mousebind=SUPER,btn_left,moveresize,curmove
             mousebind=NONE,btn_middle,togglemaximizescreen,0
             mousebind=SUPER,btn_right,moveresize,curresize
 
-            # Axis Bindings
             axisbind=SUPER,UP,viewtoleft_have_client
             axisbind=SUPER,DOWN,viewtoright_have_client
 
-            # layer rule
-            layerrule=animation_type_open:zoom,layer_name:rofi
-            layerrule=animation_type_close:zoom,layer_name:rofi
+            layerrule=noanim:1,layer_name:^dms
 
             env=NIXOS_OZONE_WL,1
             env=QT_AUTO_SCREEN_SCALE_FACTOR,1
             env=ELECTRON_OZONE_PLATFORM_HINT,auto
-            env=QT_QPA_PLATFORM,wayland;xcb
+            env=QT_QPA_PLATFORM,wayland
             env=XDG_SESSION_TYPE,wayland
             env=GDK_BACKEND,wayland,x11
             env=GDK_SCALE,1
-
-            exec-once = ~/.config/mango/autostart.sh
           '';
           autostart_sh = ''
-            wl-clip-persist --clipboard regular &
-            ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
+            wl-paste --type text --watch cliphist store &
             gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
-            awww-daemon -q &
-            ${settings-persist}
 
-            ${lib.optionalString (config.beeMods.x11.dwm.enable || config.beeMods.x11.bspwm.enable) ''
+            ${lib.optionalString (config.beeMods.dwm.enable) ''
               systemctl --user stop xidlehook.service
               systemctl --user stop xautolock-session.service
               systemctl --user stop xss-lock.service
               systemctl --user stop clipcat.service
             ''}
 
-            ${lib.optionalString (config.beeMods.x11.picom.enable) ''
+            ${lib.optionalString (config.beeMods.dwm.picom.enable) ''
               systemctl --user stop picom.service
             ''}
           '';
         };
         home.packages = with pkgs; [
-          awww
-          wl-clipboard-rs
-          wl-clip-persist
+          wl-clipboard
+          cliphist
+          brightnessctl
         ];
       }
     else
       {
         programs.mango.enable = true;
-        security.pam.services.swaylock = { };
       }
   );
 }