diff --git a/nix/home-old.nix b/nix/home-old.nix
new file mode 100644
index 0000000..8c0ed4d
--- /dev/null
+++ b/nix/home-old.nix
@@ -0,0 +1,39 @@
+{ config, pkgs, ... }:
+
+
+{
+  home.username = "luca";
+  home.homeDirectory = "/home/luca";
+
+  programs = {
+    git = import ./git.nix;
+    alacritty = {
+      enable = true;
+      settings.window.opacity = 0.6;
+    };
+    zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+    };
+  };
+
+  services.picom = {
+    enable = true;
+    vSync = true;
+  };
+
+  xsession.windowManager.i3 = {
+    enable = true;
+    config = {
+      modifier = "Mod4";
+      defaultWorkspace = "workspace number 1";
+      terminal = "alacritty";
+    };
+  };
+
+  home.stateVersion = "24.11";
+
+  programs.home-manager.enable = true;
+
+}
diff --git a/nix/hosts/tux/configuration.nix b/nix/hosts/tux/configuration.nix
new file mode 100644
index 0000000..7eb91a8
--- /dev/null
+++ b/nix/hosts/tux/configuration.nix
@@ -0,0 +1,189 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+{ config, lib, pkgs, inputs, home-manager, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.efiSupport = true;
+  boot.loader.grub.useOSProber = true;
+  services.libinput.touchpad.naturalScrolling = true;
+  networking.networkmanager.enable = true;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  networking.hostName = "tux"; # Define your hostname.
+
+#  services.xserver = {
+#    enable = true;
+#    windowManager.i3.enable = true;
+#  };
+#
+#  services.displayManager = {
+#    defaultSession = "none+i3";
+#  };
+
+
+  #programs.hyprland = {
+  #  enable = true;
+  #  xwayland.enable = true;
+  #};
+
+  security.sudo = {
+    enable = true;
+    wheelNeedsPassword = false;
+  };
+
+
+  #programs.hyprland.package = inputs.hyprland.packages."${pkgs.system}".hyprland;
+  programs.firefox.enable = true;
+  services.flatpak.enable = true;
+
+  environment.sessionVariables = {
+    WLR_NO_HARDWARE_CURSORS = "1";
+    NIXOS_OZONE_WL = "1";
+  };
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    config.common = {
+      default = [
+	"gtk"
+      ];
+    };
+  };
+
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+  # Set your time zone.
+  time.timeZone = "America/Vancouver";
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  # i18n.defaultLocale = "en_US.UTF-8";
+  # console = {
+  #   font = "Lat2-Terminus16";
+  #   keyMap = "us";
+  #   useXkbConfig = true; # use xkb.options in tty.
+  # };
+
+  # Enable the X11 windowing system.
+  # services.xserver.enable = true;
+
+
+  
+
+  # Configure keymap in X11
+  # services.xserver.xkb.layout = "us";
+  # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable sound.
+  # hardware.pulseaudio.enable = true;
+  # OR
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+  };
+  
+  hardware = {
+    graphics.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.luca = import ./home/home.nix;
+  users.users.luca = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    packages = with pkgs; [
+      vesktop
+      nodejs_22
+      pnpm
+    ];
+    shell = pkgs.zsh;
+    hashedPassword = "$y$j9T$wp9I05TfxjrAzCMCcxlei1$Fm7sJJSwFHpSIQT0RESOdJ7vkTYyN0IXs5n/xkg65y3";
+  };
+  programs.zsh.enable = true;
+
+  # programs.firefox.enable = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+ environment.systemPackages = with pkgs; [
+  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+   wget
+   curl
+   ripgrep
+   git
+   neovim
+   busybox
+   dolphin
+   wireguard-tools
+   gh
+ ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # system.copySystemConfiguration = true;
+
+  # This option defines the first version of NixOS you have installed on this particular machine,
+  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+  #
+  # Most users should NEVER change this value after the initial install, for any reason,
+  # even if you've upgraded your system to a new NixOS release.
+  #
+  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+  # to actually do that.
+  #
+  # This value being lower than the current NixOS release does NOT mean your system is
+  # out of date, out of support, or vulnerable.
+  #
+  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+  # and migrated your data accordingly.
+  #
+  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+  system.stateVersion = "24.11"; # Did you read the comment?
+
+}
+
diff --git a/nix/hosts/tux/hardware-configuration.nix b/nix/hosts/tux/hardware-configuration.nix
new file mode 100644
index 0000000..187777e
--- /dev/null
+++ b/nix/hosts/tux/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 = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/6b97d24a-2aff-482d-a7e4-952914ca3d50";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0193-75C3";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  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.wlo1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
index 2d16832..9ea2a10 100644
--- a/nix/modules/default.nix
+++ b/nix/modules/default.nix
@@ -1 +1,2 @@
 { pkgs, lib, config, ... }: { imports = [ ./commonPackages.nix ./hm.nix ]; }
+
diff --git a/nix/modules/i3.nix b/nix/modules/i3.nix
new file mode 100644
index 0000000..0eb093e
--- /dev/null
+++ b/nix/modules/i3.nix
@@ -0,0 +1,26 @@
+{ pkgs, lib, config, ... }: {
+  options = { i3.enable = lib.mkEnableOption "enable i3"; };
+
+  config = lib.mkIf config.i3.enable {
+    services.xserver = {
+      enable = true;
+      windowManager.i3.enable = true;
+    };
+
+    services.displayManager = { defaultSession = "none+i3"; };
+
+    home-manager.users.luca = {
+      programs = {
+        alacritty = {
+          enable = true;
+          settings.window.opacity = 0.6;
+        };
+      };
+    };
+
+    services.picom = {
+      enable = true;
+      vSync = true;
+    };
+  };
+}
diff --git a/nix/users/luca/home.nix b/nix/users/luca/home.nix
index 6f6890b..cd3b342 100755
--- a/nix/users/luca/home.nix
+++ b/nix/users/luca/home.nix
@@ -11,6 +11,8 @@
     helix = import ./helix.nix { inherit pkgs; };
   };
 
+ config.i3.enable ? 
+
   home.packages = with pkgs; [
     nodePackages_latest.typescript-language-server
     nodejs_22