add trix · oeiuwq.com/vix@edee4c5

+85 -81

flake.lock

··· 78 78 }, 79 79 "den": { 80 80 "locked": { 81 - "lastModified": 1765574785, 82 - "narHash": "sha256-BFj0L3fRgXUVWE0IRyme401EpA0mjEo+VoRluAfVJbE=", 81 + "lastModified": 1766081768, 82 + "narHash": "sha256-8Ea1DW3YZHifezfdEFHWEIpZBNKvEL+3iFOEcl3eFBU=", 83 83 "owner": "vic", 84 84 "repo": "den", 85 - "rev": "14c34be3da67a2a07a7e7d2cb7b0875f68b09c99", 85 + "rev": "7271da18c60ab4d7c275ecaab480d29729f05d17", 86 86 "type": "github" 87 87 }, 88 88 "original": { ··· 94 94 "doom-emacs": { 95 95 "flake": false, 96 96 "locked": { 97 - "lastModified": 1765413096, 98 - "narHash": "sha256-ADJNz84TCmcEScOeibny6/NmGXjV6BylbDD1xZnm7bE=", 97 + "lastModified": 1766476297, 98 + "narHash": "sha256-83P2aUd23svkV4bO1kyYSe+FuIYirNRVWCKb6rDanf4=", 99 99 "owner": "doomemacs", 100 100 "repo": "doomemacs", 101 - "rev": "008a539d628c8c4c4e895b8f5166b390e988dbfb", 101 + "rev": "e9a6d2954f791d805519b0b437000361bee250bc", 102 102 "type": "github" 103 103 }, 104 104 "original": { ··· 126 126 }, 127 127 "flake-aspects": { 128 128 "locked": { 129 - "lastModified": 1763763502, 130 - "narHash": "sha256-J78S02ZbBclWz7WKF8C+kHUca9/KdHtSeRgO/WF9LjY=", 129 + "lastModified": 1766081176, 130 + "narHash": "sha256-JrsuNSIEXPS3AiIxuWZw+sJ2Td6ni1OkqbW6mO/F4Rs=", 131 131 "owner": "vic", 132 132 "repo": "flake-aspects", 133 - "rev": "83c8e44186bc9631509a55cf5a053950ecd3dc30", 133 + "rev": "d0a226c84be2900d307aa1896e4e2c6e451844b2", 134 134 "type": "github" 135 135 }, 136 136 "original": { ··· 177 177 ] 178 178 }, 179 179 "locked": { 180 - "lastModified": 1765495779, 181 - "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", 180 + "lastModified": 1765835352, 181 + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", 182 182 "owner": "hercules-ci", 183 183 "repo": "flake-parts", 184 - "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", 184 + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", 185 185 "type": "github" 186 186 }, 187 187 "original": { ··· 195 195 "nixpkgs-lib": "nixpkgs-lib" 196 196 }, 197 197 "locked": { 198 - "lastModified": 1763759067, 199 - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", 198 + "lastModified": 1765495779, 199 + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", 200 200 "owner": "hercules-ci", 201 201 "repo": "flake-parts", 202 - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", 202 + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", 203 203 "type": "github" 204 204 }, 205 205 "original": { ··· 210 210 }, 211 211 "flake-utils": { 212 212 "inputs": { 213 - "systems": "systems_4" 213 + "systems": "systems_3" 214 214 }, 215 215 "locked": { 216 216 "lastModified": 1681202837, ··· 233 233 ] 234 234 }, 235 235 "locked": { 236 - "lastModified": 1765480374, 237 - "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", 236 + "lastModified": 1766529376, 237 + "narHash": "sha256-+HR+i6cEesSJnT+yYYdY1HZHTX4m3eNpLYximRkYH1U=", 238 238 "owner": "nix-community", 239 239 "repo": "home-manager", 240 - "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", 240 + "rev": "20728df08f6ecf69a99ee6f031c235bf393ea585", 241 241 "type": "github" 242 242 }, 243 243 "original": { ··· 263 263 }, 264 264 "jjui": { 265 265 "inputs": { 266 - "flake-parts": "flake-parts_2", 267 - "nixpkgs": "nixpkgs_2", 268 - "systems": "systems_2" 266 + "flake-parts": "flake-parts", 267 + "nixpkgs": "nixpkgs" 269 268 }, 270 269 "locked": { 271 - "lastModified": 1765561102, 272 - "narHash": "sha256-EJchafYCYaLLyMeN/iJt/TZNLaFw5JLENThuXYsda6A=", 270 + "lastModified": 1766505105, 271 + "narHash": "sha256-StPNq9raFotDYn4aY7KaiJS0mySRbBVziDdpVFrTz4A=", 273 272 "owner": "idursun", 274 273 "repo": "jjui", 275 - "rev": "7eda7dd7e11e1415d1f026e276d4549e2049285a", 274 + "rev": "13fac49eab7c80ef4a66b4ac2d3d69f9516187da", 276 275 "type": "github" 277 276 }, 278 277 "original": { ··· 303 302 }, 304 303 "nix-darwin": { 305 304 "inputs": { 306 - "nixpkgs": "nixpkgs_3" 305 + "nixpkgs": "nixpkgs" 307 306 }, 308 307 "locked": { 309 - "lastModified": 1765065051, 310 - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", 308 + "lastModified": 1766524813, 309 + "narHash": "sha256-N/sxS27+t9nGvGWqwwAceSMW/Y5ddcypS/aiTnZ7ScA=", 311 310 "owner": "LnL7", 312 311 "repo": "nix-darwin", 313 - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", 312 + "rev": "c2b36207f2c396c79dbed9d40536db221bd4e363", 314 313 "type": "github" 315 314 }, 316 315 "original": { ··· 321 320 }, 322 321 "nix-index-database": { 323 322 "inputs": { 324 - "nixpkgs": "nixpkgs_4" 323 + "nixpkgs": "nixpkgs" 325 324 }, 326 325 "locked": { 327 326 "lastModified": 1765267181, ··· 340 339 "nixos-wsl": { 341 340 "inputs": { 342 341 "flake-compat": "flake-compat", 343 - "nixpkgs": "nixpkgs_5" 342 + "nixpkgs": "nixpkgs" 344 343 }, 345 344 "locked": { 346 - "lastModified": 1765483419, 347 - "narHash": "sha256-w6wznH1lBzlSH3+pWDkE+L6xA0F02drFAzu2E7PD/Jo=", 345 + "lastModified": 1765841014, 346 + "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=", 348 347 "owner": "nix-community", 349 348 "repo": "nixos-wsl", 350 - "rev": "0c040f28b44b18e0d4240e027096078e34dbb029", 349 + "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b", 351 350 "type": "github" 352 351 }, 353 352 "original": { ··· 389 388 }, 390 389 "nixpkgs_2": { 391 390 "locked": { 392 - "lastModified": 1763618868, 393 - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", 394 - "owner": "nixos", 391 + "lastModified": 1765472234, 392 + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", 393 + "owner": "NixOS", 395 394 "repo": "nixpkgs", 396 - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", 395 + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", 397 396 "type": "github" 398 397 }, 399 398 "original": { 400 - "owner": "nixos", 401 - "ref": "nixpkgs-unstable", 399 + "owner": "NixOS", 400 + "ref": "nixos-unstable", 402 401 "repo": "nixpkgs", 403 402 "type": "github" 404 403 } 405 404 }, 406 405 "nixpkgs_3": { 407 406 "locked": { 408 - "lastModified": 1747728033, 409 - "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", 407 + "lastModified": 1765934234, 408 + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", 410 409 "owner": "NixOS", 411 410 "repo": "nixpkgs", 412 - "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", 411 + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", 413 412 "type": "github" 414 413 }, 415 414 "original": { ··· 437 436 }, 438 437 "nixpkgs_5": { 439 438 "locked": { 440 - "lastModified": 1764950072, 441 - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", 439 + "lastModified": 1765472234, 440 + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", 442 441 "owner": "NixOS", 443 442 "repo": "nixpkgs", 444 - "rev": "f61125a668a320878494449750330ca58b78c557", 443 + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", 445 444 "type": "github" 446 445 }, 447 446 "original": { ··· 453 452 }, 454 453 "nixpkgs_6": { 455 454 "locked": { 456 - "lastModified": 1765186076, 457 - "narHash": "sha256-fO54fp5kvvF8znmtV8QGwOsaBcB0NcFP41nC5Bhy/TM=", 458 - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", 455 + "lastModified": 1766309749, 456 + "narHash": "sha256-fT99itTh09Z6ESczofFglzEL+wtBI0AAOCqL96V2s4A=", 457 + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", 459 458 "type": "tarball", 460 - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre908783.addf7cf5f383/nixexprs.tar.xz" 459 + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre914755.a6531044f6d0/nixexprs.tar.xz" 461 460 }, 462 461 "original": { 463 462 "type": "tarball", ··· 466 465 }, 467 466 "nixpkgs_7": { 468 467 "locked": { 469 - "lastModified": 1764947035, 470 - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", 468 + "lastModified": 1766125104, 469 + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", 471 470 "owner": "NixOS", 472 471 "repo": "nixpkgs", 473 - "rev": "a672be65651c80d3f592a89b3945466584a22069", 472 + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", 474 473 "type": "github" 475 474 }, 476 475 "original": { ··· 515 514 "nixpkgs" 516 515 ], 517 516 "sops-nix": "sops-nix", 518 - "systems": "systems_3", 519 - "treefmt-nix": "treefmt-nix_2", 517 + "systems": "systems", 518 + "treefmt-nix": "treefmt-nix", 519 + "trix": "trix", 520 520 "vscode-server": "vscode-server" 521 521 } 522 522 }, 523 523 "sops-nix": { 524 524 "inputs": { 525 - "nixpkgs": "nixpkgs_7" 525 + "nixpkgs": "nixpkgs" 526 526 }, 527 527 "locked": { 528 - "lastModified": 1765553226, 529 - "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=", 528 + "lastModified": 1766289575, 529 + "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", 530 530 "owner": "Mic92", 531 531 "repo": "sops-nix", 532 - "rev": "496a6f625f63b780ce849891868f2fad22fd49c6", 532 + "rev": "9836912e37aef546029e48c8749834735a6b9dad", 533 533 "type": "github" 534 534 }, 535 535 "original": { ··· 583 583 "type": "github" 584 584 } 585 585 }, 586 - "systems_4": { 586 + "treefmt-nix": { 587 + "inputs": { 588 + "nixpkgs": [ 589 + "nixpkgs" 590 + ] 591 + }, 587 592 "locked": { 588 - "lastModified": 1681028828, 589 - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 590 - "owner": "nix-systems", 591 - "repo": "default", 592 - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 593 + "lastModified": 1766000401, 594 + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", 595 + "owner": "numtide", 596 + "repo": "treefmt-nix", 597 + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", 593 598 "type": "github" 594 599 }, 595 600 "original": { 596 - "owner": "nix-systems", 597 - "repo": "default", 601 + "owner": "numtide", 602 + "repo": "treefmt-nix", 598 603 "type": "github" 599 604 } 600 605 }, 601 - "treefmt-nix": { 606 + "treefmt-nix_2": { 602 607 "inputs": { 603 608 "nixpkgs": [ 604 - "SPC", 605 609 "nixpkgs" 606 610 ] 607 611 }, 608 612 "locked": { 609 - "lastModified": 1739829690, 610 - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", 613 + "lastModified": 1766000401, 614 + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", 611 615 "owner": "numtide", 612 616 "repo": "treefmt-nix", 613 - "rev": "3d0579f5cc93436052d94b73925b48973a104204", 617 + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", 614 618 "type": "github" 615 619 }, 616 620 "original": { ··· 619 623 "type": "github" 620 624 } 621 625 }, 622 - "treefmt-nix_2": { 626 + "trix": { 623 627 "inputs": { 624 628 "nixpkgs": [ 625 629 "nixpkgs" 626 630 ] 627 631 }, 628 632 "locked": { 629 - "lastModified": 1762938485, 630 - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", 631 - "owner": "numtide", 632 - "repo": "treefmt-nix", 633 - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", 633 + "lastModified": 1766529941, 634 + "narHash": "sha256-epBrWPuQqeJaaSnZsS5cFLmNF/BEWtT+FOPWX1KZ460=", 635 + "owner": "aanderse", 636 + "repo": "trix", 637 + "rev": "7dcf49ac523c22d55b0c528a7dd71fbc3407892f", 634 638 "type": "github" 635 639 }, 636 640 "original": { 637 - "owner": "numtide", 638 - "repo": "treefmt-nix", 641 + "owner": "aanderse", 642 + "repo": "trix", 639 643 "type": "github" 640 644 } 641 645 }, 642 646 "vscode-server": { 643 647 "inputs": { 644 648 "flake-utils": "flake-utils", 645 - "nixpkgs": "nixpkgs_8" 649 + "nixpkgs": "nixpkgs" 646 650 }, 647 651 "locked": { 648 652 "lastModified": 1753541826,

+4

flake.nix

··· 42 42 inputs.nixpkgs.follows = "nixpkgs"; 43 43 url = "github:numtide/treefmt-nix"; 44 44 }; 45 + trix = { 46 + inputs.nixpkgs.follows = "nixpkgs"; 47 + url = "github:aanderse/trix"; 48 + }; 45 49 vscode-server.url = "github:nix-community/nixos-vscode-server"; 46 50 }; 47 51

+1 -1

modules/home-manager.nix

··· 3 3 flake-file.inputs.home-manager.url = "github:nix-community/home-manager"; 4 4 flake-file.inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs"; 5 5 6 - den.default.includes = [ den._.home-manager den.aspects.hm ]; 6 + den.default.includes = [ den._.home-manager den.aspects.hm den._.inputs' den._.self' ]; 7 7 8 8 den.aspects.hm.homeManager = { pkgs, ... }: { 9 9 home.packages = [

+18 -17

modules/vic/jujutsu.nix

··· 80 80 ]; 81 81 ui.diff-formatter = diff-formatter; 82 82 } 83 - { 84 - "--when".repositories = [ "~/hk/jjui" ]; 85 - revsets.log = "default()"; 86 - revset-aliases = { 87 - "trunk()" = "main@idursun"; 88 - "vic" = "remote_bookmarks('', 'vic')"; 89 - "idursun" = "remote_bookmarks('', 'idursun')"; 90 - "default()" = 91 - "coalesce( trunk(), root() )::present(@) | ancestors(visible_heads() & recent(), 2) | idursun | vic"; 92 - }; 93 - aliases = { 94 - "n" = [ 95 - "new" 96 - "main@idursun" 97 - ]; 98 - }; 99 - } 83 + # { 84 + # "--when".repositories = [ "~/hk/jjui" ]; 85 + # revsets.log = "default()"; 86 + # revset-aliases = { 87 + # "trunk()" = "main@idursun"; 88 + # "yc" = "remote_bookmarks('', 'exact:yc')"; 89 + # "vic" = "remote_bookmarks('', 'exact:vic')"; 90 + # "idursun" = "remote_bookmarks('', 'exact:idursun')"; 91 + # "default()" = 92 + # "coalesce( trunk(), root() )::present(@) | ancestors(visible_heads() & recent(), 2) | idursun | vic"; 93 + # }; 94 + # aliases = { 95 + # "n" = [ 96 + # "new" 97 + # "main@idursun" 98 + # ]; 99 + # }; 100 + # } 100 101 ]; 101 102 102 103 ui = {

+7 -1

modules/vic/nix-btw.nix

··· 1 1 { 2 2 # flake-file.inputs.ntv.url = "github:vic/ntv"; 3 + flake-file.inputs.trix = { 4 + url = "github:aanderse/trix"; 5 + inputs.nixpkgs.follows = "nixpkgs"; 6 + }; 7 + 3 8 4 9 vic.nix-btw = { 5 10 6 11 homeManager = 7 - { pkgs, ... }: 12 + { pkgs, inputs', ... }: 8 13 { 9 14 home.packages = [ 10 15 pkgs.nix-search-cli ··· 12 17 pkgs.cachix 13 18 pkgs.nix-inspect 14 19 pkgs.nox 20 + inputs'.trix.packages.trix 15 21 ]; 16 22 17 23 programs.nh.enable = true;