chore[work]: update for new monitor setup

2026-04-14 13:19:09 +02:00 · 2025-12-18 17:28:48 +01:00 · 2025-12-18 17:28:48 +01:00 · a0f4d41c98
commit a0f4d41c98
parent fb2ea3b305
5 changed files with 68 additions and 70 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -7,6 +7,7 @@ keys:
    - &swarsel 4BE7925262289B476DBBC17B76FD3810215AE097
  - &hosts
    - &bakery age1mjgw3nxlnqdj04mgjz3wn7fj2nl2nxla4p2r2fn4nkvayfgp09pqllxzyh
+    - &summers age18cgqlely56hgmhscllkmafwpjdk6dwep6ej3vkk97dzemp8jtuksqrrjjl
    - &belchsfactory age1k73gy5em3js9zklnnkzp5hme9k04lny32fgahmzddknjw5c295asdyr4x6
    - &eagleland age1cmzh82q8k59yzceuuy2epmqu22g7m84gqvq056mhgehwpmvjadfsc3glc8
    - &hintbooth age1wmx8y2hs83j2u5srdnfxljrzxm8jtxl6fr0mq7xf2ldxyglpzf2qq89rpx
@ -25,6 +26,7 @@ creation_rules:
      - *swarsel
      age:
      - *winters
+      - *summers
      - *twothreetunnel
      - *liliputsteps
      - *stoicclub
@ -111,6 +113,8 @@ creation_rules:
    key_groups:
    - pgp:
      - *swarsel
+      age:
+      - *summers

  - path_regex: hosts/nixos/x86_64-linux/hintbooth/secrets/[^/]+\.(yaml|json|env|ini|enc)$
    key_groups:
