diff --git a/flake.lock b/flake.lock index 9f5d628..e16254d 100644 --- a/flake.lock +++ b/flake.lock @@ -106,16 +106,28 @@ "brew-src": { "flake": false, "locked": { +<<<<<<< Updated upstream "lastModified": 1769363988, "narHash": "sha256-BiGPeulrDVetXP+tjxhMcGLUROZAtZIhU5m4MqawCfM=", "owner": "Homebrew", "repo": "brew", "rev": "d01011cac6d72032c75fd2cd9489909e95d9faf2", +======= + "lastModified": 1774235677, + "narHash": "sha256-0ryNYmzDAeRlrzPTAgmzGH/Cgc8iv/LBN6jWGUANvIk=", + "owner": "Homebrew", + "repo": "brew", + "rev": "894a3d23ac0c8aaf561b9874b528b9cb2e839201", +>>>>>>> Stashed changes "type": "github" }, "original": { "owner": "Homebrew", +<<<<<<< Updated upstream "ref": "5.0.12", +======= + "ref": "5.1.1", +>>>>>>> Stashed changes "repo": "brew", "type": "github" } @@ -126,11 +138,19 @@ "nixpkgs": "nixpkgs" }, "locked": { +<<<<<<< Updated upstream "lastModified": 1772039265, "narHash": "sha256-3TR+B2DmkkkIi/b0CE8PuKkmb2jgzdKrOPsIwdWhsM0=", "owner": "9001", "repo": "copyparty", "rev": "7c60adc69c977fb4b75e31c576131b1379498c3f", +======= + "lastModified": 1775334496, + "narHash": "sha256-dUopEMj5KhH1vnv43o29kMsayp0Ki+9EfIn4UAE9sAU=", + "owner": "9001", + "repo": "copyparty", + "rev": "ede692925edfc6fca7a52f483414d543e9303237", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -277,11 +297,19 @@ "firefox-gnome-theme": { "flake": false, "locked": { +<<<<<<< Updated upstream "lastModified": 1764873433, "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", +======= + "lastModified": 1775176642, + "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "179704030c5286c729b5b0522037d1d51341022c", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -404,11 +432,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1767609335, "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", "rev": "250481aafeb741edfe23d29195671c19b36b6dca", +======= + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -548,20 +584,26 @@ "gnome-shell": { "flake": false, "locked": { +<<<<<<< Updated upstream "host": "gitlab.gnome.org", +======= +>>>>>>> Stashed changes "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", +<<<<<<< Updated upstream "type": "gitlab" +======= + "type": "github" +>>>>>>> Stashed changes }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -571,11 +613,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1772020340, "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", "owner": "nix-community", "repo": "home-manager", "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", +======= + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -592,11 +642,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1772218752, "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=", "owner": "nix-community", "repo": "home-manager", "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9", +======= + "lastModified": 1775457580, + "narHash": "sha256-ikws/ssAmG20AGrEwBuwspwPlkubJu34mB+Uz2fJBJs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "5de7dbd151b0bd65d45785553d4a22d832733ffc", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -741,11 +799,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1771992996, "narHash": "sha256-Y/ijH/unOPxzUicbla6yT/14RJgubUWnY2I2A6Ast2Q=", "owner": "nix-darwin", "repo": "nix-darwin", "rev": "3bfa436c1975674ca465ce34586467be301ff509", +======= + "lastModified": 1775037210, + "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "06648f4902343228ce2de79f291dd5a58ee12146", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -776,11 +842,19 @@ "brew-src": "brew-src" }, "locked": { +<<<<<<< Updated upstream "lastModified": 1769437432, "narHash": "sha256-8d7KnCpT2LweRvSzZYEGd9IM3eFX+A78opcnDM0+ndk=", "owner": "zhaofengli", "repo": "nix-homebrew", "rev": "a5409abd0d5013d79775d3419bcac10eacb9d8c5", +======= + "lastModified": 1774720267, + "narHash": "sha256-YYftFe8jyfpQI649yfr0E+dqEXE2jznZNcYvy/lKV1U=", + "owner": "zhaofengli", + "repo": "nix-homebrew", + "rev": "a7760a3a83f7609f742861afb5732210fdc437ed", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -838,11 +912,19 @@ }, "nixpkgs-unstable": { "locked": { +<<<<<<< Updated upstream "lastModified": 1771848320, "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", "rev": "2fc6539b481e1d2569f25f8799236694180c0993", +======= + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -853,11 +935,19 @@ }, "nixpkgs_2": { "locked": { +<<<<<<< Updated upstream "lastModified": 1772047000, "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", "owner": "NixOS", "repo": "nixpkgs", "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", +======= + "lastModified": 1775305101, + "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -925,11 +1015,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1767810917, "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", +======= + "lastModified": 1775228139, + "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "owner": "nix-community", + "repo": "NUR", + "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1196,11 +1294,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1772133306, "narHash": "sha256-NiVYFPOu7qK4EulzuvDGEhH8bSK9V1XnuJL/XE2x7ko=", "owner": "lytedev", "repo": "slippi-nix", "rev": "989b5c68c996ded030fbf6b140c3a57240477f0c", +======= + "lastModified": 1774370155, + "narHash": "sha256-emNcbleHPyUszpRFV5mHnU3q4E0aq7FNJxPtIAvsJqE=", + "owner": "lytedev", + "repo": "slippi-nix", + "rev": "c1f16cb34f7e09e8a9c7fe49744305c2f65a5b5f", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1216,11 +1322,19 @@ ] }, "locked": { +<<<<<<< Updated upstream "lastModified": 1772048434, "narHash": "sha256-/wA0OaH6kZ/pFA+nXR/tvg5oupOmEDmMS5us79JT60o=", "owner": "Mic92", "repo": "sops-nix", "rev": "334daa7c273dd8bf7a0cd370e4e16022b64e55e9", +======= + "lastModified": 1775365543, + "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1290,18 +1404,25 @@ ], "nur": "nur", "systems": "systems_2", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { +<<<<<<< Updated upstream "lastModified": 1771787992, "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=", "owner": "nix-community", "repo": "stylix", "rev": "30054cca073b49b42a71289edec858f535b27fe9", +======= + "lastModified": 1775429060, + "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", + "owner": "nix-community", + "repo": "stylix", + "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1340,23 +1461,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -1376,11 +1480,19 @@ "tinted-schemes": { "flake": false, "locked": { +<<<<<<< Updated upstream "lastModified": 1767710407, "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", +======= + "lastModified": 1772661346, + "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "13b5b0c299982bb361039601e2d72587d6846294", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1392,11 +1504,19 @@ "tinted-tmux": { "flake": false, "locked": { +<<<<<<< Updated upstream "lastModified": 1767489635, "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", +======= + "lastModified": 1772934010, + "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", +>>>>>>> Stashed changes "type": "github" }, "original": { @@ -1408,11 +1528,19 @@ "tinted-zed": { "flake": false, "locked": { +<<<<<<< Updated upstream "lastModified": 1767488740, "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", +======= + "lastModified": 1772909925, + "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", +>>>>>>> Stashed changes "type": "github" }, "original": {