Remove mango and user templates for noctalia

22 files changed, 391 insertions, 714 deletions

diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index 9e9f3d6..42b857e 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -44,7 +44,7 @@ in
               ${lib.optionalString config.beeMods.terminal.alacritty ''
                 [templates.alacritty]
                 input_path = '~/.config/matugen/templates/alacritty-colors.toml'
-                output_path = '~/.config/alacritty/matugen.toml'
+                output_path = '~/.config/alacritty/themes/matugen.toml'
               ''}
 
               ${lib.optionalString config.beeMods.terminal.ghostty ''
@@ -54,13 +54,6 @@ in
                 post_hook = 'pkill -SIGUSR2 ghostty'
               ''}
 
-              ${lib.optionalString config.beeMods.windowManagers.mango.enable ''
-                [templates.mango]
-                input_path = '~/.config/matugen/templates/mango.conf'
-                output_path = '~/.config/mango/colors.conf'
-                post_hook = 'mmsg dispatch reload_config'
-              ''}
-
               ${lib.optionalString config.programs.btop.enable ''
                 [templates.btop]
                 input_path = '~/.config/matugen/templates/btop.theme'
@@ -106,9 +99,15 @@ in
                 output_path = '~/.config/gtk-4.0/matugen.css'
               ''}
 
+              ${lib.optionalString config.beeMods.windowManagers.niri.enable ''
+                [templates.niri]
+                input_path = '~/.config/matugen/templates/matugen.kdl'
+                output_path = '~/.config/niri/matugen.kdl'
+              ''}
+
               [templates.neovim]
               input_path = '~/.config/matugen/templates/neovim.json'
-              output_path = '~/.config/beestuff/nvim-colors.json'
+              output_path = '~/.config/neovim/nvim-colors.json'
 
               [templates.waybarStyle]
               input_path = '~/.config/matugen/templates/waybar.css'
@@ -119,6 +118,7 @@ in
               output_path = '~/.config/waybar/config.jsonc'
               post_hook = 'pkill -SIGUSR2 waybar'
 
