insects/home
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

periodic update

Browse source
This commit is contained in:
ana 2021-09-22 09:27:04 +02:00
parent 0ac971ff1f
commit 6e3f3122f1
14 changed files with 18 additions and 332 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dot_config/fish/executable_config.fish
View file

@ -3,6 +3,11 @@ function setpath
test -e $argv[1]; and set PATH $argv[1] $PATH
end
# Custom greeting
function fish_greeting
end
if test -z "$XDG_RUNTIME_DIR"
set -x XDG_RUNTIME_DIR "/tmp/$USER-runtime-dir"
if test ! -e "$XDG_RUNTIME_DIR"
@ -11,19 +16,18 @@ if test -z "$XDG_RUNTIME_DIR"
end
end
# Set Nix include path if it exists
if test -e ~/.nix-profile/etc/profile.d/nix.sh
fenv source ~/.nix-profile/etc/profile.d/nix.sh
if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
end
# PATH adjustment
setpath /opt/local/bin
setpath /opt/homebrew/bin
setpath ~/.rbenv/shims
setpath ~/.rbenv/bin
setpath ~/.cargo/bin
setpath ~/.nimble/bin
setpath ~/.local/bin
setpath ~/n/bin
setpath ~/.bin
setpath ~/.cask/bin
setpath ~/.npm-packages/bin
@ -32,6 +36,8 @@ setpath /snap/bin
setpath ~/.emacs.d/bin
setpath ~/Library/Python/3.7/bin
setpath ~/.radicle/bin
setpath ~/.edgedb/bin
setpath ~/.fly/bin
# zoxide setup
zoxide init fish | source
@ -75,6 +81,7 @@ alias mkt "cd (mktemp -d)"
alias y "sudo zypper"
alias czm "chezmoi"
alias r "ranger"
alias zcc "zig cc"
# Git Aliases
alias g "git"
alias gs "g status --short"

7
dot_config/fish/executable_fishfile
View file

@ -1,7 +0,0 @@
jethrokuan/z
jorgebucaran/fish-nvm
oh-my-fish/plugin-foreign-env
jorgebucaran/fisher
mattgreen/lucid.fish
franciscolourenco/done
laughedelic/pisces

16
dot_config/nvim/init.lua
View file

@ -1,16 +0,0 @@
-- options
require('options')
-- packages
require('pack')
-- keymaps
require('mappings')
-- plugin stuff
require('plugins.setups')
require('plugins.telescope')
require('plugins.lspconfig')
require('plugins.hardline')
require('plugins.treesitter')
require('plugins.compe')

13
dot_config/nvim/lua/common.lua
View file

@ -1,13 +0,0 @@
local vim = vim
local M = {}
function M.set_keymap(mode, from, to)
local opts = {noremap = true, silent = false}
vim.api.nvim_set_keymap(mode, from, to, opts)
end
function M.nvim_set_keymap(mode, from, to, opts)
vim.api.nvim_set_keymap(mode, from, to, opts)
end
return M

57
dot_config/nvim/lua/mappings.lua
View file

