Update flake.lock 2025-03-23

Merge main branch squashed 2025-03-23
workflow: do not use squashed merging
2025-03-23 18:53:37 +01:00 · 2025-03-23 18:53:37 +01:00 · 2025-03-23 18:53:37 +01:00 · 2025-03-23 18:53:37 +01:00 · 2025-03-23 18:53:37 +01:00 · 2025-03-23 18:53:37 +01:00
2 changed files with 98 additions and 81 deletions
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@ -2,7 +2,7 @@ name: Update Nix Flake

 on:
  schedule:
-    - cron: "30 0 * * *" # daily run
+    - cron: "45 0 * * *" # daily run
  workflow_dispatch: {}

 jobs:
@ -16,10 +16,29 @@ jobs:
          fetch-depth: 0
          ref: flake-updates

-      - name: Fetch latest changes and reset branch
+      - name: Git config
+        shell: bash
        run: |
-          git fetch origin main
-          git reset --hard origin/main
+          git config user.name "Gitea Actions"
+          git config user.email "actions@gitea.local"
+
+      - name: Merge main branch
+        shell: bash
+        run: |
+            commits_ahead=$(git rev-list --count HEAD..origin/main)
+            echo "Commits ahead: $commits_ahead"
+            git log --oneline -5
+            echo "----------"
+            git log --oneline -5 origin/main
+
+            if [ $commits_ahead -ne 0 ]
+            then
+              git fetch origin
+              git merge -X theirs --squash origin/main
+              git commit -m "Merge main branch squashed $(date -I)"
+            else
+              echo "Merge not necessary"
+            fi

      - name: Set up Nix
        uses: cachix/install-nix-action@v31
@ -30,12 +49,9 @@ jobs:
      - name: Commit and push changes
        shell: bash
        run: |
-          git config user.name "Gitea Actions"
-          git config user.email "actions@gitea.local"
          git add flake.lock
-          if git diff --cached --quiet; then
-            echo "No changes to commit."
-          else
-            git commit -m "Update flake.lock $(date -I)"
-            git push origin flake-updates
-          fi
+          git status
+          git diff --cached --quiet && echo "No changes to commit." && exit 0
+
+          git commit -m "Update flake.lock $(date -I)"
+          git push origin flake-updates
--- a/flake.lock
+++ b/flake.lock
@ -3,11 +3,11 @@
    "alacritty-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1740080741,
-        "narHash": "sha256-ROer+oqSY/Z5PAxZFJ5U9R+kMfWb596/1CuEWTcoMIk=",
+        "lastModified": 1742489164,
+        "narHash": "sha256-1KSItYOIPjJzltYZyL0nB4UtNWrjSNyihlBQp3VKaBg=",
        "owner": "alacritty",
        "repo": "alacritty-theme",
-        "rev": "687675f3f2245c80ff8bfe8180b0eb40dfc0bc86",
+        "rev": "86c578469e2bf784faf6f916883bf48349ff4f6d",
        "type": "github"
      },
      "original": {
@ -40,11 +40,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741282631,
-        "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=",
+        "lastModified": 1742213273,
+        "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "81498562d0f53e613d30368bb5b076784fa86f80",
+        "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf",
        "type": "github"
      },
      "original": {
@ -135,11 +135,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735644329,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
        "type": "github"
      },
      "original": {
@ -192,15 +192,16 @@
        "yazi-flavors": "yazi-flavors"
      },
      "locked": {
-        "lastModified": 1741795856,
-        "narHash": "sha256-uSLlzKO0JwWUduD6jBYZR4RU0fevhKd/oJ4BKnav3fI=",
-        "ref": "refs/heads/master",
-        "rev": "4745b90cea47b823a560fd43884a89529df0f2b1",
-        "revCount": 543,
+        "lastModified": 1742689896,
+        "narHash": "sha256-Htt3gg9GheC4y8V84oysLhmxMC/XfV8l2PrNxsT0BpQ=",
+        "ref": "flake-updates",
+        "rev": "6aa73c2dbd0ab8c6c0d9b1b2dc850c1a318fc154",
+        "revCount": 555,
        "type": "git",
        "url": "https://gitlab.julian-mutter.de/julian/dotfiles"
      },
      "original": {
+        "ref": "flake-updates",
        "type": "git",
        "url": "https://gitlab.julian-mutter.de/julian/dotfiles"
      }
