update was needed

1 files changed, 102 insertions, 151 deletions

diff --git a/common/modules/window_managers/mango/default.nix b/common/modules/window_managers/mango/default.nix
index 73db1ab..11ac08f 100644
--- a/common/modules/window_managers/mango/default.nix
+++ b/common/modules/window_managers/mango/default.nix
@@ -47,69 +47,31 @@ in
           systemd.variables = [ "--all" ];
           extraConfig = ''
             ${lib.optionalString (config.beeMods.matugen.enable) ''
-              source = ~/.config/mango/noctalia.conf
+              source = ~/.config/mango/colors.conf
             ''}
 
-            # Window effect
-            blur=${if cfg.eyeCandy.window.blur.enable then "1" else "0"}
-            blur_layer=0
-            blur_optimized=1
-            blur_params_num_passes = ${toString cfg.eyeCandy.window.blur.passes}
-            blur_params_radius = ${toString cfg.eyeCandy.window.blur.radius}
-            blur_params_noise = 0.02
-            blur_params_brightness = 0.9
-            blur_params_contrast = 0.9
-            blur_params_saturation = 1.2
-
-            shadows=${if cfg.eyeCandy.window.shadows.enable then "1" else "0"}
-            layer_shadows = 0
-            shadow_only_floating = 1
-            shadows_size = 10
-            shadows_blur = 15
-            shadows_position_x = 0
-            shadows_position_y = 0
-
-            border_radius=${toString cfg.eyeCandy.window.borderRadius}
-            no_radius_when_single=0
-
-            ${
-              if (cfg.eyeCandy.window.blur.enable && cfg.eyeCandy.window.opacity == 1.0) then
-                ''
-                  focused_opacity=0.82
-                  unfocused_opacity=0.82
-                ''
-              else
-                ''
-                  focused_opacity=${toString cfg.eyeCandy.window.opacity}
-                  unfocused_opacity=${toString cfg.eyeCandy.window.opacity}
-                ''
-            }
-
-            # Animation Configuration(support type:zoom,slide)
-            # tag_animation_direction: 1-horizontal,0-vertical
-            animations=${if cfg.eyeCandy.animations.enable then "1" else "0"}
-            layer_animations=0
-            animation_type_open=slide
-            animation_type_close=zoom
-            animation_fade_in=0
-            animation_fade_out=1
-            tag_animation_direction=1
-            zoom_initial_ratio=0.8
-            zoom_end_ratio=0.8
-            fadein_begin_opacity=0.5
-            fadeout_begin_opacity=0.5
-            animation_duration_move=250
-            animation_duration_open=250
-            animation_duration_tag=250
-            animation_duration_close=100
-            animation_duration_focus=0
-            animation_curve_open=0.05,0.7,0.1,1.0
-            animation_curve_move=0.46,1.0,0.29,1
-            animation_curve_tag=0.46,1.0,0.29,1
-            animation_curve_close=0.0,0.0,1.0,1.0
-            animation_curve_focus=0.05,0.7,0.1,1.0
-            animation_curve_opafadeout=0.5,0.5,0.5,0.5
-            animation_curve_opafadein=0.46,1.0,0.29,1
+            # blur=1
+            # blur_layer=0
+            # blur_optimized=1
+            # blur_params_num_passes = 3
+            # blur_params_radius = 12
+            # blur_params_noise = 0.02
+            # blur_params_brightness = 0.9
+            # blur_params_contrast = 0.9
+            # blur_params_saturation = 1.1
+            #
+            # shadows=0
+            # layer_shadows = 0
+            # shadow_only_floating = 1
+            # shadows_size = 10
+            # shadows_blur = 15
+            # shadows_position_x = 0
+            # shadows_position_y = 0
+            #
+            # border_radius=0
+            # no_radius_when_single=0
+            # focused_opacity=0.90
+            # unfocused_opacity=0.90
 
             # Scroller configuration
             scroller_structs=15
@@ -123,14 +85,14 @@ in
 
             # Master-Stack Layout Setting
             new_is_master=0
-            default_mfact=0.56
+            default_mfact=0.55
             default_nmaster=1
             smartgaps=0
 
             # Overview Setting
             hotarea_size=10
             enable_hotarea=0
