From 87d550fcb065f174e53a99b9f5511c242b579b28 Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Mon, 17 Jun 2024 08:52:26 +0200 Subject: [PATCH] chore: update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'devshell': 'github:numtide/devshell/2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8?narHash=sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk%3D' (2024-03-22) → 'github:numtide/devshell/1ebbe68d57457c8cae98145410b164b5477761f4?narHash=sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY%3D' (2024-06-03) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2?narHash=sha256-Dt/wOWeW6Sqm11Yh%2B2%2Bt0dfEWxoMxGBvv3JpIocFl9E%3D' (2024-03-01) → 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01) • Updated input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8?dir=lib&narHash=sha256-cy6ArO4k5qTx%2Bl5o%2B0mL9f5fa86tYUX3ozE1S%2BTxlds%3D' (2024-02-29) → 'https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz?narHash=sha256-lIbdfCsf8LMFloheeE6N31%2BBMIeixqyQWbSr2vk79EQ%3D' (2024-06-01) • Updated input 'home-manager': 'github:nix-community/home-manager/1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb?narHash=sha256-WJOahf%2B6115%2BGMl3wUfURu8fszuNeJLv9qAWFQl3Vmo%3D' (2024-03-22) → 'github:nix-community/home-manager/0a7ffb28e5df5844d0e8039c9833d7075cdee792?narHash=sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p%2B27TpeE%3D' (2024-06-16) • Updated input 'hydra': 'github:NixOS/hydra/8f56209bd6f3b9ec53d50a23812a800dee7a1969?narHash=sha256-mhEj02VruXPmxz3jsKHMov2ERNXk9DwaTAunWEO1iIQ%3D' (2024-03-08) → 'github:NixOS/hydra/b3e0d9a8b78d55e5fea394839524f5a24d694230?narHash=sha256-WAJJ4UL3hsqsfZ05cHthjEwItnv7Xy84r2y6lzkBMh8%3D' (2024-05-23) • Updated input 'hydra/nix': 'github:NixOS/nix/8f42912c80c0a03f62f6a3d28a3af05a9762565d?narHash=sha256-fjx%2BnCOzuSxGWfhwWWc8hCsLFZAjZLDDUcbBtldRqbk%3D' (2024-01-30) → 'github:NixOS/nix/1c8150ac312b5f9ba1b3f6768ff43b09867e5883?narHash=sha256-gW1mO/CvsQQ5gvgiwzxsGhPFI/tx30NING%2BqgF5Do0s%3D' (2024-04-23) • Added input 'hydra/nix/flake-parts': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d?narHash=sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm%2BGpZNw%3D' (2024-04-01) • Added input 'hydra/nix/flake-parts/nixpkgs-lib': follows 'hydra/nix/nixpkgs' • Added input 'hydra/nix/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8?narHash=sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y%3D' (2024-04-12) • Added input 'hydra/nix/pre-commit-hooks/flake-compat': follows 'hydra/nix' • Added input 'hydra/nix/pre-commit-hooks/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f?narHash=sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau%2B/OdUAjtQ0rA%3D' (2022-11-02) • Added input 'hydra/nix/pre-commit-hooks/gitignore': follows 'hydra/nix' • Added input 'hydra/nix/pre-commit-hooks/nixpkgs': follows 'hydra/nix/nixpkgs' • Added input 'hydra/nix/pre-commit-hooks/nixpkgs-stable': follows 'hydra/nix/nixpkgs' • Updated input 'hydra/nixpkgs': 'github:NixOS/nixpkgs/a1982c92d8980a0114372973cbdfe0a307f1bdea?narHash=sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ%3D' (2024-01-12) → 'github:NixOS/nixpkgs/1d6a23f11e44d0fb64b3237569b87658a9eb5643?narHash=sha256-CzZwhqyLlebljv1zFS2KWVH/3byHND0LfaO1jKsGuVo%3D' (2024-04-11) • Removed input 'hydra/nixpkgs-for-fileset' • Updated input 'hyprland': 'github:hyprwm/Hyprland/86dc46ffea2fa72abe1228c1fad1b42d1507e45d?narHash=sha256-K5MByS37KyZ3%2BUPV/UAP6hscqiXtGQVevAA7nkGd96Y%3D' (2024-03-24) → 'github:hyprwm/Hyprland/b15be9c77de593581007de53b2bbca97d121900a?narHash=sha256-IIUhBjiDa0TjvEJb1WTJ9TM8PTGJjl%2BsOWfSdZKIJNA%3D' (2024-06-16) • Updated input 'hyprland/hyprcursor': 'github:hyprwm/hyprcursor/6a92473237f430399a417e1c2da9d7fcd4970086?narHash=sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE%3D' (2024-03-21) → 'github:hyprwm/hyprcursor/dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df?narHash=sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0%3D' (2024-06-14) • Updated input 'hyprland/hyprcursor/hyprlang': 'github:hyprwm/hyprlang/a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2?narHash=sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk%3D' (2024-03-08) → follows 'hyprland/hyprlang' • Removed input 'hyprland/hyprcursor/hyprlang/nixpkgs' • Removed input 'hyprland/hyprcursor/hyprlang/systems' • Removed input 'hyprland/hyprland-protocols' • Removed input 'hyprland/hyprland-protocols/nixpkgs' • Removed input 'hyprland/hyprland-protocols/systems' • Updated input 'hyprland/hyprlang': 'github:hyprwm/hyprlang/a2f39421144d42541c057be235154ce21b76c0f6?narHash=sha256-tt0UgVKWeLQ%2BtFzvqrm4uAZbzONwdGshpfiLHAQ1P2c%3D' (2024-03-20) → 'github:hyprwm/hyprlang/ec6938c66253429192274d612912649a0cfe4d28?narHash=sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM%2BJj94%3D' (2024-06-08) • Added input 'hyprland/hyprlang/hyprutils': follows 'hyprland/hyprutils' • Added input 'hyprland/hyprutils': 'github:hyprwm/hyprutils/8e10e0626fb26a14b859b3811b6ed7932400c86e?narHash=sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U%3D' (2024-06-13) • Added input 'hyprland/hyprutils/nixpkgs': follows 'hyprland/nixpkgs' • Added input 'hyprland/hyprutils/systems': follows 'hyprland/systems' • Added input 'hyprland/hyprwayland-scanner': 'github:hyprwm/hyprwayland-scanner/1419520d5f7f38d35e05504da5c1b38212a38525?narHash=sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4%3D' (2024-06-11) • Added input 'hyprland/hyprwayland-scanner/nixpkgs': follows 'hyprland/nixpkgs' • Added input 'hyprland/hyprwayland-scanner/systems': follows 'hyprland/systems' • Removed input 'hyprland/wlroots' • Updated input 'hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/2d2fb547178ec025da643db57d40a971507b82fe?narHash=sha256-jYqJM5khksLIbqSxCLUUcqEgI%2BO2LdlSlcMEBs39CAU%3D' (2024-03-01) → 'github:hyprwm/xdg-desktop-portal-hyprland/24be4a26f0706e456fca1b61b8c79f7486a9e86d?narHash=sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8%3D' (2024-06-13) • Updated input 'hyprland/xdph/hyprland-protocols': follows 'hyprland/hyprland-protocols' → 'github:hyprwm/hyprland-protocols/0c2ce70625cb30aef199cb388f99e19a61a6ce03?narHash=sha256-zOEwiWoXk3j3%2BEoF3ySUJmberFewWlagvewDRuWYAso%3D' (2023-08-11) • Added input 'hyprland/xdph/hyprland-protocols/nixpkgs': follows 'hyprland/xdph/nixpkgs' • Added input 'hyprland/xdph/hyprland-protocols/systems': follows 'hyprland/xdph/systems' • Updated input 'hyprland-contrib': 'github:hyprwm/contrib/536f00c5895015da1e7aa85bbee9aa6dcd149e69?narHash=sha256-BxWizZAc845ks9BjEXosRjfBv/NMr1WwoORBQuixfII%3D' (2024-03-21) → 'github:hyprwm/contrib/29a8374f4b9206d5c4af84aceb7fb5dff441ea60?narHash=sha256-fuWpgh8KasByIJWE%2BxVd37Al0LV5YAn6s871T50qVY0%3D' (2024-06-15) • Updated input 'jovian-nixos': 'github:Jovian-Experiments/Jovian-NixOS/1171169117f63f1de9ef2ea36efd8dcf377c6d5a?narHash=sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM%3D' (2024-03-23) → 'github:Jovian-Experiments/Jovian-NixOS/f02a01aab60c68b7898043c2e7f5bc97c93fb07b?narHash=sha256-vOsklVeiGCvf9LBOz0sjHMNvohgUw8/Oe/8MpdFnF%2BY%3D' (2024-06-15) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7559df1e4af972d5f1de87975b5ef6a8d7559db2?narHash=sha256-19KQXya5VERUXOdeEJJN%2BzOqtvuE6MV3qTk9Gr4J9Uo%3D' (2024-03-24) → 'github:NixOS/nixos-hardware/cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06?narHash=sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ%3D' (2024-06-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/44d0940ea560dee511026a53f0e2e2cde489b4d4?narHash=sha256-YN/Ciidm%2BA0fmJPWlHBGvVkcarYWSC%2Bs3NTPk/P%2Bq3c%3D' (2024-03-23) → 'github:NixOS/nixpkgs/e9ee548d90ff586a6471b4ae80ae9cfcbceb3420?narHash=sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY%3D' (2024-06-13) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/59f7ad2c27737a7ea7ad16a48c95631f159ef822?narHash=sha256-zaxF0fvo/FH1yVBsNbtOD%2Bb%2Bigp3g4IA8%2BcOdx44KzA%3D' (2024-03-24) → 'github:nix-community/nixpkgs-wayland/937cdd5ba09099b20d665cba048959f505fd0880?narHash=sha256-Hh5FRnI0WgDmSgs0Xky2VKtSDibcWOOEA1T79/tIer0%3D' (2024-06-16) • Updated input 'nixpkgs-wayland/flake-compat': 'github:nix-community/flake-compat/8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c?narHash=sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw%3D' (2023-06-29) → 'github:nix-community/flake-compat/38fd3954cf65ce6faf3d0d45cd26059e059f07ea?narHash=sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE%3D' (2024-06-02) • Updated input 'nixpkgs-wayland/lib-aggregate': 'github:nix-community/lib-aggregate/120535dff702c551ec76a125a181d90131407264?narHash=sha256-s6z371miAZonduv53LQzjthvNCs4R%2BoTbv9cRu%2BiyL8%3D' (2024-03-24) → 'github:nix-community/lib-aggregate/17a1c1bfca963a2776969866aaa07744d7ac9135?narHash=sha256-pVGgM3MOOpMMqprkrMkuWwhC1dsw6Xt7aRGaBkMQqG0%3D' (2024-06-16) • Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/b2a1eeef8c185f6bd27432b053ff09d773244cbc?narHash=sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0%3D' (2024-03-24) → 'github:nix-community/nixpkgs.lib/6fba0c5a27b984914794ffdab8d7bb5c29ab11b6?narHash=sha256-2oGRKxl3qEyRH2DJRiVtLeJICcybXMkqjWQYODINL9M%3D' (2024-06-16) • Updated input 'nixpkgs-wayland/nix-eval-jobs': 'github:nix-community/nix-eval-jobs/6b03a93296faf174b97546fd573c8b379f523a8d?narHash=sha256-TLj334vRwFtSym3m%2BNnKcNCnKKPNoTC/TDZL40vmOso%3D' (2024-01-14) → 'github:nix-community/nix-eval-jobs/b6169e08e76e10b673d1b54f944cddb1e7cbea97?narHash=sha256-e3/cvm7bAn0RsTBcPfHwuYOi2lwoO4jpTn4nmMSvHfU%3D' (2024-06-06) • Updated input 'nixpkgs-wayland/nix-eval-jobs/flake-parts': 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5?narHash=sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS%2BSRRWZ2TMda7E%3D' (2023-12-01) → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d?narHash=sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm%2BGpZNw%3D' (2024-04-01) • Updated input 'nixpkgs-wayland/nix-eval-jobs/nix-github-actions': 'github:nix-community/nix-github-actions/93e39cc1a087d65bcf7a132e75a650c44dd2b734?narHash=sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo%3D' (2023-11-28) → 'github:nix-community/nix-github-actions/5163432afc817cf8bd1f031418d1869e4c9d5547?narHash=sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y%3D' (2023-12-29) • Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs': 'github:NixOS/nixpkgs/d6863cbcbbb80e71cecfc03356db1cda38919523?narHash=sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz%2BUg/nug6o%3D' (2023-12-21) → 'github:NixOS/nixpkgs/ad7efee13e0d216bf29992311536fce1d3eefbef?narHash=sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl%2BpxSq/kiFc%3D' (2024-05-06) • Updated input 'nixpkgs-wayland/nix-eval-jobs/treefmt-nix': 'github:numtide/treefmt-nix/2961375283668d867e64129c22af532de8e77734?narHash=sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ%2Bg%3D' (2023-12-19) → 'github:numtide/treefmt-nix/49dc4a92b02b8e68798abd99184f228243b6e3ac?narHash=sha256-N3QDhoaX%2BpaWXHbEXZapqd1r95mdshxToGowtjtYkGI%3D' (2024-04-01) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/44d0940ea560dee511026a53f0e2e2cde489b4d4?narHash=sha256-YN/Ciidm%2BA0fmJPWlHBGvVkcarYWSC%2Bs3NTPk/P%2Bq3c%3D' (2024-03-23) → 'github:nixos/nixpkgs/e9ee548d90ff586a6471b4ae80ae9cfcbceb3420?narHash=sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY%3D' (2024-06-13) • Updated input 'pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/e611897ddfdde3ed3eaac4758635d7177ff78673?narHash=sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI%2BJMJuLo45aG3cKc%3D' (2024-03-20) → 'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06) • Removed input 'pre-commit-hooks-nix/flake-utils' • Removed input 'pre-commit-hooks-nix/flake-utils/systems' • Updated input 'qmk-udev-rules': 'github:qmk/qmk_firmware/4afbade6d122183920a888c8e6e1de4581e657fa?narHash=sha256-8tn8zPkGHDojHX1pd53x8ad5iqvpt1T3jzEbBONXujo%3D' (2024-03-22) → 'github:qmk/qmk_firmware/4864d5afca09cbd4b0bfc7e7cef505ad602b0c9c?narHash=sha256-ppwZCR0UKPqTC7LN2JhHKRixTRzHUyZ6iAdo4cTdp14%3D' (2024-06-17) • Updated input 'sops-nix': 'github:Mic92/sops-nix/405987a66cce9a4a82f321f11b205982a7127c88?narHash=sha256-N%2BPp3/8H%2Brd7cO71VNV/ovV/Kwt%2BXNeUHNhsmyTabdM%3D' (2024-03-24) → 'github:Mic92/sops-nix/797ce4c1f45a85df6dd3d9abdc53f2691bea9251?narHash=sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg%3D' (2024-06-16) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68?narHash=sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc%3D' (2024-03-23) → 'github:NixOS/nixpkgs/c884223af91820615a6146af1ae1fea25c107005?narHash=sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs%3D' (2024-06-15) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564?narHash=sha256-nehQK/XTFxfa6rYKtbi8M1w%2BIU1v5twYhiyA4dg1vpg%3D' (2024-03-18) → 'github:numtide/treefmt-nix/68eb1dc333ce82d0ab0c0357363ea17c31ea1f81?narHash=sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls%3D' (2024-06-16) --- flake.lock | 483 ++++++++++++++++++---------------- flake.nix | 12 +- modules/base-system.nix | 4 + pkgs/mattermost-desktop.nix | 69 +++++ users/malte/default.nix | 7 +- users/malte/modules/helix.nix | 7 +- 6 files changed, 334 insertions(+), 248 deletions(-) create mode 100644 pkgs/mattermost-desktop.nix diff --git a/flake.lock b/flake.lock index 6a9eecc..438a987 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -137,7 +137,7 @@ }, "devshell_4": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_7" }, "locked": { @@ -210,7 +210,7 @@ "devshell": "devshell_5", "drv-parts": "drv-parts_2", "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "flake-utils-pre-commit": "flake-utils-pre-commit_2", "ghc-utils": "ghc-utils_2", "gomod2nix": "gomod2nix_2", @@ -219,7 +219,7 @@ "nixpkgs": "nixpkgs_8", "nixpkgsV1": "nixpkgsV1_2", "poetry2nix": "poetry2nix_2", - "pre-commit-hooks": "pre-commit-hooks_2", + "pre-commit-hooks": "pre-commit-hooks_3", "pruned-racket-catalog": "pruned-racket-catalog_2" }, "locked": { @@ -424,11 +424,11 @@ }, "flake-compat_7": { "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", "owner": "nix-community", "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "type": "github" }, "original": { @@ -498,11 +498,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -512,6 +512,28 @@ } }, "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "mensa", @@ -533,7 +555,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -551,7 +573,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -560,11 +582,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -652,6 +674,21 @@ } }, "flake-utils_4": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -666,7 +703,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -681,9 +718,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1705309234, @@ -699,27 +736,9 @@ "type": "github" } }, - "flake-utils_7": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_8": { "inputs": { - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -893,11 +912,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -909,15 +928,14 @@ "hydra": { "inputs": { "nix": "nix", - "nixpkgs": "nixpkgs_6", - "nixpkgs-for-fileset": "nixpkgs-for-fileset" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1709908087, - "narHash": "sha256-mhEj02VruXPmxz3jsKHMov2ERNXk9DwaTAunWEO1iIQ=", + "lastModified": 1716479415, + "narHash": "sha256-WAJJ4UL3hsqsfZ05cHthjEwItnv7Xy84r2y6lzkBMh8=", "owner": "NixOS", "repo": "hydra", - "rev": "8f56209bd6f3b9ec53d50a23812a800dee7a1969", + "rev": "b3e0d9a8b78d55e5fea394839524f5a24d694230", "type": "github" }, "original": { @@ -928,7 +946,10 @@ }, "hyprcursor": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -939,11 +960,11 @@ ] }, "locked": { - "lastModified": 1711035742, - "narHash": "sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE=", + "lastModified": 1718368322, + "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "6a92473237f430399a417e1c2da9d7fcd4970086", + "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df", "type": "github" }, "original": { @@ -955,27 +976,29 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", - "wlroots": "wlroots", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1711249786, - "narHash": "sha256-K5MByS37KyZ3+UPV/UAP6hscqiXtGQVevAA7nkGd96Y=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "86dc46ffea2fa72abe1228c1fad1b42d1507e45d", - "type": "github" + "lastModified": 1718566457, + "narHash": "sha256-FtgnoGecYVBnGelxdcgavpogPVn+zi/5p4JFJM+9VJk=", + "ref": "refs/heads/main", + "rev": "b15be9c77de593581007de53b2bbca97d121900a", + "revCount": 4851, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-contrib": { @@ -985,11 +1008,11 @@ ] }, "locked": { - "lastModified": 1711036118, - "narHash": "sha256-BxWizZAc845ks9BjEXosRjfBv/NMr1WwoORBQuixfII=", + "lastModified": 1718476555, + "narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=", "owner": "hyprwm", "repo": "contrib", - "rev": "536f00c5895015da1e7aa85bbee9aa6dcd149e69", + "rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60", "type": "github" }, "original": { @@ -1002,10 +1025,12 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, @@ -1025,19 +1050,25 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", - "hyprcursor", "nixpkgs" ], - "systems": "systems_2" + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -1046,7 +1077,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprutils": { "inputs": { "nixpkgs": [ "hyprland", @@ -1058,16 +1089,41 @@ ] }, "locked": { - "lastModified": 1710960526, - "narHash": "sha256-tt0UgVKWeLQ+tFzvqrm4uAZbzONwdGshpfiLHAQ1P2c=", + "lastModified": 1718271409, + "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "a2f39421144d42541c057be235154ce21b76c0f6", + "repo": "hyprutils", + "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1718119275, + "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", "type": "github" } }, @@ -1079,11 +1135,11 @@ ] }, "locked": { - "lastModified": 1711231487, - "narHash": "sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM=", + "lastModified": 1718431241, + "narHash": "sha256-vOsklVeiGCvf9LBOz0sjHMNvohgUw8/Oe/8MpdFnF+Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1171169117f63f1de9ef2ea36efd8dcf377c6d5a", + "rev": "f02a01aab60c68b7898043c2e7f5bc97c93fb07b", "type": "github" }, "original": { @@ -1094,15 +1150,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1711282133, - "narHash": "sha256-s6z371miAZonduv53LQzjthvNCs4R+oTbv9cRu+iyL8=", + "lastModified": 1718539824, + "narHash": "sha256-pVGgM3MOOpMMqprkrMkuWwhC1dsw6Xt7aRGaBkMQqG0=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "120535dff702c551ec76a125a181d90131407264", + "rev": "17a1c1bfca963a2776969866aaa07744d7ac9135", "type": "github" }, "original": { @@ -1161,7 +1217,7 @@ "inputs": { "devshell": "devshell_4", "dream2nix": "dream2nix_2", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs" ], @@ -1186,41 +1242,43 @@ "nix": { "inputs": { "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_4", "libgit2": "libgit2", "nixpkgs": [ "hydra", "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1706637536, - "narHash": "sha256-fjx+nCOzuSxGWfhwWWc8hCsLFZAjZLDDUcbBtldRqbk=", + "lastModified": 1713874370, + "narHash": "sha256-gW1mO/CvsQQ5gvgiwzxsGhPFI/tx30NING+qgF5Do0s=", "owner": "NixOS", "repo": "nix", - "rev": "8f42912c80c0a03f62f6a3d28a3af05a9762565d", + "rev": "1c8150ac312b5f9ba1b3f6768ff43b09867e5883", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.20-maintenance", + "ref": "2.22-maintenance", "repo": "nix", "type": "github" } }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "nix-github-actions": "nix-github-actions_2", "nixpkgs": "nixpkgs_12", "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1705242886, - "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", + "lastModified": 1717698186, + "narHash": "sha256-e3/cvm7bAn0RsTBcPfHwuYOi2lwoO4jpTn4nmMSvHfU=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", + "rev": "b6169e08e76e10b673d1b54f944cddb1e7cbea97", "type": "github" }, "original": { @@ -1260,11 +1318,11 @@ ] }, "locked": { - "lastModified": 1701208414, - "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", + "lastModified": 1703863825, + "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", + "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", "type": "github" }, "original": { @@ -1307,11 +1365,11 @@ }, "nix-wallpaper": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_3" + "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { "lastModified": 1708554876, @@ -1329,11 +1387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1711274671, - "narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=", + "lastModified": 1718548414, + "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2", + "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", "type": "github" }, "original": { @@ -1358,22 +1416,6 @@ "type": "github" } }, - "nixpkgs-for-fileset": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -1394,20 +1436,14 @@ }, "nixpkgs-lib_2": { "locked": { - "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", - "type": "github" + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-lib_3": { @@ -1430,11 +1466,11 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1711241261, - "narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=", + "lastModified": 1718499101, + "narHash": "sha256-2oGRKxl3qEyRH2DJRiVtLeJICcybXMkqjWQYODINL9M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc", + "rev": "6fba0c5a27b984914794ffdab8d7bb5c29ab11b6", "type": "github" }, "original": { @@ -1525,11 +1561,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1711233294, - "narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", + "lastModified": 1718478900, + "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", + "rev": "c884223af91820615a6146af1ae1fea25c107005", "type": "github" }, "original": { @@ -1547,11 +1583,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1711284444, - "narHash": "sha256-zaxF0fvo/FH1yVBsNbtOD+b+igp3g4IA8+cOdx44KzA=", + "lastModified": 1718541015, + "narHash": "sha256-Hh5FRnI0WgDmSgs0Xky2VKtSDibcWOOEA1T79/tIer0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "59f7ad2c27737a7ea7ad16a48c95631f159ef822", + "rev": "937cdd5ba09099b20d665cba048959f505fd0880", "type": "github" }, "original": { @@ -1608,11 +1644,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { @@ -1623,11 +1659,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "lastModified": 1715037484, + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", "type": "github" }, "original": { @@ -1639,11 +1675,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { @@ -1750,16 +1786,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1712848736, + "narHash": "sha256-CzZwhqyLlebljv1zFS2KWVH/3byHND0LfaO1jKsGuVo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "1d6a23f11e44d0fb64b3237569b87658a9eb5643", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "nixos-23.11-small", "repo": "nixpkgs", "type": "github" } @@ -1897,7 +1933,7 @@ "pre-commit-hooks-nix_2": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "gitignore": "gitignore_2", "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_2" @@ -1919,17 +1955,16 @@ "pre-commit-hooks-nix_3": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_8", "gitignore": "gitignore_4", "nixpkgs": "nixpkgs_14", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1939,6 +1974,42 @@ } }, "pre-commit-hooks_2": { + "inputs": { + "flake-compat": [ + "hydra", + "nix" + ], + "flake-utils": "flake-utils_4", + "gitignore": [ + "hydra", + "nix" + ], + "nixpkgs": [ + "hydra", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_3": { "inputs": { "flake-utils": [ "mensa", @@ -1965,7 +2036,7 @@ "type": "github" } }, - "pre-commit-hooks_3": { + "pre-commit-hooks_4": { "inputs": { "flake-compat": "flake-compat_6", "flake-utils": [ @@ -2030,11 +2101,11 @@ "qmk-udev-rules": { "flake": false, "locked": { - "lastModified": 1711150230, - "narHash": "sha256-8tn8zPkGHDojHX1pd53x8ad5iqvpt1T3jzEbBONXujo=", + "lastModified": 1718599653, + "narHash": "sha256-ppwZCR0UKPqTC7LN2JhHKRixTRzHUyZ6iAdo4cTdp14=", "owner": "qmk", "repo": "qmk_firmware", - "rev": "4afbade6d122183920a888c8e6e1de4581e657fa", + "rev": "4864d5afca09cbd4b0bfc7e7cef505ad602b0c9c", "type": "github" }, "original": { @@ -2073,11 +2144,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1711249319, - "narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", + "lastModified": 1718506969, + "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "405987a66cce9a4a82f321f11b205982a7127c88", + "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "type": "github" }, "original": { @@ -2118,16 +2189,16 @@ }, "systems_3": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2146,36 +2217,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "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": "nixpkgs_5" @@ -2221,11 +2262,11 @@ ] }, "locked": { - "lastModified": 1702979157, - "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", + "lastModified": 1711963903, + "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2961375283668d867e64129c22af532de8e77734", + "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", "type": "github" }, "original": { @@ -2239,11 +2280,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1710781103, - "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { @@ -2252,31 +2293,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -2291,11 +2310,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1718272114, + "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f9aff37..8dffe02 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,9 @@ url = "github:NixOS/hydra"; }; hyprland = { - url = "github:hyprwm/Hyprland"; + type = "git"; + url = "https://github.com/hyprwm/Hyprland"; + submodules = true; inputs.nixpkgs.follows = "nixpkgs"; }; hyprland-contrib = { @@ -81,7 +83,6 @@ # Modules useful to most of my systems modulesSharedByAllSystems = [ inputs.sops-nix.nixosModules.sops - inputs.self.nixosModules.nixUnstable inputs.home-manager.nixosModules.home-manager ./modules/base-system.nix ]; @@ -154,13 +155,6 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; }; - nixUnstable = {pkgs, ...}: { - nix.registry.nixpkgs.flake = inputs.nixpkgs; - nix.package = pkgs.nixUnstable; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - }; } // (let removeSuffix = builtins.replaceStrings [".nix"] [""]; diff --git a/modules/base-system.nix b/modules/base-system.nix index f924ff1..80bc4e1 100644 --- a/modules/base-system.nix +++ b/modules/base-system.nix @@ -86,6 +86,10 @@ in { ] ++ lib.optional enableHydraMinion config.users.users.hydra-minion.name; }; + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + nix.registry.nixpkgs.flake = inputs.nixpkgs; nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; users.users.hydra-minion = lib.mkIf enableHydraMinion { diff --git a/pkgs/mattermost-desktop.nix b/pkgs/mattermost-desktop.nix new file mode 100644 index 0000000..9baf9a3 --- /dev/null +++ b/pkgs/mattermost-desktop.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchurl, + electron, + makeWrapper, + ... +}: let + pname = "mattermost-desktop"; + version = "5.7.0"; + + srcs = { + "x86_64-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; + hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU="; + }; + + "aarch64-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; + hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ="; + }; + }; + + inherit (stdenv.hostPlatform) system; +in + lib.warn "Mattermost is broken on nixpkgs-unstable. Needs an electron update. Remove if fixed" (stdenv.mkDerivation { + inherit pname version; + + src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); + + nativeBuildInputs = [makeWrapper]; + + installPhase = '' + runHook preInstall + + # Mattermost tarball comes with executable bit set for everything. + # We’ll apply it only to files that need it. + find . -type f -print0 | xargs -0 chmod -x + find . -type f \( -name '*.so.*' -o -name '*.s[oh]' \) -print0 | xargs -0 chmod +x + chmod +x mattermost-desktop chrome-sandbox + + mkdir -p $out/bin $out/share/applications $out/share/${pname}/ + cp -r app_icon.png create_desktop_file.sh locales/ resources/* $out/share/${pname}/ + + patchShebangs $out/share/${pname}/create_desktop_file.sh + $out/share/${pname}/create_desktop_file.sh + rm $out/share/${pname}/create_desktop_file.sh + mv Mattermost.desktop $out/share/applications/Mattermost.desktop + substituteInPlace $out/share/applications/Mattermost.desktop \ + --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + + makeWrapper '${lib.getExe electron}' $out/bin/${pname} \ + --set-default ELECTRON_IS_DEV 0 \ + --add-flags $out/share/${pname}/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Mattermost Desktop client"; + mainProgram = "mattermost-desktop"; + homepage = "https://about.mattermost.com/"; + sourceProvenance = with sourceTypes; [binaryNativeCode]; + license = licenses.asl20; + platforms = ["x86_64-linux" "aarch64-linux"]; + maintainers = [maintainers.joko]; + }; + }) diff --git a/users/malte/default.nix b/users/malte/default.nix index 1986051..ead65b3 100644 --- a/users/malte/default.nix +++ b/users/malte/default.nix @@ -16,11 +16,6 @@ wrapProgram $out/bin/${name} --set GDK_BACKEND x11 ''; - fixElectron = name: pkg: - wrap name pkg '' - wrapProgram $out/bin/${name} --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland" - ''; - lutrisWithLibs = pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ @@ -89,7 +84,7 @@ in { withVencord = true; }) vesktop - (fixElectron "mattermost-desktop" mattermost-desktop) + (pkgs.callPackage ../../pkgs/mattermost-desktop.nix {}) (fixGdk "losslesscut" losslesscut-bin) (fixGdk "skypeforlinux" skypeforlinux) # geekbench diff --git a/users/malte/modules/helix.nix b/users/malte/modules/helix.nix index cf98628..c9eda8b 100644 --- a/users/malte/modules/helix.nix +++ b/users/malte/modules/helix.nix @@ -101,11 +101,16 @@ in { extraPackages = [ pkgs.yaml-language-server pkgs.python311Packages.python-lsp-server - pkgs.nodePackages.bash-language-server + # TODO: Reenable + # pkgs.nodePackages.bash-language-server pkgs.taplo-lsp ]; }; + warnings = [ + "Reenable nodePackages.bash-language-server! (Tracker: https://nixpk.gs/pr-tracker.html?pr=319882)" + ]; + home.sessionVariables = { VISUAL = "${pkgs.kitty}/bin/kitty ${pkgs.helix}/bin/hx"; };