@ -535,11 +536,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1742655702,
+        "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
        "type": "github"
      },
      "original": {
@ -591,11 +592,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738664950,
-        "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
+        "lastModified": 1742215578,
+        "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
+        "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
        "type": "github"
      },
      "original": {
@ -652,11 +653,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1741788549,
-        "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=",
+        "lastModified": 1742681162,
+        "narHash": "sha256-kkWvzXU/w48eKqvKVvcE7rWAOH+MeT1ErIgqB7h0Eas=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10",
+        "rev": "fdb7ca6c8fa3611ab04eccf129a515efd9852c73",
        "type": "github"
      },
      "original": {
@ -685,11 +686,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738966025,
-        "narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=",
+        "lastModified": 1742550672,
+        "narHash": "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451",
+        "rev": "7429a0ea78353dab6a7a9a3e8101db98a306957d",
        "type": "github"
      },
      "original": {
@ -846,11 +847,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741123584,
-        "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=",
+        "lastModified": 1741534688,
+        "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2",
+        "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3",
        "type": "github"
      },
      "original": {
@ -1008,11 +1009,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741597901,
-        "narHash": "sha256-nLUTgXXcFFz+3pd3Khz1H4jUECqX5+OapNPGioPJRQs=",
+        "lastModified": 1742204505,
+        "narHash": "sha256-sHBzuG9K/VrvOrcLd9GwoCLaQZDVedi/00YmFfdKq/A=",
        "owner": "Mic92",
        "repo": "nix-ld",
-        "rev": "8e0308dd7dd9cd3656866fb2387bc29052fd6d3a",
+        "rev": "bc1ecb8ca83507c764a3909f02f1acf53c033585",
        "type": "github"
      },
      "original": {
@ -1030,11 +1031,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741791880,
-        "narHash": "sha256-0nFAtEaSk0OZXIp3gjeK43e3drbzXjLLSye8RT6hKPU=",
+        "lastModified": 1742655717,
+        "narHash": "sha256-p1815USOcTj+kPSw2XkK8eWG19NZXpCST9vYDVnQ144=",
        "owner": "doronbehar",
        "repo": "nix-matlab",
-        "rev": "a8ea92e365477727c924293255a143026e57a5ba",
+        "rev": "ddc7d6354cf54880c6d0748fdf7ad370a748f562",
        "type": "gitlab"
      },
      "original": {
@ -1069,11 +1070,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1741792691,
-        "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
+        "lastModified": 1742631601,
+        "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "e1f12151258b12c567f456d8248e4694e9390613",
+        "rev": "380ed15bcd6440606c6856db44a99140d422b46f",
        "type": "github"
      },
      "original": {
@ -1116,11 +1117,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1741513245,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
+        "lastModified": 1742422364,
+        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
+        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
        "type": "github"
      },
      "original": {
@ -1132,11 +1133,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1741246872,
-        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "lastModified": 1742069588,
+        "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
        "type": "github"
      },
      "original": {
@ -1160,11 +1161,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1741600792,
-        "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=",
+        "lastModified": 1742512142,
+        "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3",
+        "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
        "type": "github"
      },
      "original": {
@ -1190,11 +1191,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1741533061,
-        "narHash": "sha256-XQ5nJgVwYzH0mHqp3c/59+MLgnsXKoe/bUtkrB1BoCk=",
+        "lastModified": 1742045620,
+        "narHash": "sha256-zXkJRY/87TPX1vxlrF4941/GRHD3L+CFfe0/95dWT9o=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "af8a201b44bd7ccadcdd143cb38b5adcffaddc25",
+        "rev": "b73beb7bb8c5ec5e559bb5222af9994e7ee4bdbd",
        "type": "github"
      },
      "original": {
@ -1215,11 +1216,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739738736,
-        "narHash": "sha256-Rl4Fw+3PsLTEzzUGlB8kePaiIersDbv5voAif3D6LoM=",
+        "lastModified": 1741886583,
+        "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "9ff62c8e1fbe5dc649dee680c7eb4935936c8ac3",
+        "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
        "type": "github"
      },
      "original": {
@ -1239,11 +1240,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741379162,
-        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "lastModified": 1742058297,
+        "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
        "type": "github"
      },
      "original": {
@ -1296,11 +1297,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737048258,
-        "narHash": "sha256-QcprTngXkN/XuaiSKrswJUHEV+Nz3dSzP6zcLq00Y48=",
+        "lastModified": 1742577105,
+        "narHash": "sha256-1VFPRxydmDhq+CQogLeafh2zmNGKTMFYiV4y9NZXApo=",
        "ref": "refs/heads/master",
-        "rev": "67d5dac0d1a1c0ae0beaf972881976a8b0908fd1",
-        "revCount": 73,
+        "rev": "94de09f4298233795996e17163ae6b987cdedbe9",
+        "revCount": 75,
        "type": "git",
        "url": "https://gitlab.julian-mutter.de/julian/sheet-organizer"
      },
