diff --git a/hosts/common/configs/user/gui/hyprland/default.nix b/hosts/common/configs/user/gui/hyprland/default.nix index fd0acd7..a5d34c2 100644 --- a/hosts/common/configs/user/gui/hyprland/default.nix +++ b/hosts/common/configs/user/gui/hyprland/default.nix @@ -103,6 +103,13 @@ kb_options = "grp:alt_shift_toggle"; }; + general.layout = "master"; + + master = { + slave_count_for_center_master = 0; + mfact = 0.5; + }; + gestures = { workspace_swipe = true; workspace_swipe_min_fingers = true; @@ -110,12 +117,6 @@ workspace_swipe_cancel_ratio = 0.2; }; - misc = { - disable_hyprland_logo = true; - disable_splash_rendering = true; - new_window_takes_over_fullscreen = 2; - }; - decoration.blur = { passes = 2; popups = true; @@ -125,6 +126,12 @@ xwayland.force_zero_scaling = true; + misc = { + disable_hyprland_logo = true; + disable_splash_rendering = true; + new_window_takes_over_fullscreen = 2; + }; + ecosystem = { no_update_news = true; no_donation_nag = true; diff --git a/hosts/eirene/hardware/display.nix b/hosts/eirene/hardware/display.nix index f90f8ee..764416c 100644 --- a/hosts/eirene/hardware/display.nix +++ b/hosts/eirene/hardware/display.nix @@ -6,44 +6,9 @@ home-manager.sharedModules = [ { - wayland.windowManager.hyprland.settings = { - monitor = [ - "eDP-1, 2560x1600@165, 0x0, 1.25" - "DP-2, 5120x1440@144, -1536x-1440, 1" - ]; - - general = { - layout = "master"; - }; - - master = { - slave_count_for_center_master = 0; - mfact = 0.5; - }; - - workspace = [ - "1, monitor:eDP-1, layoutopt:orientation:left" - "2, monitor:eDP-1, layoutopt:orientation:left" - "3, monitor:eDP-1, layoutopt:orientation:left" - "4, monitor:eDP-1, layoutopt:orientation:left" - "5, monitor:eDP-1, layoutopt:orientation:left" - "6, monitor:eDP-1, layoutopt:orientation:left" - "7, monitor:eDP-1, layoutopt:orientation:left" - "8, monitor:eDP-1, layoutopt:orientation:left" - "9, monitor:eDP-1, layoutopt:orientation:left" - "10, monitor:eDP-1, layoutopt:orientation:left" - "11, monitor:DP-2, layoutopt:orientation:center" - "12, monitor:DP-2, layoutopt:orientation:center" - "13, monitor:DP-2, layoutopt:orientation:center" - "14, monitor:DP-2, layoutopt:orientation:center" - "15, monitor:DP-2, layoutopt:orientation:center" - "16, monitor:DP-2, layoutopt:orientation:center" - "17, monitor:DP-2, layoutopt:orientation:center" - "18, monitor:DP-2, layoutopt:orientation:center" - "19, monitor:DP-2, layoutopt:orientation:center" - "20, monitor:DP-2, layoutopt:orientation:center" - ]; - }; + wayland.windowManager.hyprland.settings.monitor = [ + "eDP-1, 2560x1600@165, 0x0, 1.25" + ]; programs.vscode.profiles.default.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2; diff --git a/hosts/elara/hardware/sas/display.nix b/hosts/elara/hardware/sas/display.nix index 7468344..e0f5749 100644 --- a/hosts/elara/hardware/sas/display.nix +++ b/hosts/elara/hardware/sas/display.nix @@ -6,39 +6,31 @@ { wayland.windowManager.hyprland.settings = { monitor = [ - "eDP-1, 1920x1200@60, 0x0, 1" - "DP-1, 3440x1440@60, -760x-1440, 1" + "desc:Sharp Corporation, 1920x1200@60, 0x0, 1" + "desc:Dell Inc. DELL U3425WE, 3440x1440@60, -760x-1440, 1" ]; - general = { - layout = "master"; - }; - - master = { - mfact = 0.5; - }; - workspace = [ - "1, monitor:eDP-1, layoutopt:orientation:left" - "2, monitor:eDP-1, layoutopt:orientation:left" - "3, monitor:eDP-1, layoutopt:orientation:left" - "4, monitor:eDP-1, layoutopt:orientation:left" - "5, monitor:eDP-1, layoutopt:orientation:left" - "6, monitor:eDP-1, layoutopt:orientation:left" - "7, monitor:eDP-1, layoutopt:orientation:left" - "8, monitor:eDP-1, layoutopt:orientation:left" - "9, monitor:eDP-1, layoutopt:orientation:left" - "10, monitor:eDP-1, layoutopt:orientation:left" - "11, monitor:DP-1, layoutopt:orientation:left" - "12, monitor:DP-1, layoutopt:orientation:left" - "13, monitor:DP-1, layoutopt:orientation:left" - "14, monitor:DP-1, layoutopt:orientation:left" - "15, monitor:DP-1, layoutopt:orientation:left" - "16, monitor:DP-1, layoutopt:orientation:left" - "17, monitor:DP-1, layoutopt:orientation:left" - "18, monitor:DP-1, layoutopt:orientation:left" - "19, monitor:DP-1, layoutopt:orientation:left" - "20, monitor:DP-1, layoutopt:orientation:left" + "1, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "2, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "3, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "4, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "5, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "6, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "7, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "8, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "9, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "10, monitor:desc:Sharp Corporation, layoutopt:orientation:left" + "11, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "12, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "13, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "14, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "15, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "16, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "17, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "18, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "19, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" + "20, monitor:desc:Dell Inc. DELL U3425WE, layoutopt:orientation:left" ]; }; diff --git a/hosts/himalia/hardware/display.nix b/hosts/himalia/hardware/display.nix index 85e0eb7..952657f 100644 --- a/hosts/himalia/hardware/display.nix +++ b/hosts/himalia/hardware/display.nix @@ -8,40 +8,31 @@ { wayland.windowManager.hyprland.settings = { monitor = [ - "eDP-1, 2560x1600@240, 0x0, 1.25" - "HDMI-A-2, 5120x1440@144, -1536x-1440, 1" + "desc:Samsung Display Corp. ATNA60DL01-0, 2560x1600@240, 0x0, 1.25" + "desc:LG Electronics LG ULTRAWIDE, 5120x1440@144, -1536x-1440, 1" ]; - general = { - layout = "master"; - }; - - master = { - slave_count_for_center_master = 0; - mfact = 0.5; - }; - workspace = [ - "1, monitor:eDP-1, layoutopt:orientation:left" - "2, monitor:eDP-1, layoutopt:orientation:left" - "3, monitor:eDP-1, layoutopt:orientation:left" - "4, monitor:eDP-1, layoutopt:orientation:left" - "5, monitor:eDP-1, layoutopt:orientation:left" - "6, monitor:eDP-1, layoutopt:orientation:left" - "7, monitor:eDP-1, layoutopt:orientation:left" - "8, monitor:eDP-1, layoutopt:orientation:left" - "9, monitor:eDP-1, layoutopt:orientation:left" - "10, monitor:eDP-1, layoutopt:orientation:left" - "11, monitor:HDMI-A-2, layoutopt:orientation:center" - "12, monitor:HDMI-A-2, layoutopt:orientation:center" - "13, monitor:HDMI-A-2, layoutopt:orientation:center" - "14, monitor:HDMI-A-2, layoutopt:orientation:center" - "15, monitor:HDMI-A-2, layoutopt:orientation:center" - "16, monitor:HDMI-A-2, layoutopt:orientation:center" - "17, monitor:HDMI-A-2, layoutopt:orientation:center" - "18, monitor:HDMI-A-2, layoutopt:orientation:center" - "19, monitor:HDMI-A-2, layoutopt:orientation:center" - "20, monitor:HDMI-A-2, layoutopt:orientation:center" + "1, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "2, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "3, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "4, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "5, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "6, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "7, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "8, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "9, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "10, monitor:desc:Samsung Display Corp. ATNA60DL01-0, layoutopt:orientation:left" + "11, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "12, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "13, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "14, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "15, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "16, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "17, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "18, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "19, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" + "20, monitor:desc:LG Electronics LG ULTRAWIDE, layoutopt:orientation:center" ]; };