From c4a82dfb80cb335467d82e5a91c48a0c0293122e Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Mon, 25 Sep 2023 14:17:55 +0200 Subject: [PATCH] feat: configure p330 specialization --- machines/apache/configuration.nix | 1 - machines/p330/configuration.nix | 27 -------------------- machines/p330/home-mandlm.nix | 42 +++++++++++++++++++------------ 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/machines/apache/configuration.nix b/machines/apache/configuration.nix index 1303e3c..7f30ab2 100644 --- a/machines/apache/configuration.nix +++ b/machines/apache/configuration.nix @@ -3,6 +3,5 @@ { networking.hostName = "apache"; boot.loader.grub.enableCryptodisk = true; - # services.xserver.videoDrivers = [ "intel" "nvidia" ]; } diff --git a/machines/p330/configuration.nix b/machines/p330/configuration.nix index fc06f1c..3313dd3 100644 --- a/machines/p330/configuration.nix +++ b/machines/p330/configuration.nix @@ -6,31 +6,4 @@ boot.loader.grub.enableCryptodisk = true; boot.supportedFilesystems = [ "zfs" ]; - - services.xserver = { - videoDrivers = [ "intel" ]; - dpi = 144; - xrandrHeads = [ - { - output = "DP2"; - primary = true; - monitorConfig = '' - Option "Position" "0 790" - ''; - } - { - output = "DP3"; - monitorConfig = '' - Option "Position" "3840 0" - Option "Rotate" "right" - ''; - } - ]; - serverFlagsSection = '' - Option "BlankTime" "19" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "20" - ''; - }; } diff --git a/machines/p330/home-mandlm.nix b/machines/p330/home-mandlm.nix index 810d749..a5986ee 100644 --- a/machines/p330/home-mandlm.nix +++ b/machines/p330/home-mandlm.nix @@ -1,23 +1,33 @@ { config, lib, pkgs, user, ... }: { - xsession.windowManager.i3.config = { + wayland.windowManager.sway.config = { + output = { + DP-2 = { + scale = "1.5"; + position = "0 526"; + # position = "0 790"; + }; + DP-3 = { + scale = "1.5"; + position = "2560 0"; + # position = "3840 0"; + transform = "90"; + }; + }; + workspaceOutputAssign = [ - { workspace = "1"; output = "DP3"; } - { workspace = "2"; output = "DP2"; } - { workspace = "3"; output = "DP3"; } - { workspace = "4"; output = "DP2"; } - { workspace = "5"; output = "DP3"; } - { workspace = "6"; output = "DP2"; } - { workspace = "7"; output = "DP3"; } - { workspace = "8"; output = "DP2"; } - { workspace = "9"; output = "DP3"; } - { workspace = "10"; output = "DP2"; } + { workspace = "0"; output = "DP-2"; } + { workspace = "1"; output = "DP-3"; } + { workspace = "2"; output = "DP-2"; } + { workspace = "3"; output = "DP-3"; } + { workspace = "4"; output = "DP-2"; } + { workspace = "5"; output = "DP-3"; } + { workspace = "6"; output = "DP-2"; } + { workspace = "7"; output = "DP-3"; } + { workspace = "8"; output = "DP-2"; } + { workspace = "9"; output = "DP-3"; } ]; + }; - - programs.kitty.font.size = 16; - programs.rofi.font = lib.mkForce "DejaVu Sans Mono 16"; - - services.betterlockscreen.inactiveInterval = 20; }