@ -1340,11 +1341,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741644481,
-        "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=",
+        "lastModified": 1742595978,
+        "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "e653d71e82575a43fe9d228def8eddb73887b866",
+        "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d",
        "type": "github"
      },
      "original": {
@ -1532,11 +1533,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737634991,
-        "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
+        "lastModified": 1741934139,
+        "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
+        "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
        "type": "github"
      },
      "original": {
@ -1548,11 +1549,11 @@
    "yazi-flavors": {
      "flake": false,
      "locked": {
-        "lastModified": 1741392393,
-        "narHash": "sha256-iTMch0T933Tvofvo3ZzFwk+PNs+dsK0SrAIlJ03v73E=",
+        "lastModified": 1742023253,
+        "narHash": "sha256-nhIhCMBqr4VSzesplQRF6Ik55b3Ljae0dN+TYbzQb5s=",
        "owner": "yazi-rs",
        "repo": "flavors",
-        "rev": "b929df6bdb56536e14c1fc24c9659f441b961f28",
+        "rev": "68326b4ca4b5b66da3d4a4cce3050e5e950aade5",
        "type": "github"
      },
      "original": {
Author	SHA1	Message	Date
Gitea Actions	83276ed024	Update flake.lock 2025-03-23	2025-03-23 18:53:37 +01:00
Gitea Actions	c218f0fa08	Merge main branch squashed 2025-03-23	2025-03-23 18:53:37 +01:00
Julian Mutter	e2fa915bdd	workflow: do not use squashed merging	2025-03-23 18:53:37 +01:00
Gitea Actions	9cfe01d3e4	Update flake.lock 2025-03-22	2025-03-23 18:53:37 +01:00
Gitea Actions	2be2381cc0	Merge main branch squashed 2025-03-22	2025-03-23 18:53:37 +01:00
Gitea Actions	045e353094	Update flake.lock 2025-03-21	2025-03-23 18:53:37 +01:00
Julian Mutter	fc412f2596	workflow: use rebase instead of merge	2025-03-23 18:51:49 +01:00
Julian Mutter	c9862e6efc	workflow: change cron time Some checks failed Update Nix Flake / update-flake (push) Failing after 6s Details	2025-03-22 10:51:21 +01:00
Julian Mutter	ed52562b55	workflow: use git diff --cached	2025-03-22 10:51:13 +01:00
Julian Mutter	8d9892e958	workflow: Simplify automatic merge conflict solving	2025-03-22 09:03:05 +01:00
Julian Mutter	489b839452	Workflow: automatically solve merge conflict	2025-03-22 08:58:58 +01:00
Julian Mutter	3801bbda11	remove unnecessary git push	2025-03-22 08:46:34 +01:00
Julian Mutter	a2a3d2586c	workflow: fix merge conflict failing script	2025-03-22 08:44:58 +01:00
Julian Mutter	2ac3af7a53	workflow: first check if merge is necessary	2025-03-22 08:42:55 +01:00
Julian Mutter	b0b6ef6bba	workflow: use merge instead of rebase	2025-03-22 08:34:16 +01:00
Julian Mutter	595a9761d0	workflow: use --force-with-lease instead of -f	2025-03-22 08:05:24 +01:00
Julian Mutter	9fa984aa14	workflow: use force pushing	2025-03-22 07:40:30 +01:00
Julian Mutter	4cce287379	workflow: rebase instead of reset to fix git push	2025-03-22 07:34:19 +01:00