comituje

flake.lock

@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771683283,
-        "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=",
+        "lastModified": 1771851181,
+        "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a",
+        "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
         "type": "github"
       },
       "original": {
@@ -546,9 +546,15 @@
       "inputs": {
         "catppuccin": "catppuccin",
         "home-manager": "home-manager",
+<<<<<<< HEAD
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim"
+=======
+        "nixpkgs": "nixpkgs_2",
+        "nixvim": "nixvim",
+        "wallpapers": "wallpapers"
+>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
       }
     },
     "systems": {
@@ -581,6 +587,7 @@
         "type": "github"
       }
     },
+<<<<<<< HEAD
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -619,6 +626,21 @@
       "original": {
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
+=======
+    "wallpapers": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1762937381,
+        "narHash": "sha256-N+MZHSRcwOldS5Ai8B3YfKquKs9oeUW/GkV1iKM5+i8=",
+        "owner": "orangci",
+        "repo": "walls-catppuccin-mocha",
+        "rev": "7bfdf10d16ad3a689f9f0cf3a0930da3d1a245a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "orangci",
+        "repo": "walls-catppuccin-mocha",
+>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
         "type": "github"
       }
     }