fix: merge conflicts

This commit is contained in:
Ahwx 2024-07-28 13:54:49 +02:00
commit 4eccd5bfac
8 changed files with 430 additions and 14 deletions

View file

@ -4,6 +4,8 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
nixvim.url = "github:ahwxorg/nixvim-config";
hypr-contrib.url = "github:hyprwm/contrib";
hyprpicker.url = "github:hyprwm/hyprpicker";