diff --git a/home/alex/home.nix b/home/alex/home.nix
index d6211bd..7410d3b 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -3,8 +3,9 @@
 {
   imports = [
     ./cli.nix
-    # ./programs/xmonad/default.nix
-    ./programs/rofi/default.nix
+    ./programs/xmonad
+    ./programs/rofi
+    # ./programs/polybar
   ];
 
   home = {
diff --git a/home/alex/programs/rofi/default.nix b/home/alex/programs/rofi/default.nix
index 2b7f6c4..c3f024a 100644
--- a/home/alex/programs/rofi/default.nix
+++ b/home/alex/programs/rofi/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  programs.rofi = {
+  config.programs.rofi = {
     enable = true;
     plugins = with pkgs; [ rofi-calc rofi-emoji ];
     terminal = "${pkgs.alacritty}/bin/alacritty";
@@ -12,5 +12,5 @@
   };
 
   # let rofi insert emojis directly
-  home.packages = [ pkgs.xdotool ];
+  config.home.packages = [ pkgs.xdotool ];
 }
diff --git a/home/alex/services/polybar/default.nix b/home/alex/services/polybar/default.nix
index 0289fff..c5f07c7 100644
--- a/home/alex/services/polybar/default.nix
+++ b/home/alex/services/polybar/default.nix
@@ -6,9 +6,9 @@ let
     pulseSupport = true;
   };
 in {
-  home.packages = with pkgs; [ font-awesome material-design-icons ];
+  config.home.packages = with pkgs; [ font-awesome material-design-icons ];
 
-  services.polybar = {
+  config.services.polybar = {
     enable = true;
     package = mypolybar;
     config = ./config.ini;
diff --git a/modules/wm/xmonad/default.nix b/modules/wm/xmonad/default.nix
index c59ec4e..988cd29 100644
--- a/modules/wm/xmonad/default.nix
+++ b/modules/wm/xmonad/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  services = {
+  config.services = {
     upower.enable = true;
 
     xserver = {
@@ -14,5 +14,5 @@
     };
   };
 
-  systemd.services.upower.enable = true;
+  config.systemd.services.upower.enable = true;
 }