diff --git a/modules/home-manager/notif/mako.nix b/modules/home-manager/notif/mako.nix index 4353c5f..1d81699 100644 --- a/modules/home-manager/notif/mako.nix +++ b/modules/home-manager/notif/mako.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf; in { - config = mkIf smayzy.mako.enable { + config = mkIf smayzy.hyprland.enable { services.mako = { enable = true; settings = { diff --git a/modules/nix/default.nix b/modules/nix/default.nix index eaa5357..fe2ba63 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -18,7 +18,6 @@ ./ide ./isolation ./networking - ./notif ./office ./shell ./terminal diff --git a/modules/nix/notif/default.nix b/modules/nix/notif/default.nix deleted file mode 100644 index ccaba9e..0000000 --- a/modules/nix/notif/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ - ./mako.nix - ]; -} diff --git a/modules/nix/notif/mako.nix b/modules/nix/notif/mako.nix deleted file mode 100644 index c02c227..0000000 --- a/modules/nix/notif/mako.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - 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 3080440..1355928 100644 --- a/modules/nix/wm/hyprland.nix +++ b/modules/nix/wm/hyprland.nix @@ -25,8 +25,6 @@ in fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono ]; - smayzy.mako.enable = true; - smayzy.kitty.enable = true; environment.systemPackages = with pkgs; [ @@ -42,6 +40,7 @@ in cliphist grim slurp + mako ]; }; }