Add noctalia niri and way to switch between my config and noxtalia easily

1 files changed, 63 insertions, 31 deletions

diff --git a/common/modules/window_managers/mango/default.nix b/common/modules/window_managers/mango/default.nix
index 94c83c5..3d70b82 100644
--- a/common/modules/window_managers/mango/default.nix
+++ b/common/modules/window_managers/mango/default.nix
@@ -13,6 +13,7 @@
 let
   cfg = config.${moduleNameSpace}.windowManagers;
   scripts = import ../scripts.nix { inherit pkgs config; };
+  eyecandy = cfg.eyeCandy.enable;
 in
 {
   imports =
@@ -26,21 +27,25 @@ in
           systemd.enable = true;
           systemd.variables = [ "--all" ];
           extraConfig = ''
-            ${lib.optionalString (config.beeMods.matugen.enable) ''
+            ${lib.optionalString (config.beeMods.matugen.enable && cfg.beeConfig.enable && !cfg.noctalia) ''
               source = ~/.config/mango/colors.conf
             ''}
 
-            blur=${if cfg.eyeCandy.window.blur.enable then "1" else "0"}
+            ${lib.optionalString (!cfg.beeConfig.enable && cfg.noctalia) ''
+              source = ~/.config/mango/noctalia.conf
+            ''}
+
+            blur=${if eyecandy && 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_num_passes = ${if eyecandy then toString cfg.eyeCandy.window.blur.passes else "0"}
+            blur_params_radius = ${if eyecandy then toString cfg.eyeCandy.window.blur.radius else "0"}
             blur_params_noise = 0.02
             blur_params_brightness = 0.9
             blur_params_contrast = 0.9
             blur_params_saturation = 1.1
 
-            shadows=${if cfg.eyeCandy.window.shadows.enable then "1" else "0"}
+            shadows=${if eyecandy && cfg.eyeCandy.window.shadows.enable then "1" else "0"}
             layer_shadows = 0
             shadow_only_floating = 1
             shadows_size = 10
@@ -48,11 +53,11 @@ in
             shadows_position_x = 0
             shadows_position_y = 0
 
-            border_radius=${toString cfg.eyeCandy.window.borderRadius}
+            border_radius=${if eyecandy then toString cfg.eyeCandy.window.borderRadius else "0"}
 
             no_radius_when_single=0
-            focused_opacity=${toString cfg.eyeCandy.window.opacity}
-            unfocused_opacity=${toString cfg.eyeCandy.window.opacity}
+            focused_opacity=${if eyecandy then toString cfg.eyeCandy.window.opacity else "1.0"}
+            unfocused_opacity=${if eyecandy then toString cfg.eyeCandy.window.opacity else "1.0"}
 
             # Scroller configuration
             scroller_structs=15
@@ -122,16 +127,52 @@ in
             borderpx=2
 
             #Keymaps
+            # beeConfig keymaps
+            ${lib.optionalString (config.beeMods.matugen.enable && cfg.beeConfig.enable && !cfg.noctalia) ''
+              bind=SUPER,y,spawn,${scripts.dostuff} wall
+              bind=SUPER,a,spawn,rofi -show drun
+              bind=SUPER,c,spawn,sh -c 'fyi "Clock" "$(date)"'
+              bind=SUPER,comma,spawn,${scripts.dostuff} settings
+
+              bind=NONE,XF86AudioRaiseVolume,spawn,${scripts.volume} up
+              bind=NONE,XF86AudioLowerVolume,spawn,${scripts.volume} down
+              bind=NONE,XF86AudioMute,spawn,${scripts.volume} toggle
+
+              bind=NONE,XF86AudioMicMute,spawn,${scripts.micToggle}
+
+              bind=NONE,XF86MonBrightnessUp,spawn,${scripts.brightness} up
+              bind=NONE,XF86MonBrightnessDown,spawn,${scripts.brightness} down
+
+              bind=NONE,Print,spawn,${scripts.screenshot} full
+              bind=SUPER,Print,spawn,${scripts.screenshot} selection
+              bind=SUPER+SHIFT,Print,spawn,${scripts.screenshot} window
+            ''}
+
+            ${lib.optionalString (!cfg.beeConfig.enable && cfg.noctalia) ''
+              bind=SUPER,y,spawn,noctalia msg panel-toggle wallpaper
+              bind=SUPER,a,spawn,noctalia msg panel-toggle launcher
+              bind=SUPER,c,spawn,sh -c 'fyi "Clock" "$(date)"'
+              bind=SUPER,v,spawn,noctalia msg panel-toggle clipboard
+              bind=SUPER,comma,spawn,noctalia msg settings-toggle
+
+              bind=NONE,XF86AudioRaiseVolume,spawn,noctalia msg volume-up
+              bind=NONE,XF86AudioLowerVolume,spawn,noctalia msg volume-down
+              bind=NONE,XF86AudioMute,spawn,noctalia msg volume-mute
+
+              bind=NONE,XF86AudioMicMute,spawn,noctalia msg mic-mute
+
+              bind=NONE,XF86MonBrightnessUp,spawn,noctalia msg brightness-up
+              bind=NONE,XF86MonBrightnessDown,spawn,noctalia msg brightness-down
+
+              bind=NONE,Print,spawn,noctalia msg screenshot-fullscreen
+            ''}
+
             bind=SUPER,r,reload_config
             bind=SUPER,Return,spawn,${config.beeMods.terminal.default}
-            bind=SUPER,y,spawn,${scripts.dostuff} wall
-            bind=SUPER,a,spawn,rofi -show drun
-            bind=SUPER,c,spawn,sh -c 'dunstify "$(date)"'
-            bind=SUPER,comma,spawn,${scripts.dostuff} settings
 
             bind=SUPER,F12,spawn,gnome-calculator
             bind=SUPER,b,spawn,librewolf
-            bind=SUPER,e,spawn,pcmanfm
+            bind=SUPER,e,spawn,nautilus
 
             bind=SUPER,m,quit
             bind=SUPER,q,killclient,
@@ -141,9 +182,6 @@ in
             bind=SUPER,k,focusdir,up
             bind=SUPER,j,focusdir,down
 
-            bind=NONE,Print,spawn,${scripts.screenshot} full
-            bind=SUPER,Print,spawn,${scripts.screenshot} selection
-            bind=SUPER+SHIFT,Print,spawn,${scripts.screenshot} window
 
             bind=SUPER+SHIFT,k,exchange_client,up
             bind=SUPER+SHIFT,j,exchange_client,down
@@ -199,19 +237,12 @@ in
             bind=ALT,h,resizewin,-50,+0
             bind=ALT,l,resizewin,+50,+0
 
-            bind=NONE,XF86AudioRaiseVolume,spawn,${scripts.volume} up
-            bind=NONE,XF86AudioLowerVolume,spawn,${scripts.volume} down
-            bind=NONE,XF86AudioMute,spawn,${scripts.volume} 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
 
-            bind=NONE,XF86AudioMicMute,spawn,${scripts.micToggle}
-
-            bind=NONE,XF86MonBrightnessUp,spawn,${scripts.brightness} up
-            bind=NONE,XF86MonBrightnessDown,spawn,${scripts.brightness} down
 
             mousebind=SUPER,btn_left,moveresize,curmove
             mousebind=NONE,btn_middle,togglemaximizescreen,0
@@ -242,8 +273,6 @@ in
             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
@@ -251,10 +280,9 @@ in
             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
+            animations=${if eyecandy && cfg.eyeCandy.animations.enable then "1" else "0"}
             layer_animations=0
             animation_type_open=slide
             animation_type_close=zoom
@@ -279,11 +307,15 @@ in
             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 &
-            awww-daemon &
-            waybar &
-            dunst &
+            ${lib.optionalString cfg.beeConfig.enable ''
+              wl-paste --type text --watch cliphist store &
+              awww-daemon &
+              dunst &
+            ''}
+            ${lib.optionalString cfg.beeConfig.waybar ''
+              waybar &
+            ''}
           '';
         };
       }