chanage hosts in homeConfigs to comply with new layout

homeConfigs/hosts/desktop.nix

@@ -1,11 +1,6 @@
 { ... }:
 
 {
-  imports = [ 
-    ../modules/nitrogen.nix
-	./hyprland.nix
-  ];
-
   wayland.windowManager.hyprland.settings = {
     monitor = [
 	  "HDMI-A-1, 1920x1080@60, 0x0, auto"
@@ -20,9 +15,4 @@
 	  "4, monitor:DP-3"
 	];
   };
-
-  home.file = {
-    ".config/bspwm/screenlayout.sh".source = ./bspwm/screenlayout.sh;
-    ".config/bspwm/host.sh".source = ./bspwm/host.sh;
-  };
 }

homeConfigs/hosts/desktop/bspwm/host.sh

@@ -1,5 +0,0 @@
-bspc monitor "HDMI-1-1" -d 1
-bspc monitor "HDMI-0" -d 2 3
-bspc monitor "DP-1-1" -d 4
-bspc monitor "DP-0" -d 5
-bspc desktop -f 2

homeConfigs/hosts/desktop/bspwm/screenlayout.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-echo "AAAAAAAAAAAAAAAAAAAAAAAA"
-xrandr --output DP-0 --mode 1280x1024 --pos 5120x56 --rotate normal --output DP-1 --off --output DP-2 --off --output DP-3 --off --output HDMI-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DP-1-1 --mode 1280x1024 --pos 3840x56 --rotate normal --output HDMI-1-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1-2 --off --output HDMI-1-2 --off

homeConfigs/hosts/laptop.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   programs.waybar.settings.mainBar = {
@@ -7,7 +7,7 @@
       exec-if  = "test \"$(supergfxctl -g)\" = \"Hybrid\" || test \"$(supergfxctl -g)\" = \"Vfio\"";
       exec  = "echo \"   on |\"";
       interval-if  = 10;
-      interval =100;
+      interval = 100;
     };
 
     "custom/fans" = {
@@ -17,4 +17,21 @@
       interval-if  = 1;
     };
   };
+
+  wayland.windowManager.hyprland.settings = {
+    bind = [
+      ", XF86Launch1, exec, hyprlock"
+      ", XF86Launch4, exec, pkill activate-linux"
+	];
+    monitor= [
+      "eDP-1, 1920x1080@120, 0x0, 1"
+      "HDMI-A-1, 1920x1080@60, auto, auto"
+    ];
+	env = [ "AQ_DRM_DEVICES,/dev/dri/card1"];
+  };
+
+  home.packages = with pkgs; [
+    stremio
+    blender
+  ];
 }

homeConfigs/hosts/laptop/bspwm/host.sh

@@ -1,15 +0,0 @@
-INTEGRATED="eDP"
-HDMI="HDMI-A-0"
-if xrandr | grep "$HDMI connected" && cat /proc/acpi/button/lid/LID/state | grep "closed"; then
-	bash ~/.config/bspwm/screenLayoutDocked.sh
-	bspc monitor $HDMI -d 1 2 3 4 5
-	bspc monitor $INTEGRATED -r
-elif xrandr | grep "$HDMI connected";then
-	bash ~/.config/bspwm/screenLayoutHDMI.sh
-	bspc monitor $INTEGRATED -d 1 2 3 4 
-	bspc monitor $HDMI -d A B
-else
-	bash ~/.config/bspwm/screenLayoutSingle.sh
-	bspc monitor -d 1 2 3 4 5
-	xrandr -r 60
-fi

homeConfigs/hosts/laptop/bspwm/screenLayoutDocked.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-xrandr --output eDP --off --output HDMI-A-0 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP-1-0 --off --output DP-1-1 --off

homeConfigs/hosts/laptop/bspwm/screenLayoutHDMI.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-xrandr --output eDP --primary --mode 2560x1440 --pos 0x0 --rotate normal --output HDMI-A-0 --mode 1920x1080 --pos 2560x0 --rotate normal --output DP-1-0 --off --output DP-1-1 --off

homeConfigs/hosts/laptop/bspwm/screenLayoutSingle.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-xrandr --output eDP --primary --mode 2560x1440 --pos 0x0 --rotate normal --output HDMI-A-0 --off --output DP-1-0 --off --output DP-1-1 --off

homeConfigs/hosts/laptop/home.nix

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-	imports = [
-	  ./hyprland.nix
-	  ./waybar.nix
-	];
-
-#    programs.alacritty.settings.font.size = 8;
-	home.packages = with pkgs; [
-	  stremio
-	  blender
-	];
-
-	home.file = {
-      ".config/bspwm/host.sh".source = ./bspwm/host.sh;
-	  ".config/bspwm/screenLayoutSingle.sh".source = ./bspwm/screenLayoutSingle.sh;
-	  ".config/bspwm/screenLayoutDocked.sh".source = ./bspwm/screenLayoutDocked.sh;
-	  ".config/bspwm/screenLayoutHDMI.sh".source = ./bspwm/screenLayoutHDMI.sh;
-	};
-}

homeConfigs/hosts/laptop/hyprland.nix

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  wayland.windowManager.hyprland.settings = {
-    bind = [
-      #lock
-      ", XF86Launch1, exec, hyprlock"
-      ", XF86Launch4, exec, pkill activate-linux"
-	];
-    monitor= [
-      "eDP-1, 1920x1080@120, 0x0, 1"
-      "HDMI-A-1, 1920x1080@60, auto, auto"
-    ];
-	env = [ "AQ_DRM_DEVICES,/dev/dri/card1"];
-  };
-}

homeConfigs/hosts/vbox.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 {
   services.picom = {