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/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 +++++++++++---------- 5 files changed, 173 insertions(+), 147 deletions(-) delete mode 100644 common/modules/matugen/templates/matugen-mango.nix create mode 100644 common/modules/matugen/templates/matugen-niri.nix (limited to 'common/modules/matugen/templates') 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 + ''; + }; + }; }; - }; - }; } -- cgit v1.3.1