19 Commits

Author SHA1 Message Date
3263a37074 workflow: push right after rebasing
Some checks failed
Update Nix Flake / update-flake (push) Failing after 18s
2025-03-23 18:57:16 +01:00
fc412f2596 workflow: use rebase instead of merge 2025-03-23 18:51:49 +01:00
c9862e6efc workflow: change cron time
Some checks failed
Update Nix Flake / update-flake (push) Failing after 6s
2025-03-22 10:51:21 +01:00
ed52562b55 workflow: use git diff --cached 2025-03-22 10:51:13 +01:00
8d9892e958 workflow: Simplify automatic merge conflict solving 2025-03-22 09:03:05 +01:00
489b839452 Workflow: automatically solve merge conflict 2025-03-22 08:58:58 +01:00
3801bbda11 remove unnecessary git push 2025-03-22 08:46:34 +01:00
a2a3d2586c workflow: fix merge conflict failing script 2025-03-22 08:44:58 +01:00
2ac3af7a53 workflow: first check if merge is necessary 2025-03-22 08:42:55 +01:00
b0b6ef6bba workflow: use merge instead of rebase 2025-03-22 08:34:16 +01:00
595a9761d0 workflow: use --force-with-lease instead of -f 2025-03-22 08:05:24 +01:00
9fa984aa14 workflow: use force pushing 2025-03-22 07:40:30 +01:00
4cce287379 workflow: rebase instead of reset to fix git push 2025-03-22 07:34:19 +01:00
239eaa7dd6 Workflow: refer to main instead of master
Some checks failed
Update Nix Flake / update-flake (push) Failing after 13s
2025-03-21 22:37:56 +01:00
9711e5c273 Use up-to-date dotfiles branch 2025-03-21 22:36:42 +01:00
87a3de6b98 Add gitea action to update flake daily 2025-03-21 22:36:31 +01:00
2915f8cc36 flake.lock: Update
Flake lock file updates:

• Updated input 'dotfiles':
    'git+https://gitlab.julian-mutter.de/julian/dotfiles?ref=refs/heads/master&rev=1921df83305a865dc9e5df0207b7ac4b719de2db' (2025-02-28)
  → 'git+https://gitlab.julian-mutter.de/julian/dotfiles?ref=refs/heads/master&rev=4745b90cea47b823a560fd43884a89529df0f2b1' (2025-03-12)
• Updated input 'dotfiles/disko':
    'github:nix-community/disko/19c1140419c4f1cdf88ad4c1cfb6605597628940?narHash=sha256-WK%2BPZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y%3D' (2025-02-25)
  → 'github:nix-community/disko/0d8c6ad4a43906d14abd5c60e0ffe7b587b213de?narHash=sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc%3D' (2025-03-12)
• Updated input 'dotfiles/hyprland':
    'github:hyprwm/Hyprland/445337d03dce7c9aef10ff4d57fc516ac8c1b24d?narHash=sha256-khQu5pduq%2BKTid2lHYQpVkFPR3WigOdtE5/95PijxU4%3D' (2025-02-28)
  → 'github:hyprwm/Hyprland/e86d3a14e46d19d8a47f8ceb6410546715d45f10?narHash=sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ%3D' (2025-03-12)
• Updated input 'dotfiles/hyprland/aquamarine':
    'github:hyprwm/aquamarine/f239e5aadd6d23c48e085c2de3397e2058e54d16?narHash=sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI%3D' (2025-02-11)
  → 'github:hyprwm/aquamarine/81498562d0f53e613d30368bb5b076784fa86f80?narHash=sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho%3D' (2025-03-06)
• Updated input 'dotfiles/hyprland/hyprlang':
    'github:hyprwm/hyprlang/a7334904d591f38757c46fbe2ab68651877d9099?narHash=sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx%2BpKrU%3D' (2025-02-08)
  → 'github:hyprwm/hyprlang/72df3861f1197e41b078faa3e38eedd60e00018d?narHash=sha256-kM%2B11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY%3D' (2025-03-05)
• Updated input 'dotfiles/hyprland/hyprutils':
    'github:hyprwm/hyprutils/61a5382f4b1ab578064d470b1b3d3f0df396b8ba?narHash=sha256-h8HOCZ/rw2Buzku%2BGKF77VXxrGjCSOQkLhptiEKMYg0%3D' (2025-02-18)
  → 'github:hyprwm/hyprutils/6b0154b183f9539097f13af9b5da78ca24da6df2?narHash=sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ%3D' (2025-03-04)
• Updated input 'dotfiles/hyprland/hyprwayland-scanner':
    'github:hyprwm/hyprwayland-scanner/04146df74a8d5ec0b579657307be01f1e241125f?narHash=sha256-RleJp7LYbr6s%2BM1xgbmhtBs%2BfYa3ZdIiF7%2BQalJ4D1g%3D' (2025-02-08)
  → 'github:hyprwm/hyprwayland-scanner/206367a08dc5ac4ba7ad31bdca391d098082e64b?narHash=sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u%2BENJ0Qzwc%3D' (2025-02-18)
• Updated input 'dotfiles/hyprland/nixpkgs':
    'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547?narHash=sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y%3D' (2025-02-08)
  → 'github:NixOS/nixpkgs/10069ef4cf863633f57238f179a0297de84bd8d3?narHash=sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U%3D' (2025-03-06)
• Updated input 'dotfiles/hyprland/pre-commit-hooks':
    'github:cachix/git-hooks.nix/9364dc02281ce2d37a1f55b6e51f7c0f65a75f17?narHash=sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg%3D' (2025-01-21)
  → 'github:cachix/git-hooks.nix/b5a62751225b2f62ff3147d0a334055ebadcd5cc?narHash=sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc%3D' (2025-03-07)
