diff --git a/hosts/vali/configuration.nix b/hosts/vali/configuration.nix
index f3d3aea..2076d32 100644
--- a/hosts/vali/configuration.nix
+++ b/hosts/vali/configuration.nix
@@ -17,22 +17,22 @@
           };
       };
       programs = {
-         # vesktop.enable = true;
+          vesktop.enable = true;
           btop.enable = true;
           mpv.enable = true;
-#neovim.enable = true;
-          git = {
-              enable = true;
-              userName = "vali";
-              userEmail = "valentin@kaas.cc";
-              defaultBranch = "master";
-          };
+          i3.enable = true;
+          #neovim.enable = true;
+          #git = {
+          #    enable = true;
+          #    userName = "vali";
+          #    userEmail = "valentin@kaas.cc";
+          #    defaultBranch = "master";
+          #};
           starship.enable = true;
           zsh = {
               enable = true;
               profiling = false;
           };
-         #i3 = {  };
       };
       services = {
           pipewire.enable = true;
diff --git a/hosts/vali/i3.nix b/hosts/vali/i3.nix
index 90918a6..56a1acd 100644
--- a/hosts/vali/i3.nix
+++ b/hosts/vali/i3.nix
@@ -1,10 +1,10 @@
-{ pkgs, lib, config, ...}:
+{ pkgs, lib, config, callPackage, ... }:
+with lib; let
+  cfg = config.myOptions.programs.i3;
+in {
+  options.myOptions.programs.i3.enable = mkEnableOption "i3";
 
-{
-  options = {
-    i3wm.enable = lib.mkEnableOption "enable i3wm";
-    };
-  config = lib.mkIf config.i3wm.enable {
+  config = mkIf cfg.enable {
     services.xserver = {
       enable = true;
       desktopManager = {
@@ -16,8 +16,8 @@
         };
       };
       displayManager.defaultSession="xfce+i3";
-      windowManager.i3 = {
-        enable = true;
+        windowManager.i3 = {
+          enable = true;
         extraPackages = with pkgs; [
           dmenu
           i3status
diff --git a/hosts/vali/programs.nix b/hosts/vali/programs.nix
index c6fb0e2..c56660f 100644
--- a/hosts/vali/programs.nix
+++ b/hosts/vali/programs.nix
@@ -20,6 +20,7 @@ in {
             libreoffice-fresh
             qbittorrent
             ventoy-full
+            lazygit
             zip
             unzip
             gcc