diff --git a/flake.lock b/flake.lock
index ccda59d..0270994 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753300020,
-        "narHash": "sha256-jRO3ELwG+FfYDBTDDhBJNjGuJjB4IgziuB1JWoz6l1A=",
+        "lastModified": 1755257397,
+        "narHash": "sha256-VU+OHexL2y6y7yrpEc6bZvYYwoQg6aZK1b4YxT0yZCk=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "90266818017f7a6885edc75eb4a13b68862675ea",
+        "rev": "6f9c3d4722aa253631644329f7bda60b1d3d1b97",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753373145,
-        "narHash": "sha256-UhuUj46dobD/POOdVNxKvAvP3luI2T0MZPm2IXl266Y=",
+        "lastModified": 1755229570,
+        "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "64796151f79e6f3834bfc55f07c5487708bb5b3f",
+        "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3",
         "type": "github"
       },
       "original": {
@@ -203,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752773918,
-        "narHash": "sha256-dOi/M6yNeuJlj88exI+7k154z+hAhFcuB8tZktiW7rg=",
+        "lastModified": 1755029779,
+        "narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=",
         "owner": "cachix",
         "repo": "nix",
-        "rev": "031c3cf42d2e9391eee373507d8c12e0f9606779",
+        "rev": "b0972b0eee6726081d10b1199f54de6d2917f861",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752985182,
-        "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=",
+        "lastModified": 1754800038,
+        "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c",
+        "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142",
         "type": "github"
       },
       "original": {
@@ -239,11 +239,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753250450,
-        "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
+        "lastModified": 1755186698,
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
         "type": "github"
       },
       "original": {
@@ -282,11 +282,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753335654,
-        "narHash": "sha256-XpegouCfuzYNECDpH0+J3UEdearlYhRkRgOZ97l16E8=",
+        "lastModified": 1753595452,
+        "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=",
         "ref": "refs/heads/master",
-        "rev": "f90bef2d994c88f075dbc2fcd81140e160351328",
-        "revCount": 654,
+        "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda",
+        "revCount": 665,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -335,11 +335,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752544651,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "lastModified": 1754988908,
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -370,11 +370,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752725859,
-        "narHash": "sha256-kjpmc7Y164ajPdscAZLFQTtzXP5sEE2dR30NuHe5lQY=",
+        "lastModified": 1754886070,
+        "narHash": "sha256-MZDmxOkVKL1HY72bliN8Gxh0SYkHUa3W/1fTU2ke36I=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "2276ddce91a949e0819d9e8c4b171c40ce770390",
+        "rev": "e37d2b326311320c8571111b3ef89b29d26d4b64",
         "type": "github"
       },
       "original": {
diff --git a/hosts/alys/configuration.nix b/hosts/alys/configuration.nix
index b42a768..78dcdcb 100644
--- a/hosts/alys/configuration.nix
+++ b/hosts/alys/configuration.nix
@@ -5,7 +5,7 @@
     ../../system
   ];
 
