From 881ffab22100214c8d02abb11b66d26020707432 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Sun, 17 Nov 2024 19:31:38 +0100 Subject: [PATCH] treewide: use neovim from standalone flake --- flake.lock | 102 ++++++++------ flake.nix | 5 +- home/programs/default.nix | 12 +- home/programs/editors/neovim.nix | 223 ------------------------------- 4 files changed, 74 insertions(+), 268 deletions(-) delete mode 100644 home/programs/editors/neovim.nix diff --git a/flake.lock b/flake.lock index e934c55..b4c2e33 100644 --- a/flake.lock +++ b/flake.lock @@ -558,6 +558,7 @@ "naersk_2": { "inputs": { "nixpkgs": [ + "neovim-flake", "nvf", "rnix-lsp", "nixpkgs" @@ -577,13 +578,36 @@ "type": "github" } }, + "neovim-flake": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nvf": "nvf" + }, + "locked": { + "lastModified": 1731867828, + "narHash": "sha256-7OSiuI0Jgc5rLXkBuKzj7mNxKkkESqO2rwD+PDQHoqw=", + "ref": "refs/heads/main", + "rev": "5bbc441313c556a4dbc9f27a369e1bcfe5ccce65", + "revCount": 1, + "type": "git", + "url": "https://git.nezia.dev/nezia/neovim-flake" + }, + "original": { + "type": "git", + "url": "https://git.nezia.dev/nezia/neovim-flake" + } + }, "nil": { "inputs": { "flake-utils": [ + "neovim-flake", "nvf", "flake-utils" ], "nixpkgs": [ + "neovim-flake", "nvf", "nixpkgs" ], @@ -607,7 +631,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -829,38 +853,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1726871744, "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", @@ -876,7 +868,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -892,6 +884,38 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "type": "github" + } + }, "nixpkgs_9": { "locked": { "lastModified": 1731531548, @@ -930,7 +954,7 @@ "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "nmd": "nmd", "plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-bufdelete-nvim": "plugin-bufdelete-nvim", @@ -2756,7 +2780,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "utils": "utils_2" }, "locked": { @@ -2783,11 +2807,11 @@ "home-manager": "home-manager_2", "ironbar": "ironbar", "lanzaboote": "lanzaboote", + "neovim-flake": "neovim-flake", "niri": "niri", "nix-index-db": "nix-index-db", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", - "nvf": "nvf", + "nixpkgs": "nixpkgs_8", "plasma-manager": "plasma-manager", "portfolio": "portfolio", "systems": "systems_6", @@ -2844,11 +2868,13 @@ "rust-overlay_3": { "inputs": { "flake-utils": [ + "neovim-flake", "nvf", "nil", "flake-utils" ], "nixpkgs": [ + "neovim-flake", "nvf", "nil", "nixpkgs" diff --git a/flake.nix b/flake.nix index 10da677..6ee7a15 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; niri.url = "github:sodiboo/niri-flake"; - nvf.url = "github:notashelf/nvf"; + neovim-flake = { + url = "git+https://git.nezia.dev/nezia/neovim-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; portfolio.url = "github:nezia1/portfolio"; plasma-manager = { url = "github:nix-community/plasma-manager"; diff --git a/home/programs/default.nix b/home/programs/default.nix index 6113a58..4aa5513 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -1,10 +1,13 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { imports = [ ./browsers ./media ./xdg.nix ./gtk.nix - ./editors/neovim.nix ./editors/helix.nix ]; @@ -35,9 +38,6 @@ nautilus simple-scan entr - # inputs.self.packages.${pkgs.system}.mcuxpresso.ide - # dfu-util - # segger-jlink - # inputs.self.packages.${pkgs.system}.mcuxpresso.config-tools + inputs.neovim-flake.packages.${pkgs.system}.default ]; } diff --git a/home/programs/editors/neovim.nix b/home/programs/editors/neovim.nix deleted file mode 100644 index 58d7814..0000000 --- a/home/programs/editors/neovim.nix +++ /dev/null @@ -1,223 +0,0 @@ -{ - inputs, - pkgs, - lib, - ... -}: { - imports = [inputs.nvf.homeManagerModules.default]; - - programs.nvf = { - enable = true; - settings.vim = { - viAlias = true; - vimAlias = true; - enableLuaLoader = true; - preventJunkFiles = true; - tabWidth = 4; - autoIndent = false; - useSystemClipboard = true; - - luaConfigPost = lib.concatStrings [ - '' - vim.opt.formatoptions:remove('c') - vim.opt.formatoptions:remove('r') - vim.opt.formatoptions:remove('o') - '' - ]; - - maps = { - normal = { - "m" = { - silent = true; - action = "make"; - }; # Same as nnoremap m make - "t" = { - silent = true; - action = "Neotree toggle"; - }; - }; - }; - theme = { - enable = true; - name = "catppuccin"; - style = "macchiato"; - }; - - visuals = { - enable = true; - nvimWebDevicons.enable = true; - }; - - ui = { - noice.enable = true; - }; - notify.nvim-notify.enable = true; - - statusline = { - lualine = { - enable = true; - theme = "auto"; - componentSeparator = { - left = ""; - }; - sectionSeparator = { - left = ""; - right = ""; - }; - - activeSection = { - a = [ - '' - { - "mode", - separator = { right = "" }, - right_padding = 2 - } - '' - ]; - b = [ - '' - { - "branch", - icon = '', - separator = { right = "" } - } - '' - ]; - c = [ - '' - "filename" - '' - ]; - x = [ - '' - { - "diagnostics", - sources = {'nvim_lsp', 'nvim_diagnostic', 'nvim_diagnostic', 'vim_lsp', 'coc'}, - symbols = {error = '󰅙 ', warn = ' ', info = ' ', hint = '󰌵 '}, - colored = true, - update_in_insert = false, - always_visible = false, - diagnostics_color = { - color_error = { fg = 'red' }, - color_warn = { fg = 'yellow' }, - color_info = { fg = 'cyan' }, - }, - } - '' - '' - "filetype" - '' - ]; - y = [ - '' - { - "progress", - separator = { left = "" }, - } - '' - '' - '' - ]; - z = [ - '' - { - "location", - separator = { left = "" }, - left_padding = 2 - } - '' - '' - { - "fileformat", - color = {fg='black'}, - symbols = { - unix = '', -- e712 - dos = '', -- e70f - mac = '', -- e711 - }, - } - '' - ]; - }; - - inactiveSection = { - a = [ - '' - "filename" - '' - ]; - z = [ - '' - "location" - '' - ]; - }; - }; - }; - - git.enable = true; - - utility = { - vim-wakatime.enable = true; - }; - - lsp = { - enable = true; - lspSignature.enable = true; - lspconfig.enable = true; - formatOnSave = true; - mappings = { - addWorkspaceFolder = "wa"; - codeAction = "a"; - goToDeclaration = "gD"; - goToDefinition = "gd"; - hover = "K"; - listImplementations = "gi"; - listReferences = "gr"; - listWorkspaceFolders = "wl"; - nextDiagnostic = "k"; - previousDiagnostic = "j"; - openDiagnosticFloat = "e"; - removeWorkspaceFolder = "wr"; - renameSymbol = "r"; - signatureHelp = ""; - }; - }; - - autocomplete = { - enable = true; - alwaysComplete = true; - }; - - autopairs.enable = true; - languages = { - enableExtraDiagnostics = true; - enableFormat = true; - enableLSP = true; - enableTreesitter = true; - - nix.enable = true; - clang.enable = true; - python.enable = true; - ts.enable = true; - }; - - treesitter = { - enable = true; - fold = true; - context.enable = true; - grammars = [ - pkgs.vimPlugins.nvim-treesitter.builtGrammars.nix - pkgs.vimPlugins.nvim-treesitter.builtGrammars.c - pkgs.vimPlugins.nvim-treesitter.builtGrammars.python - ]; - }; - - binds.whichKey.enable = true; - filetree.neo-tree.enable = true; - - telescope.enable = true; - }; - }; -}