@ -1,57 +0,0 @@
local set_keymap = require('common').set_keymap
-- reload vimrc
set_keymap('n', '<leader>sv', '<cmd>Reload<cr>')
-- basic
set_keymap('n', '<leader>q', '<cmd>q!<cr>')
set_keymap('n', '<leader>x', '<cmd>x<cr>')
-- moving
set_keymap('n', '<c-a>', '<Esc>I')
set_keymap('n', 'j', 'gj')
set_keymap('n', 'k', 'gk')
-- editing
set_keymap('n', 'Y', 'y$')
set_keymap('n', '<a-Up>', '<cmd>m .-2<cr>')
set_keymap('n', '<a-Down>', '<cmd>m .+1<cr>')
set_keymap('i', '<c-d>', '<Esc>ddi')
-- splits
set_keymap('n', '<leader>s', '<c-w>v')
set_keymap('n', '<leader>j', '<c-w>j')
set_keymap('n', '<leader>k', '<c-w>k')
set_keymap('n', '<leader>h', '<c-w>h')
set_keymap('n', '<leader>l', '<c-w>l')
-- tabs
set_keymap('n', '<a-Tab>', 'gT')
set_keymap('n', '<Tab>', 'gt')
set_keymap('n', '<leader>t[', '<cmd>tabmove -1<cr>')
set_keymap('n', '<leader>t]', '<cmd>tabmove +1<cr>')
set_keymap('n', '<leader>1', '1gt')
set_keymap('n', '<leader>2', '2gt')
set_keymap('n', '<leader>3', '3gt')
set_keymap('n', '<leader>4', '4gt')
set_keymap('n', '<leader>5', '5gt')
set_keymap('n', '<leader>6', '6gt')
set_keymap('n', '<leader>7', '7gt')
set_keymap('n', '<leader>8', '8gt')
set_keymap('n', '<leader>9', '9gt')
set_keymap('n', '<leader>0', '<cmd>tablast<cr>')
-- LSP
set_keymap('n', '<leader>ld', '<cmd>lua vim.lsp.buf.definition()<cr>')
set_keymap('n', '<leader>lD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
set_keymap('n', '<leader>lt', '<cmd>lua vim.lsp.buf.type_definition()<cr>')
set_keymap('n', '<leader>li', '<cmd>lua vim.lsp.buf.implementation()<cr>')
set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
set_keymap('n', 'U', '<cmd>lua vim.lsp.buf.signature_help()<cr>')
set_keymap('n', '<leader>lr', '<cmd>lua vim.lsp.buf.references()<cr>')
set_keymap('n', '<leader>ls', '<cmd>lua vim.lsp.buf.document_symbol()<cr>')
set_keymap('n', '<leader>lS', '<cmd>lua vim.lsp.buf.workspace_symbol()<cr>')
set_keymap('n', '<leader>lR', '<cmd>lua vim.lsp.buf.rename()<cr>')
set_keymap('n', '<leader>lf', '<cmd>lua vim.lsp.buf.formatting()<cr>')
-- plug manager
set_keymap('n', '<leader>pi', '<cmd>PaqInstall<cr>')
set_keymap('n', '<leader>pu', '<cmd>PaqUpdate<cr>')
set_keymap('n', '<leader>pc', '<cmd>PaqClean<cr>')
-- hop
set_keymap('n', '<leader>hw', '<cmd>HopWord<cr>')
set_keymap('n', '<leader>hl', '<cmd>HopLine<cr>')

59
dot_config/nvim/lua/options.lua
View file

@ -1,59 +0,0 @@
local cmd = vim.cmd
local opt = vim.opt
local has = vim.fn.has
cmd('filetype plugin indent on')
cmd('syntax enable')
-- system
opt.encoding = 'utf-8'
opt.fileencoding = 'utf-8'
opt.fileencodings = {'utf-8'}
opt.backup = false -- no .bak
opt.swapfile = false -- no .swap
opt.undofile = true -- use undo file
opt.updatetime = 300 -- time (in ms) to write to swap file
-- buffer
opt.expandtab = true
opt.tabstop = 2
opt.softtabstop = 2
opt.autoindent = true
opt.shiftwidth = 2
-- window
opt.number = true
-- editing
vim.g.mapleader = ' ' --space
vim.g.maplocalleader = ' '
opt.whichwrap = 'b,s,<,>,[,]'
opt.backspace = {'indent', 'eol', 'start'}
opt.list = true
opt.ignorecase = false
opt.hlsearch = true
opt.incsearch = false
opt.inccommand = 'nosplit'
opt.completeopt = {'menuone', 'noselect'}
opt.hidden = true
opt.cursorline = true
opt.ruler = true
opt.colorcolumn = {120}
opt.signcolumn = 'yes'
opt.mouse = 'nv'
cmd('set mousehide')
opt.showmatch = true
opt.cmdheight = 2
opt.wildmenu = true
opt.wildmode = {'longest', 'full'}
opt.splitright = true
opt.splitbelow = true
opt.shortmess:append('c')
if not has('gui_running') then
opt.t_Co = 256
end
opt.background = 'dark'
if has('termguicolors') then
cmd('let &t_8f = "\\<Esc>[38;2;%lu;%lu;%lum"')
cmd('let &t_8b = "\\<Esc>[48;2;%lu;%lu;%lum"')
opt.termguicolors = true
end

47
dot_config/nvim/lua/pack.lua
View file

@ -1,47 +0,0 @@
local vim = vim
vim.cmd 'packadd paq-nvim'
local paq = require'paq-nvim'.paq
paq{'savq/paq-nvim', opt = true}
-- libraries
paq 'nvim-lua/popup.nvim'
paq 'nvim-lua/plenary.nvim'
-- files
paq 'tjdevries/colorbuddy.nvim' -- color highlighting
paq 'maaslalani/nordbuddy' -- theme
paq 'mhinz/vim-startify' -- startup page
paq 'nvim-telescope/telescope.nvim' -- fuzzy finder
paq 'rmagatti/auto-session' -- auto session
paq 'rmagatti/session-lens' -- session lens for telescope
paq 'crispgm/telescope-heading.nvim' -- markdown heading for telescope
-- views
paq 'ojroques/nvim-hardline' -- status line
paq 'crispgm/nvim-tabline' -- tab line
paq 'dstein64/nvim-scrollview' -- scrollbar
paq 'google/vim-searchindex' -- search index
paq 'editorconfig/editorconfig-vim' -- editorconfig support
paq 'RRethy/vim-illuminate' -- word highlighting
paq 'lewis6991/gitsigns.nvim' -- git gutter
paq 'f-person/git-blame.nvim' -- git blame annotations
-- edit
paq 'phaazon/hop.nvim' -- hopping around
paq 'tpope/vim-surround' -- change surrounds
paq 'tpope/vim-commentary' -- comment stuff out/in
paq 'christoomey/vim-system-copy' -- copy n paste into system clipboard
paq 'steelsojka/pears.nvim' -- auto bracket match and other stuff
-- language
paq {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} -- treesitter
paq 'nvim-treesitter/playground' -- ts playground
paq 'nvim-treesitter/nvim-treesitter-textobjects' -- ts textobjects
paq 'neovim/nvim-lspconfig' -- lsp client config
paq 'hrsh7th/nvim-compe' -- completion
paq 'rust-lang/rust.vim' -- rust support
paq 'elixir-editors/vim-elixir' -- elixir support
-- misc
paq 'famiu/nvim-reload' -- reloading the vimrc

36
dot_config/nvim/lua/plugins/compe.lua
View file

@ -1,36 +0,0 @@
require'compe'.setup {
enabled = true;
autocomplete = true;
debug = false;
min_length = 1;
preselect = 'enable';
throttle_time = 80;
source_timeout = 200;
incomplete_delay = 400;
max_abbr_width = 100;
max_kind_width = 100;
max_menu_width = 100;
documentation = true;
source = {
path = true;
buffer = true;
calc = true;
vsnip = true;
nvim_lsp = true;
nvim_lua = true;
spell = true;
tags = true;
snippets_nvim = true;
treesitter = true;
}
}
local vim = vim
local opts = {
noremap = true,
silent = true,
expr = true,
}
vim.api.nvim_set_keymap('i', '<cr>', "compe#confirm('<CR>')", opts)
vim.api.nvim_set_keymap('i', '<c-c>', "compe#close('<c-c>')", opts)

16
dot_config/nvim/lua/plugins/hardline.lua
View file

@ -1,16 +0,0 @@
require('hardline').setup {
bufferline = false,
sections = {
{class = 'mode', item = require('hardline.parts.mode').get_item},
{class = 'high', item = require('hardline.parts.git').get_item, hide = 80},
'%<',
{class = 'med', item = require('hardline.parts.filename').get_item},
{class = 'med', item ='%='},
{class = 'low', item = require('hardline.parts.wordcount').get_item, hide = 80},
{class = 'error', item = require('hardline.parts.lsp').get_error},
{class = 'warning', item = require('hardline.parts.lsp').get_warning},
{class = 'warning', item = require('hardline.parts.whitespace').get_item},
{class = 'high', item = require('hardline.parts.filetype').get_item, hide = 80},
{class = 'mode', item = require('hardline.parts.line').get_item},
},
}

5
dot_config/nvim/lua/plugins/lspconfig.lua
View file

@ -1,5 +0,0 @@
require('lspconfig').tsserver.setup{}
require('lspconfig').rust_analyzer.setup{}
require('lspconfig').elixirls.setup {
cmd = {'/Users/lu/.local/bin/elixir-ls/language_server.sh'}
}

5
dot_config/nvim/lua/plugins/setups.lua
View file

@ -1,5 +0,0 @@
local vim = vim
require('tabline').setup{}
require('gitsigns').setup()
vim.api.nvim_command('colorscheme nordbuddy')

25
dot_config/nvim/lua/plugins/telescope.lua
View file

@ -1,25 +0,0 @@
require('telescope').load_extension('session-lens')
require('telescope').load_extension('heading')
local set_keymap = require('../common').set_keymap
set_keymap('n', '<leader>ff', '<cmd>Telescope find_files<cr>')
set_keymap('n', '<leader>p', '<cmd>Telescope find_files<cr>') -- alternative cuz im used to it from vscode
set_keymap('n', '<leader><leader>', '<cmd>Telescope find_files<cr>') -- another alternative, this time from doom emacs
set_keymap('n', '<leader>fd', '<cmd>Telescope git_files<cr>')
set_keymap('n', '<leader>fg', '<cmd>Telescope live_grep<cr>')
set_keymap('n', '<leader>fb', '<cmd>Telescope buffers')
set_keymap('n', '<leader>fh', '<cmd>Telescope help_tags<cr>')
set_keymap('n', '<leader>fl', '<cmd>Telescope lsp_document_symbols<cr>')
set_keymap('n', '<leader>fk', '<cmd>Telescope keymaps<cr>')
set_keymap('n', '<leader>fm', '<cmd>Telescope heading<cr>')
local actions = require('telescope.actions')
require('telescope').setup{
defaults = {
mappings = {
i = {
['<esc>'] = actions.close
},
},
}
}

37
dot_config/nvim/lua/plugins/treesitter.lua
View file

@ -1,37 +0,0 @@
require'nvim-treesitter.configs'.setup {
highlight = {
enable = true
},
ensure_installed = 'maintained',
indent = {
enable = true
},
incremental_selection = {
enable = true,
keymaps = {
init_selection = 'gnn',
node_incremental = 'grn',
scope_incremental = 'grc',
node_decremental = 'grm'
},
},
playground = {
enable = true,
disable = {},
updatetime = 25,
persist_queries = false
},
textobjects = {
select = {
enable = true,
keymaps = {
['af'] = '@function.outer',
['if'] = '@function.inner',
['ac'] = '@class.outer',
['ic'] = '@class.inner',
['aP'] = '@parameter.outer',
['iP'] = '@parameter.inner'
}
}
}
}

12
dot_gitconfig
View file

@ -1,7 +1,7 @@
[user]
name = mokou
email = mokou@fastmail.com
signingkey = 0x53A8BB015F9EAE63
name = ana
email = ana@ana.st
signingkey = 0x6F33B647A7AC80CE
[core]
editor = vim
[push]
@ -10,7 +10,9 @@
rebase = true
[rebase]
autoStash = true
[gpg]
program = /usr/local/bin/gpg
[sendemail]
smtpserver = /opt/homebrew/bin/msmtp
[gpg]
program = gpg
[init]
defaultBranch = main