monolith: update gitlab concurrent runners

scripts/screenshotsh

@@ -46,4 +46,13 @@ case $1 in
             $screenshot -o "$cur_output" - | $copy ||
             $screenshot - | $copy
         ;;
+    edit)
+        # Focused monitor to clipboard
+        cur_output=$(swaymsg -t get_outputs |
+            jq -r '.[] | select(.focused) | .name')
+
+        test -n "$cur_output" &&
+            $screenshot -o "$cur_output" - | satty --filename - --output-filename "$DESTFILE" ||
+            $screenshot - | satty --filename - --output-filename "$DESTFILE"
+        ;;
 esac

system/greetd.nix

@@ -37,8 +37,6 @@ in
     xdg.portal = {
       enable = true;
       wlr.enable = true;
-      # Always pick the first monitor, this is fine since I only ever use a single monitor
-      wlr.settings.screencast.chooser_type = "none";
       # gtk portal needed to make gtk apps happy
       extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
     };
@@ -74,7 +72,7 @@ in
             user = "lelgenio";
           };
           default_session = {
-            command = "${pkgs.sway}/bin/sway --config ${swayConfig}";
+            command = "dbus-run-session -- ${pkgs.sway}/bin/sway --config ${swayConfig}";
           };
         };
       };

system/monolith-gitlab-runner.nix

@@ -11,7 +11,7 @@ in
   virtualisation.docker.enable = true;
   services.gitlab-runner = {
     enable = true;
-    settings.concurrent = 4;
+    settings.concurrent = 8;
     services = {
       # runner for building in docker via host's nix-daemon
       # nix store will be readable in runner, might be insecure

user/sway/default.nix

@@ -76,10 +76,19 @@ in
           };
         output = {
           "*" = {
-            adaptive_sync = "on";
             bg = "${theme.background} fill";
+          };
+          "AOC 24G2W1G4 ATNM6XA004804" = {
+            position = "0,0";
+            adaptive_sync = "on";
             mode = "1920x1080@144.000Hz";
           };
+          "LG Electronics 25UM58G 0x01010101" = {
+            position = "1920,215";
+            adaptive_sync = "on";
+            scale = "1.2";
+            mode = "2560x1080@74.991Hz";
+          };
         };
         fonts = {
           names = [ font.interface ];

user/sway/kanshi.nix

@@ -8,6 +8,24 @@ in
   config.services.kanshi = lib.mkIf cfg.enable {
     enable = true;
     settings = [
+      {
+        profile = {
+          name = "home";
+          outputs = [
+            {
+              criteria = "AOC 24G2W1G4 ATNM6XA004804";
+              position = "0,0";
+            }
+            {
+              criteria = "LG Electronics 25UM58G 0x01010101";
+              position = "1920,215";
+              scale = 1.2;
+              mode = "2560x1080@74.991Hz";
+            }
+          ];
+          exec = [ "xrdb .Xresources" ];
+        };
+      }
       {
         profile = {
           name = "sedetary";

user/sway/sway-binds.nix

@@ -110,6 +110,8 @@ let
             "${mod}+Control+${keyBind}" = "resize ${resize_cmd}";
             #  focus output
             "${mod}+mod1+${keyBind}" = "focus output ${direction}";
+            #  Move window to output
+            "${mod}+mod1+Control+${keyBind}" = "move window output ${direction}; focus output ${direction}";
             #  Move workspace to output
             "${mod}+mod1+Shift+${keyBind}" = "move workspace output ${direction}";
           }
@@ -125,9 +127,8 @@ let
     "${mod}+v" = "splitv";
     "${mod}+a" = "focus parent";
 
-    ## TODO:
+    "${mod}+Shift+z" = "move scratchpad";
-    # "${mod}+Shift+minus" = "move scratchpad";
+    "${mod}+z" = "scratchpad show";
-    # "${mod}+minus" = "scratchpad show";
   };
 
   audio_binds = {
@@ -172,9 +173,7 @@ let
     "${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker";
     "${mod}+Return" = "exec ${terminal}";
     "${mod}+Ctrl+Return" = "exec thunar";
-    "${mod}+Shift+s" = ''
+    "${mod}+Shift+s" = "exec ${pkgs.screenshotsh}/bin/screenshotsh edit";
-      exec grim - | satty --filename - --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png
-    '';
     "${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy";
     "${mod}+k" = "exec showkeys";
     "${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair";