From 0816c008c3fe11f3787d92179da04bbb4f2c0007 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Mon, 1 Nov 2021 14:33:53 -0700
Subject: [PATCH] refactor(mappings): update mappings to follow better
 semantics

---
 lua/cosmic/core/navigation/mappings.lua | 27 +++++++++++++++++++------
 lua/cosmic/mappings.lua                 |  9 +++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/lua/cosmic/core/navigation/mappings.lua b/lua/cosmic/core/navigation/mappings.lua
index a4927cb..2810e0d 100644
--- a/lua/cosmic/core/navigation/mappings.lua
+++ b/lua/cosmic/core/navigation/mappings.lua
@@ -1,8 +1,23 @@
 local map = require('cosmic.utils').map
 
-map('n', '<leader>p', ':Telescope find_files<CR>')
-map('n', '<leader>f', ':Telescope git_files<CR>')
-map('n', '<leader>k', ':Telescope buffers<CR>')
-map('n', '<leader>s', ':Telescope live_grep<CR>')
-map('n', '<leader>gc', ':Telescope git_commits<CR>')
-map('n', '<leader>gs', ':Telescope git_status<CR>')
+-- navigation
+map('n', '<leader>sf', ':Telescope find_files<cr>')
+map('n', '<leader>sg', ':Telescope git_files<cr>')
+map('n', '<leader>sk', ':Telescope buffers<cr>')
+map('n', '<leader>ss', ':Telescope live_grep<cr>')
+
+-- git navigation
+map('n', '<leader>ggc', ':Telescope git_commits<cr>')
+map('n', '<leader>ggs', ':Telescope git_status<cr>')
+
+-- quickfix navigation
+map('n', '<leader>cp', ':cprev<cr>')
+map('n', '<leader>cn', ':cnext<cr>')
+
+-- buffer navigation
+map('n', '<leader>bp', ':bprev<cr>')
+map('n', '<leader>bn', ':bnext<cr>')
+
+-- tab navigation
+map('n', '<leader>tp', ':tprev<cr>')
+map('n', '<leader>tn', ':tnext<cr>')
diff --git a/lua/cosmic/mappings.lua b/lua/cosmic/mappings.lua
index 7790339..f8fdb82 100644
--- a/lua/cosmic/mappings.lua
+++ b/lua/cosmic/mappings.lua
@@ -1,16 +1,13 @@
 local map = require('cosmic.utils').map
 
--- Quickfix
+-- Quickfix mappings
 map('n', '<leader>ck', ':cexpr []<cr>')
 map('n', '<leader>cc', ':cclose <cr>')
 map('n', '<leader>co', ':copen <cr>')
 map('n', '<leader>cf', ':cfdo %s/')
 
-map('n', '<leader>cp', ':cprev <cr>')
-map('n', '<leader>cn', ':cnext <cr>')
-
-map('n', '<leader>bp', ':bprev <cr>')
-map('n', '<leader>bn', ':bnext <cr>')
+-- make Y behave like others
+map('n', 'Y', 'y$')
 
 require('cosmic.core.navigation.mappings')
 require('cosmic.core.file-explorer.mappings')