update to rga
This commit is contained in:
parent
69b6dc53b8
commit
375924e903
3 changed files with 44 additions and 20 deletions
|
@ -9,12 +9,12 @@ au BufWrite * :Autoformat
|
||||||
let g:rustfmt_autosave = 1
|
let g:rustfmt_autosave = 1
|
||||||
|
|
||||||
" searching
|
" searching
|
||||||
let $FZF_DEFAULT_COMMAND = 'rg --files --no-messages "" .'
|
let $FZF_DEFAULT_COMMAND = 'rga --files --no-messages "" .'
|
||||||
set grepprg=rg\ --vimgrep
|
set grepprg=rga\ --vimgrep
|
||||||
let g:fzf_command_prefix = 'Fzf'
|
let g:fzf_command_prefix = 'Fzf'
|
||||||
command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
|
command! -bang -nargs=* Find call fzf#vim#grep('rga --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
|
||||||
let g:ctrlp_show_hidden = 1
|
let g:ctrlp_show_hidden = 1
|
||||||
let g:ctrlp_user_command = 'rg %s --files --hidden --color=never --glob ""'
|
let g:ctrlp_user_command = 'rga %s --files --hidden --color=never --glob ""'
|
||||||
|
|
||||||
" nerdtree startup
|
" nerdtree startup
|
||||||
autocmd StdinReadPre * let s:std_in=1
|
autocmd StdinReadPre * let s:std_in=1
|
||||||
|
@ -30,11 +30,11 @@ set signcolumn=yes
|
||||||
autocmd CursorHold * silent call CocActionAsync('highlight')
|
autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||||
|
|
||||||
augroup mygroup
|
augroup mygroup
|
||||||
autocmd!
|
autocmd!
|
||||||
" Setup formatexpr specified filetype(s).
|
" Setup formatexpr specified filetype(s).
|
||||||
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
|
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
|
||||||
" Update signature help on jump placeholder.
|
" Update signature help on jump placeholder.
|
||||||
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
|
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
|
||||||
augroup end
|
augroup end
|
||||||
|
|
||||||
command! -nargs=0 Format :call CocAction('format')
|
command! -nargs=0 Format :call CocAction('format')
|
||||||
|
@ -44,6 +44,6 @@ command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organize
|
||||||
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
|
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
|
||||||
|
|
||||||
" ack
|
" ack
|
||||||
let g:ackprg = 'rg --vimgrep --smart-case'
|
let g:ackprg = 'rga --vimgrep --smart-case'
|
||||||
let g:ack_autoclose = 1
|
let g:ack_autoclose = 1
|
||||||
let g:ack_use_cword_for_empty_search = 1
|
let g:ack_use_cword_for_empty_search = 1
|
||||||
|
|
35
flake.lock
35
flake.lock
|
@ -72,6 +72,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-hardware": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1623315106,
|
||||||
|
"narHash": "sha256-a2/8mVCuZWQUIWOQGCmUvtT813ZwnL0VRdwE3VzRaLU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"rev": "6bea9761693b5d185d34bef205edb25a8081db57",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1618628710,
|
"lastModified": 1618628710,
|
||||||
|
@ -87,11 +103,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-nixos-unstable": {
|
"nixpkgs-nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1622966049,
|
"lastModified": 1623324058,
|
||||||
"narHash": "sha256-6g+28v94ISkVk9TBSsITVOnB2slK8plieWPIF2jo/l0=",
|
"narHash": "sha256-Jm9GUTXdjXz56gWDKy++EpFfjrBaxqXlLvTLfgEi8lo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94",
|
"rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -103,11 +119,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1623215930,
|
"lastModified": 1623309731,
|
||||||
"narHash": "sha256-pr9Bx31IJvqCzSA/t0NCmCopJ3+HgeZmUFaxItLKHYA=",
|
"narHash": "sha256-UZVcWcMEuWr6QmoFNryxUwjnokXXREJO7CSRe8ob6E4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "60cce7e5e1fdf62421ef6d4184ee399b46209366",
|
"rev": "cedcf2565c6b982d703d67455199b09a3d905d86",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -119,11 +135,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1623337027,
|
"lastModified": 1623474423,
|
||||||
"narHash": "sha256-F9Ay0ape0jHk1b5dqP1dKFrJXifLX+0UkUc5u5D+6Dc=",
|
"narHash": "sha256-f8kENeJ96PWEua02Iq9yUu4bK7RCcO2cSbVoh9i37v0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "20fad8de96ffccf23d5223188c28664d3bfefa3d",
|
"rev": "c7e5bd4edffc819c5c4b0df44e3fccf11214a390",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -139,6 +155,7 @@
|
||||||
"bisq": "bisq",
|
"bisq": "bisq",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable",
|
"nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nur": "nur"
|
"nur": "nur"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
description = "NixOS configuration with flakes";
|
description = "NixOS configuration with flakes";
|
||||||
outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nur, bisq, agenix } @ inputs: {
|
outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, bisq, agenix } @ inputs: {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
foureighty = nixpkgs-stable.lib.nixosSystem {
|
foureighty = nixpkgs-stable.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
@ -65,6 +65,13 @@
|
||||||
ref = "nixos-21.05";
|
ref = "nixos-21.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixos-hardware = {
|
||||||
|
type = "github";
|
||||||
|
owner = "NixOS";
|
||||||
|
repo = "nixos-hardware";
|
||||||
|
ref = "master";
|
||||||
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
type = "github";
|
type = "github";
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
|
|
Loading…
Reference in a new issue