diff --git a/SwarselSystems.org b/SwarselSystems.org index eb99dff..c278452 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -1920,12 +1920,21 @@ My work machine. Built for more security, this is the gold standard of my config workspace = "1:一"; output = "DP-3"; }; - work_middle_middle = { + work_middle_middle_main = { name = "HP Inc. HP 732pk CNC4080YL5"; mode = "3840x2160"; scale = "1"; - position = "5120,0"; + position = "-1280,0"; workspace = "1:一"; + output = "DP-8"; + }; + work_middle_middle_side = { + name = "Hewlett Packard HP Z24i CN44250RDT"; + mode = "1920x1200"; + transform = "270"; + scale = "1"; + position = "-2480,0"; + workspace = "12:S"; output = "DP-9"; }; }; @@ -8157,7 +8166,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se }; eachOutput = _name: monitor: { inherit (monitor) name; - value = builtins.removeAttrs monitor [ "mode" "name" "scale" "position" ]; + value = builtins.removeAttrs monitor [ "mode" "name" "scale" "transform" "position" ]; }; workplaceSets = lib.mapAttrs' eachOutput monitors; workplaceOutputs = map (key: lib.getAttr key workplaceSets) (lib.attrNames workplaceSets); @@ -8226,6 +8235,10 @@ Currently, I am too lazy to explain every option here, but most of it is very se "${modifier}+Shift+9" = "move container to workspace 9:九"; "${modifier}+0" = "workspace 10:十"; "${modifier}+Shift+0" = "move container to workspace 10:十"; + "${modifier}+Ctrl+m" = "workspace 11:M"; + "${modifier}+Ctrl+Shift+m" = "move container to workspace 11:M"; + "${modifier}+Ctrl+s" = "workspace 12:S"; + "${modifier}+Ctrl+Shift+s" = "move container to workspace 12:S"; "${modifier}+Left" = "focus left"; "${modifier}+Right" = "focus right"; "${modifier}+Down" = "focus down"; diff --git a/profiles/common/home/sway.nix b/profiles/common/home/sway.nix index 03b4d43..daa0e25 100644 --- a/profiles/common/home/sway.nix +++ b/profiles/common/home/sway.nix @@ -7,7 +7,7 @@ let }; eachOutput = _name: monitor: { inherit (monitor) name; - value = builtins.removeAttrs monitor [ "mode" "name" "scale" "position" ]; + value = builtins.removeAttrs monitor [ "mode" "name" "scale" "transform" "position" ]; }; workplaceSets = lib.mapAttrs' eachOutput monitors; workplaceOutputs = map (key: lib.getAttr key workplaceSets) (lib.attrNames workplaceSets); @@ -76,6 +76,10 @@ in "${modifier}+Shift+9" = "move container to workspace 9:九"; "${modifier}+0" = "workspace 10:十"; "${modifier}+Shift+0" = "move container to workspace 10:十"; + "${modifier}+Ctrl+m" = "workspace 11:M"; + "${modifier}+Ctrl+Shift+m" = "move container to workspace 11:M"; + "${modifier}+Ctrl+s" = "workspace 12:S"; + "${modifier}+Ctrl+Shift+s" = "move container to workspace 12:S"; "${modifier}+Left" = "focus left"; "${modifier}+Right" = "focus right"; "${modifier}+Down" = "focus down"; diff --git a/profiles/nbl-imba-2/default.nix b/profiles/nbl-imba-2/default.nix index 71478f4..17521c8 100644 --- a/profiles/nbl-imba-2/default.nix +++ b/profiles/nbl-imba-2/default.nix @@ -133,12 +133,21 @@ workspace = "1:一"; output = "DP-3"; }; - work_middle_middle = { + work_middle_middle_main = { name = "HP Inc. HP 732pk CNC4080YL5"; mode = "3840x2160"; scale = "1"; - position = "5120,0"; + position = "-1280,0"; workspace = "1:一"; + output = "DP-8"; + }; + work_middle_middle_side = { + name = "Hewlett Packard HP Z24i CN44250RDT"; + mode = "1920x1200"; + transform = "270"; + scale = "1"; + position = "-2480,0"; + workspace = "12:S"; output = "DP-9"; }; };