From 4186ce739b8a01ecd2f833c537d7e9db4e93d165 Mon Sep 17 00:00:00 2001 From: smayzy Date: Wed, 9 Jul 2025 13:39:58 +0200 Subject: [PATCH] webcord and element to modules --- hosts/common/common.nix | 1 - hosts/desktop1/configuration.nix | 1 - hosts/laptop1/configuration.nix | 1 - modules/nix/comm/default.nix | 7 +++++++ modules/nix/comm/element.nix | 17 +++++++++++++++++ modules/nix/comm/webcord.nix | 17 +++++++++++++++++ modules/nix/default.nix | 1 + 7 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 modules/nix/comm/default.nix create mode 100644 modules/nix/comm/element.nix create mode 100644 modules/nix/comm/webcord.nix diff --git a/hosts/common/common.nix b/hosts/common/common.nix index b80a235..f70f4fe 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -24,7 +24,6 @@ baobab arduino-ide piper - element-desktop calibre loupe gimp3 diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix index b856cf0..f91cb25 100644 --- a/hosts/desktop1/configuration.nix +++ b/hosts/desktop1/configuration.nix @@ -40,7 +40,6 @@ services.displayManager.sddm.wayland.enable = true; environment.systemPackages = with pkgs; [ - webcord obsidian libsForQt5.kdenlive komikku diff --git a/hosts/laptop1/configuration.nix b/hosts/laptop1/configuration.nix index 40868c6..3e1dcf4 100644 --- a/hosts/laptop1/configuration.nix +++ b/hosts/laptop1/configuration.nix @@ -29,7 +29,6 @@ services.displayManager.sddm.wayland.enable = true; environment.systemPackages = with pkgs; [ - webcord obsidian libsForQt5.kdenlive floorp diff --git a/modules/nix/comm/default.nix b/modules/nix/comm/default.nix new file mode 100644 index 0000000..4d7d868 --- /dev/null +++ b/modules/nix/comm/default.nix @@ -0,0 +1,7 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + ./element.nix + ./webcord.nix + ]; +} diff --git a/modules/nix/comm/element.nix b/modules/nix/comm/element.nix new file mode 100644 index 0000000..2402b50 --- /dev/null +++ b/modules/nix/comm/element.nix @@ -0,0 +1,17 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.element.enable = mkOption { + type = types.bool; + default = false; + description = "element"; + }; + + config = mkIf config.smayzy.element.enable { + environment.systemPackages = with pkgs; [ + element-desktop + ]; + }; +} diff --git a/modules/nix/comm/webcord.nix b/modules/nix/comm/webcord.nix new file mode 100644 index 0000000..5c632fa --- /dev/null +++ b/modules/nix/comm/webcord.nix @@ -0,0 +1,17 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.webcord.enable = mkOption { + type = types.bool; + default = false; + description = "webcord"; + }; + + config = mkIf config.smayzy.webcord.enable { + environment.systemPackages = with pkgs; [ + webcord + ]; + }; +} diff --git a/modules/nix/default.nix b/modules/nix/default.nix index ec89ed2..1588cfa 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -13,6 +13,7 @@ ./wm ./de ./office + ./comm ]; # Timzone and locales (same for all machines so I put it here)