change update script for ci branch

2024-08-14 20:46:38 +07:00
15 changed files with 237 additions and 238 deletions
--- a/flake.lock
+++ b/flake.lock
@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723293904,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "lastModified": 1718371084,
+        "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "3a56735779db467538fb2e577eda28a9daacaca6",
        "type": "github"
      },
      "original": {
@ -65,16 +65,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1722902027,
-        "narHash": "sha256-STgis1RRrrerOrI/l7bBeJS8HR3ZHlsAhZ4NXO1eIi0=",
-        "owner": "qowoz",
+        "lastModified": 1719797756,
+        "narHash": "sha256-TGZthxgxLdT8boadFm6+MK7HZlIxN1u1V+x3hu+Fd8I=",
+        "owner": "nix-community",
        "repo": "buildbot-nix",
-        "rev": "f43d4ee9e3325a486928ddc3d04956844b3baf56",
+        "rev": "0b56574a5c823097771487d1bac952c3549fe9fb",
        "type": "github"
      },
      "original": {
-        "owner": "qowoz",
-        "ref": "skipped-build-workers",
+        "owner": "nix-community",
        "repo": "buildbot-nix",
        "type": "github"
      }
@ -110,11 +109,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718998007,
-        "narHash": "sha256-2ByOTMmdtoD5CDVq5O/VFdz2u9xLtk5z3NpFsWOmIyA=",
+        "lastModified": 1718936559,
+        "narHash": "sha256-/wQ/mLp65bRgv42V8c86SKxr8jLLwinh3WVS0k93vq0=",
        "owner": "chayleaf",
        "repo": "coop-fd",
