Compare commits

...

2 Commits

Author SHA1 Message Date
Gender Demon 444459e785 Merge diverging changes to nvim configuration 2022-07-06 18:56:23 +01:00
Gender Demon 0cfb6463a5 Update nvim configuration 2022-07-06 18:50:17 +01:00
6 changed files with 37 additions and 4 deletions

View File

@ -4,3 +4,6 @@ require("plugin_manager")
require("interface")
require("languages")
require("tabbing")
require("keybinds")
require("repl_cfg")

View File

@ -1,5 +1,5 @@
-- Interface settings
-- Set preferred colour scheme here; it will be substituted below
-- Set preferred colour scheme/background colour here; it will be substituted below
local colours = "sourcerer"
-- Show line numbers
@ -10,6 +10,6 @@ vim.wo.number = true
-- but true-colour otherwise
vim.o.termguicolors = (os.getenv("TERM") ~= "linux")
vim.o.background = "dark"
vim.o.background = background
vim.cmd("syntax on")
vim.cmd(string.gsub("colorscheme ", "$", colours))

15
nvim/lua/keybinds.lua Normal file
View File

@ -0,0 +1,15 @@
-- Keybinds
--
local map = vim.api.nvim_set_keymap
local noremap = { noremap = true }
-- Map leader key to <Space>
-- map("n", "<Space>", "", {})
vim.g.mapleader = "\\" -- double slash because single is escape
-- Default leader key is \
-- Repl.nvim keybinds
--
map("n", "<leader>r", "<Plug>(ReplSend)", {})
map("n", "<leader>rr", "<Plug>(ReplSendLine)", {})
map("v", "<leader>r", "<Plug>(ReplSend)", {})

View File

@ -3,8 +3,11 @@
-- ALE settings
-- Which linters to use
vim.g.ale_linters = {
["python"] = {"pycodestyle", "pylint"},
["java"] = {"javac"},
["python"] = {"pycodestyle", "pydocstyle", "bandit", "mypy", "vulture"},
["lua"] = {"luac", "luacheck"},
}
-- When to run linters
vim.g.ale_lint_on_text_changed = 1
vim.g.ale_lint_on_insert_leave = 0
@ -29,3 +32,4 @@ vim.g.ale_completion_max_suggestions = 6
-- zig.vim config
-- Do not autoformat code on save
vim.g.zig_fmt_autosave = 0

View File

@ -11,7 +11,7 @@ return require("packer").startup(function()
-- Language support
-- Zig
use {"ziglang/zig.vim", ft={"zig"}}
use "ziglang/zig.vim"
-- Odin
use {"Tetralux/odin.vim", ft={"odin"}}
-- Pony
@ -20,6 +20,9 @@ return require("packer").startup(function()
-- Pencil, for writing prose
use "reedes/vim-pencil"
-- REPL, for, uh, REPLs
use "https://gitlab.com/HiPhish/repl.nvim.git"
-- Colour schemes
use "nightsense/cosmic_latte"
use "scheakur/vim-scheakur"

8
nvim/lua/repl_cfg.lua Normal file
View File

@ -0,0 +1,8 @@
-- Configuration for repl.nvim's REPLs
-- REPL setup
vim.g.repl = {
["python"] = {["syntax"] = "python"},
["racket"] = {["syntax"] = "scheme"},
["lua"] = {["syntax"] = "lua"}
}