stupid git

This commit is contained in:
2025-05-29 13:06:00 -04:00
parent 0d9e0ff10d
commit 9dfcfa898a
3 changed files with 5 additions and 141 deletions

View File

@ -1,13 +1,8 @@
{
description = "Wyatt's nix configuration suite";
inputs = {
<<<<<<< HEAD
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
=======
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
>>>>>>> origin
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";