--- a/files/scripts/swarsel-bootstrap.sh
+++ b/files/scripts/swarsel-bootstrap.sh
@ -36,6 +36,7 @@ function help_and_exit() {

 function cleanup() {
    rm -rf "$temp"
+    rm -rf /tmp/disko-password
 }
 trap cleanup exit

@ -139,7 +140,7 @@ fi

 LOCKED="$(nix eval ~/.dotfiles#nixosConfigurations."$target_hostname".config.node.lockFromBootstrapping)"
 if [[ $LOCKED == "true" ]]; then
-    red "THIS SYSTEM IS LOCKED FROM BOOTSTRAPPING"
+    red "THIS SYSTEM IS LOCKED FROM BOOTSTRAPPING - set 'node.lockFromBootstrapping = lib.mkForce false;' to proceed"
    exit
 fi

@ -229,6 +230,7 @@ if [ "$disk_encryption" -eq 1 ]; then
        green "Please confirm passphrase:"
        read -rs luks_passphrase_confirm
        if [[ $luks_passphrase == "$luks_passphrase_confirm" ]]; then
+            echo "$luks_passphrase" > /tmp/disko-password
            $ssh_root_cmd "echo '$luks_passphrase' > /tmp/disko-password"
            break
        else
@ -317,7 +319,7 @@ if yes_or_no "Do you want to manually edit .sops.yaml now?"; then
    vim "${git_root}"/.sops.yaml
 fi
 green "Updating all secrets files to reflect updates .sops.yaml"
-sops updatekeys --yes --enable-local-keyservice "${git_root}"/hosts/nixos/"$target_arch"/"$target_hostname"/secrets/*
+sops updatekeys --yes --enable-local-keyservice "${git_root}"/hosts/nixos/"$target_arch"/"$target_hostname"/secrets/* || true
 # --------------------------
 green "Making ssh_host_ed25519_key available to home-manager for user $target_user"
 sed -i "/$target_hostname/d; /$target_destination/d" ~/.ssh/known_hosts
@ -388,3 +390,5 @@ fi
 if yes_or_no "Reboot now?"; then
    $ssh_root_cmd "reboot"
 fi
+
+rm -rf /tmp/disko-password
--- a/hosts/nixos/x86_64-linux/summers/default.nix
+++ b/hosts/nixos/x86_64-linux/summers/default.nix
@ -25,8 +25,9 @@
    isLinux = true;
    isNixos = true;
    isSwap = false;
-    rootDisk = "/dev/sda";
+    rootDisk = "/dev/disk/by-id/ata-TS128GMTS430S_H537280456";
    withMicroVMs = false;
+    server.localNetwork = "lan";
  };

 } // lib.optionalAttrs (!minimal) {
@ -35,38 +36,8 @@
    server = true;
  };

-  swarselmodules = {
-    server = {
-      nfs = false;
-      nginx = false;
-      kavita = false;
-      restic = false;
-      jellyfin = false;
-      navidrome = false;
-      spotifyd = false;
-      mpd = false;
-      postgresql = false;
-      matrix = false;
-      nextcloud = false;
-      immich = false;
-      paperless = false;
-      transmission = false;
-      syncthing = false;
-      grafana = false;
-      emacs = false;
-      freshrss = false;
-      jenkins = false;
-      kanidm = false;
-      firefly-iii = false;
-      koillection = false;
-      radicale = false;
-      atuin = false;
-      forgejo = false;
-      ankisync = false;
-      homebox = false;
-      opkssh = false;
-      garage = false;
-    };
+  swarselmodules.server = {
+    nginx = lib.mkForce false;
  };

  microvm.vms =
--- a/hosts/nixos/x86_64-linux/summers/secrets/pii.nix.enc
+++ b/hosts/nixos/x86_64-linux/summers/secrets/pii.nix.enc
@ -1,18 +1,18 @@
 {
-	"data": "ENC[AES256_GCM,data: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,iv:NeAQabK7VP5CSApdrpAcPb7lj/zExR+8RUJnXljaN58=,tag:Q1XlOvQwop41N4HP9cJ5Kg==,type:str]",
+	"data": "ENC[AES256_GCM,data:xPgUMSYz77DhqS8Vvv5FawLGZOaoI+yVqyK6NIqqF5Z+eVN1FyYjg6tPRB56rq4/yPtI69fKpQyEvnrtOZRFp1L6R+blweXobmeG762a/FxoWmh2CaF1QutFKtS94xfJmci7De5h67miKRy7rGWOeMs8gvjspvLtGrmDJQj+NQCwTvUDcibMKL59GttYTUhTxeGyN2R3utEQeIkI0Sf0mJmQUWXXMsjiMrQGhGx1iS9KJHlU2izl4pZMDsGr01d/seV7O2xspfhf5saJk9yiTwxyKLAW0ueSAnstfQJU+CD4zDXxbxcl94dzLFkJm+WTYV1X+IZJtMODLYf2XgVsz4Ihf7CuzYXHGw==,iv:3eohgv4d8CUuGPb8ODmEeAGeBsfwZsmFG2ZuxWkbKRk=,tag:31eaWzlcCslHMTeq3kEvJg==,type:str]",
 	"sops": {
 		"age": [
 			{
-				"recipient": "age1s0vssf9fey2l456hucppzx2x58xep279nsdcglvkqm30sr9ht37s8rvpza",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3UFZTaXFNdjF2UmRFd3VL\nY2pZZ3ZaRkhZSjdVUjIraHV5ZlNaNGtwM3k0CkZ4OVRFcmR3MFBDcmdsbWFId3Iy\nVzQyUGI1eG44d3JFL2NvZEg4NnduT2cKLS0tIEdhOEZETk9nRTlVbmJ5UW9GalVx\nS00yaUpJZVFVNThFei8yRzJYejRkYk0Kf6Z8WnG8phRtFIUWIPys3PW0OImhAcF+\nUFLuL4Qr7zWaeItCRieYCs1yBn7KbUJHZNkJcvnkYW50NYvlEa8wBw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age18cgqlely56hgmhscllkmafwpjdk6dwep6ej3vkk97dzemp8jtuksqrrjjl",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3RjVhWERrSGtvYUhYOFpo\naDZ2UGZ3RlQwYVJaR1cxbVRRYVBVellBWXpnCjcyYjFYdG9YNk5mNWdIYnN3d1M0\nWTVLM0RyWmtyejg4T0YxNFdsTElLTGMKLS0tIGR3d21SS0Y1MHBsQjdJaEpzUUNk\nVmhjRHJ3RDhDSEdTWlpoNDlWaHJxM1kK3KsLvzB4QGCqKS1pq5jQjXU0tkS6CDat\nL8emFbAPLKPEafb/dZP+AXupztod9R0feSaDxTre5m8ljplEnE5Lew==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-12-17T22:33:24Z",
-		"mac": "ENC[AES256_GCM,data:OxdonAXWa+L2Urucf6LWHSHOML50UNIwc0FgnjyzkO1y1CEVddAmtaQrKeKmz2Si8a54L0rnhHPp25s5B7S7XwLOXQyX5L6ZbGEcWnnEKo2Uz0gYZYnqxeCKtlGvnkb6w0Ywxiszd9bPVrJONDUlc9RWTghoWlmYGl8rgK+3ie8=,iv:0mfytJItpQzJIgwSehRMar2eh1FuQWbQIjk86fvgY+s=,tag:MJZbc24aKWW0vEuUZQdvBw==,type:str]",
+		"lastmodified": "2025-12-17T22:56:04Z",
+		"mac": "ENC[AES256_GCM,data:+UeKJoKrYLGMU0LMOVvBTYCrwS5gs4dWIIi4ceUnnbs3Q2vqtyn52Ht8ECH6EAHnEtk9G5IBj72NmLgu8Hr24mDc0SFpJKqFuemvJHef9t6eB3ZGYFNwbEJ6HOjmmp6+Xrt25b/C1q7mw/ysnb0g1Fs1I0GzsyQAjDeYWYTh6Y4=,iv:ndTm8UuVgt/O44vlKafu7F9knSNNO2+RoH/GoEhTCqA=,tag:PQMhJlANkxAgngIdzuGEdQ==,type:str]",
 		"pgp": [
 			{
-				"created_at": "2025-12-02T14:59:33Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMAwDh3VI7VctTAQ//Qx2BW0k3Q/pAvbKZScmhoIoFpV5nb+ZB72J6+f2HQLSv\nVQP72XDoYyIfW7ERsY09gkNIJejZ5n/fgB5KkyEqsBRP4fYDXl+XfAvPTu3YuQOo\n9mA2baJ0HkBnsrikycaUQAIXMMCAUBS6Ooi1blQeYA9khqr5Kc361IwB4bv8WcIz\nGcBPSWBc3B86qK/v8l0Kle1mcUu9RFxNZkitjxKdf9GDn6gKo3yBWt+/8NJLDUTq\nHjrBH4WpqB8mVDupg/p6OUASc8y0pnNmbU0GK3is4IO/bk9QqPX/t2y4CUhlE3Bh\nnxYGYauohXGs/IbCGXtkd/wRcMwsXtgkZYT/wfu44/O2VW7V7MpBGVlTXmOWK5yI\n2dkqpAt2T5tFVDDX8bqDfZ2xbGgSLsY/XWwNzl60WSvcAnFoZSf4mu2RJFLAK5QZ\nGDz+N8shR8BgkzIWIjMwzBbUB+3snYkJVA7wm/idhernkB0E83JAOOHk+UGuHFWA\nkrrWPHRWf4Gy5ZEmkzVACfhzH9AbPP8yHbTh5y33I7Yv4E+4qjoVEwTNA1LSYy17\nlaMI410x7htrzxv8M06LlE47HrJPLu3+YHUPKQC/LzV831LB9IYymskYL3rYUHzn\n7BS+9Njfg+7cdHXjRABZk2yz2+XZlSLIyCC82Kbmybd3F+s8u/pP0N0TcBDTPrSF\nAgwDC9FRLmchgYQBEACaz79q7F+YshiA4MSiKoiwgVnq0HWruMtQ+exE9Ky/hTfT\nCnNn43KSE/s4KytcB8KPkXPpZ/BHSv+oxY/XGh1dNWnKQocyCHqEOax/QruAu7VS\n/CbxyUFYQS4sJIbfmQLkx/FEnaHenSOTjOBatlnVFQ3qn6MjXyq1LThyfGaMlH84\ntAUYnNG3MQsz/U7Pj2nkScfDZ0XGIu2rvB2ddVdkjr1H3acQVplAlw88yGD+lDOA\nqnafNS8FgUtXoXCPVe6SRdpqfWPGmn1jhvjCiCUtzZG3RPew2AV50RAlxP2AEXY0\n6cMeL+NJdqIGaP3Ttyn9oVbroW4N7p3rb/AGj4ZRy4QOXPkWI088qmhYgIpjJZM5\nI3g80gnkBfFrOaVM1RVfn1smT9KlCR/8noKTE3ajBaTZZJrzBclzATdkGi7rIaqS\nvAWH9LnEGFs30W/mj9avis8aJwiPYsO+1ah5sVMnNKMo8KND2MMy+EI6AvgwJKz1\nNQoIP7jHB3h8sw91Z9YhB0RTQ8yCG+IrpXnWGAVAcswtTtJbBQlXxc/h0jpT4Yw0\nV+J6xX5/PI/ZQbIbj/i5hgh+8lsvG3gRRh0zH8nSNf7yMTYQe6iAe9xHRH/kSHX/\nOwObvvrCzZcsX8b6gTXn9AzXYGST3j3wBa8sQH0NRkcZFsCh30FhEDApItQA8tJe\nAbaLVOZ9WKJCCVkTJCOBCus1zInXbFr1ZQjTciJ4WjnqedH6SVvPC9HmI9vDCXw4\nzonohAH+mjtmoRfwMGdiJO74IfX81p5MwOX94TwYB2gAp6ycyCHjZgUtpAFPKw==\n=wNQ4\n-----END PGP MESSAGE-----",
+				"created_at": "2025-12-17T23:34:30Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMAwDh3VI7VctTARAA2WAZd8mTmgXn8X+MmMTgSXZX0TJSV7gI1U98+F6ewg7Q\nDB0Q36UVEtbpYaQi+vdP0g7lzPo9ubEaO4U38LYiumxlYZASmn3faYLvgikSpDM5\nnE9Huhff5Z9gP7tY0Kq37xEOVLNx5hI019ULk9r/7T1g2bOh4fWyBVvCseQ+8r3i\nR1IN2QPCWP39evzL/FUHtiFH2XD/dFtHRLqV2Zd7JXJ57FOdwROc5omKh1bN2Q92\n9BCJ5vE32gpPcBxmAz5VY4lgF2SYps3Er9ObgTv5ux7hmqspQZayIvpYeERXTeUp\nePAqzmbbcG/MabpjuUboy5KoWsbEi4SsohzJC5r/oCnRCbu0PCz2Ip8f7CyMUyhB\neOjAJ7zrY8XW/ee6X0BYIZwUZhZw8Z/Qf2x+GSamamkhEA9AhbQcyW+c2D99vM0P\ntAqVqaPNqNeMVpmUJtgprZP5VjbckIkLsgtRRqopKjM7FkzHykwhI7hNJWJmUnC6\nrI/y+xGTQ16kge0NMbgwRuGyxFQbB9FKB5VP4vsJ227XjrEZ5HaOd+XOgj7Us29q\nkIl9ZGKbEUn3I5sxI/0ijTG/pPN+H3ROvXs9cRBkBa/T3uL4Gdvideet7IxIAOU7\neamskzNS5OosEyafAibD3ctB4wI/E19HS0JKoRNsA7CUqzVXhx5ipeLXec5tHMmF\nAgwDC9FRLmchgYQBD/9V20QCxpY8lFdhbiN5n3dnlsGAIQtYTYKXWqTWb/iq6Mhu\nUU+/2Czu1fpjOEmPcvKk3XxM2wclzpTG+7NWvtHuDLe9HCai6eujY+1Jrek95AqL\nDzm83PDONp61nGj0mCHDgyEcnDK6ViCglofjjAN5HmfZxw6NI71GIk+c3qLx1pem\nUR7ETjjBbBW3gv9BXAqe+NYRbFx173lf6er4ogqYWRFCRlN7IQGlMLhAbbYfiwIz\nsnyyCj9UEekFcsVkQHoIHFeuP8xmsOjL7AAtKAMXVL1UdHfgJjK7bI669tzmcJJV\nakECPeKDwk1/C6CwHtKrnAHoUHPLw99WEPThQ4yselDBkf7yFibnHc6dNd77xIEG\n7lVyZFFq/a+gOOWdN/6mxqumD6LgQexoatY+8shQEJ7tfcNKs3ptJZX6zLiA1A1e\nzLxpVqtAmU7H399M8Q7Q5wiJh7wlF2ssADnAMws9ybCzKqBAsbBDhlwrXvZW5lic\nQTMZoeYBgZp6l59hHppcaUXTFOCR0fW10VNyyKJa0/fRegptxGAmvVQzSLLJODw+\nXHxabaeuF8IcU00GqIC/7OuUY3yN2IHYjxkB90F+rOHYj6nF6zFxBVRplqvgbzbq\nSpx9/JEuzVqv7cwmix0osmru2NrY/xvmtJq+8VZooU6JcXk+wY5MtD7sIG/yFNJc\nARwQJ1fSiUBvXVBM46O+XQIPk4aP10cxhz0NF0LTCXttJJnHqgjjI3SAGvpAq2mH\nCGPu49vKjzW5l3Y8SfHGPe1vU11l0KZeXfPSijhupM6V45N+YBkwDLNj0Qs=\n=zt+q\n-----END PGP MESSAGE-----",
 				"fp": "4BE7925262289B476DBBC17B76FD3810215AE097"
 			}
 		],
--- a/modules/home/optional/work.nix
+++ b/modules/home/optional/work.nix
@ -308,20 +308,29 @@ in
            };
          }
          {
-            # work main screen
+            # work side screen
            output = {
              criteria = "HP Inc. HP 732pk CNC4080YL5";
              scale = 1.0;
              mode = "3840x2160";
+              transform = "270";
            };
          }
+          # {
+          #   # work side screen
+          #   output = {
+          #     criteria = "Hewlett Packard HP Z24i CN44250RDT";
+          #     scale = 1.0;
+          #     mode = "1920x1200";
+          #     transform = "270";
+          #   };
+          # }
          {
-            # work side screen
+            # work main screen
            output = {
-              criteria = "Hewlett Packard HP Z24i CN44250RDT";
+              criteria = "HP Inc. HP Z32 CN41212T55";
              scale = 1.0;
-              mode = "1920x1200";
-              transform = "270";
+              mode = "3840x2160";
            };
          }
          {
@ -329,28 +338,28 @@ in
              name = "lidopen";
              exec = [
                "${pkgs.swaybg}/bin/swaybg --output '${config.swarselsystems.sharescreen}' --image ${config.swarselsystems.wallpaper} --mode ${config.stylix.imageScalingMode}"
-                "${pkgs.swaybg}/bin/swaybg --output 'HP Inc. HP 732pk CNC4080YL5' --image ${self}/files/wallpaper/botanicswp.png --mode ${config.stylix.imageScalingMode}"
-                "${pkgs.swaybg}/bin/swaybg --output 'Hewlett Packard HP Z24i CN44250RDT' --image ${self}/files/wallpaper/op6wp.png --mode ${config.stylix.imageScalingMode}"
+                "${pkgs.swaybg}/bin/swaybg --output 'HP Inc. HP Z32 CN41212T55' --image ${self}/files/wallpaper/botanicswp.png --mode ${config.stylix.imageScalingMode}"
+                "${pkgs.swaybg}/bin/swaybg --output 'HP Inc. HP 732pk CNC4080YL5' --image ${self}/files/wallpaper/op6wp.png --mode ${config.stylix.imageScalingMode}"
              ];
              outputs = [
                {
                  criteria = config.swarselsystems.sharescreen;
                  status = "enable";
                  scale = 1.5;
-                  position = "1462,0";
+                  position = "2560,0";
                }
                {
                  criteria = "HP Inc. HP 732pk CNC4080YL5";
-                  scale = 1.4;
+                  scale = 1.0;
                  mode = "3840x2160";
-                  position = "-1280,0";
+                  position = "-3440,-1050";
+                  transform = "270";
                }
                {
-                  criteria = "Hewlett Packard HP Z24i CN44250RDT";
+                  criteria = "HP Inc. HP Z32 CN41212T55";
                  scale = 1.0;
-                  mode = "1920x1200";
-                  transform = "90";
-                  position = "-2480,0";
+                  mode = "3840x2160";
+                  position = "-1280,0";
                }
              ];
            };
@ -387,8 +396,8 @@ in
            profile = {
              name = "lidclosed";
              exec = [
-                "${pkgs.swaybg}/bin/swaybg --output 'HP Inc. HP 732pk CNC4080YL5' --image ${self}/files/wallpaper/botanicswp.png --mode ${config.stylix.imageScalingMode}"
-                "${pkgs.swaybg}/bin/swaybg --output 'Hewlett Packard HP Z24i CN44250RDT' --image ${self}/files/wallpaper/op6wp.png --mode ${config.stylix.imageScalingMode}"
+                "${pkgs.swaybg}/bin/swaybg --output 'HP Inc. HP Z32 CN41212T55'  --image ${self}/files/wallpaper/botanicswp.png --mode ${config.stylix.imageScalingMode}"
+                "${pkgs.swaybg}/bin/swaybg --output 'HP Inc. HP 732pk CNC4080YL5' --image ${self}/files/wallpaper/op6wp.png --mode ${config.stylix.imageScalingMode}"
              ];
              outputs = [
                {
@ -397,16 +406,16 @@ in
                }
                {
                  criteria = "HP Inc. HP 732pk CNC4080YL5";
-                  scale = 1.4;
+                  scale = 1.0;
                  mode = "3840x2160";
-                  position = "-1280,0";
+                  position = "-3440,-1050";
+                  transform = "270";
                }
                {
-                  criteria = "Hewlett Packard HP Z24i CN44250RDT";
+                  criteria = "HP Inc. HP Z32 CN41212T55";
                  scale = 1.0;
-                  mode = "1920x1200";
-                  transform = "270";
-                  position = "-2480,0";
+                  mode = "3840x2160";
+                  position = "-1280,0";
                }
              ];
            };
@ -591,25 +600,35 @@ in
          # output = "DP-7";
          output = name;
        };
-        work_back_right = rec {
+        work_middle_middle_main = rec {
          name = "HP Inc. HP Z32 CN41212T55";
          mode = "3840x2160";
          scale = "1";
-          position = "5120,0";
+          position = "-1280,0";
          workspace = "1:一";
          # output = "DP-3";
          output = name;
        };
-        work_middle_middle_main = rec {
+        # work_middle_middle_main = rec {
+        #   name = "HP Inc. HP 732pk CNC4080YL5";
+        #   mode = "3840x2160";
+        #   scale = "1";
+        #   position = "-1280,0";
+        #   workspace = "11:M";
+        #   # output = "DP-8";
+        #   output = name;
+        # };
+        work_middle_middle_side = rec {
          name = "HP Inc. HP 732pk CNC4080YL5";
          mode = "3840x2160";
+          transform = "270";
          scale = "1";
-          position = "-1280,0";
-          workspace = "11:M";
+          position = "-3440,-1050";
+          workspace = "12:S";
          # output = "DP-8";
          output = name;
        };
-        work_middle_middle_side = rec {
+        work_middle_middle_old = rec {
          name = "Hewlett Packard HP Z24i CN44250RDT";
          mode = "1920x1200";
          transform = "270";