Merge branch 'master' of github.com:cacharle/dotfiles

4 files changed, 56 insertions, 17 deletions

diff --git a/config/alacritty/alacritty.darwin.yml b/config/alacritty/alacritty.darwin.yml
index b8794ae..8b46d8b 100644
--- a/config/alacritty/alacritty.darwin.yml
+++ b/config/alacritty/alacritty.darwin.yml
@@ -3,10 +3,10 @@
 #############
 
 shell:
-  program: /bin/zsh
-  args:
-    - '-c'
-    - 'source ~/.config/zsh/.zshenv && zsh'
+  program: /usr/local/bin/fish
+  # args:
+  #   - '-c'
+  #   - 'source ~/.config/zsh/.zshenv && zsh'
 
 # font
 font:
@@ -24,6 +24,15 @@ font:
   bold:
     family: FiraCode Nerd Font Mono
     style: Medium
+  # normal:
+  #   family: IBM Plex Mono
+  #   style: Regular
+  # italic:
+  #   family: IBM Plex Mono
+  #   style: Italic
+  # bold:
+  #   family: IBM Plex Mono
+  #   style: Bold
 
 
 key_bindings:
diff --git a/config/fish/config.fish b/config/fish/config.fish
index dd3f69a..ee26a6c 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -93,7 +93,11 @@ if status is-interactive
     alias yay 'yay --color=auto'
     alias tree 'tree -C'
     alias less 'less -N'   # enable line number
-    alias nvim 'VIMINIT="" /usr/bin/nvim'
+    if [ "$(uname)" = 'Darwin' ]
+        alias nvim 'VIMINIT="" /usr/local/bin/nvim'
+    else
+        alias nvim 'VIMINIT="" /usr/bin/nvim'
+    end
     alias v 'nvim'
     alias gdb 'gdb -q'     # disable long intro message
     alias sudo 'sudo '     # enable color (the search for aliases continues)
@@ -145,6 +149,7 @@ if status is-interactive
     abbr grv 'git remote -v'
     abbr gra 'git remote add'
     abbr gb 'git branch'
+    abbr gt 'git tag'
     function gpa
         set -f branch "$argv[-1]"
         # if branch not specified, get current branch
@@ -174,7 +179,14 @@ if status is-interactive
     set pure_reverse_prompt_symbol_in_vimode true
 
     function fish_command_not_found
-        /usr/bin/pkgfile $argv[1]
+        if [ "$(uname)" = 'Linux' ]
+            /usr/bin/pkgfile $argv[1]
+        end
+    end
+
+    # from: https://virtualfish.readthedocs.io/en/latest/install.html#customizing-your-fish-prompt
+    if set -q VIRTUAL_ENV
+        echo -n -s (set_color -b blue white) "(" (basename "$VIRTUAL_ENV") ")" (set_color normal) " "
     end
 end
 
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index bc1e10c..03659d7 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -7,6 +7,13 @@ return require("packer").startup(function()
     use "romainl/vim-cool"          -- only highlight search matches when searching
     use "lukas-reineke/indent-blankline.nvim"
 
+    -- use {
+    --     "lewis6991/satellite.nvim",
+    --     config = function ()
+    --         require('satellite').setup()
+    --     end
+    -- }
+
     -- Put arguments on multiple lines
     use {
         "FooSoft/vim-argwrap",
@@ -342,23 +349,24 @@ return require("packer").startup(function()
         config = function()
             require("nvim-treesitter.configs").setup {
                 ensure_installed = {
-                    "c",
-                    "python",
-                    "lua",
-                    "rust",
                     "bash",
+                    "c",
                     "commonlisp",
                     "cpp",
+                    "fish",
                     "glsl",
+                    "go",
                     "haskell",
                     "json",
+                    "lua",
                     "markdown",
+                    "meson",
+                    "python",
                     "query",
+                    "rust",
                     "vim",
+                    "vimdoc",
                     "yaml",
-                    "meson",
-                    "go",
-                    "fish",
                 },
                 highlight = {
                     enable = true
@@ -486,9 +494,19 @@ return require("packer").startup(function()
     --         }
     --         -- TODO: extend with job_distant_config.lua
     --     end,
-    --     run = ":DistantInstall"
+    --     -- run = ":DistantInstall"
     -- }
 
+    use {
+        'chipsenkbeil/distant.nvim',
+        branch = 'v0.3',
+        config = function()
+            require('distant'):setup()
+            require("telescope").load_extension("distant")
+        end,
+        -- run = ":DistantInstall"
+    }
+
     -- jupyter kernel in nvim (with images, needs ueberzug)
     -- use {
     --     "dccsillag/magma-nvim",
@@ -505,6 +523,5 @@ return require("packer").startup(function()
     --     end
     -- }
 
-    -- use { "nvim-treesitter/playground", opt = true, cmd = { "TSPlaygroundToggle" } }
     -- use { "~/git/argwrap.nvim", opt = true }
 end)
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 328a92f..5e72d64 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -6,7 +6,8 @@ bind C-a send-prefix
 
 # NOTE: recommended by neovim but disliked by ssh
 set -g default-terminal "screen-256color"
-set -sa terminal-overrides ',xterm-256color:RGB'
+set -sa terminal-features ',screen-256color:RGB'
+set -ga terminal-overrides ',screen-256color:Tc'
 
 set -g focus-events on
 set -g history-limit 5000
@@ -26,8 +27,8 @@ bind 'c' new-window -c "#{pane_current_path}"
 
 bind R source-file ~/.config/tmux/tmux.conf
 
-
 set -g status-right-length 100
+set -g default-shell /usr/local/bin/fish
 
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'egel/tmux-gruvbox'