important stuff

2 files changed, 37 insertions, 19 deletions

diff --git a/users/bee/default.nix b/users/bee/default.nix
index 3c6db48..a7feb46 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -14,23 +14,40 @@
     ../common.nix
     beeMods
     programs
-    inputs.dms.homeModules.dank-material-shell
+    inputs.noctalia.homeModules.default
+    inputs.beevim.homeModules.default
   ];
 
-  programs.dank-material-shell = {
-    enable = true;
+  wrappers.neovim.enable = true;
 
-    systemd = {
-      enable = true;
-      restartIfChanged = true;
+  programs.noctalia-shell = {
+    enable = true;
+    user-templates = {
+      config = { };
+      templates = {
+        nvim = {
+          input_path = "~/.config/matugen/templates/neovim.lua";
+          output_path = "~/.config/nvim/colors/matugen.lua";
+        };
+        neovim = {
+          input_path = "~/.config/matugen/templates/neovim.json";
+          output_path = "~/.config/nvim/colors.json";
+        };
+        equibop = {
+          input_path = "~/.config/matugen/templates/discord.css";
+          output_path = "~/.config/equibop/themes/matugen-sys24.css";
+        };
+        xresources = {
+          input_path = "~/.config/matugen/templates/colors-xresources";
+          output_path = "~/.config/x11/matugen.Xresources";
+        };
+        seq = lib.mkIf (config.beeMods.terminal.default == "foot") {
+          input_path = "~/.config/matugen/templates/sequences";
+          output_path = "~/.config/sequences";
+          post_hook = "sh '${config.home.homeDirectory}/.config/sequences'";
+        };
+      };
     };
-
-    enableSystemMonitoring = true;
-    enableVPN = true;
-    enableDynamicTheming = true;
-    enableAudioWavelength = true;
-    enableCalendarEvents = false;
-    enableClipboardPaste = true;
   };
 
   beeMods = {
@@ -51,7 +68,8 @@
     matugen.enable = true;
     emacs.enable = false;
     terminal = {
-      foot = true;
+      alacritty = true;
+      default = "alacritty";
       font.family = "IosevkaInput";
       font.size = 11.0;
     };
diff --git a/users/common.nix b/users/common.nix
index 5e0386c..ff7652e 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -86,7 +86,7 @@ in
         gtk-decoration-layout = ":";
       };
       extraCss = ''
-        @import url("dank-colors.css");
+        @import url("noctalia.css");
       '';
     };
 
@@ -97,7 +97,7 @@ in
         gtk-decoration-layout = ":";
       };
       extraCss = ''
-        @import url("dank-colors.css");
+        @import url("noctalia.css");
       '';
     };
   };
@@ -136,12 +136,12 @@ in
     nautilus
     imv
     gnome-calculator
-    gpu-screen-recorder-gtk
     accountsservice
     equibop
     fastfetch
-    clang-tools
+    imagemagick
     clang
-    neovim
+    gpu-screen-recorder
+    unzip
   ];
 }