From bf385e91c80f9963624c501eb0a8d2b35c6f2466 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Thu, 18 Nov 2021 13:44:04 +0100
Subject: Added Nerd Font to alacritty for emoji, Updated zsh aliases and
 qutebrowser for Darwin specific config

---
 config/alacritty/alacritty.yml | 13 +++++++------
 config/nvim/init.lua           | 26 ++++++++++++++++++++------
 config/nvim/lua/mappings.lua   |  2 +-
 config/nvim/lua/plugins.lua    |  5 ++++-
 config/qutebrowser/config.py   |  4 ++++
 config/zsh/aliases.zsh         | 11 +++++++----
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml
index d05964a..1e1debc 100644
--- a/config/alacritty/alacritty.yml
+++ b/config/alacritty/alacritty.yml
@@ -9,14 +9,14 @@ font:
     x: 0
     y: 0
   normal:
-    family: Fira Code
-    style: Regular
+    family: FiraCode Nerd Font Mono
+    style: Retina
   italic:
-    family: Fira Code
-    style: Italic
+    family: FiraCode Nerd Font Mono
+    style: Light
   bold:
-    family: Fira Code
-    style: Bold
+    family: FiraCode Nerd Font Mono
+    style: Medium
 
 
 key_bindings:
@@ -25,6 +25,7 @@ key_bindings:
   - { key: J, mods: Command|Shift, action: ScrollHalfPageDown }
   - { key: K, mods: Command|Shift, action: ScrollHalfPageUp }
   - { key: Return, mods: Command, action: ToggleSimpleFullScreen }
+  - { key: Q, mods: Command, chars: "" }
 
 # gruvbox_dark: https://github.com/eendroroy/alacritty-theme/blob/master/schemes.yaml
 colors:
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 9634562..1afc4a3 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -63,15 +63,16 @@ require('telescope').setup {
                 ['<C-j>'] = actions.move_selection_next,
                 ['<C-k>'] = actions.move_selection_previous,
                 ['<esc>'] = actions.close,
+                ['kj'] = actions.close,
             }
-        }
+        },
     }
 }
 
 require('lualine').setup {
     options = {
         theme = 'gruvbox',
-        icons_enabled = false,
+        icons_enabled = true,
         section_separators = '',
         component_separators = ''
     }
@@ -81,9 +82,9 @@ require('nvim-treesitter.configs').setup {
     highlight = {
         enable = true
     },
-    indent = {
-        enable = true
-    },
+    -- indent = {
+    --     enable = true
+    -- },
     incremental_selection = {
         enable = true,
         keymaps = {
@@ -94,9 +95,22 @@ require('nvim-treesitter.configs').setup {
         }
     }
 }
+vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]]
+-- require 'nvim-treesitter.highlight'
+-- local hlmap = vim.treesitter.TSHighlighter.hl_map
+-- hlmap.error = nil
+
 
 require('nvim_comment').setup()
 
-require('lspconfig').clangd.setup {}
+-- local on_attach = function(_, bufnr)
+--     local opts = {noremap = true, silent = true }
+--     vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
+--     vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
+--     vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
+-- end
+
+-- require('lspconfig').clangd.setup {}
+-- require('lspconfig').pyright.setup { on_attach = on_attach }
 
 require('mappings')
diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua
index 0172aa4..df2177a 100644
--- a/config/nvim/lua/mappings.lua
+++ b/config/nvim/lua/mappings.lua
@@ -54,4 +54,4 @@ map('n', 'ga', '<cmd>EasyAlign<cr>', {})
 
 map('n', '<C-p>', '<cmd>Telescope git_files<cr>', {})
 map('n', '<f2>', '<cmd>Telescope help_tags<cr>', {})
-map('n', ';', '<cmd>Telescope commands<cr>', {})
+map('n', '<leader>;', '<cmd>Telescope commands<cr>', {})
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index a501ea8..1d5d0b4 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -25,6 +25,9 @@ return require('packer').startup(function()
     -- fuzzy finder (replace fzf.vim or ctrlp.vim)
     use {
         'nvim-telescope/telescope.nvim',
-        requires = {'nvim-lua/plenary.nvim'}
+        requires = {
+            {'nvim-lua/plenary.nvim'},
+            {'kyazdani42/nvim-web-devicons', opt = true},
+        }
     }
 end)
diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py
index d27a498..11fced5 100644
--- a/config/qutebrowser/config.py
+++ b/config/qutebrowser/config.py
@@ -1,3 +1,4 @@
+import platform
 from pathlib import Path
 
 
@@ -41,6 +42,9 @@ config.bind("<Command-Return>", "config-cycle window.hide_decoration true false"
 
 c.fonts.default_family = ["Fira Mono", "Baekmuk", "Symbola"]
 c.fonts.hints = "bold 11pt default_family"
+if platform.system() == 'Darwin':
+    c.fonts.default_size = '13pt'
+    c.fonts.hints = "bold 12pt default_family"
 
 c.hints.chars = "asdfghjkl;"  # use key in the main row for hints
 
diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh
index 7957167..7832558 100644
--- a/config/zsh/aliases.zsh
+++ b/config/zsh/aliases.zsh
@@ -3,10 +3,6 @@
 # color
 alias grep='grep --color=auto'
 alias tree='tree -C'
-alias pacman='pacman --color=auto'
-alias valgrindc='colour-valgrind'
-
-alias yay='yay --color=auto'
 
 # --sudo $(which doas) --sudoloop --sudoflags'
 
@@ -87,6 +83,13 @@ gpaf() {
     git remote | xargs -I{} git push -f {} "$branch"
 }
 
+# Linux specific aliases
+[ ! "$(uname)" = 'Linux' ] && return
+
+alias pacman='pacman --color=auto'
+alias valgrindc='colour-valgrind'
+alias yay='yay --color=auto'
+
 # lpass (lastpass-cli)
 alias lpassp='lpass show --password --clip'  # put password in clipboard
 
-- 
cgit