-            ov_tab_mode=0
+            ov_tab_mode=1
             overviewgappi=5
             overviewgappo=30
 
@@ -145,11 +107,10 @@ in
             focus_cross_tag=0
             enable_floating_snap=0
             snap_distance=30
-            # cursor_size=24
             drag_tile_to_tile=1
             xwayland_persistence=0
-            syncobj_enable=0
-            allow_tearing=0
+            syncobj_enable=1
+            allow_tearing=2
 
             # keyboard
             repeat_delay=300;
@@ -169,104 +130,59 @@ in
             middle_button_emulation=0
             swipe_min_threshold=1
 
-            # mouse
-            # need relogin to make it apply
             mouse_natural_scrolling=0
 
-            windowrule=tags:1,appid:^(foot|footclient|alacritty|dev.zed.Zed)$
-            windowrule=tags:2,appid:^(zen|firefox|obsidian)$
-            windowrule=tags:3,appid:^(vesktop|discord|thunderbird|Element|equibop)$
-            windowrule=tags:4,appid:^steam$
-
-            windowrule=scroller_proportion:0.3,appid:^steam$,title:^Friends List$
-            windowrule=scroller_proportion:0.5,appid:^steam$,title:.*(Settings|Properties).*
-            windowrule=isfloating:1,appid:^steam$,title:^Steam - News$
-            windowrule=isfloating:1,appid:^(org.gnome.Calculator|org.pulseaudio.pavucontrol)$
-            windowrule=isoverlay:1,appid:^com.gabm.satty$
-
-            # Appearance
-            gappih=5
-            gappiv=5
-            gappoh=5
-            gappov=5
+            gappih=4
+            gappiv=4
+            gappoh=4
+            gappov=4
             scratchpad_width_ratio=0.8
             scratchpad_height_ratio=0.9
             borderpx=2
 
-            # layout support:
-            # tile,scroller,grid,deck,monocle,center_tile,vertical_tile,vertical_scroller
-            tagrule=id:1,layout_name:tgmix
-            tagrule=id:2,layout_name:scroller
-            tagrule=id:3,layout_name:scroller
-            tagrule=id:4,layout_name:scroller
-            tagrule=id:5,layout_name:grid
-            tagrule=id:6,layout_name:tile
-            tagrule=id:7,layout_name:tile
-            tagrule=id:8,layout_name:tile
-            tagrule=id:9,layout_name:tile
-
-            # Key Bindings
-            # key name refer to `xev` or `wev` command output,
-            # mod keys name: super,ctrl,alt,shift,none
-
-            # reload config
+            #Keymaps
             bind=SUPER,r,reload_config
+            bind=SUPER,Return,spawn,foot
+            bind=SUPER,y,spawn,/home/beeb5k/.local/share/bee/dostuff wall
+            bind=SUPER,a,spawn,rofi -show drun
+            bind=SUPER,c,spawn,sh -c 'dunstify "$(date)"'
+            bind=SUPER,comma,spawn,/home/beeb5k/.local/share/bee/dostuff settings
 
-            bind=SUPER,Return,spawn,${scripts.terminal}
-
-            bind=SUPER,v,spawn,noctalia-shell ipc call launcher clipboard
-            bind=SUPER,a,spawn,noctalia-shell ipc call launcher toggle
-            bind=SUPER,y,spawn,noctalia-shell ipc call wallpaper toggle
-            bind=SUPER,comma,spawn,noctalia-shell ipc call settings toggle
-            bind=SUPER,n,spawn,noctalia-shell ipc call notifications toggleHistory
-            bind=SUPER,Period,spawn,noctalia-shell ipc call launcher emoji
-
-            bind=ALT,F4,spawn,noctalia-shell ipc call sessionMenu toggle
             bind=SUPER,F12,spawn,gnome-calculator
-            bind=SUPER,b,spawn,zen
-            bind=SUPER,e,spawn,nautilus
+            bind=SUPER,b,spawn,librewolf
+            bind=SUPER,e,spawn,pcmanfm
 
-            # exit
             bind=SUPER,m,quit
             bind=SUPER,q,killclient,
 
