summaryrefslogtreecommitdiff
path: root/common/modules
diff options
context:
space:
mode:
Diffstat (limited to 'common/modules')
-rw-r--r--common/modules/mango/default.nix7
-rw-r--r--common/modules/mango/scripts.nix12
-rw-r--r--common/modules/mango/swayidleNdLock.nix2
-rw-r--r--common/modules/matugen/default.nix20
-rw-r--r--common/modules/matugen/templates/matugen-rofi.nix35
-rw-r--r--common/modules/matugen/templates/matugen-terminal.nix4
-rw-r--r--common/modules/terminal/foot.nix2
-rw-r--r--common/modules/terminal/ghostty.nix2
8 files changed, 48 insertions, 36 deletions
diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix
index 95066e3..41b1029 100644
--- a/common/modules/mango/default.nix
+++ b/common/modules/mango/default.nix
@@ -94,7 +94,7 @@ in
# Window effect
blur=${if cfg.window.blur.enable then "1" else "0"}
- blur_layer=0
+ blur_layer=1
blur_optimized=1
blur_params_num_passes = ${toString cfg.window.blur.passes}
blur_params_radius = ${toString cfg.window.blur.radius}
@@ -107,6 +107,7 @@ in
layer_shadows = 0
shadow_only_floating = 1
shadows_size = 10
+ shadows_blur = 10
shadows_position_x = 0
shadows_position_y = 0
@@ -116,8 +117,8 @@ in
${
if (cfg.window.blur.enable && cfg.window.opacity == 1.0) then
''
- focused_opacity=0.90
- unfocused_opacity=0.90
+ focused_opacity=0.82
+ unfocused_opacity=0.82
''
else
''
diff --git a/common/modules/mango/scripts.nix b/common/modules/mango/scripts.nix
index a21f300..cbe387f 100644
--- a/common/modules/mango/scripts.nix
+++ b/common/modules/mango/scripts.nix
@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{
+ pkgs,
+ config,
+ lib,
+ ...
+}:
let
volume-control = pkgs.writeShellScriptBin "volume-control" ''
TAG="audio-volume"
@@ -101,7 +106,10 @@ let
if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$DISPLAY" ]; then
xrdb -merge "$HOME/.Xresources"
fi
- [ -f "$HOME/.config/sequences" ] && sh "$HOME/.config/sequences"
+
+ ${lib.optionalString (config.beeMods.terminal.default == "foot") ''
+ [ -f "$HOME/.config/sequences" ] && sh "$HOME/.config/sequences"
+ ''}
}
cmd_wall() {
diff --git a/common/modules/mango/swayidleNdLock.nix b/common/modules/mango/swayidleNdLock.nix
index ff2bde4..7a9cc1a 100644
--- a/common/modules/mango/swayidleNdLock.nix
+++ b/common/modules/mango/swayidleNdLock.nix
@@ -6,7 +6,7 @@
}:
let
cfg = config.beeMods.mango;
- swaylock_cmd = "${pkgs.swaylock}/bin/swaylock -f -C ~/.config/swaylock/swaylock-colors";
+ swaylock_cmd = "${pkgs.swaylock}/bin/swaylock -e -f -C ~/.config/swaylock/swaylock-colors";
in
{
config = lib.mkIf cfg.enable {
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index e9e9252..5ce3014 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -43,15 +43,15 @@ in
color_space = "salience";
check_contrast = true;
templates = {
- foot = {
+ foot = lib.mkIf config.beeMods.terminal.foot {
template = "foot-colors.ini";
target = "~/.config/foot/colors.ini";
};
- alacritty = {
+ alacritty = lib.mkIf config.beeMods.terminal.alacritty {
template = "alacritty-colors.toml";
target = "~/.config/alacritty/colors.toml";
};
- ghostty = {
+ ghostty = lib.mkIf config.beeMods.terminal.ghostty {
template = "ghostty-colors.conf";
target = "~/.config/ghostty/colors.conf";
};
@@ -59,11 +59,11 @@ in
template = "userChrome.css";
target = "~/.cache/wallust/userChrome.css";
};
- xresources = {
+ xresources = lib.mkIf config.beeMods.dwm.enable {
template = "colors-xresources";
target = "~/.config/x11/matugen.Xresources";
};
- sequences = {
+ sequences = lib.mkIf (config.beeMods.terminal.default == "foot") {
template = "sequences";
target = "~/.config/sequences";
};
@@ -180,14 +180,16 @@ in
output_path = "~/.config/matugen/neovim_matugen.json"
''}
+ ${lib.optionalString (config.beeMods.terminal.default == "foot") ''
+ [templates.sequences]
+ input_path = '~/.config/matugen/templates/sequences'
+ output_path = '~/.config/wallust/templates/sequences'
+ ''}
+
[templates.zed]
input_path = '~/.config/matugen/templates/zed.json'
output_path = '~/.config/zed/themes/matugen.json'
- [templates.sequences]
- input_path = '~/.config/matugen/templates/sequences'
- output_path = '~/.config/wallust/templates/sequences'
-
[templates.zen]
input_path = '~/.config/matugen/templates/zen.css'
output_path = '~/.config/wallust/templates/userChrome.css'
diff --git a/common/modules/matugen/templates/matugen-rofi.nix b/common/modules/matugen/templates/matugen-rofi.nix
index 2241c6d..60bf616 100644
--- a/common/modules/matugen/templates/matugen-rofi.nix
+++ b/common/modules/matugen/templates/matugen-rofi.nix
@@ -7,23 +7,24 @@
config = lib.mkIf config.programs.rofi.enable {
xdg.configFile = {
"matugen/templates/rofi-colors.rasi" = {
- text =
- # rasi
- ''
- * {
- <* if {{ is_dark_mode }} *>
- background: {{colors.surface.default.hex}};
- background-alt: {{colors.surface_container.default.hex}};
- <* else *>
- background: {{colors.surface_container.default.hex}};
- background-alt: {{colors.surface_container_high.default.hex}};
- <* endif *>
- foreground: {{colors.on_surface.default.hex}};
- selected: {{colors.primary.default.hex}};
- active: {{colors.secondary.default.hex}};
- urgent: {{colors.error.default.hex}};
- }
- '';
+ text = ''
+ * {
+ <* if {{ is_dark_mode }} *>
+ bg: {{colors.surface.default.hex}};
+ bg-alt: {{colors.surface_container.default.hex}};
+ <* else *>
+ bg: {{colors.surface_container.default.hex}};
+ bg-alt: {{colors.surface_container_highest.default.hex}};
+ <* endif *>
+ fg: {{colors.on_surface.default.hex}};
+ fg-dim: {{colors.on_surface_variant.default.hex}};
+ accent: {{colors.primary.default.hex}};
+ selected-bg: {{colors.primary.default.hex}};
+ selected-fg: {{colors.surface.default.hex}};
+ urgent: {{colors.error.default.hex}};
+ outline: {{colors.outline.default.hex}};
+ }
+ '';
};
};
};
diff --git a/common/modules/matugen/templates/matugen-terminal.nix b/common/modules/matugen/templates/matugen-terminal.nix
index 5ae9d86..c592226 100644
--- a/common/modules/matugen/templates/matugen-terminal.nix
+++ b/common/modules/matugen/templates/matugen-terminal.nix
@@ -87,9 +87,9 @@
xdg.configFile."matugen/templates/ghostty.conf" = {
text = ''
<* if {{ is_dark_mode }} *>
- background = '{{colors.background.default.hex}}'
+ background = {{colors.background.default.hex}}
<* else *>
- background = '{{colors.surface_container.default.hex}}'
+ background = {{colors.surface_container.default.hex}}
<* endif *>
foreground = {{colors.on_surface.default.hex}}
cursor-color = {{colors.primary.default.hex}}
diff --git a/common/modules/terminal/foot.nix b/common/modules/terminal/foot.nix
index a804815..4ad4c37 100644
--- a/common/modules/terminal/foot.nix
+++ b/common/modules/terminal/foot.nix
@@ -17,7 +17,7 @@ in
font = "${cfg.font.family}:size=${toString cfg.font.size}";
dpi-aware = "no";
- gamma-correct-blending = "yes";
+ # gamma-correct-blending = "yes";
bold-text-in-bright = if cfg.font.bright_color_is_bold then "yes" else "no";
};
cursor = {
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index 4a6277e..7ab94e6 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -15,7 +15,7 @@ in
font-family = cfg.font.family;
font-size = cfg.font.size;
- alpha-blending = "liner";
+ alpha-blending = "linear";
window-padding-x = cfg.window.padding-x;
window-padding-y = cfg.window.padding-y;
font-feature = [
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-02 16:02:33 +0000