diff --git a/.DS_Store b/.DS_Store
index da018f1..bcb6fdc 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/flake.nix b/flake.nix
index 889596e..4c5c1b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,15 @@
         inputs.sops-nix.nixosModules.sops
       ];
     };
+
+    nixosConfigurations.framework = nixpkgs.lib.nixosSystem {
+      specialArgs = { inherit inputs; };
+      modules = [
+        ./hosts/framework/configuration.nix
+        inputs.home-manager?nixosModules.default
+        inputs.sops-nix.nixosModules.sops
+      ];
+    };
     
     nixosConfigurations.laptop = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
diff --git a/hosts/.DS_Store b/hosts/.DS_Store
index 6fdbdd0..3f44c0f 100644
Binary files a/hosts/.DS_Store and b/hosts/.DS_Store differ
diff --git a/hosts/common/home.nix b/hosts/common/home.nix
index 9cda2da..fcb2f45 100644
--- a/hosts/common/home.nix
+++ b/hosts/common/home.nix
@@ -68,6 +68,7 @@
     shellAliases = {
       drs = "sudo darwin-rebuild switch --flake ~/Developer/nix/NixOSDots#macOS";
       nrs = "sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#nixos";
+      frw = "sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#framework";
       lrs = "sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#light";
       lars = "sudo nixos-rebuild switch --flake ~/Developer/nix/NixOSDots#laptop";
       cdd = "cd ~/Developer/nix/NixOSDots";
diff --git a/hosts/framework/configuration.nix b/hosts/framework/configuration.nix
new file mode 100644
index 0000000..4c4a868
--- /dev/null
+++ b/hosts/framework/configuration.nix
@@ -0,0 +1,64 @@
+{ config, pkgs, inputs, ...}:
+
+{
+  imports = [
+    ./modules.nix
+  ];
+
+  networking = {
+    hostName = "framework";
+    networkmanager = {
+      enable = true;
+    };
+  };
+
+  # Todo -> Display server for all nixos machines (lightdm or smth else)
+  
+  # User
+  users= {
+    users = {
+      alex = {
+        isNormalUser = true;
+        description = "Alexandre Delcamp--Enache";
+        shell= pkgs.zsh;
+        extraGrousp = [ "networkmanager" "wheel" ];
+      };
+    };
+  };
+  # HomeManager
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    backupFileExtension = "HM-Backup";
+    users = {
+      "alex" = import ./home.nix;
+    };
+  };
+
+  programs = {
+    hyprland = {
+      enable = true;
+    };
+    zsh = {
+      enable = true;
+      enableAutosuggestions = true;
+    };
+  };
+
+  environment = {
+    systemPackages = with pkgs; [
+      playerctl
+    ];
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+    };
+    pathsToLink = [ "/share/zsh" ];
+  };
+
+  system = {
+    stateVersion = "24.11";
+  };
+
+# End of config
+}
diff --git a/hosts/framework/hardware-configuration.nix b/hosts/framework/hardware-configuration.nix
new file mode 100755
index 0000000..b9e5267
--- /dev/null
+++ b/hosts/framework/hardware-configuration.nix
@@ -0,0 +1,38 @@
+# 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 =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/da617628-d792-4010-af1d-20a25eda3d5b";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/C246-555A";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  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.wlp1s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/framework/home.nix b/hosts/framework/home.nix
new file mode 100644
index 0000000..cd4100a
--- /dev/null
+++ b/hosts/framework/home.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, inputs, ...}:
+
+{
+  imports = [
+    ../common/home.nix
+    ../../modules/home-manager/hyprland.nix
+  ];
+
+  home = {
+    stateVersion = "25.11";
+    packages = with pkgs; [
+    ];
+    file = {
+
+    };
+
+    sessionVariables = {
+      EDITOR = "nvim";
+    };
+  };
+}
diff --git a/hosts/framework/modules.nix b/hosts/framework/modules.nix
new file mode 100644
index 0000000..63c2c77
--- /dev/null
+++ b/hosts/framework/modules.nix
@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./hardware-configuration.nix
+    inputs.sops-nix.nixosModules.sops
+    ../common/modules.nix
+    ../../modules/nixos/secrets.nix
+    ../../modules/nixos/gaming/starCitizen.nix
+    ../../modules/nixos/gaming/steam.nix
+    ../../modules/common/spotify.nix
+  ];
+}