From 447c95c22da65374fa4ea59947c96bfe9ed85dd7 Mon Sep 17 00:00:00 2001 From: tomoron Date: Sat, 7 Feb 2026 00:07:10 +0100 Subject: [PATCH] disable hugepages in vfio_ready specialisation, add pythonlsp and coq-nvim for autocompletion --- homeConfigs/modules/vim.nix | 79 ++++++++++++++++++++++++++----------- homeConfigs/packages.nix | 3 +- osConfigs/global/ld.nix | 4 +- osConfigs/hosts/laptop.nix | 5 ++- 4 files changed, 62 insertions(+), 29 deletions(-) diff --git a/homeConfigs/modules/vim.nix b/homeConfigs/modules/vim.nix index bbeceaf..c4bb945 100644 --- a/homeConfigs/modules/vim.nix +++ b/homeConfigs/modules/vim.nix @@ -2,35 +2,65 @@ { options.mods.vim.enable = lib.mkOption { - type = lib.types.bool; - default = true; - description = "install and configure vim"; + type = lib.types.bool; + default = true; + description = "install and configure vim"; }; config = lib.mkIf config.mods.vim.enable { programs.neovim = { enable = true; - defaultEditor = true; + defaultEditor = true; viAlias = true; - vimAlias = true; - }; + vimAlias = true; + }; home.packages = with pkgs; [ clang-tools nixd nodejs_24 - glsl_analyzer + glsl_analyzer + (pkgs.python3.withPackages (ps: with ps; [ + python-lsp-server + pylsp-mypy + python-lsp-ruff + pycodestyle + ])) ]; - programs.neovim.extraConfig = '' +# programs.neovim.extraLuaConfig = '' +# vim.lsp.config('pylsp', {}) +# ''; + + programs.neovim.extraLuaConfig = '' + local coq = require "coq" + + vim.lsp.config('clangd', coq.lsp_ensure_capabilities({})) + vim.lsp.enable('clangd') + + vim.lsp.config('nixd', coq.lsp_ensure_capabilities({})) + vim.lsp.enable('nixd') + + vim.lsp.config('glsl_analyzer', coq.lsp_ensure_capabilities({})) + vim.lsp.enable('glsl_analyzer') + + vim.lsp.config('pylsp', coq.lsp_ensure_capabilities({ + cmd = {"pylsp", "-vvv", "--log-file", "/tmp/lsp.log"} + })) + vim.lsp.enable('pylsp') + + ''; + + programs.neovim.extraConfig = '' set number set ai autocmd BufWinLeave *.* mkview autocmd BufWinEnter *.* silent! loadview + autocmd VimEnter * COQnow --shut-up set tabstop=4 set scrolloff=10 set smartindent - set shiftwidth=4 + set shiftwidth=4 map :bnext map :bprevious nmap :wincmd k @@ -57,41 +87,42 @@ Plug 'bluz71/vim-nightfly-colors' Plug 'catppuccin/nvim', { 'as': 'catppuccin' } Plug 'tikhomirov/vim-glsl' - Plug 'lambdalisue/nerdfont.vim' - Plug 'lambdalisue/glyph-palette.vim' - Plug 'lambdalisue/fern-renderer-nerdfont.vim' - Plug 'lambdalisue/fern-git-status.vim' - Plug 'lambdalisue/fern.vim' + Plug 'lambdalisue/nerdfont.vim' + Plug 'lambdalisue/glyph-palette.vim' + Plug 'lambdalisue/fern-renderer-nerdfont.vim' + Plug 'lambdalisue/fern-git-status.vim' + Plug 'lambdalisue/fern.vim' + Plug 'ms-jpq/coq_nvim', { 'branch': 'coq' } + Plug 'ms-jpq/coq.artifacts', { 'branch': 'artifacts' } + Plug 'ms-jpq/coq.thirdparty', { 'branch': '3p' } call plug#end() colorscheme catppuccin-mocha - lua require'lspconfig'.clangd.setup{} - lua require'lspconfig'.nixd.setup{} - lua require'lspconfig'.glsl_analyzer.setup{} set signcolumn=auto nnoremap ff Telescope find_files nnoremap fg Telescope live_grep nnoremap fb Telescope buffers nnoremap fh Telescope help_tags - nnoremap fi Fern %:h + nnoremap fi Fern %:h - let g:user42 = 'tomoron' - let g:mail42 = 'tomoron@student.42angouleme.fr' - let g:fern#renderer = "nerdfont" - ''; + let g:user42 = 'tomoron' + let g:mail42 = 'tomoron@student.42angouleme.fr' + let g:fern#renderer = "nerdfont" + + ''; home.file = { #install plug.vim - ".local/share/nvim/site/autoload/plug.vim".source = "${builtins.fetchGit { + ".local/share/nvim/site/autoload/plug.vim".source = "${fetchGit { url = "https://github.com/junegunn/vim-plug"; rev = "d80f495fabff8446972b8695ba251ca636a047b0"; ref = "master"; }}/plug.vim"; #install stdheader 42 - ".config/nvim/plugin/stdheader.vim".source = "${builtins.fetchGit { + ".config/nvim/plugin/stdheader.vim".source = "${fetchGit { url = "https://github.com/42Paris/42header"; rev = "e6e6b191871545e0d43f1aad817070bc806b8fa7"; ref = "master"; diff --git a/homeConfigs/packages.nix b/homeConfigs/packages.nix index b4b0265..7cb8137 100644 --- a/homeConfigs/packages.nix +++ b/homeConfigs/packages.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/02/09 22:01:56 by tomoron #+# #+# # -# Updated: 2025/11/22 22:07:00 by tomoron ### ########.fr # +# Updated: 2026/02/06 23:43:40 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -34,7 +34,6 @@ unison brightnessctl playerctl - python3 vlc nix-index yubikey-manager diff --git a/osConfigs/global/ld.nix b/osConfigs/global/ld.nix index 0715490..db1fb5b 100644 --- a/osConfigs/global/ld.nix +++ b/osConfigs/global/ld.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/12/30 20:37:07 by tomoron #+# #+# # -# Updated: 2026/01/19 12:02:07 by tomoron ### ########.fr # +# Updated: 2026/02/05 12:47:23 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -154,5 +154,7 @@ fuse e2fsprogs + webkitgtk_4_1 + libsoup_3 ]; } diff --git a/osConfigs/hosts/laptop.nix b/osConfigs/hosts/laptop.nix index ec40545..64f3c2a 100644 --- a/osConfigs/hosts/laptop.nix +++ b/osConfigs/hosts/laptop.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/09/06 00:56:57 by tomoron #+# #+# # -# Updated: 2026/01/29 13:16:59 by tomoron ### ########.fr # +# Updated: 2026/02/03 14:40:35 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -47,7 +47,6 @@ networking.networkmanager.enable = false; specialisation.vfio_ready.configuration = { - boot.kernel.sysctl."vm.nr_hugepages" = 5120; boot.extraModulePackages = with config.boot.kernelPackages; [ kvmfr ]; boot.kernelModules = [ "kvmfr" ]; boot.extraModprobeConfig = '' @@ -141,4 +140,6 @@ services.flatpak.enable = true; + + services.k3s.enable = true; }