my terrible dotfiles

bruh 2

Changed files
-24
-24
flake.lock
··· 343 343 "xwayland-satellite-unstable": "xwayland-satellite-unstable" 344 344 }, 345 345 "locked": { 346 - <<<<<<< HEAD 347 346 "lastModified": 1764796736, 348 347 "narHash": "sha256-JMSsWdmmzLtwVV8Z9x2mDjgA5i7DkJYnYQwkJWeHE40=", 349 348 "owner": "sodiboo", 350 349 "repo": "niri-flake", 351 350 "rev": "a482ee6c7423ff90771958cd4bab95e4410b0381", 352 - ======= 353 - "lastModified": 1764683594, 354 - "narHash": "sha256-hWFL1ZJCHx2DdusmWFkNPmIPx5cx0ncQORYXUH/zsQg=", 355 - "owner": "sodiboo", 356 - "repo": "niri-flake", 357 - "rev": "e6076aa9ff269a723cf8f558ee7471c4efce3a67", 358 - >>>>>>> 993b509e20024acff19e019d3db68269ac2e9616 359 351 "type": "github" 360 352 }, 361 353 "original": { ··· 421 413 }, 422 414 "nixpkgs": { 423 415 "locked": { 424 - <<<<<<< HEAD 425 416 "lastModified": 1764854611, 426 417 "narHash": "sha256-VgKiNaoL9dA0oxuetR+STr3rMV6sS/T3yGc9/KPheg8=", 427 418 "owner": "nixos", 428 419 "repo": "nixpkgs", 429 420 "rev": "3a4b875aef660bbd148e86b92cffea2a360c3275", 430 - ======= 431 - "lastModified": 1764681420, 432 - "narHash": "sha256-wH2PHY/meAyRHxoqkYwP/7j7Atx/3DFYQqWZuCFWN94=", 433 - "owner": "nixos", 434 - "repo": "nixpkgs", 435 - "rev": "54d23b86829900013a46c60c17d9d75717e03124", 436 - >>>>>>> 993b509e20024acff19e019d3db68269ac2e9616 437 421 "type": "github" 438 422 }, 439 423 "original": { ··· 485 469 "systems": "systems_2" 486 470 }, 487 471 "locked": { 488 - <<<<<<< HEAD 489 472 "lastModified": 1764803799, 490 473 "narHash": "sha256-94SMf4Uw5iSoX37ui6LAdcadCUHUDfrvggGay0uWkis=", 491 474 "owner": "nix-community", 492 475 "repo": "nixvim", 493 476 "rev": "5d1c27e53c96e2c94e69f2e2d083ef147b3a3ccb", 494 - ======= 495 - "lastModified": 1764663787, 496 - "narHash": "sha256-nlW6BI2CiP6wlhjwpxOc8W6lMU9eaojAyVZFWlbQ/fg=", 497 - "owner": "nix-community", 498 - "repo": "nixvim", 499 - "rev": "2d8db68a8fd4a21e2017df167c6535499adc02d1", 500 - >>>>>>> 993b509e20024acff19e019d3db68269ac2e9616 501 477 "type": "github" 502 478 }, 503 479 "original": {