Added mako modue

modules/users/modules/default.nix

@@ -9,6 +9,7 @@
     ./firefox/default.nix
     ./fontconfig/default.nix
     ./foot/default.nix
+    ./mako/default.nix
     ./obsidian/default.nix
     ./shell/bash.nix
     ./shell/fish.nix

modules/users/modules/feishin/default.nix

@@ -1,11 +1,12 @@
 {config, lib, pkgs, ... }:
 
+with lib;
 let
   cfg = config.modules.feishin;
 in {
-  options.modules.feishin.enable = lib.mkEnableOption "feishin";
+  options.modules.feishin.enable = mkEnableOption "feishin";
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     home.packages = with pkgs; [
       feishin
     ];

modules/users/modules/mako/default.nix

@@ -0,0 +1,25 @@
+{config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.modules.mako;
+  theme = config.theming;
+  colors = theme.colors;
+in {
+  options.modules.mako.enable = mkEnableOption "mako";
+
+  config = mkIf cfg.enable {
+    services.mako = {
+      enable = true;
+      anchor = "top-right";
+      defaultTimeout = 5000;
+      backgroundColor = "#${colors.bg}ff";
+      textColor = "#${colors.fg}ff";
+      borderColor = "#${colors.fg}ff";
+      progressColor = "#${colors.accent}ff";
+      borderRadius = 0;
+      borderSize = theme.layout.borderSize;
+      font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}";
+    };
+  };
+}

modules/users/modules/theming/default.nix

@@ -119,6 +119,10 @@ in {
         type = types.str;
         default = colors.base05;
       };
+      accent = mkOption {
+        type = types.str;
+        default = colors.base09;
+      };
       focused = mkOption {
         type = types.str;
         default = cfg.colors.fg;

users/jan.nix

@@ -24,6 +24,8 @@
       # Programs
       feishin.enable = true;
       firefox.enable = true;
+      foot.enable = true;
+      mako.enable = true;
       vscode.enable = true;
       zathura.enable = true;
       fish.enable = true;

users/janMerged.nix

@@ -529,18 +529,18 @@ in {
 #    };
 
   # Mako notifications setup
-  services.mako = {
-    enable = true;
-    anchor = "top-right";
-    defaultTimeout = 5000;
-    backgroundColor = "#${colors.base00}ff";
-    textColor = "#${colors.base05}ff";
-    borderColor = "#${colors.base05}ff";
-    progressColor = "#${colors.base09}ff";
-    borderRadius = 0;
-    borderSize = borderSize;
-    font = "${fonts.monospace.name} ${toString fonts.sizes.terminal}";
-  };
+  # services.mako = {
+  #   enable = true;
+  #   anchor = "top-right";
+  #   defaultTimeout = 5000;
+  #   backgroundColor = "#${colors.base00}ff";
+  #   textColor = "#${colors.base05}ff";
+  #   borderColor = "#${colors.base05}ff";
+  #   progressColor = "#${colors.base09}ff";
+  #   borderRadius = 0;
+  #   borderSize = borderSize;
+  #   font = "${fonts.monospace.name} ${toString fonts.sizes.terminal}";
+  # };
 
   # Waybar setup
   programs.waybar = {