From 5c23caf62cbb627c7be2046a5efffbbcd0f2ea67 Mon Sep 17 00:00:00 2001 From: tomoron Date: Wed, 12 Feb 2025 16:38:32 +0100 Subject: [PATCH] chanage hosts in homeConfigs to comply with new layout --- .../hosts/{desktop/home.nix => desktop.nix} | 10 --------- homeConfigs/hosts/desktop/bspwm/host.sh | 5 ----- .../hosts/desktop/bspwm/screenlayout.sh | 3 --- .../hosts/{laptop/waybar.nix => laptop.nix} | 21 +++++++++++++++++-- homeConfigs/hosts/laptop/bspwm/host.sh | 15 ------------- .../hosts/laptop/bspwm/screenLayoutDocked.sh | 2 -- .../hosts/laptop/bspwm/screenLayoutHDMI.sh | 2 -- .../hosts/laptop/bspwm/screenLayoutSingle.sh | 2 -- homeConfigs/hosts/laptop/home.nix | 21 ------------------- homeConfigs/hosts/laptop/hyprland.nix | 16 -------------- homeConfigs/hosts/modules/game.nix | 0 .../hosts/{server/home.nix => server.nix} | 0 homeConfigs/hosts/{vbox/home.nix => vbox.nix} | 2 +- 13 files changed, 20 insertions(+), 79 deletions(-) rename homeConfigs/hosts/{desktop/home.nix => desktop.nix} (64%) delete mode 100644 homeConfigs/hosts/desktop/bspwm/host.sh delete mode 100755 homeConfigs/hosts/desktop/bspwm/screenlayout.sh rename homeConfigs/hosts/{laptop/waybar.nix => laptop.nix} (60%) delete mode 100644 homeConfigs/hosts/laptop/bspwm/host.sh delete mode 100755 homeConfigs/hosts/laptop/bspwm/screenLayoutDocked.sh delete mode 100755 homeConfigs/hosts/laptop/bspwm/screenLayoutHDMI.sh delete mode 100755 homeConfigs/hosts/laptop/bspwm/screenLayoutSingle.sh delete mode 100644 homeConfigs/hosts/laptop/home.nix delete mode 100644 homeConfigs/hosts/laptop/hyprland.nix delete mode 100644 homeConfigs/hosts/modules/game.nix rename homeConfigs/hosts/{server/home.nix => server.nix} (100%) rename homeConfigs/hosts/{vbox/home.nix => vbox.nix} (84%) diff --git a/homeConfigs/hosts/desktop/home.nix b/homeConfigs/hosts/desktop.nix similarity index 64% rename from homeConfigs/hosts/desktop/home.nix rename to homeConfigs/hosts/desktop.nix index 1dea5a0..97dd55d 100644 --- a/homeConfigs/hosts/desktop/home.nix +++ b/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; - }; } diff --git a/homeConfigs/hosts/desktop/bspwm/host.sh b/homeConfigs/hosts/desktop/bspwm/host.sh deleted file mode 100644 index 3f84ae5..0000000 --- a/homeConfigs/hosts/desktop/bspwm/host.sh +++ /dev/null @@ -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 diff --git a/homeConfigs/hosts/desktop/bspwm/screenlayout.sh b/homeConfigs/hosts/desktop/bspwm/screenlayout.sh deleted file mode 100755 index 57ac959..0000000 --- a/homeConfigs/hosts/desktop/bspwm/screenlayout.sh +++ /dev/null @@ -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 diff --git a/homeConfigs/hosts/laptop/waybar.nix b/homeConfigs/hosts/laptop.nix similarity index 60% rename from homeConfigs/hosts/laptop/waybar.nix rename to homeConfigs/hosts/laptop.nix index ac41b50..e1460d1 100644 --- a/homeConfigs/hosts/laptop/waybar.nix +++ b/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 + ]; } diff --git a/homeConfigs/hosts/laptop/bspwm/host.sh b/homeConfigs/hosts/laptop/bspwm/host.sh deleted file mode 100644 index 1153668..0000000 --- a/homeConfigs/hosts/laptop/bspwm/host.sh +++ /dev/null @@ -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 diff --git a/homeConfigs/hosts/laptop/bspwm/screenLayoutDocked.sh b/homeConfigs/hosts/laptop/bspwm/screenLayoutDocked.sh deleted file mode 100755 index f4ed698..0000000 --- a/homeConfigs/hosts/laptop/bspwm/screenLayoutDocked.sh +++ /dev/null @@ -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 diff --git a/homeConfigs/hosts/laptop/bspwm/screenLayoutHDMI.sh b/homeConfigs/hosts/laptop/bspwm/screenLayoutHDMI.sh deleted file mode 100755 index 289af20..0000000 --- a/homeConfigs/hosts/laptop/bspwm/screenLayoutHDMI.sh +++ /dev/null @@ -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 diff --git a/homeConfigs/hosts/laptop/bspwm/screenLayoutSingle.sh b/homeConfigs/hosts/laptop/bspwm/screenLayoutSingle.sh deleted file mode 100755 index 0468a88..0000000 --- a/homeConfigs/hosts/laptop/bspwm/screenLayoutSingle.sh +++ /dev/null @@ -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 diff --git a/homeConfigs/hosts/laptop/home.nix b/homeConfigs/hosts/laptop/home.nix deleted file mode 100644 index 7b3894b..0000000 --- a/homeConfigs/hosts/laptop/home.nix +++ /dev/null @@ -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; - }; -} diff --git a/homeConfigs/hosts/laptop/hyprland.nix b/homeConfigs/hosts/laptop/hyprland.nix deleted file mode 100644 index 184bf3c..0000000 --- a/homeConfigs/hosts/laptop/hyprland.nix +++ /dev/null @@ -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"]; - }; -} diff --git a/homeConfigs/hosts/modules/game.nix b/homeConfigs/hosts/modules/game.nix deleted file mode 100644 index e69de29..0000000 diff --git a/homeConfigs/hosts/server/home.nix b/homeConfigs/hosts/server.nix similarity index 100% rename from homeConfigs/hosts/server/home.nix rename to homeConfigs/hosts/server.nix diff --git a/homeConfigs/hosts/vbox/home.nix b/homeConfigs/hosts/vbox.nix similarity index 84% rename from homeConfigs/hosts/vbox/home.nix rename to homeConfigs/hosts/vbox.nix index f62fdad..d901bd1 100644 --- a/homeConfigs/hosts/vbox/home.nix +++ b/homeConfigs/hosts/vbox.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { services.picom = {