From 614a10248f7c2087e40652ce521e1fffaa8883fd Mon Sep 17 00:00:00 2001 From: smayzy Date: Tue, 29 Jul 2025 18:05:45 +0200 Subject: [PATCH] mv mako to module --- dotfiles/mako/config | 5 ----- modules/home-manager/default.nix | 1 + modules/home-manager/notif/default.nix | 6 ++++++ modules/home-manager/notif/mako.nix | 18 ++++++++++++++++++ modules/home-manager/wm/hyprland.nix | 5 ----- modules/nix/default.nix | 1 + modules/nix/notif/default.nix | 6 ++++++ modules/nix/notif/mako.nix | 17 +++++++++++++++++ modules/nix/wm/hyprland.nix | 3 ++- 9 files changed, 51 insertions(+), 11 deletions(-) delete mode 100644 dotfiles/mako/config create mode 100644 modules/home-manager/notif/default.nix create mode 100644 modules/home-manager/notif/mako.nix create mode 100644 modules/nix/notif/default.nix create mode 100644 modules/nix/notif/mako.nix diff --git a/dotfiles/mako/config b/dotfiles/mako/config deleted file mode 100644 index e92c15d..0000000 --- a/dotfiles/mako/config +++ /dev/null @@ -1,5 +0,0 @@ -font=JetBrainsMono 10 -background-color=#282828 -text-color=#ebdbb2 -border-color=#98971a -border-size=2 diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 43bcb09..6f07498 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -2,6 +2,7 @@ { imports = [ ./lf + ./notif ./terminal ./wm/hyprland.nix ]; diff --git a/modules/home-manager/notif/default.nix b/modules/home-manager/notif/default.nix new file mode 100644 index 0000000..ccaba9e --- /dev/null +++ b/modules/home-manager/notif/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ + ./mako.nix + ]; +} diff --git a/modules/home-manager/notif/mako.nix b/modules/home-manager/notif/mako.nix new file mode 100644 index 0000000..f16d508 --- /dev/null +++ b/modules/home-manager/notif/mako.nix @@ -0,0 +1,18 @@ +{ lib, smayzy, ... }: +let + inherit (lib) mkIf; +in +{ + config = mkIf smayzy.mako.enable { + services.mako = { + enable = true; + settings = { + font="JetBrainsMono 10"; + background-color="#282828"; + text-color="#ebdbb2"; + border-color="#98971a"; + border-size=2; + }; + }; + }; +} diff --git a/modules/home-manager/wm/hyprland.nix b/modules/home-manager/wm/hyprland.nix index 07e35ac..2e5dafa 100644 --- a/modules/home-manager/wm/hyprland.nix +++ b/modules/home-manager/wm/hyprland.nix @@ -1,6 +1,5 @@ { lib, - config, pkgs, smayzy, ... @@ -13,10 +12,6 @@ in home.file = lib.mkMerge [ { - ".config/mako/config" = { - source = builtins.toPath ../../../dotfiles/mako/config; - force = true; - }; ".config/wofi" = { source = builtins.toPath ../../../dotfiles/wofi; recursive = true; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index b1429fa..509e64b 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -14,6 +14,7 @@ ./groups ./hardware ./ide + ./notif ./office ./rice ./shell diff --git a/modules/nix/notif/default.nix b/modules/nix/notif/default.nix new file mode 100644 index 0000000..ccaba9e --- /dev/null +++ b/modules/nix/notif/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ + ./mako.nix + ]; +} diff --git a/modules/nix/notif/mako.nix b/modules/nix/notif/mako.nix new file mode 100644 index 0000000..8d3b29d --- /dev/null +++ b/modules/nix/notif/mako.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ...}: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.mako.enable = mkOption { + type = types.bool; + default = false; + description = "mako"; + }; + + config = mkIf config.smayzy.mako.enable { + environment.systemPackages = with pkgs; [ + mako + ]; + }; +} diff --git a/modules/nix/wm/hyprland.nix b/modules/nix/wm/hyprland.nix index f966bd7..0f99527 100644 --- a/modules/nix/wm/hyprland.nix +++ b/modules/nix/wm/hyprland.nix @@ -25,8 +25,9 @@ in fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono ]; + smayzy.mako.enable = true; + environment.systemPackages = with pkgs; [ - mako wofi wlogout waybar