diff --git a/systems/PC-Fixe/configuration.nix b/systems/PC-Fixe/configuration.nix
index 6caccbf..eac4b97 100644
--- a/systems/PC-Fixe/configuration.nix
+++ b/systems/PC-Fixe/configuration.nix
@@ -82,8 +82,10 @@
     esphome
   ];
 
-  programs.wireshark.enable = true;
-  programs.wireshark.package = pkgs.wireshark;
+  programs = {
+    wireshark.enable = true;
+    alvr.enable = true;
+  };
 
   networking.firewall.enable = false;
 
diff --git a/systems/common-cli.nix b/systems/common-cli.nix
index 031f53e..3b5e1af 100644
--- a/systems/common-cli.nix
+++ b/systems/common-cli.nix
@@ -30,7 +30,6 @@
     })
 
     # Gestionnaires de version
-    gitMinimal
     tig
     gitAndTools.hub
     quilt
@@ -104,6 +103,8 @@
     bash.interactiveShellInit = ''
       eval "$(starship init bash)"
     '';
+
+    git.enable = true;
   };
 
   environment.variables = let
diff --git a/systems/common-gui.nix b/systems/common-gui.nix
index 99b065c..5de6654 100644
--- a/systems/common-gui.nix
+++ b/systems/common-gui.nix
@@ -61,7 +61,6 @@
 
     glxinfo
     i7z
-    appimage-run
     pavucontrol
   ];
 
@@ -71,31 +70,26 @@
 
   console.keyMap = "fr";
 
-  programs.steam.enable = true;
-  programs.firefox.enable = true;
-
-  security.rtkit.enable = true;
-
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
   networking.networkmanager.enable = true;
 
   systemd.extraConfig = "DefaultLimitNOFILE=1048576";
-  security.pam.loginLimits = [{
-    domain = "*";
-    type = "hard";
-    item = "nofile";
-    value = "1048576";
-  }];
+
+  security = {
+    pam.loginLimits = [{
+      domain = "*";
+      type = "hard";
+      item = "nofile";
+      value = "1048576";
+    }];
+    rtkit.enable = true;
+  };
 
   programs = {
     gnupg.agent = { enable = true; enableSSHSupport = true; };
     browserpass.enable = true;
+    steam.enable = true;
+    firefox.enable = true;
+    appimage.enable = true;
   };
 
   services = {
@@ -113,6 +107,12 @@
       exportConfiguration = true;
       desktopManager.plasma5.enable = true;
     };
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
     udev.packages = with pkgs; [ ledger-udev-rules ];
     pcscd.enable = true;
   };