M bash/.bashrc.d/90-aliases.bash → bash/.bashrc.d/90-aliases.bash

@@ -51,6 +51,9 @@ }
 
 ls() {
     case "$OSTYPE" in
+        "linux"*)
+            /bin/ls "$@"
+            ;;
         "darwin"*)
             /bin/ls -G "$@"
             ;;

M config/nvim/init.lua → config/nvim/init.lua

@@ -1,10 +1,6 @@ 
-vim.cmd 'packadd paq-nvim'
-
--- impatient.nvim
--- TODO: remove this once it's merged
-require 'impatient'
-
-require 'paq-nvim' {
+require 'paq' {
+  'savq/paq-nvim';
+  'lewis6991/impatient.nvim';
   'tpope/vim-rsi';
   'tpope/vim-surround';
   'wellle/targets.vim';
@@ -17,6 +13,10 @@ { 'ms-jpq/coq_nvim', branch='coq' };
   { 'ms-jpq/coq.artifacts', branch='artifacts' };
   { 'vim/better-text-objs', url='https://git.peppe.rs' };
 }
+
+-- impatient.nvim
+-- TODO: remove this once it's merged
+require 'impatient'
 
 require('settings')
 require('maps')

M prompt/prompt.go → prompt/prompt.go

@@ -40,7 +40,7 @@ case "-gb":
 		branchCh := make(chan string)
 		if len(gitDir) > 0 {
 			repo, _ := git.OpenRepository(gitDir)
-			go getGitBranch(repo, branchCh)
+			go getGitBranch(repo)
 			fmt.Print(<-branchCh)
 		}
 		fmt.Print("")
@@ -48,7 +48,7 @@ case "-gs":
 		statusCh := make(chan string) // git info
 		if len(gitDir) > 0 {
 			repo, _ := git.OpenRepository(gitDir)
-			go getGitStatus(repo, statusCh)
+			go getGitStatus(repo, "•", "×")
 			fmt.Print(<-statusCh)
 		}
 		fmt.Print("")