summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/modules/beevim/default.nix39
-rw-r--r--common/modules/matugen/default.nix279
-rw-r--r--common/modules/matugen/templates/matugen-terminal.nix34
-rw-r--r--flake.lock32
-rw-r--r--users/bee/default.nix3
-rw-r--r--users/common.nix1
6 files changed, 192 insertions, 196 deletions
diff --git a/common/modules/beevim/default.nix b/common/modules/beevim/default.nix
index 2f8336f..49b66c4 100644
--- a/common/modules/beevim/default.nix
+++ b/common/modules/beevim/default.nix
@@ -22,23 +22,24 @@ in
enable = lib.mkEnableOption "Enable neovim config";
};
- config = lib.mkIf (cfg.enable && homeManager) {
- beeVim = {
- enable = true;
- packageDefinitions.replace = builtins.mapAttrs (
- n: _:
- { pkgs, ... }:
- {
- settings = {
- neovim-unwrapped = pkgs.neovim-unwrapped;
- };
- categories = {
- clang = false;
- markdown = false;
- };
- }
- ) inputs.beeVim.packages.${pkgs.stdenv.hostPlatform.system}.default.packageDefinitions;
- };
- };
-
+ config = lib.mkIf cfg.enable (
+ lib.optionalAttrs homeManager {
+ beeVim = {
+ enable = true;
+ packageDefinitions.replace = builtins.mapAttrs (
+ n: _:
+ { pkgs, ... }:
+ {
+ settings = {
+ neovim-unwrapped = pkgs.neovim-unwrapped;
+ };
+ categories = {
+ clang = false;
+ markdown = false;
+ };
+ }
+ ) inputs.beeVim.packages.${pkgs.stdenv.hostPlatform.system}.default.packageDefinitions;
+ };
+ }
+ );
}
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index 316ff06..2d1cdc8 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -34,172 +34,169 @@ in
};
config = lib.mkIf cfg.enable (
- if homeManager then
- {
- programs.wallust = {
- enable = true;
- settings = {
- backend = "wal";
- color_space = "labmixed";
- palette = "dark16";
- fallback_generator = "interpolate";
- threshold = 11;
- check_contrast = true;
- templates = {
- foot = {
- template = "foot-colors.ini";
- target = "~/.config/foot/colors.ini";
- };
- alacritty = {
- template = "alacritty-colors.toml";
- target = "~/.config/alacritty/colors.toml";
- };
- ghostty = {
- template = "ghostty-colors.conf";
- target = "~/.config/ghostty/colors.conf";
- };
- zen = {
- template = "userChrome.css";
- target = "~/.cache/wallust/userChrome.css";
- };
- xresources = {
- template = "colors-xresources";
- target = "~/.config/x11/matugen.Xresources";
- };
- sequences = {
- template = "sequences";
- target = "~/.config/sequences";
- };
+ lib.optionalAttrs homeManager {
+ programs.wallust = {
+ enable = true;
+ settings = {
+ backend = "wal";
+ color_space = "labmixed";
+ palette = "dark16";
+ fallback_generator = "interpolate";
+ threshold = 11;
+ check_contrast = true;
+ templates = {
+ foot = {
+ template = "foot-colors.ini";
+ target = "~/.config/foot/colors.ini";
+ };
+ alacritty = {
+ template = "alacritty-colors.toml";
+ target = "~/.config/alacritty/colors.toml";
+ };
+ ghostty = {
+ template = "ghostty-colors.conf";
+ target = "~/.config/ghostty/colors.conf";
+ };
+ zen = {
+ template = "userChrome.css";
+ target = "~/.cache/wallust/userChrome.css";
+ };
+ xresources = {
+ template = "colors-xresources";
+ target = "~/.config/x11/matugen.Xresources";
+ };
+ sequences = {
+ template = "sequences";
+ target = "~/.config/sequences";
};
};
};
+ };
- home.packages = with pkgs; [
- matugen
- ];
+ home.packages = with pkgs; [
+ matugen
+ ];
- xdg.configFile = {
- "matugen/config.toml" = {
- # enable = !config.programs.noctalia-shell.enable;
- text =
- # toml
- ''
- [config]
- ${lib.optionalString config.beeMods.terminal.alacritty ''
- [templates.alacritty]
- input_path = '~/.config/matugen/templates/alacritty-colors.toml'
- output_path = '~/.config/wallust/templates/alacritty-colors.toml'
- ''}
+ xdg.configFile = {
+ "matugen/config.toml" = {
+ # enable = !config.programs.noctalia-shell.enable;
+ text =
+ # toml
+ ''
+ [config]
+ ${lib.optionalString config.beeMods.terminal.alacritty ''
+ [templates.alacritty]
+ input_path = '~/.config/matugen/templates/alacritty-colors.toml'
+ output_path = '~/.config/wallust/templates/alacritty-colors.toml'
+ ''}
- ${lib.optionalString config.beeMods.terminal.foot ''
- [templates.foot]
- input_path = '~/.config/matugen/templates/foot-colors.ini'
- output_path = '~/.config/wallust/templates/foot-colors.ini'
- ''}
+ ${lib.optionalString config.beeMods.terminal.foot ''
+ [templates.foot]
+ input_path = '~/.config/matugen/templates/foot-colors.ini'
+ output_path = '~/.config/wallust/templates/foot-colors.ini'
+ ''}
- ${lib.optionalString config.beeMods.terminal.ghostty ''
- [templates.ghostty]
- input_path = '~/.config/matugen/templates/ghostty.conf'
- output_path = '~/.config/wallust/templates/ghostty-colors.conf'
- ''}
+ ${lib.optionalString config.beeMods.terminal.ghostty ''
+ [templates.ghostty]
+ input_path = '~/.config/matugen/templates/ghostty.conf'
+ output_path = '~/.config/wallust/templates/ghostty-colors.conf'
+ ''}
- ${lib.optionalString config.programs.zathura.enable ''
- [templates.zathura]
- input_path = '~/.config/matugen/templates/zathura.toml'
- output_path = '~/.config/zathura/matugen'
- ''}
+ ${lib.optionalString config.programs.zathura.enable ''
+ [templates.zathura]
+ input_path = '~/.config/matugen/templates/zathura.toml'
+ output_path = '~/.config/zathura/matugen'
+ ''}
- ${lib.optionalString config.programs.swaylock.enable ''
- [templates.swaylock]
- input_path = '~/.config/matugen/templates/swaylock-colors'
- output_path = '~/.config/swaylock/swaylock-colors'
- ''}
+ ${lib.optionalString config.programs.swaylock.enable ''
+ [templates.swaylock]
+ input_path = '~/.config/matugen/templates/swaylock-colors'
+ output_path = '~/.config/swaylock/swaylock-colors'
+ ''}
- ${lib.optionalString config.beeMods.mango.enable ''
- [templates.mango]
- input_path = '~/.config/matugen/templates/mango.conf'
- output_path = '~/.config/mango/mango-colors.conf'
- post_hook = 'mmsg -d reload_config'
- ''}
+ ${lib.optionalString config.beeMods.mango.enable ''
+ [templates.mango]
+ input_path = '~/.config/matugen/templates/mango.conf'
+ output_path = '~/.config/mango/mango-colors.conf'
+ post_hook = 'mmsg -d reload_config'
+ ''}
- ${lib.optionalString config.programs.btop.enable ''
- [templates.btop]
- input_path = '~/.config/matugen/templates/btop.theme'
- output_path = '~/.config/btop/themes/matugen.theme'
- ''}
+ ${lib.optionalString config.programs.btop.enable ''
+ [templates.btop]
+ input_path = '~/.config/matugen/templates/btop.theme'
+ output_path = '~/.config/btop/themes/matugen.theme'
+ ''}
- ${lib.optionalString config.programs.yazi.enable ''
- [templates.yazi]
- input_path = '~/.config/matugen/templates/yazi.toml'
- output_path = '~/.config/yazi/theme.toml'
- ''}
+ ${lib.optionalString config.programs.yazi.enable ''
+ [templates.yazi]
+ input_path = '~/.config/matugen/templates/yazi.toml'
+ output_path = '~/.config/yazi/theme.toml'
+ ''}
- ${lib.optionalString config.beeMods.mango.enable ''
- [templates.Xresources]
- input_path = "~/.config/matugen/templates/colors-xresources"
- output_path = "~/.config/wallust/templates/colors-xresources"
- ''}
+ ${lib.optionalString config.beeMods.mango.enable ''
+ [templates.Xresources]
+ input_path = "~/.config/matugen/templates/colors-xresources"
+ output_path = "~/.config/wallust/templates/colors-xresources"
+ ''}
- ${lib.optionalString config.programs.vesktop.enable ''
- [templates.vesktop]
- input_path = "~/.config/matugen/templates/vesktop.css"
- output_path = "~/.config/vesktop/themes/midnight.css"
- ''}
+ ${lib.optionalString config.programs.vesktop.enable ''
+ [templates.vesktop]
+ input_path = "~/.config/matugen/templates/vesktop.css"
+ output_path = "~/.config/vesktop/themes/midnight.css"
+ ''}
- ${lib.optionalString config.beeMods.mango.waybar ''
- [templates.waybar]
- input_path = "~/.config/matugen/templates/waybar.css"
- output_path = "~/.config/waybar/colors.css"
- # post_hook = "pkill -SIGUSR2 waybar"
- ''}
+ ${lib.optionalString config.beeMods.mango.waybar ''
+ [templates.waybar]
+ input_path = "~/.config/matugen/templates/waybar.css"
+ output_path = "~/.config/waybar/colors.css"
+ # post_hook = "pkill -SIGUSR2 waybar"
+ ''}
- [templates.wlogout]
- input_path = "~/.config/matugen/templates/wlogout.css"
- output_path = "~/.config/wlogout/colors.css"
+ [templates.wlogout]
+ input_path = "~/.config/matugen/templates/wlogout.css"
+ output_path = "~/.config/wlogout/colors.css"
- ${lib.optionalString config.services.dunst.enable ''
- [templates.dunst]
- input_path = '~/.config/matugen/templates/dunstrc'
- output_path = '~/.config/dunst/dunstrc.d/colors.conf'
- post_hook = "dunstctl reload"
- ''}
+ ${lib.optionalString config.services.dunst.enable ''
+ [templates.dunst]
+ input_path = '~/.config/matugen/templates/dunstrc'
+ output_path = '~/.config/dunst/dunstrc.d/colors.conf'
+ post_hook = "dunstctl reload"
+ ''}
- ${lib.optionalString config.programs.rofi.enable ''
- [templates.rofi]
- input_path = '~/.config/matugen/templates/rofi-colors.rasi'
- output_path = '~/.config/rofi/shared/colors.rasi'
- ''}
+ ${lib.optionalString config.programs.rofi.enable ''
+ [templates.rofi]
+ input_path = '~/.config/matugen/templates/rofi-colors.rasi'
+ output_path = '~/.config/rofi/shared/colors.rasi'
+ ''}
- ${lib.optionalString config.gtk.enable ''
- [templates.gtk3]
- input_path = '~/.config/matugen/templates/colors.css'
- output_path = '~/.config/gtk-3.0/colors.css'
+ ${lib.optionalString config.gtk.enable ''
+ [templates.gtk3]
+ input_path = '~/.config/matugen/templates/colors.css'
+ output_path = '~/.config/gtk-3.0/colors.css'
- [templates.gtk4]
- input_path = '~/.config/matugen/templates/colors.css'
- output_path = '~/.config/gtk-4.0/colors.css'
- post_hook = "${update_gtkcolors}"
- ''}
+ [templates.gtk4]
+ input_path = '~/.config/matugen/templates/colors.css'
+ output_path = '~/.config/gtk-4.0/colors.css'
+ post_hook = "${update_gtkcolors}"
+ ''}
- [templates.zed]
- input_path = '~/.config/matugen/templates/zed.json'
- output_path = '~/.config/zed/themes/matugen.json'
+ [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.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'
- post_hook = "${link_zen}"
- '';
- };
+ [templates.zen]
+ input_path = '~/.config/matugen/templates/zen.css'
+ output_path = '~/.config/wallust/templates/userChrome.css'
+ post_hook = "${link_zen}"
+ '';
};
- }
- else
- { }
+ };
+ }
);
}
diff --git a/common/modules/matugen/templates/matugen-terminal.nix b/common/modules/matugen/templates/matugen-terminal.nix
index ae8cd79..d8ee733 100644
--- a/common/modules/matugen/templates/matugen-terminal.nix
+++ b/common/modules/matugen/templates/matugen-terminal.nix
@@ -8,30 +8,30 @@
(lib.mkIf config.beeMods.terminal.foot {
xdg.configFile."matugen/templates/foot-colors.ini" = {
text = ''
- [colors]
+ [colors-dark]
foreground={{colors.on_surface.default.hex_stripped}}
background={{colors.background.default.hex_stripped}}
selection-foreground={{colors.on_surface.default.hex_stripped}}
selection-background={{colors.primary_container.default.hex_stripped}}
cursor = {{colors.background.default.hex_stripped}} {{colors.primary.default.hex_stripped}}
- regular0=\{{color0[1:]}}
- regular1=\{{color1[1:]}}
- regular2=\{{color2[1:]}}
- regular3=\{{color3[1:]}}
- regular4=\{{color4[1:]}}
- regular5=\{{color5[1:]}}
- regular6=\{{color6[1:]}}
- regular7=\{{color7[1:]}}
+ regular0=\{{color0[1:]}}
+ regular1=\{{color1[1:]}}
+ regular2=\{{color2[1:]}}
+ regular3=\{{color3[1:]}}
+ regular4=\{{color4[1:]}}
+ regular5=\{{color5[1:]}}
+ regular6=\{{color6[1:]}}
+ regular7=\{{color7[1:]}}
- bright0=\{{color8[1:]}}
- bright1=\{{color9[1:]}}
- bright2=\{{color10[1:]}}
- bright3=\{{color11[1:]}}
- bright4=\{{color12[1:]}}
- bright5=\{{color13[1:]}}
- bright6=\{{color14[1:]}}
- bright7=\{{color15[1:]}}
+ bright0=\{{color8[1:]}}
+ bright1=\{{color9[1:]}}
+ bright2=\{{color10[1:]}}
+ bright3=\{{color11[1:]}}
+ bright4=\{{color12[1:]}}
+ bright5=\{{color13[1:]}}
+ bright6=\{{color14[1:]}}
+ bright7=\{{color15[1:]}}
dim-blend-towards=<* if {{ is_dark_mode }} *>black<* else *>white<* endif *>
diff --git a/flake.lock b/flake.lock
index cd607f2..85f42e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
"plugins-rustaceanvim": "plugins-rustaceanvim"
},
"locked": {
- "lastModified": 1773055923,
- "narHash": "sha256-i6CiGmH+JjpOI0SiP+MHwrHmN3Frelisdhn0XPMZvcc=",
+ "lastModified": 1773086970,
+ "narHash": "sha256-GeUZXdamD7+TKAxPTG7kQHDDk3MWALa3QpYHNrwn7rk=",
"ref": "refs/heads/main",
- "rev": "972e5f9c68cc433c5fc26adf92cd25b293a3776a",
- "revCount": 1,
+ "rev": "2479ff966522aeaad70f4260af1323dc637bc089",
+ "revCount": 4,
"type": "git",
"url": "https://codeberg.org/brustybee/beeVim"
},
@@ -227,11 +227,11 @@
]
},
"locked": {
- "lastModified": 1772807318,
- "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=",
+ "lastModified": 1772985285,
+ "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8",
+ "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85",
"type": "github"
},
"original": {
@@ -265,11 +265,11 @@
"scenefx": "scenefx"
},
"locked": {
- "lastModified": 1772792509,
- "narHash": "sha256-c2X+x/D8txqV5UaN6TYYh9PEXyMaWVZl4mAQ0Sl21f8=",
+ "lastModified": 1773034081,
+ "narHash": "sha256-tH1yy1LQYtmGWnCU7whsdX0iGpc2dvaJ+7p6rvuKkHg=",
"owner": "DreamMaoMao",
"repo": "mango",
- "rev": "9a17a0279c39b330d155d50282d1d2641d519dc3",
+ "rev": "db30977196b91cfe2e5db8e9829faafe13417bd9",
"type": "github"
},
"original": {
@@ -476,11 +476,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1772624091,
- "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
+ "lastModified": 1772963539,
+ "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
+ "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
"type": "github"
},
"original": {
@@ -616,11 +616,11 @@
]
},
"locked": {
- "lastModified": 1772495394,
- "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
+ "lastModified": 1772944399,
+ "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
+ "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0",
"type": "github"
},
"original": {
diff --git a/users/bee/default.nix b/users/bee/default.nix
index 9bdd0de..64384c6 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -17,7 +17,6 @@
];
beeMods = {
- beeVim.enable = true;
mango = {
enable = true;
animations = true;
@@ -27,7 +26,7 @@
};
};
mango.waybar = true;
- # beeVim.enable = false;
+ beeVim.enable = true;
matugen.enable = true;
terminal = {
foot = true;
diff --git a/users/common.nix b/users/common.nix
index b30a808..95ff7ba 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -93,7 +93,6 @@
};
home.packages = with pkgs; [
- neovim
nautilus
opencode
totem
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-02 15:05:47 +0000