-  system = {
+  mySystem = {
     boot = {
       kernel.hardened = true;
       systemd-boot = false;
diff --git a/hosts/gampo/configuration.nix b/hosts/gampo/configuration.nix
index 4abc38e..e8bb093 100644
--- a/hosts/gampo/configuration.nix
+++ b/hosts/gampo/configuration.nix
@@ -7,11 +7,10 @@
   imports = [
     inputs.sops-nix.nixosModules.sops
     ./hardware-configuration.nix
-    # ./services
     ../../system
   ];
 
-  system = {
+  mySystem = {
     boot = {
       plymouth.enable = true;
       kernel = {
diff --git a/hosts/gampo/services/default.nix b/hosts/gampo/services/default.nix
deleted file mode 100644
index c2c19c3..0000000
--- a/hosts/gampo/services/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  # imports = [
-  #   ./gnome.nix
-  # ];
-
-  services = {
-    # Enable CUPS to print documents.
-    printing.enable = true;
-    openssh.enable = true;
-    fwupd.enable = true;
-    udev.extraRules = ''
-      ATTRS{name}=="*TPPS/2 IBM TrackPoint", ENV{ID_INPUT}="", ENV{ID_INPUT_MOUSE}="", ENV{ID_INPUT_POINTINGSTICK}=""
-    '';
-  };
-}
diff --git a/hosts/gampo/services/gnome.nix b/hosts/gampo/services/gnome.nix
deleted file mode 100644
index fc8177b..0000000
--- a/hosts/gampo/services/gnome.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  services.xserver = {
-    enable = true;
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
-    xkb = {
-      layout = "fr";
-      variant = "bepo";
-    };
-  };
-}
diff --git a/hosts/marpa/configuration.nix b/hosts/marpa/configuration.nix
index 934995c..a20606b 100644
--- a/hosts/marpa/configuration.nix
+++ b/hosts/marpa/configuration.nix
@@ -5,11 +5,11 @@
 }: {
   imports = [
     inputs.sops-nix.nixosModules.sops
-    ./system/hardware-configuration.nix
+    ./hardware-configuration.nix
     ../../system
   ];
 
-  system = {
+  mySystem = {
     boot = {
       extraModprobeConfig = ''
         options snd_usb_audio vid=0x1235 pid=0x8212 device_setup=1
diff --git a/hosts/marpa/system/hardware-configuration.nix b/hosts/marpa/hardware-configuration.nix
similarity index 100%
rename from hosts/marpa/system/hardware-configuration.nix
rename to hosts/marpa/hardware-configuration.nix
diff --git a/hosts/tilo/configuration.nix b/hosts/tilo/configuration.nix
index a35b7fb..a43894d 100644
--- a/hosts/tilo/configuration.nix
+++ b/hosts/tilo/configuration.nix
@@ -9,7 +9,7 @@
     ./services
   ];
 
-  system = {
+  mySystem = {
     boot = {
       kernel = {
         hardened = true;
diff --git a/system/boot/boot.nix b/system/boot/boot.nix
index ac08b6a..531049a 100644
--- a/system/boot/boot.nix
+++ b/system/boot/boot.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.boot;
+  cfg = config.mySystem.boot;
 in {
-  options.system.boot = {
+  options.mySystem.boot = {
     extraModprobeConfig = mkOption {
       type = types.lines;
       default = "";
@@ -51,7 +51,7 @@ in {
   };
 
   config.boot = {
-    initrd.kernelModules = lists.optional config.system.hardware.amdgpu.enable "amdgpu";
+    initrd.kernelModules = lists.optional config.mySystem.hardware.amdgpu.enable "amdgpu";
     loader = {
       systemd-boot.enable = cfg.systemd-boot;
       efi.canTouchEfiVariables = cfg.systemd-boot;
diff --git a/system/boot/plymouth.nix b/system/boot/plymouth.nix
index 84af272..e1e1cdb 100644
--- a/system/boot/plymouth.nix
+++ b/system/boot/plymouth.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.boot.plymouth;
+  cfg = config.mySystem.boot.plymouth;
 in {
-  options.system.boot.plymouth.enable = mkEnableOption "Enables Plymouth at system boot";
+  options.mySystem.boot.plymouth.enable = mkEnableOption "Enables Plymouth at system boot";
   config.boot = mkIf cfg.enable {
     plymouth = {
       inherit (cfg) enable;
diff --git a/system/boot/zram.nix b/system/boot/zram.nix
index 23856f0..a525d5a 100644
--- a/system/boot/zram.nix
+++ b/system/boot/zram.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.boot.zram;
+  cfg = config.mySystem.boot.zram;
 in {
-  options.system.boot.zram = {
+  options.mySystem.boot.zram = {
     enable = mkEnableOption "Enable ZRAM";
     memoryMax = mkOption {
       type = types.int;
diff --git a/system/default.nix b/system/default.nix
index 99a3608..569b5e4 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 with lib; let
-  cfg = config.system.misc;
+  cfg = config.mySystem.misc;
 in {
   imports = [
     ./boot
@@ -19,7 +19,7 @@ in {
     ./users
   ];
 
-  options.system.misc = {
+  options.mySystem.misc = {
     timezone = mkOption {
       type = types.str;
       default = "Europe/Paris";
diff --git a/system/desktop/hyprland.nix b/system/desktop/hyprland.nix
index b2d5613..0e4a780 100644
--- a/system/desktop/hyprland.nix
+++ b/system/desktop/hyprland.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.desktop.hyprland;
+  cfg = config.mySystem.desktop.hyprland;
 in {
-  options.system.desktop.hyprland.enable = mkEnableOption "Enables Hyprland";
+  options.mySystem.desktop.hyprland.enable = mkEnableOption "Enables Hyprland";
   config.programs.hyprland = mkIf cfg.enable {
     inherit (cfg) enable;
     withUWSM = true;
diff --git a/system/desktop/niri.nix b/system/desktop/niri.nix
index d1ccdc6..cab16f1 100644
--- a/system/desktop/niri.nix
+++ b/system/desktop/niri.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.desktop.niri;
+  cfg = config.mySystem.desktop.niri;
 in {
-  options.system.desktop.niri.enable = mkEnableOption "Enables Niri";
+  options.mySystem.desktop.niri.enable = mkEnableOption "Enables Niri";
   config.programs.niri = mkIf cfg.enable {
     inherit (cfg) enable;
   };
diff --git a/system/desktop/xserver.nix b/system/desktop/xserver.nix
index 1dabe41..f6ae789 100644
--- a/system/desktop/xserver.nix
+++ b/system/desktop/xserver.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.desktop.xserver;
+  cfg = config.mySystem.desktop.xserver;
 in {
-  options.system.desktop.xserver = {
+  options.mySystem.desktop.xserver = {
     enable = mkEnableOption "Enables xserver";
     de = mkOption {
       type = types.enum ["gnome" "kde"];
@@ -35,7 +35,7 @@ in {
 
     xserver = {
       inherit (cfg) enable;
-      videoDrivers = lists.optional config.system.hardware.amdgpu.enable "amdgpu";
+      videoDrivers = lists.optional config.mySystem.hardware.amdgpu.enable "amdgpu";
       xkb = {
         layout = "fr";
         variant = "bepo_afnor";
diff --git a/system/dev/docker.nix b/system/dev/docker.nix
index 4a058c6..9b4e76c 100644
--- a/system/dev/docker.nix
+++ b/system/dev/docker.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.dev.docker;
+  cfg = config.mySystem.dev.docker;
 in {
-  options.system.dev.docker = {
+  options.mySystem.dev.docker = {
     enable = mkEnableOption "Enable Docker";
     podman.enable = mkEnableOption "Enable Podman rather than Docker";
     nvidia.enable = mkEnableOption "Activate Nvidia support";
diff --git a/system/hardware/amdgpu.nix b/system/hardware/amdgpu.nix
index 8464f13..ac588ab 100644
--- a/system/hardware/amdgpu.nix
+++ b/system/hardware/amdgpu.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.hardware.amdgpu;
+  cfg = config.mySystem.hardware.amdgpu;
 in {
-  options.system.hardware.amdgpu.enable = mkEnableOption "Enables an AMD GPU configuration";
+  options.mySystem.hardware.amdgpu.enable = mkEnableOption "Enables an AMD GPU configuration";
   config = mkIf cfg.enable {
     systemd.tmpfiles.rules = [
       "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
diff --git a/system/hardware/bluetooth.nix b/system/hardware/bluetooth.nix
index 276410f..bdd0706 100644
--- a/system/hardware/bluetooth.nix
+++ b/system/hardware/bluetooth.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.hardware.bluetooth;
+  cfg = config.mySystem.hardware.bluetooth;
 in {
-  options.system.hardware.bluetooth.enable = mkEnableOption "Enable bluetooth";
+  options.mySystem.hardware.bluetooth.enable = mkEnableOption "Enable bluetooth";
   config = mkIf cfg.enable {
     hardware.bluetooth.enable = cfg.enable;
     services.blueman.enable = cfg.enable;
diff --git a/system/hardware/corne.nix b/system/hardware/corne.nix
index 4f0e095..9929cf4 100644
--- a/system/hardware/corne.nix
+++ b/system/hardware/corne.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.hardware.corne;
+  cfg = config.mySystem.hardware.corne;
 in {
-  options.system.hardware.corne.allowHidAccess = mkEnableOption "Enable HID access to the corne keyboard";
+  options.mySystem.hardware.corne.allowHidAccess = mkEnableOption "Enable HID access to the corne keyboard";
   config.services.udev = mkIf cfg.allowHidAccess {
     extraRules = ''
       KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
diff --git a/system/hardware/ibm-trackpoint.nix b/system/hardware/ibm-trackpoint.nix
index e54887e..8e4edd7 100644
--- a/system/hardware/ibm-trackpoint.nix
+++ b/system/hardware/ibm-trackpoint.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.hardware.ibmTrackpoint;
+  cfg = config.mySystem.hardware.ibmTrackpoint;
 in {
-  options.system.hardware.ibmTrackpoint.disable = mkEnableOption "Disable IBM’s trackpoint on ThinkPad";
+  options.mySystem.hardware.ibmTrackpoint.disable = mkEnableOption "Disable IBM’s trackpoint on ThinkPad";
   config.services.udev = mkIf cfg.disable {
     extraRules = ''
       ATTRS{name}=="*TPPS/2 IBM TrackPoint", ENV{ID_INPUT}="", ENV{ID_INPUT_MOUSE}="", ENV{ID_INPUT_POINTINGSTICK}=""
diff --git a/system/hardware/opentablet.nix b/system/hardware/opentablet.nix
index c150118..b93b28b 100644
--- a/system/hardware/opentablet.nix
+++ b/system/hardware/opentablet.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.hardware.opentablet;
+  cfg = config.mySystem.hardware.opentablet;
 in {
-  options.system.hardware.opentablet.enable = mkEnableOption "Enables OpenTablet drivers";
+  options.mySystem.hardware.opentablet.enable = mkEnableOption "Enables OpenTablet drivers";
   config.hardware.opentabletdriver = mkIf cfg.enable {
     inherit (cfg) enable;
     daemon.enable = true;
diff --git a/system/hardware/sound.nix b/system/hardware/sound.nix
index cf226ad..d8e2805 100644
--- a/system/hardware/sound.nix
+++ b/system/hardware/sound.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.hardware.sound;
+  cfg = config.mySystem.hardware.sound;
 in {
-  options.system.hardware.sound = {
+  options.mySystem.hardware.sound = {
     enable = mkEnableOption "Whether to enable sounds with Pipewire";
     scarlett.enable = mkEnableOption "Activate support for Scarlett sound card";
     alsa = mkOption {
diff --git a/system/network/networking.nix b/system/network/networking.nix
index dd45906..8251e06 100644
--- a/system/network/networking.nix
+++ b/system/network/networking.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.networking;
+  cfg = config.mySystem.networking;
 in {
-  options.system.networking = with types; {
+  options.mySystem.networking = with types; {
     hostname = mkOption {
       type = str;
       example = "gampo";
diff --git a/system/packages/appimage.nix b/system/packages/appimage.nix
index b3f4f05..607b3cf 100644
--- a/system/packages/appimage.nix
+++ b/system/packages/appimage.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.packages.appimage;
+  cfg = config.mySystem.packages.appimage;
 in {
-  options.system.packages.appimage.enable = mkEnableOption "Enables AppImage support";
+  options.mySystem.packages.appimage.enable = mkEnableOption "Enables AppImage support";
   config.programs.appimage = mkIf cfg.enable {
     inherit (cfg) enable;
     binfmt = true;
diff --git a/system/packages/flatpak.nix b/system/packages/flatpak.nix
index ebd3efc..b510141 100644
--- a/system/packages/flatpak.nix
+++ b/system/packages/flatpak.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.packages.flatpak;
+  cfg = config.mySystem.packages.flatpak;
 in {
-  options.system.packages.flatpak = {
+  options.mySystem.packages.flatpak = {
     enable = mkEnableOption "Enable Flatpak support";
     builder.enable = mkEnableOption "Enable Flatpak builder";
   };
diff --git a/system/packages/nix.nix b/system/packages/nix.nix
index 5413222..3f2858e 100644
--- a/system/packages/nix.nix
+++ b/system/packages/nix.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.packages.nix;
+  cfg = config.mySystem.packages.nix;
 in {
-  options.system.packages.nix = {
+  options.mySystem.packages.nix = {
     allowUnfree = mkEnableOption "Enable unfree packages";
     disableSandbox = mkEnableOption "Disable Nix sandbox";
     gc = {
diff --git a/system/packages/steam.nix b/system/packages/steam.nix
index f63cdf6..4a4a2cc 100644
--- a/system/packages/steam.nix
+++ b/system/packages/steam.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.programs.steam;
+  cfg = config.mySystem.programs.steam;
 in {
-  options.system.programs.steam.enable = mkEnableOption "Enables Steam and Steam hardware";
+  options.mySystem.programs.steam.enable = mkEnableOption "Enables Steam and Steam hardware";
   config = mkIf cfg.enable {
     programs = {
       steam = {
diff --git a/system/services/calibre.nix b/system/services/calibre.nix
index e891915..c1bfd5c 100644
--- a/system/services/calibre.nix
+++ b/system/services/calibre.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.calibre;
+  cfg = config.mySystem.services.calibre;
 in {
-  options.system.services.calibre = {
+  options.mySystem.services.calibre = {
     enable = mkEnableOption "Enable Calibre Web";
     user = mkOption {
       type = types.string;
diff --git a/system/services/endlessh.nix b/system/services/endlessh.nix
index 925606e..09488bb 100644
--- a/system/services/endlessh.nix
+++ b/system/services/endlessh.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.endlessh;
+  cfg = config.mySystem.services.endlessh;
 in {
-  options.system.services.endlessh = {
+  options.mySystem.services.endlessh = {
     enable = mkEnableOption "Enables endlessh.";
     port = mkOption {
       type = types.port;
diff --git a/system/services/fwupd.nix b/system/services/fwupd.nix
index d11d76d..fad0da2 100644
--- a/system/services/fwupd.nix
+++ b/system/services/fwupd.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.fwupd;
+  cfg = config.mySystem.services.fwupd;
 in {
-  options.system.services.fwupd.enable = mkEnableOption "Enable fwupd";
+  options.mySystem.services.fwupd.enable = mkEnableOption "Enable fwupd";
   config.services.fwupd = mkIf cfg.enable {
     inherit (cfg) enable;
   };
diff --git a/system/services/jellyfin.nix b/system/services/jellyfin.nix
index b8ea91a..a3e4d7b 100644
--- a/system/services/jellyfin.nix
+++ b/system/services/jellyfin.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.jellyfin;
+  cfg = config.mySystem.services.jellyfin;
 in {
-  options.system.services.jellyfin = {
+  options.mySystem.services.jellyfin = {
     enable = mkEnableOption "Enable Jellyfin";
     dataDir = mkOption {
       type = types.string;
diff --git a/system/services/plex.nix b/system/services/plex.nix
index 70912b0..6bade38 100644
--- a/system/services/plex.nix
+++ b/system/services/plex.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.plex;
+  cfg = config.mySystem.services.plex;
 in {
-  options.system.services.plex = {
+  options.mySystem.services.plex = {
     enable = mkEnableOption "Enable Plex";
     group = mkOption {
       type = types.string;
diff --git a/system/services/printing.nix b/system/services/printing.nix
index 85babd9..516f994 100644
--- a/system/services/printing.nix
+++ b/system/services/printing.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.printing;
+  cfg = config.mySystem.services.printing;
 in {
-  options.system.services.printing.enable = mkEnableOption "Enable printing with CUPS";
+  options.mySystem.services.printing.enable = mkEnableOption "Enable printing with CUPS";
   config.services.printing = mkIf cfg.enable {
     inherit (cfg) enable;
   };
diff --git a/system/services/ssh.nix b/system/services/ssh.nix
index 264b6f2..9aec9fd 100644
--- a/system/services/ssh.nix
+++ b/system/services/ssh.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.ssh;
+  cfg = config.mySystem.services.ssh;
 in {
-  options.system.services.ssh = {
+  options.mySystem.services.ssh = {
     enable = mkEnableOption "Enables OpenSSH";
     allowedUsers = mkOption {
       type = types.listOf types.str;
diff --git a/system/services/sunshine.nix b/system/services/sunshine.nix
index 8e7cd9e..7625b15 100644
--- a/system/services/sunshine.nix
+++ b/system/services/sunshine.nix
@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.services.sunshine;
+  cfg = config.mySystem.services.sunshine;
 in {
-  options.system.services.sunshine = {
+  options.mySystem.services.sunshine = {
     enable = mkEnableOption "Enables Sunshine";
     autostart = mkEnableOption "Enables autostart";
   };
@@ -15,6 +15,6 @@ in {
     autoStart = cfg.autostart;
     capSysAdmin = true;
     openFirewall = true;
-    settings.sunshine_name = config.system.networking.hostname;
+    settings.sunshine_name = config.mySystem.networking.hostname;
   };
 }
diff --git a/system/users/phundrak.nix b/system/users/phundrak.nix
index aaa70a2..f364888 100644
--- a/system/users/phundrak.nix
+++ b/system/users/phundrak.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.system.users;
+  cfg = config.mySystem.users;
 in {
-  options.system.users = {
+  options.mySystem.users = {
     root.disablePassword = mkEnableOption "Disables root password";
     phundrak.enable = mkEnableOption "Enables users phundrak";
   };