From 3a27852758b5f15893316267b4465f0145d4d99d Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 5 Jun 2023 16:32:21 +0200 Subject: [PATCH] Update deps --- flake.lock | 6 +++--- home/programs/fish.nix | 9 ++++++++- home/programs/nvim/plugins.nix | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 464ac18..fe664d5 100644 --- a/flake.lock +++ b/flake.lock @@ -315,11 +315,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685894048, - "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=", + "lastModified": 1685938391, + "narHash": "sha256-96Jw6TbWDLSopt5jqCW8w1Fc1cjQyZlhfBnJ3OZGpME=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6", + "rev": "31cd1b4afbaf0b1e81272ee9c31d1ab606503aed", "type": "github" }, "original": { diff --git a/home/programs/fish.nix b/home/programs/fish.nix index dba67bb..3f8b573 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -94,7 +94,6 @@ in lg = "exa --long --all --group --header --git"; lt = "exa --long --all --group --header --tree --level "; - mysqld-direnv-init = "mysql_install_db --user $USER --datadir=$PWD/.direnv/mysql/data --auth-root-authentication-method=normal"; mysqld-direnv = "mysqld --datadir=$PWD/.direnv/mysql/data --bind-address=127.0.0.1 --socket=$PWD/.direnv/mysql/mysqld.sock --gdb"; postgres-direnv-init = "initdb --username $USER --pgdata $PWD/.direnv/postgres/data --auth trust"; postgres-direnv = "postgres -D $PWD/.direnv/postgres/data"; @@ -137,6 +136,14 @@ in set user_agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" aria2c -U "$user_agent" --file-allocation none -x 2 $argv ''; + + mysqld-direnv-init = '' + if type -q mysql_install_db + mysql_install_db --user $USER --datadir=$PWD/.direnv/mysql/data --auth-root-authentication-method=normal + else + mysqld --initialize-insecure --user $USER --datadir=$PWD/.direnv/mysql/data + end + ''; }; shellInit = '' diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index b0295d8..8a50207 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -111,8 +111,8 @@ in src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "2d6e73ab2fd1daad1e8134f174d06a869cbc96b4"; - sha256 = "03yq8586yp4fcv56cna8n3j0420771yv33jak7vrygsvr9621a1m"; + rev = "a034c7aa25a2dca0ab2c0b82d8e325f248d52e74"; + sha256 = "1axj2xdrwcb4d9b0jwcwfk09kwaczsyzwshnxvv9nxq1gs241g3d"; fetchSubmodules = false; }; };