From 3864013e1adc737c54a2b29d902297c83b07527b Mon Sep 17 00:00:00 2001 From: smayzy Date: Thu, 10 Jul 2025 16:28:08 +0200 Subject: [PATCH] mv basic gui utilities to module --- hosts/common/common.nix | 10 ---------- modules/nix/default.nix | 1 + modules/nix/groups/desktop.nix | 1 + modules/nix/groups/laptop.nix | 1 + modules/nix/utilities/default.nix | 6 ++++++ modules/nix/utilities/gui-utilities.nix | 26 +++++++++++++++++++++++++ 6 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 modules/nix/utilities/default.nix create mode 100644 modules/nix/utilities/gui-utilities.nix diff --git a/hosts/common/common.nix b/hosts/common/common.nix index 15c66e1..df6aea5 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -20,27 +20,17 @@ font-awesome thunderbird lf - qalculate-qt - baobab arduino-ide piper calibre - loupe - gimp3 base16-schemes tor - wireshark tshark freecad-wayland aegisub - audacity mpv fritzing - networkmanagerapplet - gparted - gnome-disk-utility sl - vlc ]; services.ratbagd.enable = true; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index c0b81a3..53a4a78 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -16,6 +16,7 @@ ./comm ./displaymanager ./vpn + ./utilities ]; # Timzone and locales (same for all machines so I put it here) diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index 1a154c1..d4aea7d 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -24,6 +24,7 @@ in webcord.enable = true; sddm.enable = true; mullvad.enable = true; + gui-utilities.enable = true; }; }; } diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index d56ee83..8dc5663 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -24,6 +24,7 @@ in element.enable = true; sddm.enable = true; mullvad.enable = true; + gui-utilities.enable = true; }; services.logind.lidSwitch = "ignore"; }; diff --git a/modules/nix/utilities/default.nix b/modules/nix/utilities/default.nix new file mode 100644 index 0000000..8972661 --- /dev/null +++ b/modules/nix/utilities/default.nix @@ -0,0 +1,6 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + ./gui-utilities.nix + ]; +} diff --git a/modules/nix/utilities/gui-utilities.nix b/modules/nix/utilities/gui-utilities.nix new file mode 100644 index 0000000..b73a35d --- /dev/null +++ b/modules/nix/utilities/gui-utilities.nix @@ -0,0 +1,26 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.gui-utilities.enable = mkOption { + type = types.bool; + default = false; + description = "basic gui-utilities"; + }; + + config = mkIf config.smayzy.gui-utilities.enable { + environment.systemPackages = with pkgs; [ + qalculate-qt + baobab + loupe + gimp3 + wireshark + audacity + networkmanagerapplet + gparted + gnome-disk-utility + vlc + ]; + }; +}