Compare commits
No commits in common. "9cd17eea5f4a43011dc10118ceacbd71f032f742" and "c772fc9939716176eb01ca2a92b2c9053b22c144" have entirely different histories.
9cd17eea5f
...
c772fc9939
|
@ -25,10 +25,10 @@
|
||||||
pkgs.stdenv.cc.cc.lib
|
pkgs.stdenv.cc.cc.lib
|
||||||
pkgs.yq
|
pkgs.yq
|
||||||
pkgs.python39Full
|
pkgs.python39Full
|
||||||
pkgs.xorg.xclock # TODO: only include if have GL
|
pkgs.xorg.xclock
|
||||||
pkgs.logseq # TODO: only include if have GL
|
pkgs.logseq
|
||||||
pkgs.mosh
|
pkgs.mosh
|
||||||
pkgs.nixops_unstable # nixops v2
|
pkgs.nixops_unstable
|
||||||
# pkgs.python310 # dev packages should be in jk
|
# pkgs.python310 # dev packages should be in jk
|
||||||
# pkgs.python310.numpy
|
# pkgs.python310.numpy
|
||||||
# pkgs.python310Packages.tensorflow
|
# pkgs.python310Packages.tensorflow
|
||||||
|
|
105
neovim/init.lua
105
neovim/init.lua
|
@ -1,3 +1,4 @@
|
||||||
|
vim.lsp.set_log_level("debug")
|
||||||
-- What: Mono-file nvim configuration file
|
-- What: Mono-file nvim configuration file
|
||||||
-- Why: Easy to see through everything without needing to navigate thru files
|
-- Why: Easy to see through everything without needing to navigate thru files
|
||||||
-- Features:
|
-- Features:
|
||||||
|
@ -10,19 +11,61 @@
|
||||||
-- - zk @ https://github.com/mickael-menu/zk
|
-- - zk @ https://github.com/mickael-menu/zk
|
||||||
-- - prettierd @ npm install -g @fsouza/prettierd
|
-- - prettierd @ npm install -g @fsouza/prettierd
|
||||||
|
|
||||||
|
-- Basic settings of vim
|
||||||
|
vim.cmd([[
|
||||||
|
set number relativenumber
|
||||||
|
set tabstop=4 softtabstop=4
|
||||||
|
set expandtab
|
||||||
|
set shiftwidth=4
|
||||||
|
set smartindent
|
||||||
|
set exrc
|
||||||
|
set incsearch
|
||||||
|
set scrolloff=30
|
||||||
|
set signcolumn=yes
|
||||||
|
set colorcolumn=80
|
||||||
|
set background=light
|
||||||
|
]])
|
||||||
|
vim.opt.lazyredraw = true
|
||||||
|
vim.opt.termguicolors = true
|
||||||
|
vim.opt.cursorline = true
|
||||||
|
-- some plugins misbehave when we do swap files
|
||||||
|
vim.opt.swapfile = false
|
||||||
|
vim.opt.backup = false
|
||||||
|
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
||||||
|
vim.opt.undofile = true
|
||||||
|
vim.opt.completeopt = 'menuone,noselect'
|
||||||
|
-- vim.opt.clipboard = "unnamedplus"
|
||||||
|
|
||||||
|
vim.g.mapleader = ' '
|
||||||
|
vim.g.maplocalleader = ','
|
||||||
|
|
||||||
|
-- basic keymaps
|
||||||
|
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true }) -- since we're using space for leader
|
||||||
|
vim.keymap.set('t', '<Esc>', '<C-\\><C-n>)') -- make :terminal escape out
|
||||||
|
vim.keymap.set({ 'n', 'i', 'v' }, '<c-l>', '<Cmd>:mode<Cr>') -- redraw on every mode
|
||||||
|
|
||||||
|
-- diagnostics (errors/warnings to be shown)
|
||||||
|
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
||||||
|
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
||||||
|
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float) -- opens diag in box (floating)
|
||||||
|
-- vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist) -- opens list of diags
|
||||||
|
-- vim.keymap.set('n', '<leader>wq', vim.diagnostic.setqflist) -- workspace diags
|
||||||
|
vim.keymap.set('n', '<leader>q', '<cmd>TroubleToggle loclist<cr>')
|
||||||
|
vim.keymap.set('n', '<leader>wq', '<cmd>TroubleToggle workspace_diagnostics<cr>')
|
||||||
|
|
||||||
|
|
||||||
|
-- vim-plug
|
||||||
local data_dir = vim.fn.stdpath('data')
|
local data_dir = vim.fn.stdpath('data')
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
|
let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
|
||||||
if empty(glob(data_dir . '/autoload/plug.vim'))
|
if empty(glob(data_dir . '/autoload/plug.vim'))
|
||||||
silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
|
silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
||||||
]])
|
]])
|
||||||
--
|
|
||||||
-- vim-plug
|
|
||||||
local Plug = vim.fn['plug#']
|
|
||||||
|
|
||||||
-- TODO: Change this to relative datadir
|
local Plug = vim.fn['plug#']
|
||||||
vim.call('plug#begin', '~/.config/nvim/plugged')
|
vim.call('plug#begin', '~/.config/nvim/plugged')
|
||||||
|
|
||||||
-- libs and dependencies
|
-- libs and dependencies
|
||||||
|
@ -32,9 +75,9 @@ Plug('nvim-lua/plenary.nvim')
|
||||||
Plug('tjdevries/nlua.nvim') -- adds symbols of vim stuffs in init.lua
|
Plug('tjdevries/nlua.nvim') -- adds symbols of vim stuffs in init.lua
|
||||||
Plug('nvim-treesitter/nvim-treesitter') -- language parser engine for highlighting
|
Plug('nvim-treesitter/nvim-treesitter') -- language parser engine for highlighting
|
||||||
Plug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects
|
Plug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects
|
||||||
Plug('nvim-telescope/telescope.nvim', { branch = '0.1.x' }) -- file browser
|
Plug('nvim-telescope/telescope.nvim', { tag = '0.1.0' }) -- file browser
|
||||||
Plug('nvim-telescope/telescope-fzf-native.nvim',
|
Plug('nvim-telescope/telescope-fzf-native.nvim',
|
||||||
{ ['do'] = 'make >> /tmp/log 2>&1' })
|
{ ['do'] = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=release && cmake --build build --config Release && cmake --install build --prefix build' })
|
||||||
Plug('nvim-telescope/telescope-file-browser.nvim')
|
Plug('nvim-telescope/telescope-file-browser.nvim')
|
||||||
|
|
||||||
-- cmp: auto-complete/suggestions
|
-- cmp: auto-complete/suggestions
|
||||||
|
@ -87,54 +130,8 @@ Plug('mickael-menu/zk-nvim') -- Zettelkasten
|
||||||
---------
|
---------
|
||||||
vim.call('plug#end')
|
vim.call('plug#end')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
vim.cmd([[
|
|
||||||
set number relativenumber
|
|
||||||
set tabstop=4 softtabstop=4
|
|
||||||
set expandtab
|
|
||||||
set shiftwidth=4
|
|
||||||
set smartindent
|
|
||||||
set exrc
|
|
||||||
set incsearch
|
|
||||||
set scrolloff=30
|
|
||||||
set signcolumn=yes
|
|
||||||
set colorcolumn=80
|
|
||||||
set background=light
|
|
||||||
|
|
||||||
]])
|
|
||||||
vim.opt.lazyredraw = true
|
|
||||||
vim.opt.termguicolors = true
|
|
||||||
vim.opt.cursorline = true
|
|
||||||
-- some plugins misbehave when we do swap files
|
|
||||||
vim.opt.swapfile = false
|
|
||||||
vim.opt.backup = false
|
|
||||||
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
|
|
||||||
vim.opt.undofile = true
|
|
||||||
vim.opt.completeopt = 'menuone,noselect'
|
|
||||||
-- vim.opt.clipboard = "unnamedplus"
|
|
||||||
|
|
||||||
vim.g.mapleader = ' '
|
|
||||||
vim.g.maplocalleader = ','
|
|
||||||
|
|
||||||
-- basic keymaps
|
|
||||||
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true }) -- since we're using space for leader
|
|
||||||
vim.keymap.set('t', '<Esc>', '<C-\\><C-n>)') -- make :terminal escape out
|
|
||||||
vim.keymap.set({ 'n', 'i', 'v' }, '<c-l>', '<Cmd>:mode<Cr>') -- redraw on every mode
|
|
||||||
|
|
||||||
-- diagnostics (errors/warnings to be shown)
|
|
||||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
|
||||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
|
||||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float) -- opens diag in box (floating)
|
|
||||||
-- vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist) -- opens list of diags
|
|
||||||
-- vim.keymap.set('n', '<leader>wq', vim.diagnostic.setqflist) -- workspace diags
|
|
||||||
vim.keymap.set('n', '<leader>q', '<cmd>TroubleToggle loclist<cr>')
|
|
||||||
vim.keymap.set('n', '<leader>wq', '<cmd>TroubleToggle workspace_diagnostics<cr>')
|
|
||||||
|
|
||||||
-- color, highlighting, UI stuffs
|
-- color, highlighting, UI stuffs
|
||||||
vim.cmd([[
|
vim.cmd([[ colorscheme gruvbox ]])
|
||||||
colorscheme gruvbox
|
|
||||||
]])
|
|
||||||
require('hlargs').setup()
|
require('hlargs').setup()
|
||||||
require('nvim-web-devicons').setup()
|
require('nvim-web-devicons').setup()
|
||||||
require('trouble').setup()
|
require('trouble').setup()
|
||||||
|
@ -888,5 +885,3 @@ require('nvim-surround').setup {}
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
let g:conjure#mapping#doc_word = v:false
|
let g:conjure#mapping#doc_word = v:false
|
||||||
]])
|
]])
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -43,8 +43,8 @@ Host lizzi
|
||||||
User hungtr
|
User hungtr
|
||||||
Port 22
|
Port 22
|
||||||
|
|
||||||
Host ash
|
Host lizzi
|
||||||
HostName 192.155.95.41
|
HostName 172.105.135.218
|
||||||
User hungtr
|
User hungtr
|
||||||
Port 22
|
Port 22
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue