mirror of
https://github.com/davegallant/nix-config
synced 2025-08-07 00:58:16 +00:00
Remove git branch from statusline in vim because it lags on macos
This commit is contained in:
@@ -14,6 +14,7 @@ in
|
|||||||
gnupg
|
gnupg
|
||||||
imagemagick
|
imagemagick
|
||||||
pfetch
|
pfetch
|
||||||
|
pinentry-curses
|
||||||
tree
|
tree
|
||||||
unzip
|
unzip
|
||||||
xdg_utils
|
xdg_utils
|
||||||
|
6
flake.lock
generated
6
flake.lock
generated
@@ -58,11 +58,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1625598452,
|
"lastModified": 1625697353,
|
||||||
"narHash": "sha256-Oqh7nuZfEk+nkspGN5MS5ZTJ3dSxsUudTRvY/iUFad8=",
|
"narHash": "sha256-/v85RkZ0Z+lxipkG2sjYNRINktc8VySbLQmPbirY0hQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "00c86ad14639887ec495b92ada9cd93a75317686",
|
"rev": "87807e64a5ef5206b745a40af118c7be8db73681",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@@ -218,7 +218,7 @@ in
|
|||||||
tmux = {
|
tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
clock24 = true;
|
clock24 = true;
|
||||||
terminal = "screen-256color";
|
terminal = "xterm-256color";
|
||||||
customPaneNavigationAndResize = true;
|
customPaneNavigationAndResize = true;
|
||||||
plugins = with pkgs.tmuxPlugins; [
|
plugins = with pkgs.tmuxPlugins; [
|
||||||
{
|
{
|
||||||
@@ -303,13 +303,10 @@ in
|
|||||||
vim-fugitive
|
vim-fugitive
|
||||||
vim-gitgutter
|
vim-gitgutter
|
||||||
vim-go
|
vim-go
|
||||||
vim-javacomplete2
|
|
||||||
vim-javascript
|
vim-javascript
|
||||||
vim-markdown
|
vim-markdown
|
||||||
vim-nix
|
vim-nix
|
||||||
vim-pandoc
|
|
||||||
vim-prettier
|
vim-prettier
|
||||||
vim-pandoc-syntax
|
|
||||||
vim-repeat
|
vim-repeat
|
||||||
vim-sneak
|
vim-sneak
|
||||||
vim-surround
|
vim-surround
|
||||||
|
@@ -11,7 +11,6 @@ set statusline=
|
|||||||
set statusline+=%#Pmenu#
|
set statusline+=%#Pmenu#
|
||||||
set statusline+=%{StatuslineMode()}
|
set statusline+=%{StatuslineMode()}
|
||||||
set statusline+=%#PmenuSel#
|
set statusline+=%#PmenuSel#
|
||||||
set statusline+=%{StatuslineGit()}
|
|
||||||
set statusline+=%#LineNr#
|
set statusline+=%#LineNr#
|
||||||
set statusline+=\ %f
|
set statusline+=\ %f
|
||||||
set statusline+=%m
|
set statusline+=%m
|
||||||
@@ -49,15 +48,6 @@ function! StatuslineMode()
|
|||||||
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! GitBranch()
|
|
||||||
return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! StatuslineGit()
|
|
||||||
let l:branchname = GitBranch()
|
|
||||||
return strlen(l:branchname) > 0?' '.l:branchname.' ':''
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
augroup SetStatusline
|
augroup SetStatusline
|
||||||
autocmd!
|
autocmd!
|
||||||
autocmd BufEnter,WinEnter * call ActivateStatusline()
|
autocmd BufEnter,WinEnter * call ActivateStatusline()
|
||||||
|
@@ -45,9 +45,7 @@
|
|||||||
"com.apple.sound.beep.feedback" = 0;
|
"com.apple.sound.beep.feedback" = 0;
|
||||||
"com.apple.sound.beep.volume" = "0.000";
|
"com.apple.sound.beep.volume" = "0.000";
|
||||||
ApplePressAndHoldEnabled = false;
|
ApplePressAndHoldEnabled = false;
|
||||||
# delay before repeating keystrokes
|
|
||||||
InitialKeyRepeat = 10;
|
InitialKeyRepeat = 10;
|
||||||
# delay between repeated keystrokes upon holding a key
|
|
||||||
KeyRepeat = 2;
|
KeyRepeat = 2;
|
||||||
AppleShowAllExtensions = true;
|
AppleShowAllExtensions = true;
|
||||||
AppleShowScrollBars = "Automatic";
|
AppleShowScrollBars = "Automatic";
|
||||||
|
Reference in New Issue
Block a user