diff --git a/home/modules/laptop.nix b/home/common/laptop.nix
similarity index 79%
rename from home/modules/laptop.nix
rename to home/common/laptop.nix
index fd4b710..604dcdb 100644
--- a/home/modules/laptop.nix
+++ b/home/common/laptop.nix
@@ -1,6 +1,6 @@
 { lib, ... }:
 {
-  options.natto.laptop = lib.mkOption {
+  options.isLaptop = lib.mkOption {
     type = lib.types.bool;
     default = false;
     example = true;
diff --git a/home/modules/programs.nix b/home/common/programs.nix
similarity index 100%
rename from home/modules/programs.nix
rename to home/common/programs.nix
diff --git a/home/modules/zsh.nix b/home/common/zsh.nix
similarity index 89%
rename from home/modules/zsh.nix
rename to home/common/zsh.nix
index 6b62cba..af7c411 100644
--- a/home/modules/zsh.nix
+++ b/home/common/zsh.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 {
   programs.zsh = {
     enable = true;
@@ -8,7 +8,7 @@
       size = 30000;
       save = size;
     };
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     enableCompletion = true;
     syntaxHighlighting.enable = true;
     prezto = {
diff --git a/home/default.nix b/home/default.nix
index 83eb9e7..17a038b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,8 +1,8 @@
 { self, inputs, globalArgs, ... }:
 let
-  commonModules = [
-    ./modules/zsh.nix
-    ./modules/programs.nix
+  common = [
+    ./common/zsh.nix
+    ./common/programs.nix
     globalArgs
   ];
 
@@ -22,15 +22,15 @@ in
 
       nattoModules = [
         ./natto
-        ./modules/laptop.nix
+        ./common/laptop.nix
         inputs.hyprland.homeManagerModules.default
         inputs.agenix.homeManagerModules.default
-      ] ++ commonModules;
+      ] ++ common;
     in
     {
       natto-laptop = inputs.home-manager.lib.homeManagerConfiguration {
         modules = nattoModules ++ [
-          { natto.laptop = true; }
+          { isLaptop = true; }
         ];
         pkgs = mkPkgs "x86_64-linux";
       };
@@ -50,7 +50,7 @@ in
             username = "spark";
             stateVersion = "23.05";
           };
-        }] ++ commonModules;
+        }] ++ common;
         pkgs = self.legacyPackages.aarch64-linux;
       };
 
@@ -61,7 +61,7 @@ in
             username = "bat";
             stateVersion = "23.05";
           };
-        }] ++ commonModules;
+        }] ++ common;
         pkgs = self.legacyPackages.x86_64-linux;
       };
 
@@ -72,7 +72,7 @@ in
             username = "spin";
             stateVersion = "23.05";
           };
-        }] ++ commonModules;
+        }] ++ common;
         pkgs = self.legacyPackages.x86_64-linux;
       };
     };
diff --git a/home/natto/default.nix b/home/natto/default.nix
index e0ae6ad..b8418b0 100644
--- a/home/natto/default.nix
+++ b/home/natto/default.nix
@@ -9,16 +9,16 @@
   imports = [
     ./email.nix
     ./programs.nix
-    ./eww
     # ./xsession.nix
     ./wayland.nix
     ./pkgs.nix
     ./stuff.nix
-    ./emacs.nix
+    #./emacs.nix
     ./gtk.nix
     ./dunst.nix
     ./git.nix
     ./music.nix
     ./zsh.nix
+    ./games.nix
   ];
 }
