diff --git a/modules/nix/browser/default.nix b/modules/nix/browser/default.nix index a2e34d7..5099124 100644 --- a/modules/nix/browser/default.nix +++ b/modules/nix/browser/default.nix @@ -1,8 +1,6 @@ { ... }: { imports = [ - ./firefox.nix - ./librewolf.nix ./chromium.nix ]; } diff --git a/modules/nix/browser/firefox.nix b/modules/nix/browser/firefox.nix deleted file mode 100644 index 612e97a..0000000 --- a/modules/nix/browser/firefox.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, config, ... }: -let - inherit (lib) mkIf mkOption types; -in -{ - options.smayzy.firefox.enable = mkOption { - type = types.bool; - default = false; - description = "firefox"; - }; - - config = mkIf config.smayzy.firefox.enable { - programs.firefox.enable = true; - }; -} diff --git a/modules/nix/browser/librewolf.nix b/modules/nix/browser/librewolf.nix deleted file mode 100644 index 1402d62..0000000 --- a/modules/nix/browser/librewolf.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -let - inherit (lib) mkIf mkOption types; -in -{ - options.smayzy.librewolf.enable = mkOption { - type = types.bool; - default = false; - description = "librewolf"; - }; - - config = mkIf config.smayzy.librewolf.enable { - environment.systemPackages = with pkgs; [ librewolf ]; - }; -} diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index b78dc09..0aea806 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, pkgs, ... }: let inherit (lib) mkIf mkOption types; in @@ -15,8 +15,6 @@ in power = "desktop"; steam.enable = true; prism.enable = true; - firefox.enable = true; - librewolf.enable = true; audio.enable = true; office.enable = true; element.enable = true; @@ -50,5 +48,7 @@ in bitwarden.enable = true; alacritty.enable = true; }; + programs.firefox.enable = true; + environment.systemPackages = with pkgs; [ librewolf ]; }; } diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index 9ea141a..cd71883 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -20,8 +20,6 @@ in power = "laptop"; grub-on-lap.enable = true; prism.enable = true; - firefox.enable = true; - librewolf.enable = true; audio.enable = true; office.enable = true; element.enable = true; @@ -53,7 +51,9 @@ in bitwarden.enable = true; steam.enable = true; }; + programs.firefox.enable = true; + networking.networkmanager.enable = true; - environment.systemPackages = with pkgs; [ networkmanagerapplet ]; + environment.systemPackages = with pkgs; [ networkmanagerapplet librewolf]; }; }