diff --git a/bash/default.nix b/bash/default.nix index de170fe..0ac101c 100644 --- a/bash/default.nix +++ b/bash/default.nix @@ -10,6 +10,7 @@ }; profileExtra = '' SHELL="$BASH" + PATH=~/.bin:$PATH set -o vi bind "set show-mode-in-prompt on" neofetch diff --git a/home.nix b/home.nix index aef6e30..b53a585 100644 --- a/home.nix +++ b/home.nix @@ -29,6 +29,7 @@ in android-tools awscli2 bashInteractive + cw gitAndTools.gh google-cloud-sdk imagemagick diff --git a/nvim/config/lua/lsp-config.lua b/nvim/config/lua/lsp-config.lua index 4ebf876..8dc14e9 100644 --- a/nvim/config/lua/lsp-config.lua +++ b/nvim/config/lua/lsp-config.lua @@ -173,19 +173,11 @@ end null_ls.setup({ sources = { -- Prettier Formatting - null_ls.builtins.formatting.prettier.with({ - condition = function(utils) - return not has_eslint_in_parents(vim.fn.getcwd()) - end - }), -- ESLint Diagnostics & Formatting + null_ls.builtins.formatting.prettier, null_ls.builtins.diagnostics.eslint_d.with({ condition = function(utils) return has_eslint_in_parents(vim.fn.getcwd()) end - }), null_ls.builtins.formatting.eslint_d.with({ - condition = function(utils) - return has_eslint_in_parents(vim.fn.getcwd()) - end }), null_ls.builtins.formatting.djlint.with({filetypes = {"template"}}), null_ls.builtins.completion.spell, null_ls.builtins.formatting.nixpkgs_fmt,