diff --git a/global/home.nix b/global/home/default.nix
similarity index 74%
rename from global/home.nix
rename to global/home/default.nix
index c4945c3..b00fd63 100644
--- a/global/home.nix
+++ b/global/home/default.nix
@@ -25,8 +25,12 @@ let
     glow = "${pkgs.glow}/bin/glow";
     ffmpegthumbnailer = "${pkgs.ffmpegthumbnailer}/bin/ffmpegthumbnailer";
   };
-  lf-sixel = pkgs.callPackage ../custom/lf-sixel/. {};
+  lf-sixel = pkgs.callPackage ../../custom/lf-sixel/. {};
 in {
+  imports = [
+    ./graphical.nix
+  ];
+
   programs.home-manager.enable = true;
 
   home.username = "tristan";
@@ -44,32 +48,10 @@ in {
     wl-clipboard
     du-dust
     htop
-    imv
     libsixel
     yt-dlp
     playerctl
-    swww
     neofetch
-    obs-studio
-    selectdefaultapplication
-    easyeffects
-
-    inkscape
-    libsForQt5.okular
-    pavucontrol
-    qpwgraph
-    element-desktop
-    brave
-    gimp
-    quickemu
-    bitwarden
-    libsForQt5.kasts
-    libreoffice
-    (makeDesktopItem {
-      name = "logseq";
-      desktopName = "Logseq";
-      exec = "${logseq}/bin/logseq --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --disable-gpu";
-    })
   ];
 
   programs.fish = {
@@ -81,45 +63,6 @@ in {
     notify = true;
   };
 
-  gtk = {
-    enable = true;
-    iconTheme = {
-      name = "Vimix-Doder";
-      package = pkgs.vimix-icon-theme;
-    };
-    cursorTheme = {
-      name = "Vanilla-DMZ";
-      package = pkgs.vanilla-dmz;
-      size = 24;
-    };
-    gtk3.bookmarks = [
-      "file:///home/tristan/Documents"
-      "file:///home/tristan/Pictures/Screenshots"
-      "file:///home/tristan/Downloads"
-    ];
-  };
-
-  programs.mpv.enable = true;
-  programs.mpv.bindings = {
-    l = "seek 5";
-    h = "seek -5";
-    e = "add chapter 1";
-    b = "add chapter -1";
-    ">" = "multiply speed 1.1";
-    "<" = "multiply speed 1/1.1";
-    "." = "frame-step";
-    "," = "frame-back-step";
-    "ctrl+n" = "playlist-next";
-    "ctrl+p" = "playlist-prev";
-    k = "add volume 2";
-    j = "add volume -2";
-    m = "cycle mute";
-    c = "cycle sub-visibility";
-  };
-  programs.mpv.scripts = [
-    pkgs.mpvScripts.mpris
-  ];
-
   programs.rbw = {
     enable = true;
     settings = {
@@ -259,8 +202,6 @@ in {
   '';
   home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
 
-  programs.librewolf.enable = true;
-
   programs.helix = {
     enable = true;
     languages = {
@@ -298,38 +239,6 @@ in {
     indicator = true;
   };
 
-  programs.qutebrowser = {
-    enable = true;
-    searchEngines = {
-      DEFAULT = "https://search.brave.com/search?q={}";
-      w = "https://en.wikipedia.org/wiki/Special:Search?search={}&go=Go&ns0=1";
-      aw = "https://wiki.archlinux.org/?search={}";
-      nw = "https://nixos.wiki/index.php?search={}";
-      nixpkgs = "https://search.nixos.org/packages?channel=unstable&query={}";
-    };
-    settings = {
-      colors = {
-        webpage.preferred_color_scheme = "dark";
-      };
-      tabs = {
-        background = false;
-        indicator.width = 0;
-        favicons.scale = 2.0;
-        position = "left";
-        show = "always";
-        width = 40;
-      };
-    };
-    extraConfig = ''
-      c.tabs.padding = {
-        "bottom" : 10,
-        "left" : 5,
-        "right" : 5,
-        "top" : 10
-      }
-    '';
-  };
-
   programs.pandoc = {
     enable = true;
     defaults = {
diff --git a/global/home/graphical.nix b/global/home/graphical.nix
new file mode 100644
index 0000000..508ea96
--- /dev/null
+++ b/global/home/graphical.nix
@@ -0,0 +1,93 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    imv
+    obs-studio
+    selectdefaultapplication
+    easyeffects
+    inkscape
+    libsForQt5.okular
+    pavucontrol
+    qpwgraph
+    element-desktop
+    brave
+    gimp
+    quickemu
+    bitwarden
+    libsForQt5.kasts
+    libreoffice
+    logseq
+  ];
+
+  gtk = {
+    enable = true;
+    iconTheme = {
+      name = "Vimix-Doder";
+      package = pkgs.vimix-icon-theme;
+    };
+    cursorTheme = {
+      name = "Vanilla-DMZ";
+      package = pkgs.vanilla-dmz;
+      size = 24;
+    };
+    gtk3.bookmarks = [
+      "file:///home/tristan/Documents"
+      "file:///home/tristan/Pictures/Screenshots"
+      "file:///home/tristan/Downloads"
+    ];
+  };
+
+  programs.mpv.enable = true;
+  programs.mpv.bindings = {
+    l = "seek 5";
+    h = "seek -5";
+    e = "add chapter 1";
+    b = "add chapter -1";
+    ">" = "multiply speed 1.1";
+    "<" = "multiply speed 1/1.1";
+    "." = "frame-step";
+    "," = "frame-back-step";
+    "ctrl+n" = "playlist-next";
+    "ctrl+p" = "playlist-prev";
+    k = "add volume 2";
+    j = "add volume -2";
+    m = "cycle mute";
+    c = "cycle sub-visibility";
+  };
+  programs.mpv.scripts = [
+    pkgs.mpvScripts.mpris
+  ];
+
+  programs.librewolf.enable = true;
+
+  programs.qutebrowser = {
+    enable = true;
+    searchEngines = {
+      DEFAULT = "https://search.brave.com/search?q={}";
+      w = "https://en.wikipedia.org/wiki/Special:Search?search={}&go=Go&ns0=1";
+      aw = "https://wiki.archlinux.org/?search={}";
+      nw = "https://nixos.wiki/index.php?search={}";
+      nixpkgs = "https://search.nixos.org/packages?channel=unstable&query={}";
+    };
+    settings = {
+      colors = {
+        webpage.preferred_color_scheme = "dark";
+      };
+      tabs = {
+        background = false;
+        indicator.width = 0;
+        favicons.scale = 2.0;
+        position = "left";
+        show = "always";
+        width = 40;
+      };
+    };
+    extraConfig = ''
+      c.tabs.padding = {
+        "bottom" : 10,
+        "left" : 5,
+        "right" : 5,
+        "top" : 10
+      }
+    '';
+  };
+}
diff --git a/global/system.nix b/global/system.nix
index 12359b7..0dab281 100644
--- a/global/system.nix
+++ b/global/system.nix
@@ -7,7 +7,7 @@ user: {
   ...
 }: {
   home-manager.users.${user}.imports = [
-    ./home.nix
+    ./home/.
   ];
 
   nix = {
diff --git a/lib/home.nix b/lib/home.nix
deleted file mode 100644
index 375c92a..0000000
--- a/lib/home.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  user,
-  name,
-  work ? false,
-  displays ? {},
-  userName,
-  inputs,
-  ...
-}: {
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    (import ./modules/terminal.nix {inherit user;})
-    (import ./modules/scripts.nix {inherit user;})
-    (import ./modules/editor.nix {inherit user;})
-    (import ./modules/keyboard.nix {inherit user;})
-    (import ./modules/display.nix {inherit user;})
-    (import ./modules/work.nix {inherit user;})
-    (import ./modules/menu.nix {inherit user;})
-    (import ./modules/email.nix {inherit user userName;})
-    (import ./modules/mpd.nix {inherit user;})
-    (import ./modules/git.nix {inherit user userName;})
-    (import ./modules/laptop.nix {inherit user;})
-    (import ./modules/dev.nix {inherit user;})
-    (import ./modules/personal.nix {inherit user;})
-    (import ./modules/gamer.nix {inherit user;})
-    (import ./programs/hyprland.nix {inherit user;})
-    (import ../hardware/${name}.nix {inherit user;})
-    ./scripts.nix
-    (import ../global/system.nix user)
-  ];
-
-  programs.menu.enable = true;
-  roles.work.enable = work;
-  roles.personal.enable = !work;
-  roles.mpd.enable = true;
-  programs.editor.neovim = true;
-}
diff --git a/lib/mkconf.nix b/lib/mkconf.nix
index 9a029be..290faf4 100644
--- a/lib/mkconf.nix
+++ b/lib/mkconf.nix
@@ -26,6 +26,33 @@ nixpkgs.lib.nixosSystem {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
     }
-    (import ./home.nix {inherit inputs user userName name laptop work;})
+    {
+      imports = [
+        (import ./modules/terminal.nix {inherit user;})
+        (import ./modules/scripts.nix {inherit user;})
+        (import ./modules/editor.nix {inherit user;})
+        (import ./modules/keyboard.nix {inherit user;})
+        (import ./modules/display.nix {inherit user;})
+        (import ./modules/work.nix {inherit user;})
+        (import ./modules/menu.nix {inherit user;})
+        (import ./modules/email.nix {inherit user userName;})
+        (import ./modules/mpd.nix {inherit user;})
+        (import ./modules/git.nix {inherit user userName;})
+        (import ./modules/laptop.nix {inherit user;})
+        (import ./modules/dev.nix {inherit user;})
+        (import ./modules/personal.nix {inherit user;})
+        (import ./modules/gamer.nix {inherit user;})
+        (import ./programs/hyprland.nix {inherit user;})
+        (import ../hardware/${name}.nix {inherit user;})
+        ./scripts.nix
+        (import ../global/system.nix user)
+      ];
+
+      programs.menu.enable = true;
+      roles.work.enable = work;
+      roles.personal.enable = !work;
+      roles.mpd.enable = true;
+      programs.editor.neovim = true;
+    }
   ];
 }