first commit
This commit is contained in:
Executable
+4
@@ -0,0 +1,4 @@
|
|||||||
|
require("autocmd")
|
||||||
|
require("config")
|
||||||
|
require("keymap")
|
||||||
|
require("plugins")
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
vim.opt.completeopt = { "menuone", "noselect", "popup" }
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
|
callback = function(ev)
|
||||||
|
local client = vim.lsp.get_client_by_id(ev.data.client_id)
|
||||||
|
if client:supports_method("textDocument/completion") then
|
||||||
|
vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = false })
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd('TextYankPost', {
|
||||||
|
callback = function()
|
||||||
|
vim.highlight.on_yank({ timeout = 170 })
|
||||||
|
end,
|
||||||
|
})
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
vim.cmd.colorscheme "wildcharm"
|
||||||
|
|
||||||
|
vim.opt.number = true
|
||||||
|
vim.opt.relativenumber = true
|
||||||
|
vim.opt.cursorline = true
|
||||||
|
vim.opt.tabstop = 4
|
||||||
|
vim.opt.shiftwidth = 4
|
||||||
|
vim.opt.updatetime = 50
|
||||||
|
vim.opt.incsearch = true
|
||||||
|
vim.opt.hlsearch = true
|
||||||
|
vim.opt.ignorecase = true
|
||||||
|
vim.opt.smartcase = true
|
||||||
|
vim.opt.scrolloff = 7
|
||||||
|
vim.opt.swapfile = false
|
||||||
|
vim.opt.backup = false
|
||||||
|
vim.opt.clipboard = "unnamedplus"
|
||||||
|
vim.opt.signcolumn = "yes"
|
||||||
|
vim.opt.langmap="ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNOPQRSTUVWXYZ,фисвуапршолдьтщзйкыегмцчня;abcdefghijklmnopqrstuvwxyz"
|
||||||
|
vim.opt.list = true
|
||||||
|
vim.opt.listchars = "tab:>-,space:·"
|
||||||
|
|
||||||
|
vim.g.mapleader = " "
|
||||||
|
vim.g.maplocalleader = " "
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
vim.api.nvim_set_keymap("n", "<leader>o", ":lua MiniFiles.open()<CR>", {})
|
||||||
|
vim.api.nvim_set_keymap("n", "<leader>f", ":Pick files<CR>", {})
|
||||||
|
vim.api.nvim_set_keymap("n", "<leader>b", ":Pick buffers<CR>", {})
|
||||||
|
vim.api.nvim_set_keymap("n", "<leader>g", ":Pick grep_live<CR>", {})
|
||||||
|
|
||||||
|
vim.keymap.set("i", "<c-enter>", function()
|
||||||
|
vim.lsp.completion.get()
|
||||||
|
end)
|
||||||
|
|
||||||
|
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float,
|
||||||
|
{ desc = 'Show error/diagnostic messages' })
|
||||||
|
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev,
|
||||||
|
{ desc = 'Go to previous diagnostic' })
|
||||||
|
vim.keymap.set('n', ']d', vim.diagnostic.goto_next,
|
||||||
|
{ desc = 'Go to next diagnostic' })
|
||||||
|
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist,
|
||||||
|
{ desc = 'Open diagnostics list' })
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
|
desc = 'LSP actions',
|
||||||
|
callback = function(event)
|
||||||
|
local function map(mode, keys, func, desc)
|
||||||
|
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = desc })
|
||||||
|
end
|
||||||
|
|
||||||
|
map('n', 'gd', vim.lsp.buf.definition, 'Go to Definition')
|
||||||
|
map('n', 'gD', vim.lsp.buf.declaration, 'Go to Declaration')
|
||||||
|
map('n', 'gi', vim.lsp.buf.implementation, 'Go to Implementation')
|
||||||
|
map('n', 'go', vim.lsp.buf.type_definition, 'Go to Type Definition')
|
||||||
|
map('n', 'gr', vim.lsp.buf.references, 'Go to References')
|
||||||
|
|
||||||
|
map('n', 'K', vim.lsp.buf.hover, 'Show Hover Documentation')
|
||||||
|
map('n', '<C-k>', vim.lsp.buf.signature_help, 'Show Signature Help')
|
||||||
|
|
||||||
|
map('n', '<leader>rn', vim.lsp.buf.rename, 'Rename Symbol')
|
||||||
|
map({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, 'Code Action')
|
||||||
|
end,
|
||||||
|
})
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
vim.pack.add({
|
||||||
|
"https://github.com/nvim-mini/mini.nvim",
|
||||||
|
"https://github.com/neovim/nvim-lspconfig",
|
||||||
|
})
|
||||||
|
|
||||||
|
require("mini.surround").setup()
|
||||||
|
require("mini.files").setup()
|
||||||
|
require("mini.pick").setup()
|
||||||
|
|
||||||
|
vim.lsp.enable("clangd")
|
||||||
|
vim.lsp.config("clangd", {
|
||||||
|
cmd = { "clangd", "--header-insertion=never"}
|
||||||
|
})
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
(setq custom-file "~/.emacs.custom.el")
|
||||||
|
|
||||||
|
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
|
||||||
|
(require 'use-package)
|
||||||
|
(setq
|
||||||
|
use-package-always-ensure t
|
||||||
|
use-package-verbose t)
|
||||||
|
|
||||||
|
(setq auto-save-default nil)
|
||||||
|
(setq make-backup-files nil)
|
||||||
|
(setq create-lockfiles nil)
|
||||||
|
|
||||||
|
(setq display-line-numbers-type 'relative)
|
||||||
|
(global-display-line-numbers-mode t)
|
||||||
|
|
||||||
|
(setq ring-bell-function 'ignore)
|
||||||
|
|
||||||
|
(set-face-attribute 'default nil :font "Iosevka-16")
|
||||||
|
|
||||||
|
(tool-bar-mode -1)
|
||||||
|
(menu-bar-mode -1)
|
||||||
|
(scroll-bar-mode -1)
|
||||||
|
|
||||||
|
(setq-default dired-dwim-target t)
|
||||||
|
(windmove-default-keybindings)
|
||||||
|
|
||||||
|
(setq split-height-threshold 0)
|
||||||
|
(setq split-width-threshold nil)
|
||||||
|
|
||||||
|
(setq-default show-trailing-whitespace t)
|
||||||
|
(setq-default tab-width 4)
|
||||||
|
(setq-default indent-tabs-mode nil)
|
||||||
|
|
||||||
|
(load-file "~/.emacs.local/simpc-mode.el")
|
||||||
|
(require 'simpc-mode)
|
||||||
|
(add-to-list 'auto-mode-alist '("\\.[hc]\\(pp\\)?\\'" . simpc-mode))
|
||||||
|
|
||||||
|
(ido-mode 1)
|
||||||
|
(ido-everywhere 1)
|
||||||
|
(use-package smex
|
||||||
|
:init
|
||||||
|
(smex-initialize)
|
||||||
|
:bind ("M-x" . smex))
|
||||||
|
|
||||||
|
(use-package kaolin-themes
|
||||||
|
:config
|
||||||
|
(load-theme 'kaolin-bubblegum t))
|
||||||
|
|
||||||
|
(use-package haskell-mode)
|
||||||
|
|
||||||
|
(use-package company
|
||||||
|
:ensure t
|
||||||
|
:init
|
||||||
|
(global-company-mode)
|
||||||
|
:config
|
||||||
|
(setq company-minimum-prefix-length 3)
|
||||||
|
(global-set-key (kbd "M-<tab>") 'company-complete))
|
||||||
|
|
||||||
|
(use-package multiple-cursors
|
||||||
|
:bind
|
||||||
|
(("M-n" . mc/mark-next-like-this)
|
||||||
|
("M-p" . mc/mark-previous-like-this)
|
||||||
|
("C-c C-a" . mc/mark-all-like-this)))
|
||||||
@@ -0,0 +1,127 @@
|
|||||||
|
(require 'subr-x)
|
||||||
|
|
||||||
|
(defvar simpc-mode-syntax-table
|
||||||
|
(let ((table (make-syntax-table)))
|
||||||
|
;; C/C++ style comments
|
||||||
|
(modify-syntax-entry ?/ ". 124b" table)
|
||||||
|
(modify-syntax-entry ?* ". 23" table)
|
||||||
|
(modify-syntax-entry ?\n "> b" table)
|
||||||
|
;; Preprocessor stuff?
|
||||||
|
(modify-syntax-entry ?# "." table)
|
||||||
|
;; Chars are the same as strings
|
||||||
|
(modify-syntax-entry ?' "\"" table)
|
||||||
|
;; Treat <> as punctuation (needed to highlight C++ keywords
|
||||||
|
;; properly in template syntax)
|
||||||
|
(modify-syntax-entry ?< "." table)
|
||||||
|
(modify-syntax-entry ?> "." table)
|
||||||
|
|
||||||
|
(modify-syntax-entry ?& "." table)
|
||||||
|
(modify-syntax-entry ?% "." table)
|
||||||
|
table))
|
||||||
|
|
||||||
|
(defun simpc-types ()
|
||||||
|
'("char" "int" "long" "short" "void" "bool" "float" "double" "signed" "unsigned"
|
||||||
|
"char16_t" "char32_t" "char8_t"
|
||||||
|
"int8_t" "uint8_t" "int16_t" "uint16_t" "int32_t" "uint32_t" "int64_t" "uint64_t"
|
||||||
|
"uintptr_t"
|
||||||
|
"size_t" "ptrdiff_t"
|
||||||
|
"va_list"))
|
||||||
|
|
||||||
|
(defun simpc-keywords ()
|
||||||
|
'("auto" "break" "case" "const" "continue" "default" "do"
|
||||||
|
"else" "enum" "extern" "for" "goto" "if" "register"
|
||||||
|
"return" "sizeof" "static" "struct" "switch" "typedef"
|
||||||
|
"union" "volatile" "while" "alignas" "alignof" "and"
|
||||||
|
"and_eq" "asm" "atomic_cancel" "atomic_commit" "atomic_noexcept" "bitand"
|
||||||
|
"bitor" "catch" "class" "co_await"
|
||||||
|
"co_return" "co_yield" "compl" "concept" "const_cast" "consteval" "constexpr"
|
||||||
|
"constinit" "decltype" "delete" "dynamic_cast" "explicit" "export" "false"
|
||||||
|
"friend" "inline" "mutable" "namespace" "new" "noexcept" "not" "not_eq"
|
||||||
|
"nullptr" "operator" "or" "or_eq" "private" "protected" "public" "reflexpr"
|
||||||
|
"reinterpret_cast" "requires" "static_assert" "static_cast" "synchronized"
|
||||||
|
"template" "this" "thread_local" "throw" "true" "try" "typeid" "typename"
|
||||||
|
"using" "virtual" "wchar_t" "xor" "xor_eq"))
|
||||||
|
|
||||||
|
(defun simpc-font-lock-keywords ()
|
||||||
|
(list
|
||||||
|
`("# *\\(warn\\|error\\)" . font-lock-warning-face)
|
||||||
|
`("# *[#a-zA-Z0-9_]+" . font-lock-preprocessor-face)
|
||||||
|
`("# *include\\(?:_next\\)?\\s-+\\(\\(<\\|\"\\).*\\(>\\|\"\\)\\)" . (1 font-lock-string-face))
|
||||||
|
`("\\(?:enum\\|struct\\)\\s-+\\([a-zA-Z0-9_]+\\)" . (1 font-lock-type-face))
|
||||||
|
`(,(regexp-opt (simpc-keywords) 'symbols) . font-lock-keyword-face)
|
||||||
|
`(,(regexp-opt (simpc-types) 'symbols) . font-lock-type-face)))
|
||||||
|
|
||||||
|
(defun simpc--previous-non-empty-line ()
|
||||||
|
"Returns either NIL when there is no such line or a pair (line . indentation)"
|
||||||
|
(save-excursion
|
||||||
|
;; If you are on the first line, but not at the beginning of buffer (BOB) the `(bobp)`
|
||||||
|
;; function does not return `t`. So we have to move to the beginning of the line first.
|
||||||
|
;; TODO: feel free to suggest a better approach for checking BOB here.
|
||||||
|
(move-beginning-of-line nil)
|
||||||
|
(if (bobp)
|
||||||
|
;; If you are standing at the BOB, you by definition don't have a previous non-empty line.
|
||||||
|
nil
|
||||||
|
;; Moving one line backwards because the current line is by definition is not
|
||||||
|
;; the previous non-empty line.
|
||||||
|
(forward-line -1)
|
||||||
|
;; Keep moving backwards until we hit BOB or a non-empty line.
|
||||||
|
(while (and (not (bobp))
|
||||||
|
(string-empty-p
|
||||||
|
(string-trim-right
|
||||||
|
(thing-at-point 'line t))))
|
||||||
|
(forward-line -1))
|
||||||
|
|
||||||
|
(if (string-empty-p
|
||||||
|
(string-trim-right
|
||||||
|
(thing-at-point 'line t)))
|
||||||
|
;; If after moving backwards for this long we still look at an empty
|
||||||
|
;; line we by definition didn't find the previous non-empty line.
|
||||||
|
nil
|
||||||
|
;; We found the previous non-empty line!
|
||||||
|
(cons (thing-at-point 'line t)
|
||||||
|
(current-indentation))))))
|
||||||
|
|
||||||
|
(defun simpc--desired-indentation ()
|
||||||
|
(let ((prev (simpc--previous-non-empty-line)))
|
||||||
|
(if (not prev)
|
||||||
|
(current-indentation)
|
||||||
|
(let ((indent-len 4)
|
||||||
|
(cur-line (string-trim-right (thing-at-point 'line t)))
|
||||||
|
(prev-line (string-trim-right (car prev)))
|
||||||
|
(prev-indent (cdr prev)))
|
||||||
|
(cond
|
||||||
|
((string-match-p "^\\s-*switch\\s-*(.+)" prev-line)
|
||||||
|
prev-indent)
|
||||||
|
((and (string-suffix-p "{" prev-line)
|
||||||
|
(string-prefix-p "}" (string-trim-left cur-line)))
|
||||||
|
prev-indent)
|
||||||
|
((string-suffix-p "{" prev-line)
|
||||||
|
(+ prev-indent indent-len))
|
||||||
|
((string-prefix-p "}" (string-trim-left cur-line))
|
||||||
|
(max (- prev-indent indent-len) 0))
|
||||||
|
((string-suffix-p ":" prev-line)
|
||||||
|
(if (string-suffix-p ":" cur-line)
|
||||||
|
prev-indent
|
||||||
|
(+ prev-indent indent-len)))
|
||||||
|
((string-suffix-p ":" cur-line)
|
||||||
|
(max (- prev-indent indent-len) 0))
|
||||||
|
(t prev-indent))))))
|
||||||
|
|
||||||
|
;;; TODO: customizable indentation (amount of spaces, tabs, etc)
|
||||||
|
(defun simpc-indent-line ()
|
||||||
|
(interactive)
|
||||||
|
(when (not (bobp))
|
||||||
|
(let* ((desired-indentation
|
||||||
|
(simpc--desired-indentation))
|
||||||
|
(n (max (- (current-column) (current-indentation)) 0)))
|
||||||
|
(indent-line-to desired-indentation)
|
||||||
|
(forward-char n))))
|
||||||
|
|
||||||
|
(define-derived-mode simpc-mode prog-mode "Simple C"
|
||||||
|
"Simple major mode for editing C files."
|
||||||
|
:syntax-table simpc-mode-syntax-table
|
||||||
|
(setq-local font-lock-defaults '(simpc-font-lock-keywords))
|
||||||
|
(setq-local indent-line-function 'simpc-indent-line)
|
||||||
|
(setq-local comment-start "// "))
|
||||||
|
|
||||||
|
(provide 'simpc-mode)
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
syntax on
|
||||||
|
colorscheme wildcharm
|
||||||
|
set background=dark
|
||||||
|
|
||||||
|
set number
|
||||||
|
set relativenumber
|
||||||
|
set cursorline
|
||||||
|
set noesckeys
|
||||||
|
set updatetime=50
|
||||||
|
set tabstop=4
|
||||||
|
set shiftwidth=4
|
||||||
|
set expandtab
|
||||||
|
set incsearch
|
||||||
|
set ignorecase
|
||||||
|
set smartcase
|
||||||
|
set scrolloff=7
|
||||||
|
set noswapfile
|
||||||
|
set nobackup
|
||||||
|
set clipboard=unnamedplus
|
||||||
|
set splitbelow
|
||||||
|
set splitright
|
||||||
|
set list
|
||||||
|
set listchars=tab:>-,space:·
|
||||||
Reference in New Issue
Block a user