From 46b0b8ac8bc612e4bf86478e08ada33d94dad01d Mon Sep 17 00:00:00 2001 From: beeb5k Date: Mon, 17 Aug 2026 23:03:59 +0530 Subject: Remove mango and user templates for noctalia --- common/modules/matugen/default.nix | 18 +- common/modules/matugen/templates/matugen-mango.nix | 26 -- common/modules/matugen/templates/matugen-niri.nix | 49 +++ common/modules/matugen/templates/matugen-nvim.nix | 34 +-- .../modules/matugen/templates/matugen-waybar.nix | 7 +- .../modules/matugen/templates/matugen-zathura.nix | 204 ++++++------- common/modules/window_managers/default.nix | 2 - common/modules/window_managers/mango/default.nix | 327 --------------------- common/modules/window_managers/niri/default.nix | 7 +- common/modules/window_managers/noctalia.nix | 12 + common/overlays/default.nix | 1 + common/overlays/git.nix | 6 + common/programs/brave.nix | 4 +- common/programs/librewolf.nix | 2 +- common/programs/vesktop.nix | 10 +- common/programs/zenBrowser.nix | 129 ++++++++ 16 files changed, 342 insertions(+), 496 deletions(-) delete mode 100644 common/modules/matugen/templates/matugen-mango.nix create mode 100644 common/modules/matugen/templates/matugen-niri.nix delete mode 100644 common/modules/window_managers/mango/default.nix create mode 100644 common/overlays/git.nix create mode 100644 common/programs/zenBrowser.nix (limited to 'common') 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 - " ----------------------------------------------------------------------------- - - " 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 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-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 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 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" - - " Clipboard - set selection-clipboard clipboard - - " Search - set incremental-search true - set search-hadjust true - - " Autoadjust - set adjust-open width - - " 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 - - " 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 - - " Fullscreen - map [normal] f toggle_fullscreen - map [fullscreen] f toggle_fullscreen - - " Reload - map [normal] reload - map [fullscreen] reload - - " 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 - - map [normal] i set recolor - map [fullscreen] i set recolor - ''; + 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}}" + + 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 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 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-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 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 + + " Search + set incremental-search true + set search-hadjust true + + " Autoadjust + set adjust-open width + + " 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 + + " 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 + + " Fullscreen + map [normal] f toggle_fullscreen + map [fullscreen] f toggle_fullscreen + + " Reload + map [normal] reload + map [fullscreen] reload + + " 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 + + 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"; + } + ]; + }; + }; + } + ) + ]; +} -- cgit v1.3.1