Browse Source

feat: add tmux.conf

master
Tovi Jaeschke-Rogers 7 months ago
parent
commit
3802a2e1a1
13 changed files with 153 additions and 43 deletions
  1. +1
    -1
      .config/alacritty/alacritty.toml
  2. +2
    -2
      .config/nvim/lua/settings/theme.lua
  3. +1
    -1
      .config/nvim/lua/tovi/core/autocmd.lua
  4. +0
    -6
      .config/nvim/lua/tovi/core/remaps.lua
  5. +51
    -1
      .config/nvim/lua/tovi/plugins/colorscheme.lua
  6. +15
    -23
      .config/nvim/lua/tovi/plugins/harpoon.lua
  7. +6
    -9
      .config/nvim/lua/tovi/plugins/lsp/lspconfig.lua
  8. +10
    -0
      .config/nvim/lua/tovi/plugins/tmux.lua
  9. +1
    -0
      .config/tmux/plugins/tmux
  10. +1
    -0
      .config/tmux/plugins/tmux-sensible
  11. +1
    -0
      .config/tmux/plugins/tmux-tokyo-night
  12. +1
    -0
      .config/tmux/plugins/tpm
  13. +63
    -0
      .config/tmux/tmux.conf

+ 1
- 1
.config/alacritty/alacritty.toml View File

@ -1,4 +1,4 @@
import = ["/home/tovi/.config/alacritty/themes/carbonfox.toml.toml"]
# import = ["/home/tovi/.config/alacritty/themes/carbonfox.toml.toml"]
[font] [font]
size = 11 size = 11


+ 2
- 2
.config/nvim/lua/settings/theme.lua View File

@ -1,5 +1,5 @@
-- Themery block -- Themery block
-- This block will be replaced by Themery. -- This block will be replaced by Themery.
vim.cmd("colorscheme eldritch")
vim.g.theme_id = 12
vim.cmd("colorscheme catppuccin")
vim.g.theme_id = 5
-- end themery block -- end themery block

+ 1
- 1
.config/nvim/lua/tovi/core/autocmd.lua View File

