diff --git a/modules/codedPC/anyrun.nix b/modules/codedPC/anyrun.nix
new file mode 100644
index 0000000..3ae2393
--- /dev/null
+++ b/modules/codedPC/anyrun.nix
@@ -0,0 +1,16 @@
+{ inputs, system, ...}: {
+  home-manager.users.coded.imports = [ inputs.anyrun.homeManagerModules.default ];
+  home-manager.users.coded.programs.anyrun = {
+    enable = true;
+    config = {
+      plugins = [
+        inputs.anyrun.packages.${system}.applications
+        inputs.anyrun.packages.${system}.rink
+        inputs.anyrun.packages.${system}.shell
+        inputs.anyrun.packages.${system}.translate
+        inputs.anyrun.packages.${system}.kidex
+        inputs.anyrun.packages.${system}.symbols
+      ];
+    };
+  };
+}
diff --git a/modules/codedPC/eww.nix b/modules/codedPC/eww.nix
new file mode 100644
index 0000000..edbdf3e
--- /dev/null
+++ b/modules/codedPC/eww.nix
@@ -0,0 +1,6 @@
+{ flakeRoot, ... }: {
+  home-manager.users.coded.programs.eww = {
+    enable = true;
+    configDir = "${flakeRoot}/extensions/eww";
+  };
+}
diff --git a/modules/codedPC/kde_plasma.nix b/modules/codedPC/kde_plasma.nix
deleted file mode 100644
index 39683b3..0000000
--- a/modules/codedPC/kde_plasma.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  environment.plasma5.excludePackages = [
-    pkgs.libsForQt5.okular
-    pkgs.libsForQt5.konsole
-  ];
-
-  environment.systemPackages = [
-    pkgs.sweet-nova
-    pkgs.pitch-black
-    pkgs.adapta-kde-theme
-    pkgs.ocs-url
-  ];
-
-}
diff --git a/modules/codedPC/packages.nix b/modules/codedPC/packages.nix
index 5fdd854..d39fb0b 100644
--- a/modules/codedPC/packages.nix
+++ b/modules/codedPC/packages.nix
@@ -6,6 +6,5 @@
     pkgs.email
     pkgs.thunderbird
     pkgs.ollama
-    pkgs.kdocker
   ];
 }
