diff --git a/flake.nix b/flake.nix
index d5a55d9..60956c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,6 +37,7 @@
               inputs
               outputs
               system
+              lib
               pkgs
               ;
           };
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index a9f7375..6cdd30a 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -2,6 +2,7 @@
 {
   config,
   pkgs,
+  lib,
   inputs,
   system,
   ...
@@ -27,9 +28,6 @@ in
   boot.initrd.luks.devices."luks-7adaa102-d438-4e9e-9972-4a3c91b887b3".device = "/dev/disk/by-uuid/7adaa102-d438-4e9e-9972-4a3c91b887b3";
   networking.hostName = hostname;
 
-  # Enable networking
-  networking.networkmanager.enable = true;
-
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
   hardware.opengl.enable = true;
@@ -74,6 +72,10 @@ in
       };
   };
 
+  programs.dconf.enable = true;
+  programs.steam.enable = true;
+  programs.fish.enable = true;
+
   home-manager.users.${username} = import ../../home {
     inherit
       config
@@ -86,9 +88,7 @@ in
       ;
   };
 
-  programs.dconf.enable = true;
-
-  #security.polkit.enable = true;
+  #: Virtualisation {{{
   virtualisation.docker.enable = true;
   virtualisation.docker.enableOnBoot = false;
   virtualisation.docker.rootless = {
@@ -97,7 +97,9 @@ in
   };
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
+  #: }}}
 
+  #: Power Consumption {{{
   services.thermald.enable = true;
 
   services.tlp = {
@@ -124,10 +126,12 @@ in
     enable = true;
     criticalPowerAction = "Hibernate";
   };
+  #:}}}
 
   services.fwupd.enable = true;
 
   services.dbus.enable = true;
+
   xdg.portal = {
     enable = true;
     wlr = {
@@ -148,20 +152,20 @@ in
 
   # Configure console keymap
   console.keyMap = "fr";
-  programs.fish.enable = true;
 
-  users.defaultUserShell = pkgs.fish;
-
-  users.users.${username} = {
-    isNormalUser = true;
-    createHome = true;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "audio"
-      "libvirtd"
-    ];
-    shell = pkgs.fish;
+  users = {
+    defaultUserShell = pkgs.fish;
+    users.${username} = {
+      isNormalUser = true;
+      createHome = true;
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "audio"
+        "libvirtd"
+      ];
+      shell = pkgs.fish;
+    };
   };
 
   services.greetd = {
diff --git a/modules/default.nix b/modules/default.nix
index de31b90..eb5c739 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,5 +8,6 @@
     ./programs/thunderbird.nix
     ./programs/sway.nix
     ./programs/lazygit.nix
+    ./programs/steam.nix
   ];
 }
diff --git a/modules/networking.nix b/modules/networking.nix
index c4bd1cf..5683098 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -3,7 +3,10 @@
   networking = {
     wireless.iwd.enable = true;
 
-    networkmanager.wifi.backend = "iwd";
+    networkmanager = {
+      enable = true;
+      wifi.backend = "iwd";
+    };
 
     firewall =
       let
diff --git a/modules/programs/steam.nix b/modules/programs/steam.nix
new file mode 100644
index 0000000..78124dc
--- /dev/null
+++ b/modules/programs/steam.nix
@@ -0,0 +1,14 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  programs.steam = lib.mkIf config.programs.steam.enable {
+    gamescopeSession.enable = true;
+    extest.enable = true;
+    localNetworkGameTransfers.openFirewall = true;
+    extraCompatPackages = with pkgs; [ proton-ge-bin ];
+  };
+}