diff --git a/nixos/module/hectic/hardware/lenovo-legion.nix b/nixos/module/hectic/hardware/lenovo-legion.nix
index 600e08b..d8acb1c 100644
--- a/nixos/module/hectic/hardware/lenovo-legion.nix
+++ b/nixos/module/hectic/hardware/lenovo-legion.nix
@@ -33,5 +33,5 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    };
+  };
 }
diff --git a/nixos/module/hectic/user/yukkop.nix b/nixos/module/hectic/user/yukkop.nix
new file mode 100644
index 0000000..33d07b2
--- /dev/null
+++ b/nixos/module/hectic/user/yukkop.nix
@@ -0,0 +1,97 @@
+{
+  self,
+  inputs,
+  ...
+}:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let 
+  name = builtins.baseNameOf ./.;
+  home = "/home/${name}";
+  cfg = config.hectic.user.yukkop;
+in {
+  options.hectic.user.yukkop.enable = lib.mkEnableOption "Enable user.yukkop";
+
+  config = lib.mkIf cfg.enable {
+    #home = {
+    #  username = name;
+    #  homeDirectory = home;
+    #  packages = [];
+    #  stateVersion = "25.05";
+    #};
+
+    #xdg = {
+    #  enable = true;
+    #  userDirs = {
+    #    enable = true;
+    #    pictures    = "${home}/px";
+    #    videos      = "${home}/vd";
+    #    music       = "${home}/mu";
+    #    documents   = "${home}/dc";
+    #    downloads   = "${home}/dw";
+    #    desktop     = "${home}/dx";
+    #    publicShare = "${home}/pu";
+    #    templates   = "${config.xdg.dataHome}/templates";
+    #  };
+    #  mimeApps = {
+    #    enable = true;
+    #    defaultApplications = {
+
+    #      # Files
+    #      "application/x-shellscript" = [ "nvim.desktop" ];
+    #      "text/x-shellscript" = [ "nvim.desktop" ];
+    #      "text/plain" = [ "nvim.desktop" ];
+    #      "inode/directory" = [ "pcmanfm.desktop" ];
+
+    #      # Images
+    #      "image/png" = [ "sxiv.desktop" ];
+    #      "image/jpeg" = [ "sxiv.desktop" ];
+    #      "image/gif" = [ "sxiv.desktop" ];
+    #      "image/webp" = [ "sxiv.desktop" ];
+    #      "image/x-xcf" = [ "gimp.desktop" ];
+
+    #      # Videos
+    #      "video/x-matroska" = [ "mpv.desktop" ];
+
+    #      # # Application-specific
+    #      # "application/postscript" = [ "pdf.desktop" ];
+    #      # "application/pdf" = [ "pdf.desktop" ];
+    #      # "application/rss+xml" = [ "rss.desktop" ];
+    #      # "application/x-bittorrent" = [ "torrent.desktop" ];
+
+    #      # Protocols
+    #      "x-scheme-handler/http"  = [ "firefox.desktop" ];
+    #      "x-scheme-handler/https" = [ "firefox.desktop" ];
+    #      # "x-scheme-handler/magnet" = [ "torrent.desktop" ];
+    #      # "x-scheme-handler/mailto" = [ "mail.desktop" ];
+    #      # "x-scheme-handler/lbry" = [ "lbry.desktop" ];
+    #      # "x-scheme-handler/tg" = [ "telegram.desktop" ];
+
+    #      # text/x-shellscript=text.desktop;
+    #      # x-scheme-handler/magnet=torrent.desktop;
+    #      # application/x-bittorrent=torrent.desktop;
+    #      # x-scheme-handler/mailto=mail.desktop;
+    #      # text/plain=text.desktop;
+    #      # application/postscript=pdf.desktop;
+    #      # application/pdf=pdf.desktop;
+    #      # image/png=img.desktop;
+    #      # image/jpeg=img.desktop;
+    #      # image/gif=img.desktop;
+    #      # image/webp=img.desktop;
+    #      # application/rss+xml=rss.desktop;
+    #      # video/x-matroska=video.desktop;
+    #      # x-scheme-handler/lbry=lbry.desktop;
+    #      # inode/directory=file.desktop;
+    #      # text/html=chromium.desktop;
+    #      # x-scheme-handler/http=chromium.desktop;
+    #      # x-scheme-handler/https=chromium.desktop;
+    #      # x-scheme-handler/about=chromium.desktop;
+    #      # x-scheme-handler/unknown=chromium.desktop;
+    #    };
+    #  };
+    #};
+  };
+}
diff --git a/nixos/module/hectic/user/yukkop/default.nix b/nixos/module/hectic/user/yukkop/default.nix
deleted file mode 100644
index 29b1ff9..0000000
--- a/nixos/module/hectic/user/yukkop/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  self,
-  inputs,
-  flake,
-  system ? "x86_64-linux",
-  ...
-}: let
-  # Use folder name as name of this system
-  name = builtins.baseNameOf ./.;
-in inputs.home-manager.lib.homeManagerConfiguration {
-  pkgs = self.legacyPackages."${system}";
-  modules = [
-    (import ./${name}.nix { inherit flake self inputs; })
-  ];
-}
diff --git a/nixos/module/hectic/user/yukkop/yukkop.nix b/nixos/module/hectic/user/yukkop/yukkop.nix
deleted file mode 100644
index e6a8374..0000000
--- a/nixos/module/hectic/user/yukkop/yukkop.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}:
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let 
-  name = builtins.baseNameOf ./.;
-  home = "/home/${name}";
-  cfg = config.hectic.user.yukkop;
-in {
-  options.hectic.user.yukkop.enable = lib.mkEnableOption "Enable user.yukkop";
-
-  config = lib.mkIf cfg.enable {
-    home = {
-      username = name;
-      homeDirectory = home;
-      packages = [];
-      stateVersion = "25.05";
-    };
-
-    xdg = {
-      enable = true;
-      userDirs = {
-        enable = true;
-        pictures    = "${home}/px";
-        videos      = "${home}/vd";
-        music       = "${home}/mu";
-        documents   = "${home}/dc";
-        downloads   = "${home}/dw";
-        desktop     = "${home}/dx";
-        publicShare = "${home}/pu";
-        templates   = "${config.xdg.dataHome}/templates";
-      };
-      mimeApps = {
-        enable = true;
-        defaultApplications = {
-
-          # Files
-          "application/x-shellscript" = [ "nvim.desktop" ];
-          "text/x-shellscript" = [ "nvim.desktop" ];
-          "text/plain" = [ "nvim.desktop" ];
-          "inode/directory" = [ "pcmanfm.desktop" ];
-
-          # Images
-          "image/png" = [ "sxiv.desktop" ];
-          "image/jpeg" = [ "sxiv.desktop" ];
-          "image/gif" = [ "sxiv.desktop" ];
-          "image/webp" = [ "sxiv.desktop" ];
-          "image/x-xcf" = [ "gimp.desktop" ];
-
-          # Videos
-          "video/x-matroska" = [ "mpv.desktop" ];
-
-          # # Application-specific
-          # "application/postscript" = [ "pdf.desktop" ];
-          # "application/pdf" = [ "pdf.desktop" ];
-          # "application/rss+xml" = [ "rss.desktop" ];
-          # "application/x-bittorrent" = [ "torrent.desktop" ];
-
-          # Protocols
-          "x-scheme-handler/http"  = [ "firefox.desktop" ];
-          "x-scheme-handler/https" = [ "firefox.desktop" ];
-          # "x-scheme-handler/magnet" = [ "torrent.desktop" ];
-          # "x-scheme-handler/mailto" = [ "mail.desktop" ];
-          # "x-scheme-handler/lbry" = [ "lbry.desktop" ];
-          # "x-scheme-handler/tg" = [ "telegram.desktop" ];
-
-          # text/x-shellscript=text.desktop;
-          # x-scheme-handler/magnet=torrent.desktop;
-          # application/x-bittorrent=torrent.desktop;
-          # x-scheme-handler/mailto=mail.desktop;
-          # text/plain=text.desktop;
-          # application/postscript=pdf.desktop;
-          # application/pdf=pdf.desktop;
-          # image/png=img.desktop;
-          # image/jpeg=img.desktop;
-          # image/gif=img.desktop;
-          # image/webp=img.desktop;
-          # application/rss+xml=rss.desktop;
-          # video/x-matroska=video.desktop;
-          # x-scheme-handler/lbry=lbry.desktop;
-          # inode/directory=file.desktop;
-          # text/html=chromium.desktop;
-          # x-scheme-handler/http=chromium.desktop;
-          # x-scheme-handler/https=chromium.desktop;
-          # x-scheme-handler/about=chromium.desktop;
-          # x-scheme-handler/unknown=chromium.desktop;
-        };
-      };
-    };
-  };
-}