-            # switch window focus
             bind=SUPER,h,focusdir,left
             bind=SUPER,l,focusdir,right
             bind=SUPER,k,focusdir,up
             bind=SUPER,j,focusdir,down
 
-            bind=NONE,Print,spawn,${snip} full
-            bind=SUPER,Print,spawn,${snip} selection
-            bind=SUPER+SHIFT,Print,spawn,${snip} window
+            bind=NONE,Print,spawn,/home/beeb5k/.config/mango/screenshot full
+            bind=SUPER,Print,spawn,/home/beeb5k/.config/mango/screenshot selection
+            bind=SUPER+SHIFT,Print,spawn,/home/beeb5k/.config/mango/screenshot window
 
-            # swap window
             bind=SUPER+SHIFT,k,exchange_client,up
             bind=SUPER+SHIFT,j,exchange_client,down
             bind=SUPER+SHIFT,h,exchange_client,left
             bind=SUPER+SHIFT,l,exchange_client,right
 
-            # switch window status
             bind=SUPER,g,toggleglobal,
             bind=ALT,Tab,toggleoverview,
             bind=SUPER,space,togglefloating,
-            bind=ALT,a,togglemaximizescreen,
-            bind=SUPER,f,toggle_all_floating,
-            bind=ALT,f,togglefullscreen,
+            bind=SUPER,d,togglemaximizescreen,
+            bind=SUPER,f,togglefullscreen,
             bind=ALT+SHIFT,f,togglefakefullscreen,
             bind=SUPER,i,minimized,
             bind=SUPER,o,toggleoverlay,
             bind=SUPER+SHIFT,I,restore_minimized
-            bind=ALT,z,toggle_scratchpad
+            bind=SUPER,s,toggle_scratchpad
 
-            # scroller layout
             bind=ALT,e,set_proportion,1.0
             bind=ALT,x,switch_proportion_preset,
 
-            # switch layout
-            # bind=SUPER,n,switch_layout
-
-            # tag switch
             bind=SUPER,1,view,1,0
             bind=SUPER,2,view,2,0
             bind=SUPER,3,view,3,0
@@ -277,9 +193,6 @@ in
             bind=SUPER,8,view,8,0
             bind=SUPER,9,view,9,0
 
-            # tag: move client to the tag and focus it
-            # tagsilent: move client to the tag and not focus it
-            # bind=Alt,1,tagsilent,1
             bind=SUPER+SHIFT,1,tag,1,0
             bind=SUPER+SHIFT,2,tag,2,0
             bind=SUPER+SHIFT,3,tag,3,0
@@ -290,43 +203,34 @@ in
             bind=SUPER+SHIFT,8,tag,8,0
             bind=SUPER+SHIFT,9,tag,9,0
 
-            # monitor switch
             bind=alt+shift,Left,focusmon,left
             bind=alt+shift,Right,focusmon,right
             bind=SUPER+Alt,Left,tagmon,left
             bind=SUPER+Alt,Right,tagmon,right
 
-            # gaps
-            bind=ALT+SHIFT,X,incgaps,1
-            bind=ALT+SHIFT,Z,incgaps,-1
-            bind=ALT+SHIFT,R,togglegaps
-
-            # movewin
             bind=SUPER,Up,movewin,+0,-50
             bind=SUPER,Down,movewin,+0,+50
             bind=SUPER,Left,movewin,-50,+0
             bind=SUPER,Right,movewin,+50,+0
 
-            # resizewin
             bind=ALT,k,resizewin,+0,-50
             bind=ALT,j,resizewin,+0,+50
             bind=ALT,h,resizewin,-50,+0
             bind=ALT,l,resizewin,+50,+0
 
-            # Volume Control (using wpctl/Pipewire)
-            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,XF86AudioRaiseVolume,spawn,/home/beeb5k/.local/share/bee/dostuff volume up
+            bind=NONE,XF86AudioLowerVolume,spawn,/home/beeb5k/.local/share/bee/dostuff volume down
+            bind=NONE,XF86AudioMute,spawn,/home/beeb5k/.local/share/bee/dostuff volume mute
 
             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
 
-            bind=NONE,XF86AudioMicMute,spawn,wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+            bind=NONE,XF86AudioMicMute,spawn,/home/beeb5k/.local/share/bee/dostuff mic toggle
 
