merged up

This commit is contained in:
Anthony Cicchetti 2024-11-18 08:52:08 -05:00
parent 600a5aa862
commit 0d5c8e93d5
3 changed files with 30 additions and 30 deletions

16
flake.lock generated
View file

@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731169617, "lastModified": 1731782081,
"narHash": "sha256-Imod8I59qsOyEwInlHmPoiWrYlPkzwKO1e8h2g8ruX4=", "narHash": "sha256-yonI7FCxlMHJy06ecIrDkeF7BiTvDfB4GeX0p3ba5a0=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "983153344922e5fb8545aae7e5e70127da981a71", "rev": "206ac362af93a3d14593cd4fbae1d94c53b925df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,12 +223,12 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1731139594, "lastModified": 1731676054,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"revCount": 705705, "revCount": 708622,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.705705%2Brev-76612b17c0ce71689921ca12d9ffdc9c23ce40b2/019316f9-5a16-7c56-8623-797f62e3b419/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.708622%2Brev-5e4fbfb6b3de1aa2872b76d49fafc942626e2add/0193363c-ab27-7bbd-af1d-3e6093ed5e2d/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",

View file

@ -237,11 +237,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731782173, "lastModified": 1731887066,
"narHash": "sha256-l0vlBmqQOJneVtvRjAJuYPGV5wtiqq1+OTkVti8b3CY=", "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c7c251761235282acfc681accf8d3deea6681cc0", "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1731751919, "lastModified": 1731932342,
"narHash": "sha256-8Z+Y2PvA2rAPQdKSm3wYJXqtoU5GiDAlVlXoYnFe4oE=", "narHash": "sha256-ybiqZ1ygyHgJjwTU+lKWJnLFVYMjayh3tkBuZnZ4OhU=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "eb91547e520ebed79bf6daf21627f266b26a87a1", "rev": "ecd64aae8e4a8ea630047164225e021bc029a324",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -325,11 +325,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731642829, "lastModified": 1731809072,
"narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=", "narHash": "sha256-pOsDJQR0imnFLfpvTmRpHcP0tflyxtP/QIzokrKSP8U=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a", "rev": "34588d57cfc41c6953c54c93b6b685cab3b548ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,11 +345,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731593150, "lastModified": 1731814505,
"narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=", "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "40d882b55e89add1ded379cc99edaab24983d6d9", "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +369,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731777811, "lastModified": 1731864220,
"narHash": "sha256-AewyPy+YOT7mXm45+X6RgTAUiMKeAD17buE7Aw0ANbc=", "narHash": "sha256-S91NrqYj3Q2Nmxy5sRLpxjUwY6mBh6LBHRXmp10y9PE=",
"owner": "m15a", "owner": "m15a",
"repo": "flake-awesome-neovim-plugins", "repo": "flake-awesome-neovim-plugins",
"rev": "cdc8fd03e54ffe1c4b9c0ba86a55fd5956b6dd36", "rev": "e1ebcd8e4c7b9868a738b56f7e63c9fd1d852019",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1731782469, "lastModified": 1731935954,
"narHash": "sha256-cWOJcYeqkb3Bk8NcHKORa+NmlE5jLhZGbs1FcwBUvd0=", "narHash": "sha256-DkY0Mmq64WE6kMqGO9VnKXpdOM96ks1oW/tu2G7jwpA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ddfd26721ee7dbb799db2c39a6fdd90ac788f576", "rev": "294fb30959cbacb2b136081715d8b57bae234821",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,11 +444,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1731780782, "lastModified": 1731920852,
"narHash": "sha256-CG3rcxcZEViYEUTAXatqXrW0Gn9tQvydF+lLYH+0VPA=", "narHash": "sha256-TczdWFVNDYS8YjVjiUmzOHbBn52keL4ECygrWrBtIgs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "9d99d7cfdbd7f94da9571a4d7bbb9de185241935", "rev": "f4c910dd82eb6e811ba171bc923087b7ecfb321c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,7 +4,7 @@
if isLinux if isLinux
# ncdu (well, all zig packages) don't work on macOS nix right now # ncdu (well, all zig packages) don't work on macOS nix right now
then [zsh racket mold ncdu zed-editor] then [zsh racket mold ncdu zed-editor]
else [keka colima neovide]; else [keka colima neovide aerospace];
in { in {
imports = [ imports = [
./git.nix ./git.nix