diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6652342 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/jj/repos/ diff --git a/nix/flake.lock b/nix/flake.lock index 3d58cba..3ce2a7c 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1777270315, - "narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=", + "lastModified": 1780930886, + "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6368eda62c9775c38ef7f714b2555a741c20c72d", + "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index b73aaa9..028db78 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -60,7 +60,7 @@ pkgs.bleve-cli pkgs.btop pkgs.difftastic - pkgs.direnv + pkgs-unstable.direnv pkgs.dust pkgs.eza pkgs.fd @@ -73,7 +73,7 @@ pkgs.janet pkgs.yarn pkgs.jpm - pkgs.kotlin-lsp + # pkgs.kotlin-lsp pkgs.ktfmt pkgs.meld pkgs.mprocs @@ -92,7 +92,7 @@ pkgs.unixtools.watch pkgs.vim pkgs.zellij - pkgs.llvmPackages_17.clang-tools + pkgs.llvmPackages.clang-tools pkgs-unstable.jujutsu pkgs.neovim (pkgs-unstable.lua5_1.withPackages (ps: with ps; [luarocks])) @@ -116,7 +116,7 @@ pkgs.iina pkgs.imagemagick pkgs.macmon - pkgs.docker + pkgs-unstable.docker pkgs.slack ] else []); };