-        "rev": "f71ac2a8a62cc53896a2c0d6649c1451e86f8135",
+        "rev": "d493b50550988a5a07421248102ebfdf68f4a046",
        "type": "github"
      },
      "original": {
@ -173,11 +172,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723426710,
-        "narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=",
+        "lastModified": 1719733833,
+        "narHash": "sha256-6h2EqZU9bL9rHlXE+2LCBgnDImejzbS+4dYsNDDFlkY=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "0d510fe40b56ed74907a021d7e1ffd0042592914",
+        "rev": "d185770ea261fb5cf81aa5ad1791b93a7834d12c",
        "type": "github"
      },
      "original": {
@ -272,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1719745305,
+        "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
        "type": "github"
      },
      "original": {
@ -290,11 +289,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1717285511,
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
        "type": "github"
      },
      "original": {
@ -305,7 +304,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1710146030,
@ -321,6 +320,24 @@
        "type": "github"
      }
    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -343,11 +360,11 @@
    },
    "impermanence": {
      "locked": {
-        "lastModified": 1719091691,
-        "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
+        "lastModified": 1708968331,
+        "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
+        "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
        "type": "github"
      },
      "original": {
@ -359,16 +376,15 @@
    "mobile-nixos": {
      "flake": false,
      "locked": {
-        "lastModified": 1723685418,
-        "narHash": "sha256-ZDgzeknbWB7ZS4DfbQrYZC1iWcWnL5Zhr9c6iwP26yk=",
-        "owner": "chayleaf",
+        "lastModified": 1720660935,
+        "narHash": "sha256-GnDGoVaObUjnYdCHUSIYVE1anMElis+Pq+RY30LFlIk=",
+        "owner": "NixOS",
        "repo": "mobile-nixos",
-        "rev": "71e6bb4a74b91f4a45cb5387670423a56bbfad36",
+        "rev": "31704f8a55f5773c9b4e7adb7408a142d142e1f2",
        "type": "github"
      },
      "original": {
-        "owner": "chayleaf",
-        "ref": "sdm845",
+        "owner": "NixOS",
        "repo": "mobile-nixos",
        "type": "github"
      }
@ -393,11 +409,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1723586765,
-        "narHash": "sha256-2YtIQm1DOph5fXkEySRdKAYSiWJK8ztc1NxoUnjvfSs=",
+        "lastModified": 1719876004,
+        "narHash": "sha256-YIGAUeEVgJ/Qpn+YUoyR9HjV6j01W+5vOKRYpqsx+gw=",
        "owner": "nix-community",
        "repo": "infra",
-        "rev": "177e5a2fbfeb70bbf86d7ca7efdfd5d1870678db",
+        "rev": "766a23a468858d2413f12bec828860158abaadf1",
        "type": "github"
      },
      "original": {
@ -414,11 +430,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722924007,
-        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
+        "lastModified": 1719128254,
+        "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
+        "rev": "50581970f37f06a4719001735828519925ef8310",
        "type": "github"
      },
      "original": {
@ -432,15 +448,14 @@
        "flake-parts": "flake-parts_2",
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "umu": "umu"
+        ]
      },
      "locked": {
-        "lastModified": 1723425928,
-        "narHash": "sha256-BFj0H0h3+hTCTsHTMCzmO7hQL3ym2MTgIdQe1SN1wPw=",
+        "lastModified": 1717896375,
+        "narHash": "sha256-qI8f1XSFo1X29+RSVmYo5hDAMKKULnpmIZbRl77u21A=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "cd19f284c40ce697db66314d0b7d29e41d47eb6b",
+        "rev": "6ed58348c20bab127555a3645e832591d2611f0c",
        "type": "github"
      },
      "original": {
@ -456,11 +471,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723352546,
-        "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
+        "lastModified": 1717919703,
+        "narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
+        "rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6",
        "type": "github"
      },
      "original": {
@ -471,11 +486,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1723310128,
-        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "lastModified": 1717828156,
+        "narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "rev": "057a7996d012f342a38a26261ee529cebb1755ef",
        "type": "github"
      },
      "original": {
@ -491,16 +506,14 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": [
-          "nixpkgs"
-        ]
+        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1722877200,
-        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
+        "lastModified": 1717515088,
+        "narHash": "sha256-nWOLpPA7+k7V1OjXTuxdsVd5jeeI0b13Di57wvnqkic=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
+        "rev": "0d51a32e4799d081f260eb4db37145f5f4ee7456",
        "type": "gitlab"
      },
      "original": {
@ -516,11 +529,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721190060,
-        "narHash": "sha256-vWymGrTWE5tpzDMuVRRMNh7nQRYY4sTs8xYfG6Yeqk4=",
+        "lastModified": 1720913908,
+        "narHash": "sha256-AZ0AcL1ze6gS8EmwRpuR04MXCLb/NDLjp9n+Gs4IhFQ=",
        "owner": "chayleaf",
        "repo": "nixos-router",
-        "rev": "4c8feecbd2c569bc511781a492b37dc6e5c29669",
+        "rev": "38088dc1745350db709e9f2cf777979b5217f671",
        "type": "github"
      },
      "original": {
@ -531,11 +544,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1723316219,
-        "narHash": "sha256-2B9qh8QBvw3kV/8cHc7ZJcrbVsRwP8wKjkwPXTSz76Y=",
+        "lastModified": 1719824438,
+        "narHash": "sha256-pY0wosAgcr9W4vmGML0T3BVhQiGuKoozCbs2t+Je1zc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bef98989a27429e1cb9e3d9c25701ba2da742af2",
+        "rev": "7f993cdf26ccef564eabf31fdb40d140821e12bc",
        "type": "github"
      },
      "original": {
@ -547,30 +560,30 @@
    },
    "nixpkgs-kernel": {
      "locked": {
-        "lastModified": 1723362943,
-        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
+        "lastModified": 1717974879,
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
        "type": "github"
      }
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1722555339,
-        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
+        "lastModified": 1717284937,
+        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
      }
    },
    "nixpkgs-update": {
@ -590,11 +603,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722969327,
-        "narHash": "sha256-P8g6kDgZYMwxqmp8FRRZOwwBjkT4ILifvXV0fOz9ofY=",
+        "lastModified": 1719362107,
+        "narHash": "sha256-Vrd+Y3odIIXjlUwSDOjyrhf6V4svB5njtGH9i0NJIxc=",
        "owner": "nix-community",
        "repo": "nixpkgs-update",
-        "rev": "503f7b0d94b6eb780a51823972e6ab0204b0a137",
+        "rev": "d49fec1752e0bcb69f156a86ba5b93e14aaca2c3",
        "type": "github"
      },
      "original": {
@ -635,16 +648,15 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1723686439,
-        "narHash": "sha256-sgHQqIDtHQUivF5vqa+k4iwbc/cx8F6x6IvXTlNd4Pg=",
+        "lastModified": 1720888318,
+        "narHash": "sha256-s5Pf3Es1reWTvHiz0YNuVknH/0RGo2vu+8MyeKT7VWo=",
        "owner": "chayleaf",
        "repo": "nixpkgs",
-        "rev": "43a0d4fefbfb1a9bc2f109769610038fcfae5ea0",
+        "rev": "81b52fd15be6a3331668cc7bbaab4aec7c654472",
        "type": "github"
      },
      "original": {
        "owner": "chayleaf",
-        "ref": "ci",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -691,11 +703,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1723664702,
-        "narHash": "sha256-ErRJ3oUHFOzUXoDAzws/h5u7c6dCExETjmm5uIFL/QY=",
+        "lastModified": 1717921035,
+        "narHash": "sha256-TxZv3M3M2EromaaJCbRKWWjrnk9DSeJ139K4DkJlhAg=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "7bcbb0362c92f230ba4a2c5ad227e04f84fc1ce0",
+        "rev": "02f829e2432d4204370445272084ce22761ba4bc",
        "type": "github"
      },
      "original": {
@ -771,16 +783,17 @@
    },
    "rust-overlay": {
      "inputs": {
+        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1723602049,
-        "narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=",
+        "lastModified": 1717899611,
+        "narHash": "sha256-9Z95F8lnY/5sOf7Z4IdABKz1ulB0ueNrZU864rQj280=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "ea0bf33a11a26a62c60123c49d96011da396602c",
+        "rev": "1f536afad5c18ea4ae6bb592c3fef038e1e33568",
        "type": "github"
      },
      "original": {
@ -801,11 +814,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722897572,
-        "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
+        "lastModified": 1719716556,
+        "narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
+        "rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6",
        "type": "github"
      },
      "original": {
@ -822,11 +835,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723423676,
-        "narHash": "sha256-E+DdXV2cFj77vU35cVNoEEE5YueE075HXiJLXwAxJ0k=",
+        "lastModified": 1719835186,
+        "narHash": "sha256-o0FB8SQVLOnbsYTk2Bt6gXwsfqEv4ZHsGP50/kM/gR0=",
        "owner": "nix-community",
        "repo": "srvos",
-        "rev": "a7cc81cd76c4c07bb7db01b731199ecd4be17305",
+        "rev": "14b3b0aa48fa291f1be26ab8948d5b9eadaed0b8",
        "type": "github"
      },
      "original": {
@ -865,6 +878,36 @@
        "type": "github"
      }
    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "treefmt-nix": {
      "inputs": {
        "nixpkgs": [
@ -873,11 +916,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723402464,
-        "narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=",
+        "lastModified": 1719749022,
+        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "c9f97032be6816fa234f24803b8ae79dc7753a91",
+        "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
        "type": "github"
      },
      "original": {
@ -886,31 +929,6 @@
        "type": "github"
      }
    },
-    "umu": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-gaming",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "packaging/nix",
-        "lastModified": 1723319758,
-        "narHash": "sha256-4WYwxNzH/95Vj0IqR2xh4gyiSn8H9bGnBECFWy4vjIk=",
-        "ref": "refs/heads/main",
-        "rev": "74656e9da4008f75f3b1d136dbaf1172bf6c232f",
-        "revCount": 697,
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
-      },
-      "original": {
-        "dir": "packaging/nix",
-        "submodules": true,
-        "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
-      }
-    },
    "unbound-rust-mod": {
      "inputs": {
        "crane": "crane_2",
@ -931,6 +949,24 @@
        "repo": "unbound-rust-mod",
        "type": "github"
      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -3,15 +3,15 @@

  inputs = {
    nix-community-infra.url = "github:nix-community/infra";
-    nixpkgs-kernel.url = "github:NixOS/nixpkgs/a58bc8ad779655e790115244571758e8de055e3d";
-    nixpkgs.url = "github:chayleaf/nixpkgs/ci";
+    nixpkgs-kernel.url = "github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3";
+    nixpkgs.url = "github:chayleaf/nixpkgs";
    nixos-hardware.url = "github:NixOS/nixos-hardware";
    nix-index-database = {
      url = "github:nix-community/nix-index-database";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    mobile-nixos = {
-      url = "github:chayleaf/mobile-nixos/sdm845";
+      url = "github:NixOS/mobile-nixos";
      flake = false;
    };
    osu-wine = {
@ -51,7 +51,6 @@
    nixos-mailserver = {
      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-24_05.follows = "nixpkgs";
    };
    unbound-rust-mod = {
      url = "github:chayleaf/unbound-rust-mod";
--- a/home/modules/i3-sway.nix
+++ b/home/modules/i3-sway.nix
@ -103,9 +103,6 @@ commonConfig = {
  inherit modifier;
  startup = [
    { command = toString (pkgs.writeShellScript "init-wm" ''
-      ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
-      /run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
-      /run/current-system/sw/bin/systemctl --user start xdg-desktop-portal-gtk.service || true
      ${lib.optionalString config.phone.enable ''
        ${pkgs.procps}/bin/pkill -x wvkbd-mobintl
        ${pkgs.wvkbd}/bin/wvkbd-mobintl --hidden -l full,special,cyrillic,emoji&
@ -288,15 +285,7 @@ in
    config = commonConfig // {
      bars = [
        {
-          command = toString (pkgs.writeShellScript "run-waybar" ''
-            ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
-            /run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
-            /run/current-system/sw/bin/systemctl --user start xdg-desktop-portal-gtk.service || true
-            while true; do
-              ${config.programs.waybar.package}/bin/waybar > ~/var/waybar.log 2>&1
-              sleep 5 || true
-            done
-          ''); 
+          command = "${config.programs.waybar.package}/bin/waybar";
          mode = "dock";
          position = "top";
          hiddenState = "hide";
@ -401,7 +390,7 @@ in
      startup = [
        {
          always = true;
-          command = "${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; /run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; /run/current-system/sw/bin/systemctl --user reset-failed && /run/current-system/sw/bin/systemctl --user start sway-session.target && ${pkgs.sway}/bin/swaymsg -mt subscribe '[]' || true && /run/current-system/sw/bin/systemctl --user stop sway-session.target";
+          command = "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP";
        }
        {
          command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store --no-persist";
@ -498,7 +487,7 @@ in
  home.packages = lib.mkIf config.wayland.windowManager.sway.enable (with pkgs; [
    wl-clipboard
    xdg-desktop-portal
-    # xdg-desktop-portal-wlr
+    xdg-desktop-portal-wlr
    xdg-desktop-portal-gtk
  ]);
  programs.rofi = {
--- a/home/modules/waybar.nix
+++ b/home/modules/waybar.nix
@ -21,25 +21,7 @@
    });*/
    settings = let
      layer = if config.phone.enable then "overlay" else "top";
-    in lib.optionals config.phone.enable [
-      {
-        inherit layer;
-        position = "top";
-        ipc = true;
-        height = 40;
-        clock = {
-          interval = 5;
-          format = "{:%Y-%m-%d %H:%M:%S}";
-        };
-        cpu = {
-          # format = "{usage}% ";
-          format = "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}";
-          format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
-        };
-        modules-left = [ "cpu" ];
-        modules-right = [ "clock" ];
-      }
-    ] ++ lib.toList {
+    in lib.toList {
      inherit layer;
      position = "top";
      ipc = true;
@ -170,6 +152,23 @@
        min-length = 2;
      };
    } ++ lib.optionals config.phone.enable [
+      {
+        inherit layer;
+        position = "top";
+        ipc = true;
+        height = 40;
+        clock = {
+          interval = 5;
+          format = "{:%Y-%m-%d %H:%M:%S}";
+        };
+        cpu = {
+          # format = "{usage}% ";
+          format = "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}";
+          format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
+        };
+        modules-left = [ "cpu" ];
+        modules-right = [ "clock" ];
+      }
      {
        inherit layer;
        position = "bottom";
--- a/pkgs/_sources/generated.json
+++ b/pkgs/_sources/generated.json
@ -22,24 +22,24 @@
        "pinned": false,
        "src": {
            "name": null,
-            "sha256": "sha256-vpr4DVWI7TZWb+roijpX5kJRPOJT4wZhT/ZnRrkgZKI=",
+            "sha256": "sha256-4jh3mDm1GpR9tQBkzx9BRsJ5awNrBgRzylyRB04LqIE=",
            "type": "url",
-            "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-11/GE-Proton9-11.tar.gz"
+            "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-7/GE-Proton9-7.tar.gz"
        },
-        "version": "GE-Proton9-11"
+        "version": "GE-Proton9-7"
    },
    "searxng": {
        "cargoLocks": null,
-        "date": "2024-08-09",
+        "date": "2024-06-07",
        "extract": null,
        "name": "searxng",
        "passthru": null,
        "pinned": false,
        "src": {
-            "sha256": "sha256-2QetT4xLlyKAC/eiIhShYRMRwFU9dJm6Ah5wS84Rgf8=",
+            "sha256": "sha256-WWbpfZZei3kOdN607/J2M1oSzbPZKaLbsU5gO2kIc90=",
            "type": "tarball",
-            "url": "https://github.com/searxng/searxng/archive/f1c05e7c16e59a8d5d98640bc057958ea268cddf.tar.gz"
+            "url": "https://github.com/searxng/searxng/archive/f5eb56b63f250c7804e5e1cf4426e550bc933906.tar.gz"
        },
-        "version": "f1c05e7c16e59a8d5d98640bc057958ea268cddf"
+        "version": "f5eb56b63f250c7804e5e1cf4426e550bc933906"
    }
 }
--- a/pkgs/_sources/generated.nix
+++ b/pkgs/_sources/generated.nix
@ -12,19 +12,19 @@
  };
  proton-ge = {
    pname = "proton-ge";
-    version = "GE-Proton9-11";
+    version = "GE-Proton9-7";
    src = fetchurl {
-      url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-11/GE-Proton9-11.tar.gz";
-      sha256 = "sha256-vpr4DVWI7TZWb+roijpX5kJRPOJT4wZhT/ZnRrkgZKI=";
+      url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-7/GE-Proton9-7.tar.gz";
+      sha256 = "sha256-4jh3mDm1GpR9tQBkzx9BRsJ5awNrBgRzylyRB04LqIE=";
    };
  };
  searxng = {
    pname = "searxng";
-    version = "f1c05e7c16e59a8d5d98640bc057958ea268cddf";
+    version = "f5eb56b63f250c7804e5e1cf4426e550bc933906";
    src = fetchTarball {
-      url = "https://github.com/searxng/searxng/archive/f1c05e7c16e59a8d5d98640bc057958ea268cddf.tar.gz";
-      sha256 = "sha256-2QetT4xLlyKAC/eiIhShYRMRwFU9dJm6Ah5wS84Rgf8=";
+      url = "https://github.com/searxng/searxng/archive/f5eb56b63f250c7804e5e1cf4426e550bc933906.tar.gz";
+      sha256 = "sha256-WWbpfZZei3kOdN607/J2M1oSzbPZKaLbsU5gO2kIc90=";
    };
-    date = "2024-08-09";
+    date = "2024-06-07";
  };
 }
--- a/pkgs/firefox-addons/generated.nix
+++ b/pkgs/firefox-addons/generated.nix
@ -23,10 +23,10 @@
    };
    "rikaitan" = buildFirefoxXpiAddon {
      pname = "rikaitan";
-      version = "24.7.31.0";
+      version = "24.5.21.0";
      addonId = "tatsu@autistici.org";
-      url = "https://addons.mozilla.org/firefox/downloads/file/4337076/rikaitan-24.7.31.0.xpi";
-      sha256 = "be4b8484221aa8eb4348d1880de988d6f19f3b9ca53deda3fca657dfa2ce3108";
+      url = "https://addons.mozilla.org/firefox/downloads/file/4291845/rikaitan-24.5.21.0.xpi";
+      sha256 = "a2a94d88af04023f14daaafda1f6ca7a7197f2ab92ada08ee2e9e4292d57a391";
      meta = with lib;
      {
        homepage = "https://github.com/Ajatt-Tools/rikaitan";
@ -38,7 +38,6 @@
          "unlimitedStorage"
          "declarativeNetRequest"
          "scripting"
-          "contextMenus"
          "http://*/*"
          "https://*/*"
          "file://*/*"
--- a/pkgs/sway/0001-mobile-reverse-layer-order.patch
+++ b/pkgs/sway/0001-mobile-reverse-layer-order.patch
@ -0,0 +1,26 @@
+From 7fead3cd2158fe913775ede5651291cf5f4ccf4d Mon Sep 17 00:00:00 2001
+From: chayleaf <chayleaf-git@pavluk.org>
+Date: Wed, 14 Aug 2024 07:32:11 +0700
+Subject: [PATCH 1/2] mobile: reverse layer order
+
+This makes exclusive anchored layers that were added first be first
+---
+ sway/desktop/layer_shell.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
+index 8c6cedfe..41a638ee 100644
+--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
+@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
+ 	struct wlr_box full_area = { 0 };
+ 	wlr_output_effective_resolution(output->wlr_output,
+ 			&full_area.width, &full_area.height);
+-	wl_list_for_each(sway_layer, list, link) {
+	wl_list_for_each_reverse(sway_layer, list, link) {
+ 		struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
+ 		struct wlr_layer_surface_v1_state *state = &layer->current;
+ 		if (exclusive != (state->exclusive_zone > 0)) {
+-- 
+2.44.1
+
--- a/pkgs/sway/0002-mobile-don-t-idle_notify-for-volume-keys.patch
+++ b/pkgs/sway/0002-mobile-don-t-idle_notify-for-volume-keys.patch
@ -1,7 +1,7 @@
-From c4690b1496ca34c416869d2932abfa112a93f188 Mon Sep 17 00:00:00 2001
+From 466d750b96184b793d276d9d0e30d37af4477fea Mon Sep 17 00:00:00 2001
 From: chayleaf <chayleaf-git@pavluk.org>
 Date: Wed, 14 Aug 2024 08:17:44 +0700
-Subject: [PATCH 1/2] mobile: don't idle_notify for volume keys
+Subject: [PATCH 2/2] mobile: don't idle_notify for volume keys

 ---
 sway/input/keyboard.c | 4 +++-
--- a/pkgs/sway/0002-mobile-reverse-layer-order.patch
+++ b/pkgs/sway/0002-mobile-reverse-layer-order.patch
@ -1,46 +0,0 @@
-From 0d352dff09bab4536d2e182538641af1c6d2a1ef Mon Sep 17 00:00:00 2001
-From: chayleaf <chayleaf-git@pavluk.org>
-Date: Wed, 14 Aug 2024 07:32:11 +0700
-Subject: [PATCH 2/2] mobile: reverse layer order
-
-This makes exclusive anchored layers that were added first be first
---
- sway/desktop/layer_shell.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
-index 8c6cedfe..4afca0b7 100644
--- a/sway/desktop/layer_shell.c
-+++ b/sway/desktop/layer_shell.c
-@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
- 	struct wlr_box full_area = { 0 };
- 	wlr_output_effective_resolution(output->wlr_output,
- 			&full_area.width, &full_area.height);
-	wl_list_for_each(sway_layer, list, link) {
-+	wl_list_for_each_reverse(sway_layer, list, link) {
- 		struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
- 		struct wlr_layer_surface_v1_state *state = &layer->current;
- 		if (exclusive != (state->exclusive_zone > 0)) {
-@@ -214,14 +214,14 @@ void arrange_layers(struct sway_output *output) {
- 	wlr_output_effective_resolution(output->wlr_output,
- 			&usable_area.width, &usable_area.height);
- 
-	// Arrange exclusive surfaces from top->bottom
-	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
-			&usable_area, true);
-	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
-+	// Arrange exclusive surfaces from bottom->top
-+	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
- 			&usable_area, true);
- 	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
- 			&usable_area, true);
-	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
-+	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
-+			&usable_area, true);
-+	arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
- 			&usable_area, true);
- 
- 	if (memcmp(&usable_area, &output->usable_area,
-- 
-2.44.1
-
--- a/system/devices/radxa-rock5a-server.nix
+++ b/system/devices/radxa-rock5a-server.nix
@ -37,6 +37,7 @@ in
    "net.ipv4.tcp_congestion_control" = "bbr";
  };

+  # as expected, systemd initrd didn't work well, and i really cba to debug it
  networking.useDHCP = false;
  networking.useNetworkd = true;
  systemd.network = {
--- a/system/hardware/oneplus-enchilada/pkgs.nix
+++ b/system/hardware/oneplus-enchilada/pkgs.nix
@ -41,8 +41,8 @@ in {
    src = pkgs.fetchFromGitLab {
      owner = "sdm845-mainline";
      repo = "alsa-ucm-conf";
-      rev = "aaa7889f7a6de640b4d78300e118457335ad16c0";
-      hash = "sha256-2P5ZTrI1vCJ99BcZVPlkH4sv1M6IfAlaXR6ZjAdy4HQ=";
+      rev = "9ed12836b269764c4a853411d38ccb6abb70b383";
+      hash = "sha256-QvGZGLEmqE+sZpd15fHb+9+MmoD5zoGT+pYqyWZLdkM=";
    };
    installPhase = ''
      substituteInPlace ucm2/lib/card-init.conf --replace '"/bin' '"/run/current-system/sw/bin'
@ -124,11 +124,8 @@ in {
    # ignoreConfigErrors = false;
    kernelPatches = [
      {
-        name = "linux_6_10";
-        patch = pkgs.fetchpatch {
-          url = "https://github.com/chayleaf/linux-sdm845/compare/v6.10.3...e81e06b6ac82b46d849f3c981a55d87572544c38.patch";
-          hash = "sha256-KYK2RMbSAkHIrXYdB0jhCifcNdH5qa010FGs6KyU8Ug=";
-        };
+        name = "linux_6_9";
+        patch = ./linux_6_9.patch;
      }
      {
        name = "config_fixes";
@ -144,6 +141,9 @@ in {
      # fix build
      LENOVO_YOGA_C630_EC = no;
      RPMSG_QCOM_GLINK_SMEM = yes;
+      # useless lines, remove on update
+      DM_MIRROR = no;
+      DM_ZERO = no;
      # for adb and stuff (doesn't have to be built-in, but it's easier that way)
      USB_FUNCTIONFS = yes;
      USB_LIBCOMPOSITE = yes;
--- a/system/hosts/nixmsi.nix
+++ b/system/hosts/nixmsi.nix
@ -149,13 +149,20 @@
    isNormalUser = true;
  };
  nix.settings = {
+    netrc-file = "/secrets/netrc";
    trusted-users = [ "hydra-builder" ];
+    substituters = [
+      "https://binarycache.pavluk.org"
+      "https://cache.nixos.org/"
+    ];
    trusted-substituters = [
      "https://nix-community.cachix.org"
      "https://nix-gaming.cachix.org"
      "https://nixpkgs-wayland.cachix.org"
    ];
    trusted-public-keys = [
+      "binarycache.pavluk.org:Vk0ms/vSqoOV2JXeNVOroc8EfilgVxCCUtpCShGIKsQ="
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
--- a/system/hosts/phone/default.nix
+++ b/system/hosts/phone/default.nix
@ -15,6 +15,7 @@
    linkConfig.MACAddress = config.phone.mac;
  };

+  sound.enable = true;
  services.logind.powerKey = "ignore";
  services.logind.powerKeyLongPress = "poweroff";
  hardware.sensor.iio.enable = true;
@ -61,7 +62,7 @@
  programs.sway.enable = true;
  xdg.portal = {
    enable = true;
-    extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
+    extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ];
  };
  # services.xserver.desktopManager.phosh = {
  #   enable = true;
--- a/system/modules/common.nix
+++ b/system/modules/common.nix
@ -205,18 +205,6 @@ in {
    security.rtkit.enable = true;
    services.dbus.enable = true;
    programs.dconf.enable = true;
-
-    nix.settings = {
-      netrc-file = "/secrets/netrc";
-      substituters = [
-        "https://binarycache.pavluk.org"
-        "https://cache.nixos.org/"
-      ];
-      trusted-public-keys = [
-        "binarycache.pavluk.org:Vk0ms/vSqoOV2JXeNVOroc8EfilgVxCCUtpCShGIKsQ="
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      ];
-    };
  })

  ];