diff --git a/modules/codedPC/shell.nix b/modules/codedPC/shell.nix
index 997afe8..39dfd70 100644
--- a/modules/codedPC/shell.nix
+++ b/modules/codedPC/shell.nix
@@ -1,18 +1,12 @@
 { inputs, ... }: {
-  home-manager.users.coded.programs.alacritty = {
+  home-manager.users.coded.programs.kitty = {
     enable = true;
-    settings = {
-      window.dimensions = {
-        lines = 40;
-        columns = 150;
-      };
-      import = [
-        "${inputs.alacritty-themes}/themes/Catppuccin-Mocha.yml"
-      ];
-    };
+    theme = "Catppuccin-Macchiato";
+    shellIntegration.enableZshIntegration = true;
   };
 
   home-manager.users.coded.programs.zsh.shellAliases = {
+    launch = "hyprctl dispatch exec $1";
     print3d = "sudo /run/current-system/sw/bin/pronsole.py";
   };
 }
diff --git a/modules/codedPC/video.nix b/modules/codedPC/video.nix
index 00fdb9f..bc5cffb 100644
--- a/modules/codedPC/video.nix
+++ b/modules/codedPC/video.nix
@@ -1,18 +1,122 @@
-{
-  services.xserver.enable = true;
-  services.xserver.videoDrivers = [ "amdgpu" ];
+{ pkgs, inputs, ... }: {
 
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  programs.hyprland.enable = true;
 
-  hardware.opengl.driSupport = true;
-  # For 32 bit applications
-  hardware.opengl.driSupport32Bit = true;
+  home-manager.users.coded = {
+    home.packages = [ pkgs.hyprpicker ];
 
-  programs.dconf.enable = true;
+    wayland.windowManager.hyprland = {
+      enable = true;
 
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "";
+      xwayland.enable = true;
+      systemd.enable = true;
+
+      plugins = [
+        
+      ];
+
+
+      settings = {
+        "$mainMod" = "SUPER";
+        "$terminal" = "kitty";
+        "$menu" = "anyrun";
+
+        general = {
+          gaps_in = 5;
+          gaps_out = 20;
+
+          border_size = 2;
+          "col.active_border" = "rgba(71AEF5EE) rgba(F2D478EE) 45deg";
+          "col.inactive_border" = "rgba(C4C4C4EE)";
+
+          layout = "dwindle";
+        };
+
+        decoration = {
+          rounding = 10;
+
+          drop_shadow = true;
+          shadow_range = 4;
+          shadow_render_power = 3;
+          "col.shadow" = "rgba(1a1a1aee)";
+        };
+
+        input = {
+          kb_layout = "us";
+          numlock_by_default = true;
+        };
+
+        monitor = [
+          "DP-1,1920x1080@165,0x0,1"
+          "DP-2,1920x1080@165,1920x0,1"
+          "HDMI-A-1,1920x1080@60,960x-1080,1"
+          ",preferred,auto,1"
+        ];
+
+        xwayland = {
+          force_zero_scaling = true;
+        };
+
+        master = {
+          new_is_master = true;
+        };
+
+        bind = [
+          "$mainMod, Q, killactive"
+          "$mainMod, SPACE, togglefloating"
+          "$mainMod, RETURN, exec, $terminal"
+          "$mainMod, down, movefocus, d"
+          "$mainMod, up, movefocus, u"
+          "$mainMod, right, movefocus, r"
+          "$mainMod, left, movefocus, l"
+
+          "ALT, SPACE, exec, $menu"
+        ] ++ (
+          builtins.concatLists (builtins.genList (
+              x: let
+                ws = let
+                  c = (x + 1) / 10;
+                in
+                  builtins.toString (x + 1 - (c * 10));
+              in [
+                "$mainMod, ${ws}, workspace, ${toString (x + 1)}"
+                "$mainMod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+              ]
+            )
+            10)
+        );
+
+        bindm = [
+          "$mainMod, mouse:272, movewindow"
+          "$mainMod, mouse:273, resizewindow"
+        ];
+      };
+    };
+  };
+
+  # services.xserver.enable = true;
+  # services.xserver.videoDrivers = [ "amdgpu" ];
+
+  # services.xserver.displayManager.sddm.enable = true;
+  # services.xserver.desktopManager.plasma5.enable = true;
+
+  # hardware.opengl.driSupport = true;
+  # # For 32 bit applications
+  # hardware.opengl.driSupport32Bit = true;
+
+  # programs.dconf.enable = true;
+
+  # services.xserver = {
+  #   layout = "us";
+  #   xkbVariant = "";
+  # };
+
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+    extraPackages = [
+      pkgs.vaapiVdpau
+    ];
   };
 }
diff --git a/modules/codedPC/vscode.nix b/modules/codedPC/vscode.nix
index ecd4f35..0ae2c18 100644
--- a/modules/codedPC/vscode.nix
+++ b/modules/codedPC/vscode.nix
@@ -15,6 +15,7 @@
         "javascript.updateImportsOnFileMove.enabled" = "always";
         "terminal.integrated.enableMultiLinePasteWarning" = false;
         "liveshare.languages.allowGuestCommandControl" = true;
+        "gerrit.auth.url" = "https://git.clicks.codes";
     };
     extensions =
       [
@@ -23,11 +24,19 @@
         pkgs.vscode-extensions.editorconfig.editorconfig
         pkgs.vscode-extensions.zhuangtongfa.material-theme
         pkgs.vscode-extensions.bbenoist.nix
-      ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [{
-        name = "helium-icon-theme";
-        publisher = "helgardrichard";
-        version = "1.0.0";
-        sha256 = "sha256-uSApuTXQgvPiJpBL91d3mX35Sa2l2vLIAFpBo+cZ4h4=";
-      }];
+      ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        {
+          name = "helium-icon-theme";
+          publisher = "helgardrichard";
+          version = "1.0.0";
+          sha256 = "sha256-uSApuTXQgvPiJpBL91d3mX35Sa2l2vLIAFpBo+cZ4h4=";
+        }
+        {
+          name = "vscode--gerrit";
+          publisher = "sanderronde";
+          version = "1.2.21";
+          sha256 = "sha256-M7ZEBhxDCZ4/YCK8ujkAjIpiO1otpNXh13yeQVQZ8SA=";
+        }
+      ];
   };
 }
diff --git a/modules/common/basicServices.nix b/modules/common/basicServices.nix
index 81eea42..acb18e3 100644
--- a/modules/common/basicServices.nix
+++ b/modules/common/basicServices.nix
@@ -1 +1 @@
-{ config, pkgs, ... }: { services.printing.enable = true; }
+{ services.printing.enable = true; }
diff --git a/modules/common/shell.nix b/modules/common/shell.nix
index 77b2ce9..e993f1c 100644
--- a/modules/common/shell.nix
+++ b/modules/common/shell.nix
@@ -3,9 +3,9 @@
   users.users.coded.shell = pkgs.zsh;
 
   home-manager.users.coded.home.packages = [
+    pkgs.htop
     pkgs.bmon
     pkgs.wget
-    pkgs.guake
   ];
 
   home-manager.users.coded.programs = {