diff --git a/machines/core/core.nix b/machines/core/core.nix
index 1920013..794cb67 100644
--- a/machines/core/core.nix
+++ b/machines/core/core.nix
@@ -41,7 +41,6 @@
 
   time.timeZone = "Europe/Berlin";
   services.timesyncd.enable = true;
-  boot.loader.grub.enable = true;
 
   # Enable networking
   networking.networkmanager.enable = true;
diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix
index cc0c801..441d155 100644
--- a/machines/jupiter/configuration.nix
+++ b/machines/jupiter/configuration.nix
@@ -9,7 +9,45 @@
   ];
 
   networking.hostName = "jupiter";
+  
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the GNOME Desktop Environment.
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "de";
+    xkbVariant = "";
+  };
+
+  # Configure console keymap
+  console.keyMap = "de";
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
 
   system = {
     stateVersion = "23.05";
diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix
index 6f11613..f4a0c75 100644
--- a/machines/jupiter/disks.nix
+++ b/machines/jupiter/disks.nix
@@ -3,8 +3,13 @@
 #TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it 
 
 {
-    fileSystems."/" =
-    { device = "/dev/disk/by-uuid/5c778ca7-57fb-44be-ac8c-ae5d2486b7ad";
+   fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f4901cbb-db30-4f14-8d8e-9dbb55aaf098";
       fsType = "ext4";
     };
-}
\ No newline at end of file
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1121-FAE5";
+      fsType = "vfat";
+    };
+}
diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix
index 9655e58..5988e31 100644
--- a/machines/jupiter/environments.nix
+++ b/machines/jupiter/environments.nix
@@ -10,6 +10,7 @@ in
     apps = {
       desktop_apps = true;
       dev_apps = true;
+      gnome_apps = true;
     };
   };
 }
\ No newline at end of file
diff --git a/machines/jupiter/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix
index 388cfd3..070c0bc 100644
--- a/machines/jupiter/hardware-configuration.nix
+++ b/machines/jupiter/hardware-configuration.nix
@@ -4,15 +4,26 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+  hardware.enableRedistributableFirmware = true;
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/5c778ca7-57fb-44be-ac8c-ae5d2486b7ad";
+    { device = "/dev/disk/by-uuid/f4901cbb-db30-4f14-8d8e-9dbb55aaf098";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1121-FAE5";
+      fsType = "vfat";
+    };
+
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -20,7 +31,9 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s3.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix
index fae3991..963ac40 100644
--- a/modules/environments/apps/default.nix
+++ b/modules/environments/apps/default.nix
@@ -9,6 +9,7 @@ let
   options.my.profiles.apps = with lib; {
     desktop_apps = mkEnableOption "Basic Apps";
     dev_apps = mkEnableOption "Development Apps";
+    gnome_apps = mkEnableOption "Gnome Extentions and Configuration";
   };
 
   config = lib.mkIf cfg.desktop_apps {
@@ -27,6 +28,10 @@ let
         jetbrains.goland
         jetbrains.pycharm-professional
         jetbrains.idea-ultimate
+      ] ++ lib.optionals cfg.gnome_apps [
+          gnomeExtensions.tweaks-in-system-menu
+          gnomeExtensions.wireless-hid
+          gnome.gnome-tweaks
       ];
     };    
   }
\ No newline at end of file