@ -2,7 +2,7 @@ local aucmd_dict = {
FileType = { FileType = {
{ {
-- Set tabstop to 2 for Dart, Vue, JavaScript, TypeScript, and JSON files -- Set tabstop to 2 for Dart, Vue, JavaScript, TypeScript, and JSON files
pattern = "dart,vue,javascript,typescript,json",
pattern = "dart,vue,javascript,typescript,json,markdown",
callback = function() callback = function()
vim.opt_local.tabstop = 2 vim.opt_local.tabstop = 2
vim.opt_local.softtabstop = 2 vim.opt_local.softtabstop = 2


+ 0
- 6
.config/nvim/lua/tovi/core/remaps.lua View File

@ -9,12 +9,6 @@ vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
vim.keymap.set("n", "<leader>hs", "<cmd>split<cr>", { desc = "Open horizontal spilt" }) vim.keymap.set("n", "<leader>hs", "<cmd>split<cr>", { desc = "Open horizontal spilt" })
vim.keymap.set("n", "<leader>vs", "<cmd>vsplit<cr>", { desc = "Open vertical spilt" }) vim.keymap.set("n", "<leader>vs", "<cmd>vsplit<cr>", { desc = "Open vertical spilt" })
-- Easily navigate splits
vim.keymap.set("n", "<A-h>", "<C-w>h", { desc = "Move focus to split left" })
vim.keymap.set("n", "<A-j>", "<C-w>j", { desc = "Move focus to split down" })
vim.keymap.set("n", "<A-k>", "<C-w>k", { desc = "Move focus to split up" })
vim.keymap.set("n", "<A-l>", "<C-w>l", { desc = "Move focus to split right" })
-- Copy the entire file -- Copy the entire file
vim.keymap.set("n", "<leader>y", "ggyG<C-o>", { desc = "Copy the entire file to default register" }) vim.keymap.set("n", "<leader>y", "ggyG<C-o>", { desc = "Copy the entire file to default register" })


+ 51
- 1
.config/nvim/lua/tovi/plugins/colorscheme.lua View File

@ -38,7 +38,57 @@ return {
{ {
"catppuccin/nvim", "catppuccin/nvim",
name = "catppuccin", name = "catppuccin",
priority = 1000
priority = 1000,
config = function ()
require("catppuccin").setup({
flavour = "auto", -- latte, frappe, macchiato, mocha
background = { -- :h background
light = "latte",
dark = "mocha",
},
transparent_background = false, -- disables setting the background color.
show_end_of_buffer = false, -- shows the '~' characters after the end of buffers
term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`)
dim_inactive = {
enabled = false, -- dims the background color of inactive window
shade = "dark",
percentage = 0.15, -- percentage of the shade to apply to the inactive window
},
no_italic = false, -- Force no italic
no_bold = false, -- Force no bold
no_underline = false, -- Force no underline
styles = { -- Handles the styles of general hi groups (see `:h highlight-args`):
comments = { "italic" }, -- Change the style of comments
conditionals = { "italic" },
loops = {},
functions = {},
keywords = {},
strings = {},
variables = {},
numbers = {},
booleans = {},
properties = {},
types = {},
operators = {},
-- miscs = {}, -- Uncomment to turn off hard-coded styles
},
color_overrides = {},
custom_highlights = {},
default_integrations = true,
integrations = {
cmp = true,
gitsigns = true,
nvimtree = true,
treesitter = true,
notify = false,
mini = {
enabled = true,
indentscope_color = "",
},
-- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
},
})
end
}, },
{ {
"rebelot/kanagawa.nvim", "rebelot/kanagawa.nvim",


+ 15
- 23
.config/nvim/lua/tovi/plugins/harpoon.lua View File

@ -22,28 +22,20 @@ return {
harpoon.ui:toggle_quick_menu(harpoon:list()) harpoon.ui:toggle_quick_menu(harpoon:list())
end, { desc = "Toggle quick menu for harpoon" }) end, { desc = "Toggle quick menu for harpoon" })
keymap.set("n", "<C-,>", function()
harpoon:list():prev()
end, { desc = "Go to previous harpoon mark" })
keymap.set("n", "<C-.>", function()
harpoon:list():next()
end, { desc = "Go to next harpoon mark" })
keymap.set("n", "<C-h>", function()
harpoon:list():select(1)
end, { desc = "Go to first harpoon file" })
keymap.set("n", "<C-j>", function()
harpoon:list():select(2)
end, { desc = "Go to second harpoon file" })
keymap.set("n", "<C-k>", function()
harpoon:list():select(3)
end, { desc = "Go to third harpoon file" })
keymap.set("n", "<C-l>", function()
harpoon:list():select(4)
end, { desc = "Go to fourth harpoon file" })
-- keymap.set("n", "<C-h>", function()
-- harpoon:list():select(1)
-- end, { desc = "Go to first harpoon file" })
--
-- keymap.set("n", "<C-j>", function()
-- harpoon:list():select(2)
-- end, { desc = "Go to second harpoon file" })
--
-- keymap.set("n", "<C-k>", function()
-- harpoon:list():select(3)
-- end, { desc = "Go to third harpoon file" })
--
-- keymap.set("n", "<C-l>", function()
-- harpoon:list():select(4)
-- end, { desc = "Go to fourth harpoon file" })
end, end,
} }

+ 6
- 9
.config/nvim/lua/tovi/plugins/lsp/lspconfig.lua View File

@ -114,17 +114,14 @@ return {
lspconfig["tsserver"].setup({ lspconfig["tsserver"].setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
filetypes = { "vue" },
filetypes = { "typescript", "vue" },
init_options = { init_options = {
tsdk = '/usr/local/lib/node_modules/typescript/lib',
plugins = {
{
name = "@vue/typescript-plugin",
location = "/usr/local/lib/node_modules/@vue/typescript-plugin",
languages = {"javascript", "typescript", "vue"},
},
{
name = "@vue/typescript-plugin",
location = "/usr/local/lib/node_modules/@vue/typescript-plugin",
languages = {"javascript", "typescript", "vue"},
}, },
},
}
}) })
-- configure css server -- configure css server


+ 10
- 0
.config/nvim/lua/tovi/plugins/tmux.lua View File

@ -0,0 +1,10 @@
return {
"aserowy/tmux.nvim",
config = function ()
require("tmux").setup({
copy_sync = {
enable = false
},
})
end
}

+ 1
- 0
.config/tmux/plugins/tmux

@ -0,0 +1 @@
Subproject commit a556353d60833367b13739e660d4057a96f2f4fe

+ 1
- 0
.config/tmux/plugins/tmux-sensible

@ -0,0 +1 @@
Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa

+ 1
- 0
.config/tmux/plugins/tmux-tokyo-night

@ -0,0 +1 @@
Subproject commit ee73d4a9ba6222d7d51492a4e0e797c9249a879c

+ 1
- 0
.config/tmux/plugins/tpm

@ -0,0 +1 @@
Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946

+ 63
- 0
.config/tmux/tmux.conf View File

@ -0,0 +1,63 @@
# List of plugins
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'catppuccin/tmux'
# set -g @plugin 'fabioluciano/tmux-tokyo-night'
# Colour scheme
# set -g @theme_variation 'moon'
# set -g @theme_left_separator ' '
# set -g @theme_right_separator ' '
set -g @catppuccin_flavour 'mocha' # or frappe, macchiato, mocha
set -g @catppuccin_status_left_separator " "
set -g @catppuccin_status_right_separator ""
# easy reload config
bind-key r source-file ~/.config/tmux/tmux.conf \; display-message "~/.config/tmux/tmux.conf reloaded."
set-option -g status-position top
# set window split
bind-key v split-window -h
bind-key b split-window
# C-b is not acceptable -- Vim uses it
set-option -g prefix C-a
bind-key C-a last-window
# Start numbering at 1
set -g base-index 1
# Allows for faster key repetition
set -s escape-time 50
# Rather than constraining window size to the maximum size of any client
# connected to the *session*, constrain window size to the maximum size of any
# client connected to *that window*. Much more reasonable.
setw -g aggressive-resize on
is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?\.?(view|n?vim?x?)(-wrapped)?(diff)?$'"
bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' { if -F '#{pane_at_left}' '' 'select-pane -L' }
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' { if -F '#{pane_at_bottom}' '' 'select-pane -D' }
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' { if -F '#{pane_at_top}' '' 'select-pane -U' }
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' { if -F '#{pane_at_right}' '' 'select-pane -R' }
bind-key -T copy-mode-vi 'C-h' if -F '#{pane_at_left}' '' 'select-pane -L'
bind-key -T copy-mode-vi 'C-j' if -F '#{pane_at_bottom}' '' 'select-pane -D'
bind-key -T copy-mode-vi 'C-k' if -F '#{pane_at_top}' '' 'select-pane -U'
bind-key -T copy-mode-vi 'C-l' if -F '#{pane_at_right}' '' 'select-pane -R'
bind-key C command-prompt -p "Name of new window: " "new-window -n '%%'"
set-window-option -g mode-keys vi
bind 'V' copy-mode
# Enable mouse control (clickable windows, panes, resizable panes)
set -g mouse on
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.tmux/plugins/tpm/tpm'

Loading…
Cancel
Save