greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'neovim-lua-config'

Browse Source
This commit is contained in:
Greg Hellings
2023-06-28 21:07:21 -05:00
parent f99cfcb3bf 3faab8db04
commit b82acf0b3f
9 changed files with 418 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+6 -6
View File
@@ -113,11 +113,11 @@
]
},
"locked": {
"lastModified": 1683813037,
"narHash": "sha256-UMEXfYLVcI4p0JUHQD07UWglqj7XUw6xhdJqqNRu4KY=",
"lastModified": 1687204608,
"narHash": "sha256-rZ0e0iAIQM7vlsMd2/pcGfymZzNBRawObFgqIpxE94c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d97e8f8861a7ad3cb2f72adf5b2cd14ab302c593",
"rev": "f06a43dca05fb7f1aa44742bf861d9c827b45122",
"type": "github"
},
"original": {
@@ -177,11 +177,11 @@
},
"nixunstable": {
"locked": {
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
"lastModified": 1686960236,
"narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
"rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"type": "github"
},
"original": {
home/init.lua
+242
View File
@@ -0,0 +1,242 @@
-- Core vim settings
vim.opt.background="dark"
vim.opt.copyindent=true
vim.opt.expandtab=false
vim.opt.hidden=true
vim.opt.ignorecase=true
vim.opt.mouse="a"
vim.opt.number=true
vim.opt.relativenumber=true
vim.opt.shiftwidth=4
vim.opt.smartcase=true
vim.opt.tabstop=4
vim.opt.preserveindent=true
vim.opt.softtabstop=0
vim.opt.wrap=false
vim.opt.showcmd=true
vim.opt.cursorline=true
vim.opt.lazyredraw=true
vim.opt.showmatch=true
vim.opt.hlsearch=true
vim.opt.backup=false
vim.opt.writebackup=false
vim.opt.signcolumn="yes"
vim.opt.listchars="tab:→ ,extends:→,precedes:←,trail:·,eol:¬"
vim.opt.list=true
-- dunno about these?
-- syntax enable -- on by default in neovim
vim.cmd [[colorscheme gruvbox]]
-- ======================================================================
--
-- nvim-cmp configuration
--
-- ======================================================================
--local cmp = require'cmp'
--cmp.setup({
--snippet = {
--expand = function(args)
--vim.fn["vsnip#anonymous"](args.body)
--end,
--},
--window = {
---- completion = cmp.config.window.bordered(),
---- documentation = cmp.config.window.bordered(),
--},
--mapping = cmp.mapping.preset.insert({
--['<C-b>'] = cmp.mapping.scroll_docs(-4),
--['<C-f>'] = cmp.mapping.scroll_docs(4),
--['<C-space>'] = cmp.mapping.complete(),
--['<C-e>'] = cmp.mapping.abort(),
--['<CR>'] = cmp.mapping.confirm({ select = true }),
--}),
--sources = cmp.config.sources({
--{ name = 'nvim_lspconfig' },
--{ name = 'vsnip' },
--},{
--{ name = 'buffer' }
--})
--})
--
--cmp.setup.filetype('gitcommit', {
--sources = cmp.config.sources({
--{ name = 'git' }
--},{
--{ name = 'buffer' }
--})
--})
--
--cmp.setup.cmdline({ '/', '?' }, {
--mapping = cmp.mapping.preset.cmdline(),
--sources = { { name = 'buffer' } }
--})
--
--cmp.setup.cmdline(':', {
--mapping = cmp.mapping.preset.cmdline(),
--sources = cmp.config.sources({
--{ name = 'path' }
--},{
--{ name = 'cmdline' }
--})
--})
--
--local capabilities = require('cmp_nvim_lsp').default_capabilities()
--local lspconfig = require('lspconfig')
---- Add each LSP that you have configured here
----require('lspconfig')['<LANGUAGE_SERVER_HERE>'].setup {
---- capabilities = capabilities
----}
----lspconfig.pyright.setup { capabilities = capabilities }
--lspconfig.ansiblels.setup { capabilities = capabilities }
--lspconfig.jedi_language_server.setup { capabilities = capabilities }
-- ======================================================================
--
-- automatic commands
--
-- ======================================================================
local api = vim.api
-- Highlights bad whitespace
--api.nvim_create_autocmd("ColorScheme", { command = "highlight ExtraWhitespace ctermbg=red guibg=red" })
--api.nvim_create_autocmd("BufWinEnter", { command = "match ExtraWhitespace /\s\+$/" })
--api.nvim_create_autocmd("InsertEnter", { command = "match ExtraWhitespace /\s\+\%#\@<!$/" })
--api.nvim_create_autocmd("InsertLeave", { command = "match ExtraWhitespace /\s\+$/" })
vim.fn.matchadd('errorMsg', [[\s\+$]])
api.nvim_create_autocmd("BufWinLeave", { command = "call clearmatches()" })
-- Automatically source .vimrc when we write that file
-- This is probably no longer valid since we're writing init.lua, but we'll keep it for the sake
-- of posterity at the moment
api.nvim_create_autocmd("BufWritePost", {
pattern = ".vimrc",
command = "source $MYVIMRC"
})
-- Toggles absolute line numbers on/off when a window has focus or not
numbertoggle = api.nvim_create_augroup("numbertoggle", { clear = true })
api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave" }, {
command = "set relativenumber",
group = numbertoggle
})
api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter" }, {
command = "set norelativenumber",
group = numbertoggle
})
-- Set file highlighting to Ruby for Vagrantfiles
api.nvim_create_autocmd({ "BufRead", "BufNewFile"}, {
pattern = "Vagrantfile*",
command = "set filetype=ruby"
})
-- ======================================================================
--
-- Plugin configurations
--
-- ======================================================================
-- Set filetype to the way I want it
vim.g.nix_recommended_style=0
-- Settings for CtrlP
vim.opt.wildignore="*.swp,*.pyc,*.class,.tox"
-- Settings for NerdTree
vim.g.NERDTreeIgnore = {'\\.pyc$', '\\.o$', '\\.class$'}
-- indent guides
vim.g.indent_guides_enable_on_vim_startup = 1
-- Tell syntastic to use yamllint
vim.g.syntastic_yaml_checkers = {'yamllint'}
vim.g.syntastic_yaml_yamllint_args = {}
vim.g.syntastic_shell = "${pkgs.bash}/bin/bash"
-- Shortcuts for resolving git diff conflicts
vim.g.diffget_local_map = "gl"
vim.g.diffget_upstream_map = "gu"
-- ======================================================================
--
-- Custom commands and key mappings
--
-- ======================================================================
local all = {"n", "v", "i"}
-- Key mappings
-- map <F2> <Esc>\be
-- imap <F2> <Esc>\be
vim.keymap.set(all, "<F2>", "<Esc>\\be")
-- map <F4> <Esc>:NERDTreeToggle<Cr>
vim.keymap.set(all, "<F4>", "<Esc>:NERDTreeToggle")
-- Which file list to pop up
-- silent !git rev-parse --is-inside-work-tree
-- if v:shell_error == 0
-- map <C-p> :GFiles --cached --others --exclude-standard<CR>
-- map <C-o> :GFiles?
--else
-- map <C-p> :Files<CR>
--endif
if api.nvim_command_output("!git rev-parse --is-inside-work-tree") == true then
vim.keymap.set(all, "<C-p>", ":GFiles --cached --others --exclude-standard<CR>")
vim.keymap.set(all, "<C-o>", ":GFiles?")
else
vim.keymap.set(all, "<C-p>", ":Files")
end
-- map <F6> <Esc>:Files<Cr>
vim.keymap.set(all, "<F6>", "<Esc>:Files<CR>")
-- Allows navigating splits
-- map <C-j> <C-w>j<C-w><Cr>
-- map <C-k> <C-w>k<C-w><Cr>
-- map <C-h> <C-w>h<C-w><Cr>
-- map <C-l> <C-w>l<C-w><Cr>
vim.keymap.set(all, "<C-j>", "<C-w>j<C-w><Cr>")
vim.keymap.set(all, "<C-k>", "<C-w>k<C-w><Cr>")
vim.keymap.set(all, "<C-h>", "<C-w>h<C-w><Cr>")
vim.keymap.set(all, "<C-l>", "<C-w>l<C-w><Cr>")
-- ============================================================================
-- User functions to just make life easier
-- ============================================================================
-- Creates the directory for a file if it doesn't already exist.
bufWritePres = vim.cmd [[
function! s:MkNonExDir(file, buf)
if empty(getbufvar(a:buf, '&buftype')) && a:file!~#'\v^\w+\:\/'
let dir=fnamemodify(a:file, ':h')
if !isdirectory(dir)
call mkdir(dir, 'p')
endif
endif
endfunction
augroup BWCCreateDir
autocmd!
autocmd BufWritePre * :call s:MkNonExDir(expand('<afile>'), +expand('<abuf>'))
augroup END
]]
-- Return indent (all whitespace at start of a line), converted from
-- tabs to spaces if what = 1, or from spaces to tabs otherwise.
-- When converting to tabs, result has no redundant spaces.
vim.cmd [[
function! Indenting(indent, what, cols)
let spccol = repeat(' ', a:cols)
let result = substitute(a:indent, spccol, '\t', 'g')
let result = substitute(result, ' \+\ze\t', ''', 'g')
if a:what == 1
let result = substitute(result, '\t', spccol, 'g')
endif
return result
endfunction
]]
--Convert whitespace used for indenting (before first non-whitespace).
--what = 0 (convert spaces to tabs), or 1 (convert tabs to spaces).
--cols = string with number of columns per tab, or empty to use 'tabstop'.
--The cursor position is restored, but the cursor will be in a different
--column when the number of characters in the indent of the line is changed.
vim.cmd [[
function! IndentConvert(line1, line2, what, cols)
let savepos = getpos('.')
let cols = empty(a:cols) ? &tabstop : a:cols
execute a:line1 . ',' . a:line2 . 's/^\s\+/\=Indenting(submatch(0), a:what, cols)/e'
call histdel('search', -1)
call setpos('.', savepos)
endfunction
command! -nargs=? -range=% Space2Tab call IndentConvert(<line1>,<line2>,0,<q-args>)
command! -nargs=? -range=% Tab2Space call IndentConvert(<line1>,<line2>,1,<q-args>)
command! -nargs=? -range=% RetabIndent call IndentConvert(<line1>,<line2>,&et,<q-args>)
]]
home/vim.nix
+17 -15
View File
@@ -22,6 +22,11 @@ let
};
in
{
home.packages = with pkgs; [
ansible-language-server
pyright
];
programs.neovim = {
enable = true;
viAlias = true;
@@ -30,24 +35,17 @@ in
plugins = with pkgs.vimPlugins; [
ansible-vim
bufexplorer
coc-cmake
coc-css
coc-go
coc-highlight
coc-html
coc-java
coc-json
coc-lists
coc-markdownlint
coc-nvim
coc-pyright
coc-tslint
coc-vimtex
coc-yaml
#cmp-nvim-lsp
#cmp-vsnip
#nvim-lspconfig
#nvim-cmp
context-vim
direnv-vim
fzf-vim
nerdtree
nvim-notify
vim-airline
vim-gitgutter
vim-flake8
@@ -58,6 +56,10 @@ in
vim-xonsh
gruvbox
];
extraConfig = builtins.readFile ./vimrc;
#extraConfig = builtins.readFile ./vimrc;
extraLuaConfig = builtins.readFile ./init.lua;
coc = {
enable = true;
};
};
}
home/vimrc
+61 -145
View File
@@ -29,153 +29,68 @@ set updatetime=300
set listchars=tab:→\ ,extends:→,precedes:←,trail:·,eol:¬
set list
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
""""""""""" coc.nnim configuration """""""""""""""""""""""""""""""""""""
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" https://github.com/neoclide/coc.nvim
" Use tab for trigger completion with characters ahead and navigate.
" NOTE: There's always complete item selected by default, you may want to enable
" no select by `"suggest.noselect": true` in your configuration file.
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
" other plugin before putting this into your config.
inoremap <silent><expr> <TAB>
\ coc#pum#visible() ? coc#pum#next(1) :
\ CheckBackspace() ? "\<Tab>" :
\ coc#refresh()
inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
" Make <CR> to accept selected completion item or notify coc.nvim to format
" <C-g>u breaks current undo, please make your own choice.
inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
function! CheckBackspace() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
" Use <c-space> to trigger completion.
if has('nvim')
inoremap <silent><expr> <c-space> coc#refresh()
else
inoremap <silent><expr> <c-@> coc#refresh()
endif
" Use `[g` and `]g` to navigate diagnostics
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next)
" GoTo code navigation.
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window.
nnoremap <silent> K :call ShowDocumentation()<CR>
function! ShowDocumentation()
if CocAction('hasProvider', 'hover')
call CocActionAsync('doHover')
else
call feedkeys('K', 'in')
endif
endfunction
" Highlight the symbol and its references when holding the cursor.
autocmd CursorHold * silent call CocActionAsync('highlight')
" Symbol renaming.
nmap <leader>rn <Plug>(coc-rename)
" Formatting selected code.
xmap <leader>f <Plug>(coc-format-selected)
nmap <leader>f <Plug>(coc-format-selected)
augroup mygroup
autocmd!
" Setup formatexpr specified filetype(s).
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
" Update signature help on jump placeholder.
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
augroup end
" Applying codeAction to the selected region.
" Example: `<leader>aap` for current paragraph
xmap <leader>a <Plug>(coc-codeaction-selected)
nmap <leader>a <Plug>(coc-codeaction-selected)
" Remap keys for applying codeAction to the current buffer.
nmap <leader>ac <Plug>(coc-codeaction)
" Apply AutoFix to problem on the current line.
nmap <leader>qf <Plug>(coc-fix-current)
" Run the Code Lens action on the current line.
nmap <leader>cl <Plug>(coc-codelens-action)
" Map function and class text objects
" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
xmap if <Plug>(coc-funcobj-i)
omap if <Plug>(coc-funcobj-i)
xmap af <Plug>(coc-funcobj-a)
omap af <Plug>(coc-funcobj-a)
xmap ic <Plug>(coc-classobj-i)
omap ic <Plug>(coc-classobj-i)
xmap ac <Plug>(coc-classobj-a)
omap ac <Plug>(coc-classobj-a)
" Remap <C-f> and <C-b> for scroll float windows/popups.
if has('nvim-0.4.0') || has('patch-8.2.0750')
nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
endif
" Use CTRL-S for selections ranges.
" Requires 'textDocument/selectionRange' support of language server.
nmap <silent> <C-s> <Plug>(coc-range-select)
xmap <silent> <C-s> <Plug>(coc-range-select)
" Add `:Format` command to format current buffer.
command! -nargs=0 Format :call CocActionAsync('format')
" Add `:Fold` command to fold current buffer.
command! -nargs=? Fold :call CocAction('fold', <f-args>)
" Add `:OR` command for organize imports of the current buffer.
command! -nargs=0 OR :call CocActionAsync('runCommand', 'editor.action.organizeImport')
" Add (Neo)Vim's native statusline support.
" NOTE: Please see `:h coc-status` for integrations with external plugins that
" provide custom statusline: lightline.vim, vim-airline.
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
" Mappings for CoCList
" Show all diagnostics.
nnoremap <silent><nowait> <space>a :<C-u>CocList diagnostics<cr>
" Manage extensions.
nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<cr>
" Show commands.
nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr>
" Find symbol of current document.
nnoremap <silent><nowait> <space>o :<C-u>CocList outline<cr>
" Search workspace symbols.
nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr>
" Do default action for next item.
nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR>
" Do default action for previous item.
nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR>
" Resume latest coc list.
nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR>
" nvim-cmp configuration
"
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
""""""""""" END coc.nnim configuration """""""""""""""""""""""""""""""""
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
lua <<EOF
local cmp = require'cmp'
cmp.setup({
snippet = {
expand = function(args)
vim.fn["vsnip#anonymous"](args.body)
end,
},
window = {
-- completion = cmp.config.window.bordered(),
-- documentation = cmp.config.window.bordered(),
},
mapping = cmp.mapping.preset.insert({
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.abort(),
['<CR>'] = cmp.mapping.confirm({ select = true }),
}),
sources = cmp.config.sources({
{ name = 'nvim_lspconfig' },
{ name = 'vsnip' },
},{
{ name = 'buffer' }
})
})
cmp.setup.filetype('gitcommit', {
sources = cmp.config.sources({
{ name = 'git' }
},{
{ name = 'buffer' }
})
})
cmp.setup.cmdline({ '/', '?' }, {
mapping = cmp.mapping.preset.cmdline(),
sources = { { name = 'buffer' } }
})
cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = 'path' }
},{
{ name = 'cmdline' }
})
})
local capabilities = require('cmp_nvim_lsp').default_capabilities()
local lspconfig = require('lspconfig')
-- Add each LSP that you have configured here
--require('lspconfig')['<LANGUAGE_SERVER_HERE>'].setup {
-- capabilities = capabilities
--}
--lspconfig.pyright.setup { capabilities = capabilities }
lspconfig.ansiblels.setup { capabilities = capabilities }
lspconfig.jedi_language_server.setup { capabilities = capabilities }
EOF
" Set filetype to the way I want it
let g:nix_recommended_style = 0
@@ -203,6 +118,7 @@ let g:diffget_upstream_map = 'gu'
" Key mappings
map <F2> <Esc>\be
imap <F2> <Esc>\be
map <F4> <Esc>:NERDTreeToggle<Cr>
silent !git rev-parse --is-inside-work-tree
if v:shell_error == 0
overlays/default.nix
+14 -4
View File
@@ -10,6 +10,7 @@ let
flake8
ipython
jedi
jedi-language-server
mypy
pylint
pyyaml
@@ -48,14 +49,21 @@ let
});
in rec {
#python3 = final.unstable.python3;
gregpy = myPython;
## Testing adding python packages in the correct manner
pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [
(python-final: python-prev: {
django-rapyd-modernauth = python-final.callPackage ./django-rapyd-modernauth.nix {};
xonsh-apipenv = cp ./xonsh-apipenv.nix {};
xonsh-direnv = cp ./xonsh-direnv.nix {};
})
];
my-py-addons = rec {
copier = cp ./copier.nix {
inherit iteration-utilities
jinja2-ansible-filters
pydantic
pyyaml-include
;
};
@@ -63,7 +71,6 @@ in rec {
jinja2-ansible-filters = cp ./jinja2-ansible-filters.nix {};
pydantic = cp ./pydantic.nix {};
pyyaml-include = cp ./pyyaml-include.nix {};
xonsh-direnv = cp ./xonsh-direnv.nix {};
};
#fcitx-engines = if ! prev.stdenv.isDarwin then prev.fcitx5 else prev.fcitx-engines;
@@ -79,7 +86,10 @@ in rec {
xonsh = prev.xonsh.overridePythonAttrs (old: rec{
python3 = final.gregpy;
propagatedBuildInputs = old.propagatedBuildInputs ++ [ my-py-addons.xonsh-direnv ];
propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [
xonsh-apipenv
xonsh-direnv
];
});
bitwarden = macOver ./mac/bitwarden.nix "bitwarden";
overlays/django-rapyd-modernauth.nix
+45
View File
@@ -0,0 +1,45 @@
{ lib, buildPythonPackage, fetchPypi, pkgs}:
let
pydeps = pypkgs: with pypkgs; [
click
django
python-dotenv
pytz
setuptools
sqlparse
zipp
];
in buildPythonPackage rec {
pname = "django-rapyd-modernauth";
version = "0.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kDZjI32LcKsmLI38ruINKOUfi6lWTIqXF5qIQHi0LeQ=";
};
meta = with lib; {
description = "A Django application that provides a custom User model where the username is the email address.";
homepage = "https://github.com/karthicraghupathi/django_rapyd_modernauth";
license = licenses.afl20;
maintainers = [];
};
doCheck = false;
buildInputs = with pkgs; [
#(python3.withPackages pydeps)
click
django
python-dotenv
pytz
setuptools
sqlparse
zipp
];
nativeBuildInputs = with pkgs; [
#(python3.withPackages pydeps)
];
}
overlays/packages.nix
+4
View File
@@ -14,6 +14,10 @@ flake-utils.lib.eachDefaultSystemMap (system:
brew = pkgs.callPackage ./homebrew.nix {};
django-rapyd-modernauth = pkgs.callPackage ./django-rapyd-modernauth.nix {
buildPythonPackage = pkgs.python3.pkgs.buildPythonPackage;
};
xonsh-direnv = pkgs.callPackage ./xonsh-direnv.nix {
buildPythonPackage = pkgs.python3.pkgs.buildPythonPackage;
fetchPypi = pkgs.python.pkgs.fetchPypi;
overlays/pydantic.nix
-33
View File
@@ -1,33 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, pkgs,
typing-extensions
}:
let
pydeps = [
typing-extensions
];
in buildPythonPackage rec {
pname = "pydantic";
version = "1.10.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kbjiGIUu9gB8K5jNhhYBxqCfGqMru7dPq1scM9Sh5BA=";
};
meta = with lib; {
description = "Data validation and settings management using Python type hints.";
homepage = "https://github.com/pydantic/pydantic";
license = licenses.mit;
maintainers = [];
};
doCheck = false;
propagatedBuildInputs = pydeps;
buildInputs = [];
nativeBuildInputs = with pkgs; [
];
}
overlays/xonsh-apipenv.nix
+29
View File
@@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchFromGitHub, pkgs}:
buildPythonPackage rec {
pname = "xonsh-apipenv";
version = "0.4.0";
src = fetchFromGitHub {
owner = "deeuu";
repo = "xontrib-apipenv";
rev = "0.4.0";
sha256 = "sha256-uFn3kF7P4wykd72XkQx6cPWLhBOh2SDQBcI3Idc2rFM=";
};
meta = with lib; {
description = "Auto pipenv support for Xonsh";
homepage = "https://github.com/deeuu/xontrib-apipenv";
license = licenses.mit;
maintainers = [];
};
doCheck = false;
buildInputs = with pkgs; [
pipenv
];
nativeBuildInputs = [
];
}