+
               ${lib.optionalString
                 (config.beeMods.terminal.default == "foot" || config.beeMods.terminal.default == "ghostty")
                 ''
diff --git a/common/modules/matugen/templates/matugen-mango.nix b/common/modules/matugen/templates/matugen-mango.nix
deleted file mode 100644
index 440c4a9..0000000
--- a/common/modules/matugen/templates/matugen-mango.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  config =
-    lib.mkIf
-      (config.beeMods.windowManagers.mango.enable && config.beeMods.windowManagers.beeConfig.enable)
-      {
-        xdg.configFile = {
-          "matugen/templates/mango.conf" = {
-            text = ''
-              rootcolor={{colors.background.default.hex_stripped}}ff
-              bordercolor={{colors.outline_variant.default.hex_stripped}}ff
-              focuscolor={{colors.primary.default.hex_stripped}}ff
-              maximizescreencolor={{colors.secondary_container.default.hex_stripped}}ff
-              urgentcolor={{colors.error.default.hex_stripped}}ff
-              scratchpadcolor={{colors.tertiary.default.hex_stripped}}ff
-              globalcolor={{colors.secondary_container.default.hex_stripped}}ff
-              overlaycolor={{colors.tertiary_container.default.hex_stripped}}ff
-            '';
-          };
-        };
-      };
-}
diff --git a/common/modules/matugen/templates/matugen-niri.nix b/common/modules/matugen/templates/matugen-niri.nix
new file mode 100644
index 0000000..2bb80ca
--- /dev/null
+++ b/common/modules/matugen/templates/matugen-niri.nix
@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  config = lib.mkIf (config.beeMods.windowManagers.niri.enable) {
+    xdg.configFile = {
+      "matugen/templates/matugen.kdl" = {
+        text = ''
+          layout {
+              focus-ring {
+                  active-color   "{{colors.primary.default.hex}}"
+                  inactive-color "{{colors.outline.default.hex}}"
+                  urgent-color   "{{colors.error.default.hex}}"
+              }
+
+              border {
+                  active-color   "{{colors.primary.default.hex}}"
+                  inactive-color "{{colors.outline.default.hex}}"
+                  urgent-color   "{{colors.error.default.hex}}"
+              }
+
+              shadow {
+                  color "{{colors.shadow.default.hex}}"
+              }
+
+              tab-indicator {
+                  active-color   "{{colors.primary.default.hex}}"
+                  inactive-color "{{colors.outline.default.hex}}"
+                  urgent-color   "{{colors.error.default.hex}}"
+              }
+
+              insert-hint {
+                  color "{{colors.primary.default.hex}}80"
+              }
+          }
+
+          recent-windows {
+              highlight {
+                  active-color   "{{colors.primary.default.hex}}"
+                  urgent-color   "{{colors.error.default.hex}}"
+              }
+          }
+        '';
+      };
+    };
+  };
+}
diff --git a/common/modules/matugen/templates/matugen-nvim.nix b/common/modules/matugen/templates/matugen-nvim.nix
index 276d695..3be508e 100644
--- a/common/modules/matugen/templates/matugen-nvim.nix
+++ b/common/modules/matugen/templates/matugen-nvim.nix
@@ -4,23 +4,21 @@
   ...
 }:
 {
-  config =
-    lib.mkIf (config.wrappers.neovim.enable && config.beeMods.windowManagers.beeConfig.enable)
-      {
-        xdg.configFile = {
-          "matugen/templates/neovim.json" = {
-            text = ''
-              {
-                  "mode": "{{mode}}",
-                  "source_color":"{{colors.primary.default.hex}}",
-                  <* if {{ is_dark_mode }} *>
-                  "background":"{{colors.surface.default.hex}}"
-                  <* else *>
-                  "background":"{{colors.surface_container_low.default.hex}}"
-                  <* endif *>
-              }
-            '';
-          };
-        };
+  config = lib.mkIf (config.wrappers.neovim.enable) {
+    xdg.configFile = {
+      "matugen/templates/neovim.json" = {
+        text = ''
+          {
+              "mode": "{{mode}}",
+              "source_color":"{{colors.primary.default.hex}}",
+              <* if {{ is_dark_mode }} *>
+              "background":"{{colors.surface.default.hex}}"
+              <* else *>
+              "background":"{{colors.surface_container_low.default.hex}}"
+              <* endif *>
+          }
+        '';
       };
+    };
+  };
 }
diff --git a/common/modules/matugen/templates/matugen-waybar.nix b/common/modules/matugen/templates/matugen-waybar.nix
index 2958c0e..71b62e5 100644
--- a/common/modules/matugen/templates/matugen-waybar.nix
+++ b/common/modules/matugen/templates/matugen-waybar.nix
@@ -11,13 +11,13 @@
           {
             "exclusive": true,
             "reload_style_on_change": true,
-            "position": "top",
+            "position": "bottom",
             "margin-top": 0,
             "spacing": 0,
             "height": 0,
             "margin-bottom": 0,
             "modules-left": [
-              "dwl/tags",
+              "niri/workspaces",
               "custom/separator",
               "tray",
               "custom/separator7",
@@ -47,6 +47,9 @@
               "cpu",
               "custom/separator2"
             ],
+            "niri/workspaces": {
+              "format": "{icon}",
+            },
             "dwl/tags" : {
               "num-tags" : 9,
               // "tag-labels" : ["一" "二" "三" "四" "五" "六" "七" "八" "九"];
diff --git a/common/modules/matugen/templates/matugen-zathura.nix b/common/modules/matugen/templates/matugen-zathura.nix
index afb78ee..c4269e6 100644
--- a/common/modules/matugen/templates/matugen-zathura.nix
+++ b/common/modules/matugen/templates/matugen-zathura.nix
@@ -4,106 +4,108 @@
   ...
 }:
 {
-  config = lib.mkIf config.programs.zathura.enable {
-    xdg.configFile = {
-      "matugen/templates/zathura.toml" = {
-        text =
-          # toml
-          ''
-            " -----------------------------------------------------------------------------
-            " Zathura settings
-            " -----------------------------------------------------------------------------
+  config =
+    lib.mkIf (config.programs.zathura.enable && config.beeMods.windowManagers.beeConfig.enable)
+      {
+        xdg.configFile = {
+          "matugen/templates/zathura.toml" = {
+            text =
+              # toml
+              ''
+                " -----------------------------------------------------------------------------
+                " Zathura settings
+                " -----------------------------------------------------------------------------
 
-            " Colors
-            set default-bg              "{{colors.on_primary.default.rgba | set_alpha: 1.0}}"
-            set default-fg              "{{colors.primary.default.hex}}"
+                " Colors
+                set default-bg              "{{colors.on_primary.default.rgba | set_alpha: 1.0}}"
+                set default-fg              "{{colors.primary.default.hex}}"
 
-            set statusbar-bg            "{{colors.on_primary.default.hex}}"
-            set statusbar-fg            "{{colors.primary.default.hex}}"
+                set statusbar-bg            "{{colors.on_primary.default.hex}}"
+                set statusbar-fg            "{{colors.primary.default.hex}}"
 
-            set inputbar-bg             "{{colors.on_primary.default.hex}}"
-            set inputbar-fg             "{{colors.primary.default.hex}}"
+                set inputbar-bg             "{{colors.on_primary.default.hex}}"
+                set inputbar-fg             "{{colors.primary.default.hex}}"
 
-            set notification-error-bg   "{{colors.on_error.default.hex}}"
-            set notification-error-fg   "{{colors.error.default.hex}}"
+                set notification-error-bg   "{{colors.on_error.default.hex}}"
+                set notification-error-fg   "{{colors.error.default.hex}}"
 
-            set notification-warning-bg "{{colors.primary_fixed.default.hex}}"
-            set notification-warning-fg "{{colors.error_container.default.hex}}"
+                set notification-warning-bg "{{colors.primary_fixed.default.hex}}"
+                set notification-warning-fg "{{colors.error_container.default.hex}}"
 
-            set highlight-color         "{{colors.primary_fixed.default.hex}}"
-            set highlight-active-color  "{{colors.primary_fixed_dim.default.hex}}"
+                set highlight-color         "{{colors.primary_fixed.default.hex}}"
+                set highlight-active-color  "{{colors.primary_fixed_dim.default.hex}}"
 
-            set completion-highlight-fg "{{colors.on_primary.default.hex}}"
-            set completion-highlight-bg {{colors.primary.default.hex}}""
+                set completion-highlight-fg "{{colors.on_primary.default.hex}}"
+                set completion-highlight-bg {{colors.primary.default.hex}}""
 
-            set completion-bg           "{{colors.on_primary.default.hex}}"
-            set completion-fg           "{{colors.primary.default.hex}}"
+                set completion-bg           "{{colors.on_primary.default.hex}}"
+                set completion-fg           "{{colors.primary.default.hex}}"
 
-            set notification-bg         "{{colors.on_primary.default.hex}}"
-            set notification-fg         "{{colors.primary.default.hex}}"
+                set notification-bg         "{{colors.on_primary.default.hex}}"
+                set notification-fg         "{{colors.primary.default.hex}}"
 
-            set recolor                 "true"
-            set recolor-lightcolor      "{{colors.on_primary.default.rgba | set_alpha: 1.0}}"
-            set recolor-darkcolor       "{{colors.primary.default.hex}}"
-            set recolor-reverse-video   "true"
-            set recolor-keephue         "true"
+                set recolor                 "true"
+                set recolor-lightcolor      "{{colors.on_primary.default.rgba | set_alpha: 1.0}}"
+                set recolor-darkcolor       "{{colors.primary.default.hex}}"
+                set recolor-reverse-video   "true"
+                set recolor-keephue         "true"
 
-            " Clipboard
-            set selection-clipboard clipboard
+                " Clipboard
+                set selection-clipboard clipboard
 
-            " Search
-            set incremental-search true
-            set search-hadjust true
+                " Search
+                set incremental-search true
+                set search-hadjust true
 
-            " Autoadjust
-            set adjust-open width
+                " Autoadjust
+                set adjust-open width
 
-            " Typography
-            set font "FiraCode Nerd Font 12"
+                " Typography
+                set font "FiraCode Nerd Font 12"
 
-            " -----------------------------------------------------------------------------
-            " Zathura mappings
-            " -----------------------------------------------------------------------------
-            " remove status bar
-            set guioptions none
-            " Zoom in/out
-            map [normal]     z zoom in
-            map [normal]     Z zoom out
-            map [fullscreen] z zoom in
-            map [fullscreen] Z zoom out
+                " -----------------------------------------------------------------------------
+                " Zathura mappings
+                " -----------------------------------------------------------------------------
+                " remove status bar
+                set guioptions none
+                " Zoom in/out
+                map [normal]     z zoom in
+                map [normal]     Z zoom out
+                map [fullscreen] z zoom in
+                map [fullscreen] Z zoom out
 
-            " Toggle mode
-            map [normal]     D toggle_page_mode
-            map [fullscreen] D toggle_page_mode
+                " Toggle mode
+                map [normal]     D toggle_page_mode
+                map [fullscreen] D toggle_page_mode
 
-            " Scroll
-            map [normal]     u scroll half-up
-            map [normal]     d scroll half-down
-            map [fullscreen] u scroll half-up
-            map [fullscreen] d scroll half-down
+                " Scroll
+                map [normal]     u scroll half-up
+                map [normal]     d scroll half-down
+                map [fullscreen] u scroll half-up
+                map [fullscreen] d scroll half-down
 
-            " Fullscreen
-            map [normal]     f toggle_fullscreen
-            map [fullscreen] f toggle_fullscreen
+                " Fullscreen
+                map [normal]     f toggle_fullscreen
+                map [fullscreen] f toggle_fullscreen
 
-            " Reload
-            map [normal]     <C-r> reload
-            map [fullscreen] <C-r> reload
+                " Reload
+                map [normal]     <C-r> reload
+                map [fullscreen] <C-r> reload
 
-            " Status bar
-            map [normal]     b toggle_statusbar
-            map [fullscreen] b toggle_statusbar
+                " Status bar
+                map [normal]     b toggle_statusbar
+                map [fullscreen] b toggle_statusbar
 
-            " Set width as in mupdf
-            map [normal]     H adjust_window best-fit
-            map [normal]     W adjust_window width
-            map [fullscreen] H adjust_window best-fit
-            map [fullscreen] W adjust_window width
+                " Set width as in mupdf
+                map [normal]     H adjust_window best-fit
+                map [normal]     W adjust_window width
+                map [fullscreen] H adjust_window best-fit
+                map [fullscreen] W adjust_window width
 
-            map [normal]     i set recolor
-            map [fullscreen] i set recolor
-          '';
+                map [normal]     i set recolor
+                map [fullscreen] i set recolor
+              '';
+          };
+        };
       };
-    };
-  };
 }
diff --git a/common/modules/window_managers/default.nix b/common/modules/window_managers/default.nix
index 9b8f660..fed05bf 100644
--- a/common/modules/window_managers/default.nix
+++ b/common/modules/window_managers/default.nix
@@ -19,13 +19,11 @@ let
 in
 {
   imports = [
-    (import ./mango args)
     (import ./niri args)
     (import ./noctalia.nix args)
   ];
 
   options.${moduleNameSpace}.windowManagers = {
-    mango.enable = lib.mkEnableOption "Enable mangowm";
     niri.enable = lib.mkEnableOption "Enable niri";
     noctalia = lib.mkEnableOption "Enable noctalia shell";
     xwayland = lib.mkEnableOption "Enable Xwayland support";
diff --git a/common/modules/window_managers/mango/default.nix b/common/modules/window_managers/mango/default.nix
deleted file mode 100644
index 67a8574..0000000
--- a/common/modules/window_managers/mango/default.nix
+++ /dev/null
@@ -1,327 +0,0 @@
-{
-  homeManager,
-  inputs,
-  moduleNameSpace,
-  ...
-}:
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.${moduleNameSpace}.windowManagers;
-  scripts = import ../scripts.nix { inherit pkgs config; };
-  eyecandy = cfg.eyeCandy.enable;
-in
-{
-  imports =
-    if homeManager then [ inputs.mango.hmModules.mango ] else [ inputs.mango.nixosModules.mango ];
-
-  config = lib.mkIf cfg.mango.enable (
-    if homeManager then
-      {
-        wayland.windowManager.mango = {
-          enable = true;
-          systemd.enable = true;
-          systemd.variables = [ "--all" ];
-          extraConfig = ''
-            ${lib.optionalString (config.beeMods.matugen.enable && cfg.beeConfig.enable && !cfg.noctalia) ''
-              source = ~/.config/mango/colors.conf
-            ''}
-
-            ${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 = ${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 eyecandy && 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=${if eyecandy then toString cfg.eyeCandy.window.borderRadius else "0"}
-
-            no_radius_when_single=0
-            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
-            scroller_default_proportion=0.6
-            scroller_focus_center=0
-            scroller_prefer_center=0
-            edge_scroller_pointer_focus=1
-            scroller_default_proportion_single=1.0
-            scroller_ignore_proportion_single=0
-            scroller_proportion_preset=0.5,0.8,1.0
-
-            # Master-Stack Layout Setting
-            new_is_master=0
-            default_mfact=0.55
-            default_nmaster=1
-            smartgaps=0
-
-            # Overview Setting
-            hotarea_size=10
-            enable_hotarea=0
-            ov_tab_mode=1
-            overviewgappi=5
-            overviewgappo=30
-
-            # Misc
-            no_border_when_single=0
-            axis_bind_apply_timeout=100
-            focus_on_activate=1
-            idleinhibit_ignore_visible=0
-            sloppyfocus=1
-            warpcursor=1
-            focus_cross_monitor=0
-            focus_cross_tag=0
-            enable_floating_snap=0
-            snap_distance=30
-            drag_tile_to_tile=1
-            xwayland_persistence=0
-            syncobj_enable=1
-            allow_tearing=2
-
-            # keyboard
-            repeat_delay=300;
-            repeat_rate=50;
-            numlockon=0
-            xkb_rules_layout=us
-
-            # Trackpad
-            # need relogin to make it apply
-            disable_trackpad=0
-            tap_to_click=1
-            tap_and_drag=1
-            drag_lock=1
-            trackpad_natural_scrolling=1
-            disable_while_typing=1
-            left_handed=0
-            middle_button_emulation=0
-            swipe_min_threshold=1
-
-            mouse_natural_scrolling=0
-
-            gappih=4
-            gappiv=4
-            gappoh=4
-            gappov=4
-            scratchpad_width_ratio=0.8
-            scratchpad_height_ratio=0.9
-            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,sh -c '${scripts.terminal}'
-
-            bind=SUPER,F12,spawn,gnome-calculator
-            bind=SUPER,b,spawn,librewolf
-            bind=SUPER,e,spawn,nautilus
-
-            bind=SUPER,m,quit
-            bind=SUPER,q,killclient,
-
-            bind=SUPER,h,focusdir,left
-            bind=SUPER,l,focusdir,right
-            bind=SUPER,k,focusdir,up
-            bind=SUPER,j,focusdir,down
-
-
-            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
-
-            bind=SUPER,g,toggleglobal,
-            bind=ALT,Tab,toggleoverview,
-            bind=SUPER,space,togglefloating,
-            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=SUPER,s,toggle_scratchpad
-
-            bind=ALT,e,set_proportion,1.0
-            bind=ALT,x,switch_proportion_preset,
-
-            bind=SUPER,1,view,1,0
-            bind=SUPER,2,view,2,0
-            bind=SUPER,3,view,3,0
-            bind=SUPER,4,view,4,0
-            bind=SUPER,5,view,5,0
-            bind=SUPER,6,view,6,0
-            bind=SUPER,7,view,7,0
-            bind=SUPER,8,view,8,0
-            bind=SUPER,9,view,9,0
-
-            bind=SUPER+SHIFT,1,tag,1,0
-            bind=SUPER+SHIFT,2,tag,2,0
-            bind=SUPER+SHIFT,3,tag,3,0
-            bind=SUPER+SHIFT,4,tag,4,0
-            bind=SUPER+SHIFT,5,tag,5,0
-            bind=SUPER+SHIFT,6,tag,6,0
-            bind=SUPER+SHIFT,7,tag,7,0
-            bind=SUPER+SHIFT,8,tag,8,0
-            bind=SUPER+SHIFT,9,tag,9,0
-
-            bind=alt+shift,Left,focusmon,left
-            bind=alt+shift,Right,focusmon,right
-            bind=SUPER+Alt,Left,tagmon,left
-            bind=SUPER+Alt,Right,tagmon,right
-
-            bind=SUPER,Up,movewin,+0,-50
-            bind=SUPER,Down,movewin,+0,+50
-            bind=SUPER,Left,movewin,-50,+0
-            bind=SUPER,Right,movewin,+50,+0
-
-            bind=ALT,k,resizewin,+0,-50
-            bind=ALT,j,resizewin,+0,+50
-            bind=ALT,h,resizewin,-50,+0
-            bind=ALT,l,resizewin,+50,+0
-
-
-            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
-
-
-            mousebind=SUPER,btn_left,moveresize,curmove
-            mousebind=NONE,btn_middle,togglemaximizescreen,0
-            mousebind=SUPER,btn_right,moveresize,curresize
-
-            axisbind=SUPER,UP,viewtoleft_have_client
-            axisbind=SUPER,DOWN,viewtoright_have_client
-
-            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$
-
-            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=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=NVD_BACKEND,direct
-
-            animations=${if eyecandy && 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=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 = ''
-            gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 &
-            ${lib.optionalString cfg.beeConfig.enable ''
-              wl-paste --type text --watch cliphist store &
-              awww-daemon &
-              dunst &
-            ''}
-            ${lib.optionalString cfg.beeConfig.waybar ''
-              waybar &
-            ''}
-          '';
-        };
-      }
-    else
-      {
-        programs.mango.enable = true;
-      }
-  );
-}
diff --git a/common/modules/window_managers/niri/default.nix b/common/modules/window_managers/niri/default.nix
index 4fbf6a4..de1b021 100644
--- a/common/modules/window_managers/niri/default.nix
+++ b/common/modules/window_managers/niri/default.nix
@@ -26,7 +26,7 @@ in
           ];
 
         xdg.configFile."niri/config.kdl".text = ''
-          include optional=true "./noctalia.kdl"
+          include optional=true "./matugen.kdl"
           workspace "1"
           workspace "2"
           workspace "3"
@@ -158,7 +158,7 @@ in
           }
 
           window-rule {
-              match app-id=r#"^(firefox|librewolf|brave-origin|org.pwmt.zathura)$"#
+              match app-id=r#"^(firefox|librewolf|brave-origin|zen|org.pwmt.zathura)$"#
               open-on-workspace "1"
               open-maximized true
           }
@@ -173,6 +173,7 @@ in
               match app-id=r#"^(vesktop|mpv|.*Kdenlive.*)$"#
               open-on-workspace "3"
               open-focused true
+              open-maximized true
           }
 
           window-rule {
@@ -264,7 +265,7 @@ in
               ''}
 
               Mod+E hotkey-overlay-title="Open wallpaper picker" { spawn-sh "nautilus"; }
-              Mod+B hotkey-overlay-title="Open Browser" { spawn-sh "librewolf || brave-origin"; }
+              Mod+B hotkey-overlay-title="Open Browser" { spawn-sh "zen || librewolf || brave-origin"; }
               Mod+Shift+C hotkey-overlay-title="Get current date and time as noticiation" { spawn-sh "fyi Clock $(date)"; }
               XF86AudioPlay        allow-when-locked=true { spawn-sh "playerctl play-pause"; }
               XF86AudioStop        allow-when-locked=true { spawn-sh "playerctl stop"; }
diff --git a/common/modules/window_managers/noctalia.nix b/common/modules/window_managers/noctalia.nix
index cc4c88c..fabe3e4 100644
--- a/common/modules/window_managers/noctalia.nix
+++ b/common/modules/window_managers/noctalia.nix
@@ -24,6 +24,18 @@ in
         enable = true;
         systemd.enable = true;
       };
+
+      xdg.configFile."noctalia/template.toml" = {
+        text = ''
+          [theme.templates.user.nvim_base46]
+          input_path = '~/.config/matugen/templates/neovim.json'
+          output_path = '~/.config/neovim/nvim-colors.json'
+
+          [theme.templates.user.niri]
+          input_path = '~/.config/matugen/templates/matugen.kdl'
+          output_path = '~/.config/niri/matugen.kdl'
+        '';
+      };
     }
   );
 }
diff --git a/common/overlays/default.nix b/common/overlays/default.nix
index 6918e89..8d21a9f 100644
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@@ -2,5 +2,6 @@
 {
   flake.overlays = {
     qt6ct = import ./qt6ct.nix;
+    mygit = import ./git.nix;
   };
 }
diff --git a/common/overlays/git.nix b/common/overlays/git.nix
new file mode 100644
index 0000000..638956f
--- /dev/null
+++ b/common/overlays/git.nix
@@ -0,0 +1,6 @@
+final: prev: {
+  mygit = (prev.git.override { withLibsecret = true; }).overrideAttrs (old: {
+    doCheck = false;
+    doInstallCheck = false;
+  });
+}
diff --git a/common/programs/brave.nix b/common/programs/brave.nix
index cba3bca..cfd7a59 100644
--- a/common/programs/brave.nix
+++ b/common/programs/brave.nix
@@ -1,8 +1,8 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
   programs.brave = {
     enable = false;
-    package = inputs.brave-origin.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    package = pkgs.brave-origin;
 
     extensions = [
     ];
diff --git a/common/programs/librewolf.nix b/common/programs/librewolf.nix
index f5a6440..6caac4d 100644
--- a/common/programs/librewolf.nix
+++ b/common/programs/librewolf.nix
@@ -7,7 +7,7 @@
 }:
 {
   programs.librewolf = {
-    enable = true;
+    enable = false;
     policies = {
       ExtensionSettings = {
         # "uBlock0@raymondhill.net" = {
diff --git a/common/programs/vesktop.nix b/common/programs/vesktop.nix
index a8dbb4c..5f7a1da 100644
--- a/common/programs/vesktop.nix
+++ b/common/programs/vesktop.nix
@@ -10,12 +10,12 @@
             && config.beeMods.windowManagers.beeConfig.enable
             && !config.beeMods.windowManagers.noctalia
           then
-            [ "system24-matugen.css" ]
+            [ "midnight.css" ]
           else
-            [ "discord-system24.css" ];
-        autoUpdate = false;
-        autoUpdateNotification = false;
-        notifyAboutUpdates = false;
+            [ "noctalia.theme.css" ];
+        # autoUpdate = true;
+        # autoUpdateNotification = true;
+        # notifyAboutUpdates = false;
         useQuickCss = false;
         disableMinSize = true;
         plugins = {
diff --git a/common/programs/zenBrowser.nix b/common/programs/zenBrowser.nix
new file mode 100644
index 0000000..406f9b7
--- /dev/null
+++ b/common/programs/zenBrowser.nix
@@ -0,0 +1,129 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  extension = shortId: guid: {
+    name = guid;
+    value = {
+      install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
+      installation_mode = "normal_installed";
+      private_browsing = true;
+      default_area = "menupanel"; # menupanel = unpin, navbar = pin
+    };
+  };
+
+  prefs = {
+    "browser.aboutConfig.showWarning" = false;
+    "browser.sessionstore.resume_from_crash" = false;
+    "browser.sessionstore.restore_on_demand" = false;
+    "browser.sessionstore.restore_tabs_lazily" = false;
+    "browser.sessionstore.restore_windows_to_virtual_desktop" = false;
+    "browser.sessionstore.max_resumed_crashes" = 0;
+    "gfx.webrender.all" = true;
+    "gfx.webrender.compositor" = true;
+    "gfx.x11-egl.force-enabled" = true;
+    "layers.acceleration.force-enabled" = true;
+    "media.ffmpeg.vaapi.enabled" = true;
+    "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+    "zen.welcome-screen.seen" = true;
+  };
+
+  extensions = [
+    (extension "ublock-origin" "uBlock0@raymondhill.net")
+    (extension "darkreader" "addon@darkreader.org")
+    (extension "enhanced-h264ify" "{9a41dee2-b924-4161-a971-7fb35c053a4a}")
+    (extension "sponsorblock" "sponsorBlocker@ajay.app")
+  ];
+in
+{
+  home.packages = [
+    (pkgs.wrapFirefox
+      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped
+      {
+        extraPrefs = lib.concatLines (
+          lib.mapAttrsToList (
+            name: value: "lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});"
+          ) prefs
+        );
+
+        extraPolicies = {
+          DisableTelemetry = true;
+          AutofillAddressEnabled = true;
+          AutofillCreditCardEnabled = false;
+          DisableAppUpdate = true;
+          DisableFeedbackCommands = true;
+          DisableFirefoxStudies = true;
+          DisablePocket = true;
+          DontCheckDefaultBrowser = true;
+          NoDefaultBookmarks = true;
+          DisableFirefoxScreenshots = true;
+          OfferToSaveLogins = false;
+          EnableTrackingProtection = {
+            Value = true;
+            Locked = true;
+            Cryptomining = true;
+            Fingerprinting = true;
+          };
+          DNSOverHTTPS = {
+            Enabled = true;
+            ProviderURL = "https://dns.quad9.net/dns-query";
+            Locked = true;
+            Fallback = true;
+          };
+
+          ExtensionSettings = builtins.listToAttrs extensions;
+
+          SearchEngines = {
+            Default = "DuckDuckGo";
+            PreventInstalls = true;
+            Remove = [
+              "Google"
+              "Bing"
+            ];
+            Add = [
+              {
+                Name = "google";
+                URLTemplate = "https://www.google.com/search?q={searchTerms}";
+                IconURL = "https://www.google.com/favicon.ico";
+                Alias = ":g";
+              }
+              {
+                Name = "Nixpkgs";
+                URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
+                IconURL = "https://wiki.nixos.org/favicon.ico";
+                Alias = ":np";
+              }
+              {
+                Name = "Nixpkgs";
+                URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
+                IconURL = "https://wiki.nixos.org/favicon.ico";
+                Alias = ":np";
+              }
+              {
+                Name = "NixOS options";
+                URLTemplate = "https://search.nixos.org/options?query={searchTerms}";
+                IconURL = "https://wiki.nixos.org/favicon.ico";
+                Alias = ":no";
+              }
+              {
+                Name = "NixOS Wiki";
+                URLTemplate = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
+                IconURL = "https://wiki.nixos.org/favicon.ico";
+                Alias = ":nw";
+              }
+              {
+                Name = "noogle";
+                URLTemplate = "https://noogle.dev/q?term={searchTerms}";
+                IconURL = "https://noogle.dev/favicon.ico";
+                Alias = ":ng";
+              }
+            ];
+          };
+        };
+      }
+    )
+  ];
+}
diff --git a/flake.lock b/flake.lock
index 77ac68b..7c052fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1781950583,
-        "narHash": "sha256-wkhNutjCft4TdxUCwI4bE9zRXKxMECBg/Rrz3Px0GFY=",
+        "lastModified": 1786985328,
+        "narHash": "sha256-4buflYowr+rZecPe+rLDrEX5ZFO9lx0iyp0Cjbzw8cw=",
         "ref": "refs/heads/main",
-        "rev": "478e2f31aa5945bc39edfc59b3e9f081633dca66",
-        "revCount": 46,
+        "rev": "eb2ff1efdf31180c3dbeabb928dcf028ff8b33f9",
+        "revCount": 52,
         "type": "git",
         "url": "https://codeberg.org/beeb5k/beeVim"
       },
@@ -25,55 +25,16 @@
         "url": "https://codeberg.org/beeb5k/beeVim"
       }
     },
-    "brave-origin": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1783759392,
-        "narHash": "sha256-I2zI2OW8hKD8BVx9DX7quTxWgQhhzAaCF/8JXgUJpHU=",
-        "owner": "Daniel-42-z",
-        "repo": "brave-origin-flake",
-        "rev": "1b2fb9bc254e7de179595728bb5f2d621cf1b7b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Daniel-42-z",
-        "repo": "brave-origin-flake",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1782949081,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1782949081,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "lastModified": 1785627969,
+        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
         "type": "github"
       },
       "original": {
@@ -82,46 +43,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": [
-          "mango",
-          "scenefx",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -129,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783823409,
-        "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=",
+        "lastModified": 1786501082,
+        "narHash": "sha256-ROC70hdloiAY74yodpAgT0sP1dmYk+vchjYsrfmhfiM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9",
+        "rev": "99e84ee7387ff24cd112ff51f71c3465eb9cb770",
         "type": "github"
       },
       "original": {
@@ -142,35 +63,13 @@
         "type": "github"
       }
     },
-    "mango": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "scenefx": "scenefx"
-      },
-      "locked": {
-        "lastModified": 1783828427,
-        "narHash": "sha256-yYYtJZBUWdZmMQ1knD/avgjJr80G3Tz8zKMMYfxXR7E=",
-        "owner": "mangowm",
-        "repo": "mango",
-        "rev": "5aab9f57e5eef00e4251fa1e7afdf87d9b01ee95",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mangowm",
-        "repo": "mango",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1783776592,
-        "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
+        "lastModified": 1786384358,
+        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
+        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
         "type": "github"
       },
       "original": {
@@ -182,26 +81,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1782614948,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
+        "lastModified": 1785031560,
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
-      "locked": {
-        "lastModified": 1782614948,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
         "type": "github"
       },
       "original": {
@@ -217,11 +101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783870718,
-        "narHash": "sha256-72H4jkm35LOE6XTN75dihEEVytW0uDRKcOUJECq6pZY=",
+        "lastModified": 1786499996,
+        "narHash": "sha256-OUYo5wttl2nyHeZ2U7VG+aCSFwvpej6ADn2d0YfylRA=",
         "owner": "noctalia-dev",
         "repo": "noctalia",
-        "rev": "f29f3c0dd1e70f22c891df474a047c5ddcf1ac69",
+        "rev": "451c391cb0cdf3303f4f74473c4129c22dcd0e46",
         "type": "github"
       },
       "original": {
@@ -233,11 +117,11 @@
     "plugins-base46": {
       "flake": false,
       "locked": {
-        "lastModified": 1780820761,
-        "narHash": "sha256-6kK8q2dmmW3RO9FQmlcYN6Yyhl6fXE5ey1l8PWRVCfc=",
+        "lastModified": 1784785285,
+        "narHash": "sha256-kwDMC6rYzJYECmGnwn8JiAbffUq7hAXcUH6gPSkk2uI=",
         "owner": "AvengeMedia",
         "repo": "base46",
-        "rev": "cb8a1257bbc2640f6e7415a01219b34d3efd1494",
+        "rev": "83522e02c6c3b4ea901c4bffd9e0a5e0371c1fe6",
         "type": "github"
       },
       "original": {
@@ -249,11 +133,11 @@
     "plugins-lze": {
       "flake": false,
       "locked": {
-        "lastModified": 1781615349,
-        "narHash": "sha256-vc4nNSOVecUA2ZD2TKN48ffGLpOz5alNt11LlfqYOrI=",
+        "lastModified": 1782136817,
+        "narHash": "sha256-7RNUVDWU13E0LGv3QVfC/Qmz/gA564FKfpv6PxYn75M=",
         "owner": "BirdeeHub",
         "repo": "lze",
-        "rev": "bb97115ec6dad1872d5005f7ef6c0e05cf5132e9",
+        "rev": "ae45b9f1fd923955a5ebc733b920e23f0c105ae1",
         "type": "github"
       },
       "original": {
@@ -265,11 +149,11 @@
     "plugins-lzextras": {
       "flake": false,
       "locked": {
-        "lastModified": 1781615385,
-        "narHash": "sha256-Q+av9YqiF4PzgvsMngIrdoYRaZXnMvP1YDzGD78DUGM=",
+        "lastModified": 1782220927,
+        "narHash": "sha256-9hoMQoor4SjQ8+2eH33YQkoEfSXc+kKjRdTRCJYxL+M=",
         "owner": "BirdeeHub",
         "repo": "lzextras",
-        "rev": "5f6bc3682e19b4c5e12e5a5215bc3fade9f29876",
+        "rev": "0dd4ed15331b6eaf4b6304d4e0db32ccb043b76e",
         "type": "github"
       },
       "original": {
@@ -281,11 +165,11 @@
     "plugins-neogit": {
       "flake": false,
       "locked": {
-        "lastModified": 1781870821,
-        "narHash": "sha256-oai8d/Zin+7jsrde4wGN2x/2vI3dH/Hs4raV/h2lrIA=",
+        "lastModified": 1785165041,
+        "narHash": "sha256-oyGGEbBCGr9mYeaG7siHl/Zz2HOBEKEkhQuwmJ2eA3o=",
         "owner": "NeogitOrg",
         "repo": "neogit",
-        "rev": "828dd073e6ad180fdb5c1603c7ad7f68a384c40b",
+        "rev": "37e0f22a2345bad1bffe01b31970885882f46275",
         "type": "github"
       },
       "original": {
@@ -297,36 +181,12 @@
     "root": {
       "inputs": {
         "beevim": "beevim",
-        "brave-origin": "brave-origin",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
-        "mango": "mango",
         "nixpkgs": "nixpkgs",
         "noctalia": "noctalia",
-        "sops-nix": "sops-nix"
-      }
-    },
-    "scenefx": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "mango",
-          "nixpkgs"
-        ],
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1782624992,
-        "narHash": "sha256-vUjLG6eubEhJJVa9LPygIcVmNoHwYbSUTJcWEcbxnU4=",
-        "owner": "wlrfx",
-        "repo": "scenefx",
-        "rev": "37ccd723bef49e6891156ffafce8f549f01446cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "wlrfx",
-        "repo": "scenefx",
-        "type": "github"
+        "sops-nix": "sops-nix",
+        "zen-browser": "zen-browser"
       }
     },
     "sops-nix": {
@@ -336,11 +196,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783174389,
-        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
+        "lastModified": 1786375908,
+        "narHash": "sha256-G7qDAT98nywA4EFmJCwIRO5wKvDlBBN3BWpsOnjAto8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
+        "rev": "d1337e05ba0a8e88a75d2c0e1595d82f3b3e2ac4",
         "type": "github"
       },
       "original": {
@@ -349,54 +209,44 @@
         "type": "github"
       }
     },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
+    "wrappers": {
+      "inputs": {
+        "nixpkgs": [
+          "beevim",
+          "nixpkgs"
+        ]
       },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "lastModified": 1782135443,
+        "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
+        "owner": "BirdeeHub",
+        "repo": "nix-wrapper-modules",
+        "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
+        "owner": "BirdeeHub",
+        "repo": "nix-wrapper-modules",
         "type": "github"
       }
     },
-    "wrappers": {
+    "zen-browser": {
       "inputs": {
         "nixpkgs": [
-          "beevim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1780661205,
-        "narHash": "sha256-3F5DixT3Gk91lBI9E+TGMm0ko5HrRbDiL23di16TJGA=",
-        "owner": "BirdeeHub",
-        "repo": "nix-wrapper-modules",
-        "rev": "8dd304c3582ddd339217e1cc5fb53f50acb63c2d",
+        "lastModified": 1786424696,
+        "narHash": "sha256-cyMeyF4QCZF7YL5+ynYZMDIA2LChF3L51ZLP6BvJ1L4=",
+        "owner": "youwen5",
+        "repo": "zen-browser-flake",
+        "rev": "64791844717b786a93dde8f76c8a35222e53cf53",
         "type": "github"
       },
       "original": {
-        "owner": "BirdeeHub",
-        "repo": "nix-wrapper-modules",
+        "owner": "youwen5",
+        "repo": "zen-browser-flake",
         "type": "github"
       }
     }
diff --git a/flake.nix b/flake.nix
index d314a2f..6eb8831 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,10 +13,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    mango = {
-      url = "github:mangowm/mango";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -30,8 +26,8 @@
       url = "github:noctalia-dev/noctalia";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    brave-origin = {
-      url = "github:Daniel-42-z/brave-origin-flake";
+    zen-browser = {
+      url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/hosts/common.nix b/hosts/common.nix
index 9cd4112..0be25ce 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -121,11 +121,11 @@
 
   networking.networkmanager = {
     enable = true;
-    dns = "systemd-resolved";
+    # dns = "systemd-resolved";
   };
 
   services.resolved = {
-    enable = true;
+    enable = false;
     settings.Resolve = {
       DNSOverTLS = "opportunistic";
       DNSSEC = "allow-downgrade";
@@ -140,12 +140,12 @@
         "2620:fe::9#dns.quad9.net"
 
         # Cloudflare IPv4
-        # "1.1.1.1#cloudflare-dns.com"
-        # "1.0.0.1#cloudflare-dns.com"
+        "1.1.1.1#cloudflare-dns.com"
+        "1.0.0.1#cloudflare-dns.com"
 
         # Cloudflare IPv6
-        # "2606:4700:4700::1111#cloudflare-dns.com"
-        # "2606:4700:4700::1001#cloudflare-dns.com"
+        "2606:4700:4700::1111#cloudflare-dns.com"
+        "2606:4700:4700::1001#cloudflare-dns.com"
       ];
     };
   };
@@ -248,8 +248,8 @@
   services.udisks2.enable = true;
 
   environment.systemPackages = with pkgs; [
+    mygit
     android-tools
-    scrcpy
     playerctl
     pciutils
     sops
diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix
index 7e05c79..02a98d4 100644
--- a/hosts/niuwux/default.nix
+++ b/hosts/niuwux/default.nix
@@ -30,7 +30,6 @@
 
   beeMods = {
     windowManagers = {
-      mango.enable = false;
       niri.enable = true;
     };
   };
@@ -41,10 +40,6 @@
     enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gnome
-    ]
-    ++ lib.optionals config.beeMods.windowManagers.mango.enable [
-      pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal-wlr
     ];
     config = {
       common = {
@@ -52,11 +47,6 @@
         "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
         "org.freedesktop.impl.portal.Inhibit" = [ "none" ];
       };
-      mango = {
-        "org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ];
-        "org.freedesktop.impl.portal.Screenshot" = [ "wlr" ];
-        "org.freedesktop.impl.portal.Inhibit" = [ "none" ];
-      };
       niri = {
         default = [ "gnome" ];
         "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
@@ -76,7 +66,7 @@
     # capSysNice = true;
   };
   programs.steam = {
-    enable = false;
+    enable = true;
     protontricks.enable = true;
     gamescopeSession.enable = false;
     remotePlay.openFirewall = true;
diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix
index 9d5b773..b9655ed 100644
--- a/users/beeb5k/default.nix
+++ b/users/beeb5k/default.nix
@@ -21,9 +21,8 @@
 
   beeMods = {
     windowManagers = {
-      mango.enable = false;
       niri.enable = true;
-      xwayland = false;
+      xwayland = true;
       eyeCandy.enable = true;
       eyeCandy = {
         window = {
@@ -40,7 +39,8 @@
     };
     matugen.enable = true;
     terminal = {
-      foot = true;
+      default = "alacritty";
+      alacritty = true;
       font.family = "monospace";
       font.size = 12.0;
     };
diff --git a/users/common.nix b/users/common.nix
index 498c9f4..fef80fb 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -32,10 +32,7 @@ in
 {
   programs.git = {
     enable = true;
-    package = (pkgs.git.override { withLibsecret = true; }).overrideAttrs (old: {
-      docheck = false;
-      doInstallCheck = false;
-    });
+    package = pkgs.mygit;
     settings = {
       user = {
         name = "beeb5k";
@@ -156,8 +153,6 @@ in
   };
 
   home.packages = with pkgs; [
-    # kew
-    cliamp
     imagemagick
     nautilus
     proton-vpn