diff --git a/modules/apps/browser/brave.nix b/modules/apps/browser/brave.nix
new file mode 100644
index 0000000..9550f79
--- /dev/null
+++ b/modules/apps/browser/brave.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  flake.nixosModules.brave = { pkgs, ... }: {
+    environment.systemPackages = with pkgs; [
+      brave
+    ];
+  };
+}
diff --git a/modules/desktop/bluetooth/bluetooth.nix b/modules/desktop/bluetooth/bluetooth.nix
new file mode 100644
index 0000000..238a976
--- /dev/null
+++ b/modules/desktop/bluetooth/bluetooth.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+  flake.nixosModules.bluetooth = {
+    hardware.bluetooth.enable = true;
+    hardware.bluetooth.powerOnBoot = true;
+  };
+}
diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix
new file mode 100644
index 0000000..7a7d8ef
--- /dev/null
+++ b/modules/desktop/desktop.nix
@@ -0,0 +1,12 @@
+{ inputs, ... }: {
+  flake.nixosModules.desktop = {
+    imports = with inputs.self.nixosModules; [
+      bluetooth
+      fonts
+      gpu-amd
+      input
+      printing
+      sound
+    ];
+  };
+}
diff --git a/modules/desktop/fonts/fonts.nix b/modules/desktop/fonts/fonts.nix
new file mode 100644
index 0000000..7dd18d4
--- /dev/null
+++ b/modules/desktop/fonts/fonts.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  flake.nixosModules.fonts = { pkgs-unstable, ... }: {
+    environment.systemPackages = with pkgs-unstable; [
+      ibm-plex
+      adwaita-fonts
+    ];
+  };
+}
diff --git a/modules/desktop/gpu-amd/gpu-amd.nix b/modules/desktop/gpu-amd/gpu-amd.nix
new file mode 100644
index 0000000..e7765fa
--- /dev/null
+++ b/modules/desktop/gpu-amd/gpu-amd.nix
@@ -0,0 +1,16 @@
+{ ... }: {
+  flake.nixosModules.gpu-amd = { pkgs, ... }: {
+    boot.initrd.kernelModules = [ "amdgpu" ];
+    boot.kernelModules = [ "amdgpu" ];
+
+    hardware.amdgpu.initrd.enable = true;
+    hardware.graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+
+    environment.systemPackages = with pkgs; [
+      vulkan-tools
+    ];
+  };
+}
diff --git a/modules/desktop/input/input.nix b/modules/desktop/input/input.nix
new file mode 100644
index 0000000..2275044
--- /dev/null
+++ b/modules/desktop/input/input.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  flake.nixosModules.input = {
+    services.libinput.enable = true;
+  };
+}
diff --git a/modules/desktop/printing/printing.nix b/modules/desktop/printing/printing.nix
new file mode 100644
index 0000000..920c348
--- /dev/null
+++ b/modules/desktop/printing/printing.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  flake.nixosModules.printing = {
+    services.printing.enable = true;
+  };
+}
diff --git a/modules/desktop/sound/sound.nix b/modules/desktop/sound/sound.nix
new file mode 100644
index 0000000..2b7a3c9
--- /dev/null
+++ b/modules/desktop/sound/sound.nix
@@ -0,0 +1,10 @@
+{ ... }: {
+  flake.nixosModules.sound = { ... }: {
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+  };
+}
diff --git a/modules/gaming/controller/controller.nix b/modules/gaming/controller/controller.nix
new file mode 100644
index 0000000..05cffb6
--- /dev/null
+++ b/modules/gaming/controller/controller.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  flake.nixosModules.controller = { ... }: {
+    services.udev.extraRules = ''
+      ACTION=="add|change", KERNEL=="event[0-9]*", ATTRS{name}=="*Wireless Controller Touchpad", ENV{LIBINPUT_IGNORE_DEVICE}="1"
+    '';
+  };
+}
diff --git a/modules/gaming/jovian/jovian.nix b/modules/gaming/jovian/jovian.nix
new file mode 100644
index 0000000..4b417fd
--- /dev/null
+++ b/modules/gaming/jovian/jovian.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  flake.nixosModules.jovian = { user, ... }:{
+    jovian.steam.enable = true;
+    jovian.steam.autoStart = true;
+    jovian.steam.user = user;
+    jovian.steam.desktopSession = "gnome";
+  };
+}
diff --git a/modules/gaming/lact/lact.nix b/modules/gaming/lact/lact.nix
new file mode 100644
index 0000000..7e9d528
--- /dev/null
+++ b/modules/gaming/lact/lact.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+  flake.nixosModules.lact = {
+   services.lact.enable = true;
+   hardware.amdgpu.overdrive.enable = true;
+  };
+}
diff --git a/modules/gaming/steam/steam.nix b/modules/gaming/steam/steam.nix
new file mode 100644
index 0000000..cbd72d4
--- /dev/null
+++ b/modules/gaming/steam/steam.nix
@@ -0,0 +1,17 @@
+{ ... }: {
+  flake.nixosModules.steam = { pkgs-unstable, ... }: {
+    programs.steam = {
+      enable = true;
+      extest.enable = true;
+      
+      extraCompatPackages = with pkgs-unstable; [
+        proton-ge-bin
+      ];
+
+      extraPackages = with pkgs-unstable; [
+        gamescope
+        mangohud
+      ];
+    };
+  };
+}
diff --git a/modules/gnome/gdm/gdm.nix b/modules/gnome/gdm/gdm.nix
new file mode 100644
index 0000000..0071078
--- /dev/null
+++ b/modules/gnome/gdm/gdm.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  flake.nixosModules.gdm = { user, ... }:{
+    services.displayManager.gdm.enable = true;
+    services.displayManager.autoLogin.enable = true;
+    services.displayManager.autoLogin.user = user;
+  };
+}
diff --git a/modules/gnome/gnome-apps/gnome-apps.nix b/modules/gnome/gnome-apps/gnome-apps.nix
new file mode 100644
index 0000000..6a1721f
--- /dev/null
+++ b/modules/gnome/gnome-apps/gnome-apps.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  flake.nixosModules.gnome-apps = { pkgs-unstable, ...}:{
+     environment.systemPackages = with pkgs-unstable; [
+       gnome-text-editor
+   ];
+  };
+}
diff --git a/modules/gnome/gnome-de/gnome.nix b/modules/gnome/gnome-de/gnome.nix
new file mode 100644
index 0000000..2ec0880
--- /dev/null
+++ b/modules/gnome/gnome-de/gnome.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  flake.nixosModules.gnome = { pkgs, ... }:{
+    services.desktopManager.gnome.enable = true;
+    services.gnome.core-apps.enable = false;
+    services.gnome.core-developer-tools.enable = false;
+    services.gnome.games.enable = false;
+  };
+}
diff --git a/modules/hosts/computer-mo/configuration.nix b/modules/hosts/computer-mo/configuration.nix
index 308ae0e..c381f69 100644
--- a/modules/hosts/computer-mo/configuration.nix
+++ b/modules/hosts/computer-mo/configuration.nix
@@ -3,7 +3,11 @@
   flake.nixosModules.computer-mo = {
     imports = with inputs.self.nixosModules; [
       base
+      desktop
       singledisk
+      gdm
+      gnome-apps
+      gnome
     ];
   };
 }