From ce259e9afeaa239088bd2b7bf38c965d4f0cc5df Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 10 Mar 2025 21:47:31 +0100 Subject: [PATCH 1/3] sway/module.nix: init Trying out sway, maybe actually viable? --- modules/wms/wayland/sway/module.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/wms/wayland/sway/module.nix diff --git a/modules/wms/wayland/sway/module.nix b/modules/wms/wayland/sway/module.nix new file mode 100644 index 0000000..ea2b0e0 --- /dev/null +++ b/modules/wms/wayland/sway/module.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + pkgs, + ... +}: let +in { + programs.sway = { + enable = true; + xwayland.enable = true; + }; + + environment.systemPackages = builtins.attrValues { + inherit (pkgs) i3status; + }; +} From d930e1befa7f18d7f4e0c547609da4ec362b16a5 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 10 Mar 2025 21:47:48 +0100 Subject: [PATCH 2/3] hardware/graphics.nix: force open graphics --- modules/system/hardware/graphics.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/system/hardware/graphics.nix b/modules/system/hardware/graphics.nix index fd7d492..dae0ada 100644 --- a/modules/system/hardware/graphics.nix +++ b/modules/system/hardware/graphics.nix @@ -6,6 +6,7 @@ }: let cfg = config.modules.system.hardware; inherit (lib) mkIf; + inherit (lib.modules) mkForce; in { config = { hardware = { @@ -22,7 +23,7 @@ in { }; nvidia = mkIf cfg.nvidia.enable { modesetting.enable = true; - open = true; + open = mkForce true; powerManagement = { enable = true; finegrained = false; From a777db4848b2738a274e70c13b41e08f3e002165 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 10 Mar 2025 21:48:11 +0100 Subject: [PATCH 3/3] temperance/hardware/monitors.nix: switch from three to two monitors --- hosts/temperance/hardware/monitors.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hosts/temperance/hardware/monitors.nix b/hosts/temperance/hardware/monitors.nix index 3b69ab9..67d1c06 100644 --- a/hosts/temperance/hardware/monitors.nix +++ b/hosts/temperance/hardware/monitors.nix @@ -12,18 +12,18 @@ _: { y = 0; }; }; - HDMI-A-2 = { - resolution = { - x = 1920; - y = 1080; - }; - scale = 1; - refreshRate = 60; - position = { - x = 1920; - y = 0; - }; - }; + # HDMI-A-2 = { + # resolution = { + # x = 1920; + # y = 1080; + # }; + # scale = 1; + # refreshRate = 60; + # position = { + # x = 1920; + # y = 0; + # }; + # }; HDMI-A-1 = { resolution = { x = 1920; @@ -32,7 +32,7 @@ _: { scale = 1; refreshRate = 60; position = { - x = 3840; + x = 1920; y = 0; }; };