diff --git a/home/jonas@comfy-station/configuration.nix b/home/jonas@comfy-station/configuration.nix
index a780603..00ad23d 100644
--- a/home/jonas@comfy-station/configuration.nix
+++ b/home/jonas@comfy-station/configuration.nix
@@ -17,11 +17,6 @@
   };
 
   # hive modules
-  #hive.waybar.enable = true;
-  #hive.wlogout.enable = true;
-  #hive.wofi.enable = true;
-  #hive.kitty.enable = true;
-  #hive.nextcloud.enable = true;
   #hive.firefox = {
   #  enable = true;
   #  plasmaIntegration = true;
diff --git a/home/jonas@comfy-station/default.nix b/home/jonas@comfy-station/default.nix
index 4dfc26f..a5adc3d 100644
--- a/home/jonas@comfy-station/default.nix
+++ b/home/jonas@comfy-station/default.nix
@@ -16,6 +16,10 @@
       self.homeModules.hyprland
       self.homeModules.swaync
       self.homeModules.waybar
+      self.homeModules.wlogout
+      self.homeModules.wofi
+      self.homeModules.kitty
+      self.homeModules.nextcloud-client
     ];
   };
 }
diff --git a/modules/desktop/kitty.nix b/modules/desktop/kitty.nix
new file mode 100644
index 0000000..8e18cdf
--- /dev/null
+++ b/modules/desktop/kitty.nix
@@ -0,0 +1,19 @@
+{
+  flake.homeModules.kitty = {pkgs, ...}: {
+    programs.kitty = {
+      enable = true;
+      shellIntegration.enableZshIntegration = true;
+      font = {
+        package = pkgs.nerd-fonts.fira-code;
+        name = "FiraCode Nerd Font";
+        size = 12;
+      };
+      themeFile = "Molokai";
+      settings = {
+        background_opacity = "0.6";
+        enable_audio_bell = false;
+        confirm_os_window_close = 0;
+      };
+    };
+  };
+}
diff --git a/modules/desktop/nextcloud-client.nix b/modules/desktop/nextcloud-client.nix
new file mode 100644
index 0000000..3769ce6
--- /dev/null
+++ b/modules/desktop/nextcloud-client.nix
@@ -0,0 +1,9 @@
+{
+  flake.homeModules.nextcloud-client = {pkgs, ...}: {
+    services.nextcloud-client = {
+      enable = true;
+      startInBackground = true;
+      package = pkgs.nextcloud-client;
+    };
+  };
+}
diff --git a/modules/desktop/wlogout/icons/hibernate-hover.png b/modules/desktop/wlogout/icons/hibernate-hover.png
new file mode 100644
index 0000000..9f93aaf
Binary files /dev/null and b/modules/desktop/wlogout/icons/hibernate-hover.png differ
diff --git a/modules/desktop/wlogout/icons/hibernate.png b/modules/desktop/wlogout/icons/hibernate.png
new file mode 100644
index 0000000..0090e02
Binary files /dev/null and b/modules/desktop/wlogout/icons/hibernate.png differ
diff --git a/modules/desktop/wlogout/icons/lock-hover.png b/modules/desktop/wlogout/icons/lock-hover.png
new file mode 100644
index 0000000..093d11e
Binary files /dev/null and b/modules/desktop/wlogout/icons/lock-hover.png differ
diff --git a/modules/desktop/wlogout/icons/lock.png b/modules/desktop/wlogout/icons/lock.png
new file mode 100644
index 0000000..6b4afb7
Binary files /dev/null and b/modules/desktop/wlogout/icons/lock.png differ
diff --git a/modules/desktop/wlogout/icons/logout-hover.png b/modules/desktop/wlogout/icons/logout-hover.png
new file mode 100644
index 0000000..bcdf57b
Binary files /dev/null and b/modules/desktop/wlogout/icons/logout-hover.png differ
diff --git a/modules/desktop/wlogout/icons/logout.png b/modules/desktop/wlogout/icons/logout.png
new file mode 100644
index 0000000..f280ca9
Binary files /dev/null and b/modules/desktop/wlogout/icons/logout.png differ
diff --git a/modules/desktop/wlogout/icons/power-hover.png b/modules/desktop/wlogout/icons/power-hover.png
new file mode 100644
index 0000000..26c06af
Binary files /dev/null and b/modules/desktop/wlogout/icons/power-hover.png differ
diff --git a/modules/desktop/wlogout/icons/power.png b/modules/desktop/wlogout/icons/power.png
new file mode 100644
index 0000000..a32880b
Binary files /dev/null and b/modules/desktop/wlogout/icons/power.png differ
diff --git a/modules/desktop/wlogout/icons/restart-hover.png b/modules/desktop/wlogout/icons/restart-hover.png
new file mode 100644
index 0000000..09f7797
Binary files /dev/null and b/modules/desktop/wlogout/icons/restart-hover.png differ
diff --git a/modules/desktop/wlogout/icons/restart.png b/modules/desktop/wlogout/icons/restart.png
new file mode 100644
index 0000000..719e03f
Binary files /dev/null and b/modules/desktop/wlogout/icons/restart.png differ
diff --git a/modules/desktop/wlogout/icons/sleep-hover.png b/modules/desktop/wlogout/icons/sleep-hover.png
new file mode 100644
index 0000000..cd39d3d
Binary files /dev/null and b/modules/desktop/wlogout/icons/sleep-hover.png differ
diff --git a/modules/desktop/wlogout/icons/sleep.png b/modules/desktop/wlogout/icons/sleep.png
new file mode 100644
index 0000000..3c6c618
Binary files /dev/null and b/modules/desktop/wlogout/icons/sleep.png differ
diff --git a/modules/desktop/wlogout/style.css b/modules/desktop/wlogout/style.css
new file mode 100644
index 0000000..2098f17
--- /dev/null
+++ b/modules/desktop/wlogout/style.css
@@ -0,0 +1,80 @@
+    /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+    /* pywal-wlogout */
+
+/* Importing pywal colors */
+
+/*
+@import '../../.cache/wal/colors-waybar.css';
+*/
+
+window {
+    font-family: Fira Code Medium;
+    font-size: 16pt;
+    /* color:  @foreground; */
+    color: rgba(255, 255, 255, 0.9);
+    background-color: rgba(24, 27, 32, 0.2);
+
+}
+
+button {
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 20%;
+    background-color: transparent;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s ease-in;
+    box-shadow: 0 0 10px 2px transparent;
+    border-radius: 36px;
+    border-style: none;
+    margin: 10px;
+}
+
+button:focus {
+    box-shadow: none;
+    background-size : 20%;
+}
+
+button:hover {
+    background-size: 50%;
+    box-shadow: 0 0 10px 3px rgba(0,0,0,.4);
+    /* background-color: @color6;*/
+    background-color: rgba(24, 27, 32, 0);
+    color: transparent;
+    transition: all 0.3s cubic-bezier(.55, 0.0, .28, 1.682), box-shadow 0.5s ease-in;
+}
+
+#shutdown {
+    background-image: image(url("./icons/power.png"));
+}
+#shutdown:hover {
+    background-image: image(url("./icons/power-hover.png"));
+}
+
+#logout {
+    background-image: image(url("./icons/logout.png"));
+
+}
+#logout:hover {
+    background-image: image(url("./icons/logout-hover.png"));
+}
+
+#reboot {
+    background-image: image(url("./icons/restart.png"));
+}
+#reboot:hover {
+    background-image: image(url("./icons/restart-hover.png"));
+}
+
+#lock {
+    background-image: image(url("./icons/lock.png"));
+}
+#lock:hover {
+    background-image: image(url("./icons/lock-hover.png"));
+}
+
+#hibernate {
+    background-image: image(url("./icons/hibernate.png"));
+}
+#hibernate:hover {
+    background-image: image(url("./icons/hibernate-hover.png"));
+}
diff --git a/modules/desktop/wlogout/wlogout.nix b/modules/desktop/wlogout/wlogout.nix
new file mode 100644
index 0000000..bd090a8
--- /dev/null
+++ b/modules/desktop/wlogout/wlogout.nix
@@ -0,0 +1,71 @@
+{
+  flake.homeModules.wlogout = {
+    programs.wlogout.enable = true;
+    programs.wlogout.layout = [
+      {
+        label = "shutdown";
+        action = "systemctl poweroff";
+        text = "Shutdown";
+        keybind = "s";
+      }
+      {
+        label = "reboot";
+        action = "systemctl reboot";
+        text = "Reboot";
+        keybind = "r";
+      }
+      {
+        label = "logout";
+        action = "loginctl kill-session $XDG_SESSION_ID";
+        text = "Logout";
+        keybind = "e";
+      }
+      {
+        label = "hibernate";
+        action = "hyprlock --immediate & (sleep 1; systemctl hibernate -i)";
+        text = "Hibernate";
+        keybind = "h";
+      }
+      {
+        label = "lock";
+        action = "hyprlock";
+        text = "Lock";
+        keybind = "l";
+      }
+    ];
+    programs.wlogout.style = builtins.readFile ./style.css;
+    xdg.enable = true;
+    xdg.configFile = {
+      "wlogout/icons/hibernate.png" = {
+        source = ./icons/hibernate.png;
+      };
+      "wlogout/icons/lock.png" = {
+        source = ./icons/lock.png;
+      };
+      "wlogout/icons/logout.png" = {
+        source = ./icons/logout.png;
+      };
+      "wlogout/icons/power.png" = {
+        source = ./icons/power.png;
+      };
+      "wlogout/icons/restart.png" = {
+        source = ./icons/restart.png;
+      };
+      "wlogout/icons/hibernate-hover.png" = {
+        source = ./icons/hibernate-hover.png;
+      };
+      "wlogout/icons/lock-hover.png" = {
+        source = ./icons/lock-hover.png;
+      };
+      "wlogout/icons/logout-hover.png" = {
+        source = ./icons/logout-hover.png;
+      };
+      "wlogout/icons/power-hover.png" = {
+        source = ./icons/power-hover.png;
+      };
+      "wlogout/icons/restart-hover.png" = {
+        source = ./icons/restart-hover.png;
+      };
+    };
+  };
+}
diff --git a/modules/desktop/wofi.nix b/modules/desktop/wofi.nix
new file mode 100644
index 0000000..a1810f8
--- /dev/null
+++ b/modules/desktop/wofi.nix
@@ -0,0 +1,92 @@
+{
+  flake.homeModules.wofi = {
+    programs.wofi.enable = true;
+    programs.wofi.settings = {
+      location = "center";
+      allow_images = true;
+      allow_markup = true;
+      key_expand = "Tab";
+      key_up = "Ctrl-k";
+      key_down = "Ctrl-j";
+      key_left = "Ctrl-h";
+      key_right = "Ctrl-l";
+      insensitive = true;
+    };
+
+    programs.wofi.style = ''
+      #window {
+          border-radius: 15px;
+          border-color: #33ccff;
+          border-width: 2px;
+          border-style: solid;
+          background-color: rgba(0, 0, 0, 0.6);
+      }
+
+      #input {
+          margin: 5px;
+          border-radius: 15px;
+          border-color: #33ccff;
+          border-width: 2px;
+          border-style: solid;
+          background: transparent;
+          color: white;
+      }
+
+      #input {
+          margin: 5px;
+          border-radius: 15px;
+          border-color: #33ccff;
+          border-width: 2px;
+          border-style: solid;
+          background: transparent;
+          color: white;
+      }
+
+      #img {
+          background-color: transparent;
+      }
+
+      #inner-box {
+          background-color: transparent;
+      }
+
+      #outer-box {
+          margin: 2px;
+          padding: 10px;
+          background: transparent;
+      }
+
+      #scroll {
+          margin: 5px;
+      }
+
+      #text {
+          padding: 4px;
+          color: white;
+          background: transparent;
+          border: none;
+      }
+
+      #entry {
+        background: transparent;
+        border: none;
+      }
+
+      #entry:selected {
+          border-radius: 15px;
+          border-color: #33ccff;
+          border-width: 2px;
+          border-style: solid;
+          background: transparent;
+      }
+
+      #expander {
+          border-radius: 15px;
+          border-color: #33ccff;
+          border-width: 2px;
+          border-style: solid;
+          background: transparent;
+      }
+    '';
+  };
+}