hosts/common/common.nix

@@ -24,10 +24,13 @@
     baobab
     arduino-ide
     piper
+    element-desktop
     calibre
     loupe
     gimp3
     mullvad-vpn
+    libreoffice-qt6-still
+    hunspellDicts.fr-any
     base16-schemes
     tor
     wireshark

hosts/desktop1/configuration.nix

@@ -40,6 +40,7 @@
   services.displayManager.sddm.wayland.enable = true;
 
   environment.systemPackages = with pkgs; [
+  webcord
   obsidian
   libsForQt5.kdenlive
   komikku

hosts/laptop1/configuration.nix

@@ -29,6 +29,7 @@
   services.displayManager.sddm.wayland.enable = true;
 
   environment.systemPackages = with pkgs; [
+  webcord
   obsidian
   libsForQt5.kdenlive
   floorp

modules/nix/comm/default.nix

@@ -1,7 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./element.nix
-    ./webcord.nix
-  ];
-}

modules/nix/comm/element.nix

@@ -1,17 +0,0 @@
-{  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
-    ];
-  };
-}

modules/nix/comm/webcord.nix

@@ -1,17 +0,0 @@
-{  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
-    ];
-  };
-}

modules/nix/default.nix

@@ -12,8 +12,6 @@
     ./groups
     ./wm
     ./de
-    ./office
-    ./comm
   ];
 
   # Timzone and locales (same for all machines so I put it here)

modules/nix/groups/desktop.nix

@@ -19,9 +19,6 @@ in
       librewolf.enable = true;
       stylix.enable = true;
       audio.enable = true;
-      office.enable = true;
-      element.enable = true;
-      webcord.enable = true;
     };
   };
 }

modules/nix/groups/laptop.nix

@@ -19,9 +19,6 @@ in
       floorp.enable = true;
       stylix.enable = true;
       audio.enable = true;
-      office.enable= true;
-      webcord.enable = true;
-      element.enable = true;
     };
     services.logind.lidSwitch = "ignore";
   };

modules/nix/office/default.nix

@@ -1,6 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./office.nix
-  ];
-}

modules/nix/office/office.nix

@@ -1,18 +0,0 @@
-{  lib, config, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.office.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "office";
-  };
-
-  config = mkIf config.smayzy.office.enable {
-    environment.systemPackages = with pkgs; [
-      libreoffice-qt6-still
-      hunspellDicts.fr-any
-    ];
-  };
-}