diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix
index c6dd991..6f11613 100644
--- a/machines/jupiter/disks.nix
+++ b/machines/jupiter/disks.nix
@@ -1,31 +1,10 @@
 { config, lib, pkgs, ... }:
 
-# CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it 
+#TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it 
 
 {
-  boot.initrd.luks.devices."luks-drive" = {
-    name = "luks-drive";
-    device = "/dev/disk/by-partlabel/Crypt";
-    preLVM = true;
-    allowDiscards = true;
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/thinkman-root";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/thinkman-bo";
-    fsType = "vfat";
-  };
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-label/thinkman-home";
-    fsType = "ext4";
-  };
-
-  swapDevices = [{
-    device = "/dev/disk/by-label/thinkman-swap";
-  }];
+    fileSystems."/" =
+    { device = "/dev/disk/by-uuid/5c778ca7-57fb-44be-ac8c-ae5d2486b7ad";
+      fsType = "ext4";
+    };
 }
\ No newline at end of file
diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix
index e69de29..9655e58 100644
--- a/machines/jupiter/environments.nix
+++ b/machines/jupiter/environments.nix
@@ -0,0 +1,15 @@
+# enabled profiles
+{ config, lib, ... }:
+let
+  secrets = config.sops.secrets;
+in
+{
+  my.profiles = {
+    hyprland.enable = true;
+    zsh.enable = true;
+    apps = {
+      desktop_apps = true;
+      dev_apps = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/machines/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix
similarity index 91%
rename from machines/hardware-configuration.nix
rename to machines/jupiter/hardware-configuration.nix
index c8d117a..5a52e8b 100644
--- a/machines/hardware-configuration.nix
+++ b/machines/jupiter/hardware-configuration.nix
@@ -7,9 +7,6 @@
   imports = [ ];
 
   boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/5c778ca7-57fb-44be-ac8c-ae5d2486b7ad";
diff --git a/machines/jupiter/hardware-configuration_old.nix b/machines/jupiter/hardware-configuration_old.nix
deleted file mode 100644
index c8d117a..0000000
--- a/machines/jupiter/hardware-configuration_old.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [ ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/5c778ca7-57fb-44be-ac8c-ae5d2486b7ad";
-      fsType = "ext4";
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # 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;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  virtualisation.virtualbox.guest.enable = true;
-}
diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix
new file mode 100644
index 0000000..668d7d5
--- /dev/null
+++ b/modules/environments/apps/default.nix
@@ -0,0 +1,36 @@
+
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.profiles.apps;
+ in {
+
+
+
+  options.my.profiles.apps = with lib; {
+    desktop_apps = mkEnableOption "Basic Apps";
+    dev_apps = mkEnableOption "Development Apps";
+  };
+
+  config = lib.mkIf cfg.desktop_apps {
+    users.users.finn.packages = with pkgs; [
+        firefox
+        thunderbird
+	    google-chrome
+	    discord
+	    spotify
+	    keepassxc
+	    nextcloud-client
+	    neovim
+    ] ++ lib.optionals cf.dev_apps [
+        vscode
+        jetbrains.webstorm
+        jetbrains.goland
+        jetbrains.pycharm-professional
+        jetbrains.idea-ultimate
+    ];
+
+    
+    }   
+
+
+}
\ No newline at end of file
diff --git a/modules/environments/default.nix b/modules/environments/default.nix
new file mode 100644
index 0000000..e69de29