aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--git/.gitconfig2
-rw-r--r--nvim/.config/nvim/init.lua8
-rw-r--r--nvim/.config/nvim/lazy-lock.json10
-rw-r--r--nvim/.config/nvim/lua/config/filetypes.lua16
-rw-r--r--nvim/.config/nvim/lua/config/keymaps.lua3
-rw-r--r--nvim/.config/nvim/lua/config/options.lua11
-rw-r--r--nvim/.config/nvim/lua/plugins/colorscheme.lua11
-rw-r--r--nvim/.config/nvim/lua/plugins/editor.lua21
-rw-r--r--nvim/.config/nvim/lua/plugins/ui.lua32
m---------tmux/.config/tmux/plugins/tmux-sensible0
m---------tmux/.config/tmux/plugins/tpm0
-rw-r--r--tmux/.config/tmux/tmux.conf89
-rw-r--r--tmux/.tmux.conf61
m---------tmux/.tmux/plugins/tpm0
14 files changed, 178 insertions, 86 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 5e70b84..ab87075 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -7,7 +7,7 @@
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
[pull]
- ff = only
+ ff = only
[fetch]
prune = true
[diff]
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index de5bfc1..b73d02d 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,6 +1,6 @@
-require("config.options") -- Vim Options
-require("config.keymaps") -- Kep mappings
-require("config.autocmds") -- Auto commands
+require("config.options") -- Vim Options
+require("config.keymaps") -- Kep mappings
+require("config.autocmds") -- Auto commands
require("config.filetypes") -- Language-specific settings
-require("config.lazy") -- Plugin management
+require("config.lazy") -- Plugin management
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index b24b124..8b17953 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,4 +1,14 @@
{
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+<<<<<<< HEAD
+=======
+ "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" },
+ "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
+ "neo-tree.nvim": { "branch": "v3.x", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" },
+ "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
+ "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
+ "nvim-web-devicons": { "branch": "master", "commit": "855c97005c8eebcdd19846f2e54706bffd40ee96" },
+ "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+>>>>>>> upstream
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }
}
diff --git a/nvim/.config/nvim/lua/config/filetypes.lua b/nvim/.config/nvim/lua/config/filetypes.lua
index dfe37ec..7e0e416 100644
--- a/nvim/.config/nvim/lua/config/filetypes.lua
+++ b/nvim/.config/nvim/lua/config/filetypes.lua
@@ -3,10 +3,17 @@ local api = vim.api
api.nvim_create_autocmd("FileType", {
pattern = "python",
callback = function()
+ -- PEP 8 indentation settings
vim.opt_local.tabstop = 4
+ vim.opt_local.softtabstop = 4
vim.opt_local.shiftwidth = 4
vim.opt_local.expandtab = true
+
+ -- 88 character length lines for Black formatter
vim.opt_local.colorcolumn = "88"
+
+ -- Google-style docstrings
+ g.python_style = "google"
end,
})
@@ -20,15 +27,6 @@ api.nvim_create_autocmd("FileType", {
})
api.nvim_create_autocmd("FileType", {
- pattern = "rust",
- callback = function()
- vim.opt_local.tabstop = 4
- vim.opt_local.shiftwidth = 4
- vim.opt_local.commentstring = "// %s"
- end,
-})
-
-api.nvim_create_autocmd("FileType", {
pattern = { "html", "css", "javascript", "typescript", "javascriptreact", "typescriptreact" },
callback = function()
vim.opt_local.tabstop = 2
diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua
index ee7c68b..d4d2a45 100644
--- a/nvim/.config/nvim/lua/config/keymaps.lua
+++ b/nvim/.config/nvim/lua/config/keymaps.lua
@@ -1,2 +1,5 @@
vim.g.mapleader = "<Space>"
vim.g.maplocalleader = "\\"
+
+local map = vim.keymap.set
+
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua
index 80522dc..b1daeef 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/config/options.lua
@@ -18,3 +18,14 @@ opt.smartcase = true
opt.termguicolors = true
opt.signcolumn = "yes"
opt.cursorline = true
+
+-- Files
+opt.swapfile = false
+opt.backup = false
+opt.undofile = true
+opt.undodir = vim.fn.stdpath("data") .. "/undodir"
+
+-- Behavior
+opt.hidden = true
+opt.scrolloff = 8
+opt.mouse = "a"
diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua
deleted file mode 100644
index be7f5b8..0000000
--- a/nvim/.config/nvim/lua/plugins/colorscheme.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
- {
- "folke/tokyonight.nvim",
- lazy = false,
- priority = 1000,
- opts = { style = "moon" },
- init = function()
- vim.cmd([[colorscheme tokyonight]])
- end,
- }
-}
diff --git a/nvim/.config/nvim/lua/plugins/editor.lua b/nvim/.config/nvim/lua/plugins/editor.lua
new file mode 100644
index 0000000..022b72a
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/editor.lua
@@ -0,0 +1,21 @@
+return {
+ {
+ "echasnovski/mini.surround",
+ version = false,
+ config = function()
+ require('mini.surround').setup()
+ end,
+ },
+ {
+ "nvim-neo-tree/neo-tree.nvim",
+ branch = "v3.x",
+ dependencies = {
+ "nvim-lua/plenary.nvim",
+ "nvim-tree/nvim-web-devicons",
+ "MunifTanjim/nui.nvim",
+ -- {"3rd/image.nvim", opts = {}},
+ },
+ lazy = false,
+ opts = {},
+ }
+}
diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua
new file mode 100644
index 0000000..00ca27e
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/ui.lua
@@ -0,0 +1,32 @@
+return {
+ -- Colorscheme
+ {
+ "folke/tokyonight.nvim",
+ lazy = false,
+ priority = 1000,
+ opts = { style = "moon" },
+ init = function()
+ vim.cmd([[colorscheme tokyonight]])
+ end,
+ },
+ -- Status bar
+ {
+ "nvim-lualine/lualine.nvim",
+ event = "VeryLazy",
+ dependencies = { "nvim-tree/nvim-web-devicons" },
+ opts = {
+ options = {
+ theme = "tokyonight",
+ component_separators = { left = "|", right = "|" },
+ section_separators = { left = "", right = "" },
+ },
+ },
+ },
+ -- Color highlighter
+ {
+ "norcalli/nvim-colorizer.lua",
+ config = function()
+ require 'colorizer'.setup()
+ end,
+ }
+}
diff --git a/tmux/.config/tmux/plugins/tmux-sensible b/tmux/.config/tmux/plugins/tmux-sensible
new file mode 160000
+Subproject 25cb91f42d020f675bb0a2ce3fbd3a5d96119ef
diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm
new file mode 160000
+Subproject 99469c4a9b1ccf77fade25842dc7bafbc8ce994
diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf
new file mode 100644
index 0000000..7f5851e
--- /dev/null
+++ b/tmux/.config/tmux/tmux.conf
@@ -0,0 +1,89 @@
+# Remap prefix from 'C-b' to 'C-a'
+#
+# This works well if you remap the regular
+# Caps Lock key to Ctrl.
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+
+# More intuitive pane splits.
+#
+# Split panes using | for horizontal splits
+# and - for vertical splits
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# Enable faster pane switching
+#
+# Switch panes using Alt-arrow without prefix
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+# Set terminal colors
+set-option -sa terminal-overrides ",xterm*:Tc"
+
+# Enable mouse support (clickable windows, panes, resizable panes)
+set -g mouse on
+
+# Start windows and panes at 1, not 0
+set -g base-index 1
+set -g pane-base-index 1
+set-window-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# kill pane
+bind-key x kill-pane
+
+# Pane resizing
+# bind -n M-h resize-pane -L
+# bind -n M-l resize-pane -R
+# bind -n M-k resize-pane -U
+# bind -n M-j resize-pane -D
+#
+# # Move window to the left
+# bind -n M-i swap-window -t -1
+#
+# # Move window to the right
+# bind -n M-o swap-window -t +1
+#
+# Set vi mode
+set-window-option -g mode-keys vi
+
+# Use visual selection mode as vi
+bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
+bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
+
+# Save and restore session
+# set -g @resurrect-save 'S'
+# set -g @resurrect-restore 'R'
+
+# Tmux theme
+# set -g @catppuccin_flavour 'mocha'
+# set -g @catppuccin_right_separator "█"
+# set -g @catppuccin_left_separator "█"
+#
+# TMUX_FZF_ORDER="session|window|pane|command|keybinding"
+# TMUX_FZF_OPTIONS="-p -w 90% -h 70% -m"
+
+# # more options here: https://github.com/sainnhe/tmux-fzf/issues/6#issuecomment-578750879
+# bind w run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/window.sh switch"
+
+# Plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+
+# set -g @plugin 'tmux-plugins/tpm'
+# set -g @plugin 'tmux-plugins/tmux-sensible'
+# set -g @plugin 'sainnhe/tmux-fzf'
+# set -g @plugin 'christoomey/vim-tmux-navigator'
+# set -g @plugin 'oca159/catppuccin-tmux'
+# set -g @plugin 'tmux-plugins/tmux-resurrect'
+# set -g @plugin 'tmux-plugins/tmux-continuum'
+# set -g @resurrect-strategy-nvim 'session'
+#
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
deleted file mode 100644
index b18c61c..0000000
--- a/tmux/.tmux.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-# Set terminal colors
-set-option -sa terminal-overrides ",xterm*:Tc"
-
-# Enable mouse support
-set -g mouse on
-
-# Start windows and panes at 1, not 0
-set -g base-index 1
-set -g pane-base-index 1
-set-window-option -g pane-base-index 1
-set-option -g renumber-windows on
-
-# kill pane
-bind-key x kill-pane
-
-# Pane resizing
-bind -n M-h resize-pane -L
-bind -n M-l resize-pane -R
-bind -n M-k resize-pane -U
-bind -n M-j resize-pane -D
-
-# Move window to the left
-bind -n M-i swap-window -t -1
-
-# Move window to the right
-bind -n M-o swap-window -t +1
-
-# Set vi mode
-set-window-option -g mode-keys vi
-
-# Use visual selection mode as vi
-bind-key -T copy-mode-vi v send-keys -X begin-selection
-bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
-bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
-
-# Save and restore session
-set -g @resurrect-save 'S'
-set -g @resurrect-restore 'R'
-
-# Tmux theme
-set -g @catppuccin_flavour 'mocha'
-set -g @catppuccin_right_separator "█"
-set -g @catppuccin_left_separator "█"
-
-TMUX_FZF_ORDER="session|window|pane|command|keybinding"
-TMUX_FZF_OPTIONS="-p -w 90% -h 70% -m"
-
-# more options here: https://github.com/sainnhe/tmux-fzf/issues/6#issuecomment-578750879
-bind w run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/window.sh switch"
-
-# Plugins
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'sainnhe/tmux-fzf'
-set -g @plugin 'christoomey/vim-tmux-navigator'
-set -g @plugin 'oca159/catppuccin-tmux'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
-set -g @resurrect-strategy-nvim 'session'
-
-run '~/.tmux/plugins/tpm/tpm'
diff --git a/tmux/.tmux/plugins/tpm b/tmux/.tmux/plugins/tpm
new file mode 160000
+Subproject 99469c4a9b1ccf77fade25842dc7bafbc8ce994