diff --git a/home/natto/eww/default.nix b/home/natto/eww/default.nix
index 6f776ca..b6de378 100644
--- a/home/natto/eww/default.nix
+++ b/home/natto/eww/default.nix
@@ -2,7 +2,7 @@
 {
   programs.eww = {
     enable = true;
-    package = pkgs.eww-wayland;
+    package = pkgs.eww;
     configDir = lib.cleanSourceWith {
       src = ./.;
       filter = name: _:
@@ -22,8 +22,22 @@
       let
         deps = [
           config.programs.eww.package
+        ] ++ lib.optional
+          config.wayland.windowManager.hyprland.enable
           config.wayland.windowManager.hyprland.package
-        ] ++ (import ./bar pkgs);
+        ++ (with pkgs; [
+          coreutils
+          bash
+          jq
+          less
+          gawk
+          socat
+          playerctl
+          networkmanager
+          iwgtk
+          wireplumber
+        ])
+        ++ lib.optional config.laptop pkgs.light;
       in
       {
         Type = "simple";
diff --git a/home/natto/games.nix b/home/natto/games.nix
new file mode 100644
index 0000000..7818efe
--- /dev/null
+++ b/home/natto/games.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # Wine and games and stuff
+    wineWowPackages.stable
+    steam
+    winetricks
+    # lutris
+    # inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
+  ];
+
+  programs.mangohud.enable = true;
+}
+
diff --git a/home/natto/music.nix b/home/natto/music.nix
index aed732d..0878717 100644
--- a/home/natto/music.nix
+++ b/home/natto/music.nix
@@ -18,7 +18,8 @@ in
     };
 
     mpd-discord-rpc = {
-      inherit (mpd) enable;
+      #     inherit (mpd) enable;
+      enable = false;
       settings = {
         id = 1039532008424099850; # dont really care
         format = {
@@ -37,8 +38,6 @@ in
         host = "localhost";
       };
     };
-
-    playerctld.enable = true;
   };
 
   systemd.user.services = {
@@ -68,12 +67,12 @@ in
 
   home = {
     packages = with pkgs; [
+      playerctl
+      mpc_cli
       (ncmpcpp.override {
         visualizerSupport = true;
         clockSupport = true;
       })
-      mpc_cli
-      playerctl
       (tauon.override {
         withDiscordRPC = true;
       })
@@ -83,6 +82,10 @@ in
       source = ./config/ncmpcpp/config;
       target = "${config.xdg.configHome}/ncmpcpp/config";
     };
+
+    sessionVariables = {
+      # LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
+    };
   };
 
   age.secrets.mpdasrc = {
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 7a5b846..f3d8c25 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -1,7 +1,6 @@
-{ config, flake, inputs, pkgs, ... }:
+{ flake, pkgs, config, ... }:
 {
   home.packages = with pkgs; [
-
     # A/V, codec and media stuff
     ffmpeg-full
     wireplumber
@@ -18,20 +17,12 @@
     p7zip
     unrar
     vim
-    jmtpfs
-    (flake.packages.${pkgs.system}.customscripts)
-    translate-shell
-    powertop
+    (flake.packages.${system}.customscripts)
     cachix
-    undervolt
-    w3m
     steam-run
 
     # GUI utils
     slack
-    (discord.override {
-      nss = nss_latest;
-    })
     webcord
     (xfce.thunar.override {
       thunarPlugins = with xfce; [
@@ -44,21 +35,9 @@
     xfce.tumbler
     qbittorrent
     hexchat
-    luajit
     dunst
-    authy
     gnome.zenity
 
-    # Wine and games and stuff
-    lutris
-    wineWowPackages.stable
-    steam
-    lutris
-    winetricks
-    flake.packages.${pkgs.system}.tlauncher
-    mangohud
-    #   inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
-
     # Programming and dev stuff
     (texlive.combine {
       inherit (texlive)
@@ -83,16 +62,14 @@
         tcolorbox;
     })
     python3Packages.pygments
-    inform7
-    ghc
-    nodejs
-    rust-bin.nightly.latest.default
-    openjdk
 
     # Misc
     anki
     tor-browser-bundle-bin
     mailcap
     libsForQt5.qtstyleplugins
+  ] ++ lib.optionals config.isLaptop [
+    powertop
+    undervolt
   ];
 }
diff --git a/home/natto/secrets/gitconfig.age b/home/natto/secrets/gitconfig.age
index a4a565a..7aa9a16 100644
Binary files a/home/natto/secrets/gitconfig.age and b/home/natto/secrets/gitconfig.age differ
diff --git a/home/natto/stuff.nix b/home/natto/stuff.nix
index 60dd4e5..454617d 100644
--- a/home/natto/stuff.nix
+++ b/home/natto/stuff.nix
@@ -19,7 +19,6 @@
     };
 
     sessionVariables = {
-      LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
       QT_X11_NO_MITSHM = "1";
       HM_CONF_DIR = "/etc/nixos";
       QT_QPA_PLATFORMTHEME = "gtk2";
diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix
index 115f787..dbf94d2 100644
--- a/home/natto/wayland.nix
+++ b/home/natto/wayland.nix
@@ -1,5 +1,9 @@
 { pkgs, config, conf, inputs, ... }:
 {
+  imports = [
+    # ./eww
+  ];
+
   wayland = {
     windowManager = {
       sway = {