neovim matugen template

8 files changed, 63 insertions, 7 deletions

diff --git a/common/modules/mango/scripts.nix b/common/modules/mango/scripts.nix
index edc9830..28a388e 100644
--- a/common/modules/mango/scripts.nix
+++ b/common/modules/mango/scripts.nix
@@ -132,7 +132,7 @@ let
         local theme=$(get_val "theme")
         local nl=$(get_val "nightlight")
 
-        CHOICE=$(echo -e "Mode: $theme\nNight Light: $nl\nLayouts" | rofi -dmenu -p "Settings" -i)
+        CHOICE=$(echo -e "Mode: $theme\nNight Light: $nl\nWallpaper\nLayouts" | rofi -dmenu -p "Settings" -i)
 
         case "$CHOICE" in
             "Mode: "*)
@@ -146,6 +146,9 @@ let
                     set_val "nightlight" "on"; wlsunset -T 4500 &
                 fi
                 ;;
+            "Wallpaper")
+                cmd_wall
+                ;;
             "Layouts")
                 L=$(echo -e "tile\nmonocle\nscroller\ntgmix\ngrid\ndeck\ncenter tile\nright tile\nvertical scroller\nvertical tile\nvertical grid\nvertical deck" | rofi -dmenu -p "Layout")
                 case "$L" in
diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index 301e9fa..a3af2f6 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -134,7 +134,6 @@ in
                 output_path = '~/.config/yazi/theme.toml'
               ''}
 
-
               ${lib.optionalString config.beeMods.dwm.enable ''
                 [templates.Xresources]
                 input_path = "~/.config/matugen/templates/colors-xresources"
@@ -183,6 +182,12 @@ in
                 # post_hook = "${update_gtkcolors}"
               ''}
 
+              ${lib.optionalString config.beeMods.beeVim.enable ''
+                [templates.neovim]
+                input_path = "~/.config/matugen/templates/neovim.json"
+                output_path = "~/.config/matugen/neovim_matugen.json"
+              ''}
+
               [templates.zed]
               input_path = '~/.config/matugen/templates/zed.json'
               output_path = '~/.config/zed/themes/matugen.json'
diff --git a/common/modules/matugen/templates/matugen-neovim.nix b/common/modules/matugen/templates/matugen-neovim.nix
new file mode 100644
index 0000000..dcb84a2
--- /dev/null
+++ b/common/modules/matugen/templates/matugen-neovim.nix
@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  ...
+}:
+{
+  config = lib.mkIf config.beeMods.beeVim.enable {
+    xdg.configFile = {
+      "matugen/templates/neovim.json" = {
+        text =
+          # json
+          ''
+            {
+                "source_color": "{{colors.primary.default.hex}}",
+                <* if {{ is_dark_mode }} *>
+                "background": "{{colors.background.default.hex}}",
+                <* else *>
+                "background": "{{colors.surface_container.default.hex}}",
+                <* endif *>
+                "harmony": 0.5,
+                "mode": "{{mode}}"
+            }
+          '';
+
+      };
+    };
+  };
+}
diff --git a/flake.lock b/flake.lock
index a498e40..9bdaf6c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,6 +7,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "plugins-base46-nvim": "plugins-base46-nvim",
         "plugins-lze": "plugins-lze",
         "plugins-lzextras": "plugins-lzextras",
         "plugins-neogit": "plugins-neogit",
@@ -14,11 +15,11 @@
         "plugins-rustaceanvim": "plugins-rustaceanvim"
       },
       "locked": {
-        "lastModified": 1773086970,
-        "narHash": "sha256-GeUZXdamD7+TKAxPTG7kQHDDk3MWALa3QpYHNrwn7rk=",
+        "lastModified": 1773522455,
+        "narHash": "sha256-GqX0MMC857VOfZh3Us3wiD6Q0rTf5ZyQc/Ln8nOfnfw=",
         "ref": "refs/heads/main",
-        "rev": "2479ff966522aeaad70f4260af1323dc637bc089",
-        "revCount": 4,
+        "rev": "308050915920dc2e78a22b974bc38ae7ffc51a37",
+        "revCount": 6,
         "type": "git",
         "url": "https://codeberg.org/brustybee/beeVim"
       },
@@ -496,6 +497,22 @@
         "type": "github"
       }
     },
+    "plugins-base46-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773491679,
+        "narHash": "sha256-oJkbSuuTlQkh74MTBlgjwfzu5ybelWjHUpr6EfIAeA4=",
+        "owner": "AvengeMedia",
+        "repo": "base46",
+        "rev": "b242464654a42310a1b76efe522ddbfb74c4847f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AvengeMedia",
+        "repo": "base46",
+        "type": "github"
+      }
+    },
     "plugins-lze": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index ce69870..265007e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     beeVim.url = "git+https://codeberg.org/brustybee/beeVim";
+    # beeVim.url = "git+file:/home/bee/beeVim";
     beeVim.inputs.nixpkgs.follows = "nixpkgs";
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/hosts/common.nix b/hosts/common.nix
index 035dbcf..8db2ecf 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -190,8 +190,8 @@
     nerd-fonts.jetbrains-mono
   ];
   fonts.fontconfig.defaultFonts.monospace = [
+    "JetBrainsMono Nerd Font"
     "Ioskeley Mono"
-    "JetBrainsMono Nerd Fonts"
     "Symbols Nerd Font"
   ];
   programs.fish.enable = true;
diff --git a/users/bee/default.nix b/users/bee/default.nix
index a777b81..72a6ed9 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -43,6 +43,7 @@
     matugen.enable = true;
     terminal = {
       foot = true;
+      font.family = "JetBrainsMono Nerd Font Mono";
     };
   };
 
diff --git a/users/common.nix b/users/common.nix
index 42ae12f..0df7167 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -102,6 +102,7 @@
     cava
     element-desktop
     zed-editor-fhs
+    wlsunset
     (pkgs.obsidian.override {
       electron = pkgs.electron_40;
     })