-            bind=NONE,XF86MonBrightnessUp,spawn,brightnessctl set +5%
-            bind=NONE,XF86MonBrightnessDown,spawn,brightnessctl set 5%-
+            bind=NONE,XF86MonBrightnessUp,spawn,/home/beeb5k/.local/share/bee/dostuff brightness up
+            bind=NONE,XF86MonBrightnessDown,spawn,/home/beeb5k/.local/share/bee/dostuff brightness down
 
             mousebind=SUPER,btn_left,moveresize,curmove
             mousebind=NONE,btn_middle,togglemaximizescreen,0
@@ -335,20 +239,67 @@ in
             axisbind=SUPER,UP,viewtoleft_have_client
             axisbind=SUPER,DOWN,viewtoright_have_client
 
-            layerrule=noanim:1,layer_name:^dms
+            windowrule=tags:1,appid:^(zen|firefox|librewolf|obsidian)$
+            windowrule=tags:2,appid:^(foot|footclient|alacritty|dev.zed.Zed)$
+            windowrule=tags:3,appid:^(vesktop|discord|thunderbird|Element|equibop)$
+            windowrule=tags:4,appid:^steam$
 
-            env=NIXOS_OZONE_WL,1
-            env=QT_AUTO_SCREEN_SCALE_FACTOR,1
+            windowrule=scroller_proportion:0.3,appid:^steam$,title:^Friends List$
+            windowrule=scroller_proportion:0.5,appid:^steam$,title:.*(Settings|Properties).*
+            windowrule=isfloating:1,appid:^steam$,title:^Steam - News$
+            windowrule=isfloating:1,appid:^(org.gnome.Calculator|org.pulseaudio.pavucontrol|Pinentry-gtk)$
+            windowrule=isoverlay:1,appid:^com.gabm.satty$
+
+            # Tag rules
+            tagrule=id:1,layout_name:scroller
+            tagrule=id:2,layout_name:fair
+            tagrule=id:3,layout_name:scroller
+            tagrule=id:4,layout_name:scroller
+            tagrule=id:5,layout_name:grid
+            tagrule=id:6,layout_name:tile
+            tagrule=id:7,layout_name:tile
+            tagrule=id:8,layout_name:tile
+            tagrule=id:9,layout_name:tile
+
+            env=XCURSOR_THEME, Bibata-Modern-Ice
+            env=XCURSOR_SIZE, 24
             env=ELECTRON_OZONE_PLATFORM_HINT,auto
+            env=QT_QPA_PLATFORMTHEME,qt6ct
             env=QT_QPA_PLATFORM,wayland
+            env=QT_AUTO_SCREEN_SCALE_FACTOR,1
             env=XDG_SESSION_TYPE,wayland
             env=GDK_BACKEND,wayland,x11
             env=GDK_SCALE,1
+            env=XCURSOR_PATH,/usr/share/icons
+            env=NVD_BACKEND,direct
+
+            animations=0
+            layer_animations=0
+            animation_type_open=slide
+            animation_type_close=zoom
+            animation_fade_in=0
+            animation_fade_out=1
+            tag_animation_direction=1
+            zoom_initial_ratio=0.8
+            zoom_end_ratio=0.8
+            fadein_begin_opacity=0.5
+            fadeout_begin_opacity=0.5
+            animation_duration_move=200
+            animation_duration_open=200
+            animation_duration_tag=150
+            animation_duration_close=100
+            animation_duration_focus=0
+            animation_curve_open=0.05,0.7,0.1,1.0
+            animation_curve_move=0.46,1.0,0.29,1
+            animation_curve_tag=0.46,1.0,0.29,1
+            animation_curve_close=0.0,0.0,1.0,1.0
+            animation_curve_focus=0.05,0.7,0.1,1.0
+            animation_curve_opafadeout=0.5,0.5,0.5,0.5
+            animation_curve_opafadein=0.46,1.0,0.29,1
           '';
           autostart_sh = ''
             wl-paste --type text --watch cliphist store &
             gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
-            noctalia-shell &
 
             ${lib.optionalString (config.beeMods.windowManagers.dwm.enable) ''
               systemctl --user stop xidlehook.service