• Updated input 'dotfiles/nix-ld':
    'github:Mic92/nix-ld/4c86e9f94553bceba004c48be6f2691971d2a6f7?narHash=sha256-UnMANgi2Zf4gf4p49cXM4fDRrPEpN6oJJMXT4Z2BW/U%3D' (2025-02-24)
  → 'github:Mic92/nix-ld/8e0308dd7dd9cd3656866fb2387bc29052fd6d3a?narHash=sha256-nLUTgXXcFFz%2B3pd3Khz1H4jUECqX5%2BOapNPGioPJRQs%3D' (2025-03-10)
• Updated input 'dotfiles/nix-matlab':
    'gitlab:doronbehar/nix-matlab/020fd90de2d8e229def4adae56222536486bce8a?narHash=sha256-nSxpFfRQmOcIhXo4bCwNucFtIiu4L4ODIicRJPKcwdw%3D' (2025-02-27)
  → 'gitlab:doronbehar/nix-matlab/a8ea92e365477727c924293255a143026e57a5ba?narHash=sha256-0nFAtEaSk0OZXIp3gjeK43e3drbzXjLLSye8RT6hKPU%3D' (2025-03-12)
• Updated input 'dotfiles/nixos-hardware':
    'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49?narHash=sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE%3D' (2025-02-27)
  → 'github:NixOS/nixos-hardware/e1f12151258b12c567f456d8248e4694e9390613?narHash=sha256-f0BVt1/cvA0DQ/q3rB%2BHY4g4tKksd03ZkzI4xehC2Ew%3D' (2025-03-12)
• Updated input 'dotfiles/nixpkgs':
    'github:nixos/nixpkgs/f44bd8ca21e026135061a0a57dcf3d0775b67a49?narHash=sha256-t%2BVaahjQAWyA%2BCtn2idyo1yxRIYpaDxMgHkgCNiMJa4%3D' (2025-02-26)
  → 'github:nixos/nixpkgs/ebe2788eafd539477f83775ef93c3c7e244421d3?narHash=sha256-yfDy6chHcM7pXpMF4wycuuV%2BILSTG486Z/vLx/Bdi6Y%3D' (2025-03-10)
• Updated input 'dotfiles/nixpkgs-unstable':
    'github:nixos/nixpkgs/5135c59491985879812717f4c9fea69604e7f26f?narHash=sha256-Vr3Qi346M%2B8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic%3D' (2025-02-26)
  → 'github:nixos/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1?narHash=sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk%3D' (2025-03-09)
• Updated input 'dotfiles/nixvim':
    'github:nix-community/nixvim/92a97c5e4170b1509dc598fc2d63160eb48095c7?narHash=sha256-RNT0py9/iF8JIBYLaMAL0H52wt2TIyc0uLmyz7tmfkc%3D' (2025-02-24)
  → 'github:nix-community/nixvim/af8a201b44bd7ccadcdd143cb38b5adcffaddc25?narHash=sha256-XQ5nJgVwYzH0mHqp3c/59%2BMLgnsXKoe/bUtkrB1BoCk%3D' (2025-03-09)
• Updated input 'dotfiles/nixvim/flake-parts':
    'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd?narHash=sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm%2BzmZ7vxbJdo%3D' (2025-02-01)
  → 'github:hercules-ci/flake-parts/f4330d22f1c5d2ba72d3d22df5597d123fdb60a9?narHash=sha256-%2Bu2UunDA4Cl5Fci3m7S643HzKmIDAe%2BfiXrLqYsR2fs%3D' (2025-03-07)
• Updated input 'dotfiles/nixvim/git-hooks':
    'github:cachix/git-hooks.nix/9364dc02281ce2d37a1f55b6e51f7c0f65a75f17?narHash=sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg%3D' (2025-01-21)
  → 'github:cachix/git-hooks.nix/b5a62751225b2f62ff3147d0a334055ebadcd5cc?narHash=sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc%3D' (2025-03-07)
• Updated input 'dotfiles/nixvim/nix-darwin':
    'github:lnl7/nix-darwin/353846417f985e74fdc060555f17939e4472ea2c?narHash=sha256-L4ou3xfOr17EAe836djRoQ7auVkYOREMtiQa82wVGqU%3D' (2025-02-14)
  → 'github:lnl7/nix-darwin/c172f50b55b087f8e7801631de977461603bb976?narHash=sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU%3D' (2025-03-04)
• Updated input 'dotfiles/sops-nix':
    'github:Mic92/sops-nix/07af005bb7d60c7f118d9d9f5530485da5d1e975?narHash=sha256-7JAGezJ0Dn5qIyA2%2BT4Dt/xQgAbhCglh6lzCekTVMeU%3D' (2025-02-11)
  → 'github:Mic92/sops-nix/e653d71e82575a43fe9d228def8eddb73887b866?narHash=sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn%2BiZajOyg%3D' (2025-03-10)
• Updated input 'dotfiles/yazi-flavors':
    'github:yazi-rs/flavors/c0234604789f17953b356f9d36879349e793f2ed?narHash=sha256-xYEVdDv0AzPYGwANiP1V5JEKg6k1JXEBeH5tHbPPFl4%3D' (2025-02-26)
  → 'github:yazi-rs/flavors/b929df6bdb56536e14c1fc24c9659f441b961f28?narHash=sha256-iTMch0T933Tvofvo3ZzFwk%2BPNs%2BdsK0SrAIlJ03v73E%3D' (2025-03-08)
2025-03-12 17:12:08 +01:00
7cdedf4f9b Update flake 2025-02-28 19:25:51 +01:00
0c290e5d23 first commit 2025-02-28 19:03:33 +01:00