merge

nix/programs/hyprland/config.nix

@@ -178,6 +178,9 @@
       workspace_swipe = true;
     };
 
+    monitor = config.conf.hyprland.monitor;
+    workspace = config.conf.hyprland.workspace;
+
     env = [
       "GTK_CSD,0"
       "TERM,\"kitty /bin/fish\""
@@ -243,7 +246,7 @@
       "oxipaste_daemon"
       "nextcloud --background"
       "oxinoti"
-    ] ++ config.programs.hyprland.extra_autostart;
+    ] ++ config.conf.hyprland.extra_autostart;
 
     # plugin = {
     #   hyprspace = {

nix/programs/hyprland/hyprpaper.nix

@@ -1,5 +1,5 @@
 { config, ... }: {
   xdg.configFile."hypr/hyprpaper.conf" = {
-    text = config.programs.hyprland.hyprpaper;
+    text = config.conf.hyprland.hyprpaper;
   };
 }

nix/programs/hyprland/ironbar.nix

@@ -146,7 +146,7 @@ in
       ];
       config = {
         monitors."${config.conf.monitor}" = {
-          end = config.conf.battery ++ [
+          end = config.conf.ironbar.modules ++ [
             {
               type = "sys_info";
               format = [