From 3d1c72039a86ef9ec7246deecddae319a3ad322c Mon Sep 17 00:00:00 2001 From: Mykhailo Nikiforov Date: Sun, 2 Apr 2023 13:46:42 +0300 Subject: [PATCH] init nvim --- .flake.nix.swp | Bin 20480 -> 0 bytes flake.lock | 6 ++--- flake.nix | 14 +++++----- init.lua | 22 ++++++++-------- {nvim => pwnvim}/abbreviations.lua | 0 {nvim => pwnvim}/filetypes.lua | 0 {nvim => pwnvim}/mappings.lua | 0 {nvim => pwnvim}/markdown.lua | 0 {nvim => pwnvim}/options.lua | 0 {nvim => pwnvim}/plugins.lua | 24 +++++++++--------- {nvim => pwnvim}/plugins/bufferline.lua | 0 {nvim => pwnvim}/plugins/gitsigns.lua | 0 {nvim => pwnvim}/plugins/indent-blankline.lua | 0 {nvim => pwnvim}/plugins/lualine.lua | 0 {nvim => pwnvim}/plugins/nvim-tree.lua | 0 {nvim => pwnvim}/plugins/todo-comments.lua | 0 {nvim => pwnvim}/plugins/treesitter.lua | 0 {nvim => pwnvim}/signs.lua | 0 {nvim => pwnvim}/tasks.lua | 0 19 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 .flake.nix.swp rename {nvim => pwnvim}/abbreviations.lua (100%) rename {nvim => pwnvim}/filetypes.lua (100%) rename {nvim => pwnvim}/mappings.lua (100%) rename {nvim => pwnvim}/markdown.lua (100%) rename {nvim => pwnvim}/options.lua (100%) rename {nvim => pwnvim}/plugins.lua (98%) rename {nvim => pwnvim}/plugins/bufferline.lua (100%) rename {nvim => pwnvim}/plugins/gitsigns.lua (100%) rename {nvim => pwnvim}/plugins/indent-blankline.lua (100%) rename {nvim => pwnvim}/plugins/lualine.lua (100%) rename {nvim => pwnvim}/plugins/nvim-tree.lua (100%) rename {nvim => pwnvim}/plugins/todo-comments.lua (100%) rename {nvim => pwnvim}/plugins/treesitter.lua (100%) rename {nvim => pwnvim}/signs.lua (100%) rename {nvim => pwnvim}/tasks.lua (100%) diff --git a/.flake.nix.swp b/.flake.nix.swp deleted file mode 100644 index d31d0b236612df60973e140584b6b0c3fea7cb86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 QGF#3>dh)8e(q}sV11+$%bN~PV diff --git a/flake.lock b/flake.lock index 304b881..2af228a 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679319606, - "narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=", + "lastModified": 1680273054, + "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bc6945b1224a1cfa679d6801580b1054dba1a5c", + "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 33a72c3..47331fd 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,7 @@ pkgs.neovim-unwrapped {buildInputs = dependencies;} ]; - packages.nvim = pkgs.wrapNeovim neovim-augmented { + packages.pwnvim = pkgs.wrapNeovim neovim-augmented { viAlias = true; vimAlias = true; withNodeJs = false; @@ -188,15 +188,15 @@ }; }; }; - apps.nvim = flake-utils.lib.mkApp { - drv = packages.nvim; - name = "nvim"; + apps.pwnvim = flake-utils.lib.mkApp { + drv = packages.pwnvim; + name = "pwnvim"; exePath = "/bin/nvim"; }; - packages.default = packages.nvim; - apps.default = apps.nvim; + packages.default = packages.pwnvim; + apps.default = apps.pwnvim; devShell = pkgs.mkShell { - buildInputs = with pkgs; [packages.nvim] ++ dependencies; + buildInputs = with pkgs; [packages.pwnvim] ++ dependencies; }; }); } diff --git a/init.lua b/init.lua index 09ff7b3..5a6c2cf 100644 --- a/init.lua +++ b/init.lua @@ -6,14 +6,14 @@ else end require('impatient') require('impatient').enable_profile() -require('nvim.filetypes').config() -require('nvim.options').defaults() -require('nvim.options').gui() -require('nvim.mappings') -require('nvim.abbreviations') -require('nvim.plugins').ui() -require('nvim.plugins').diagnostics() -require('nvim.plugins').telescope() -require('nvim.plugins').completions() -require('nvim.plugins').notes() -require('nvim.plugins').misc() +require('pwnvim.filetypes').config() +require('pwnvim.options').defaults() +require('pwnvim.options').gui() +require('pwnvim.mappings') +require('pwnvim.abbreviations') +require('pwnvim.plugins').ui() +require('pwnvim.plugins').diagnostics() +require('pwnvim.plugins').telescope() +require('pwnvim.plugins').completions() +require('pwnvim.plugins').notes() +require('pwnvim.plugins').misc() diff --git a/nvim/abbreviations.lua b/pwnvim/abbreviations.lua similarity index 100% rename from nvim/abbreviations.lua rename to pwnvim/abbreviations.lua diff --git a/nvim/filetypes.lua b/pwnvim/filetypes.lua similarity index 100% rename from nvim/filetypes.lua rename to pwnvim/filetypes.lua diff --git a/nvim/mappings.lua b/pwnvim/mappings.lua similarity index 100% rename from nvim/mappings.lua rename to pwnvim/mappings.lua diff --git a/nvim/markdown.lua b/pwnvim/markdown.lua similarity index 100% rename from nvim/markdown.lua rename to pwnvim/markdown.lua diff --git a/nvim/options.lua b/pwnvim/options.lua similarity index 100% rename from nvim/options.lua rename to pwnvim/options.lua diff --git a/nvim/plugins.lua b/pwnvim/plugins.lua similarity index 98% rename from nvim/plugins.lua rename to pwnvim/plugins.lua index 58c356d..e0a6381 100644 --- a/nvim/plugins.lua +++ b/pwnvim/plugins.lua @@ -270,18 +270,18 @@ M.diagnostics = function() .make_client_capabilities(), cmp_nvim_lsp.default_capabilities()); - require('rust-tools').setup({ - server = { - on_attach = attached, - capabilities = capabilities, - standalone = false - }, - tools = { - autoSetHints = true, - inlay_hints = { auto = true, only_current_line = true }, - runnables = { use_telescope = true } - } - }) + -- require('rust-tools').setup({ + -- server = { + -- on_attach = attached, + -- capabilities = capabilities, + -- standalone = false + -- }, + -- tools = { + -- autoSetHints = true, + -- inlay_hints = { auto = true, only_current_line = true }, + -- runnables = { use_telescope = true } + -- } + -- }) require('crates').setup {} require('cmp-npm').setup({}) lspconfig.tsserver.setup { capabilities = capabilities, on_attach = attached } diff --git a/nvim/plugins/bufferline.lua b/pwnvim/plugins/bufferline.lua similarity index 100% rename from nvim/plugins/bufferline.lua rename to pwnvim/plugins/bufferline.lua diff --git a/nvim/plugins/gitsigns.lua b/pwnvim/plugins/gitsigns.lua similarity index 100% rename from nvim/plugins/gitsigns.lua rename to pwnvim/plugins/gitsigns.lua diff --git a/nvim/plugins/indent-blankline.lua b/pwnvim/plugins/indent-blankline.lua similarity index 100% rename from nvim/plugins/indent-blankline.lua rename to pwnvim/plugins/indent-blankline.lua diff --git a/nvim/plugins/lualine.lua b/pwnvim/plugins/lualine.lua similarity index 100% rename from nvim/plugins/lualine.lua rename to pwnvim/plugins/lualine.lua diff --git a/nvim/plugins/nvim-tree.lua b/pwnvim/plugins/nvim-tree.lua similarity index 100% rename from nvim/plugins/nvim-tree.lua rename to pwnvim/plugins/nvim-tree.lua diff --git a/nvim/plugins/todo-comments.lua b/pwnvim/plugins/todo-comments.lua similarity index 100% rename from nvim/plugins/todo-comments.lua rename to pwnvim/plugins/todo-comments.lua diff --git a/nvim/plugins/treesitter.lua b/pwnvim/plugins/treesitter.lua similarity index 100% rename from nvim/plugins/treesitter.lua rename to pwnvim/plugins/treesitter.lua diff --git a/nvim/signs.lua b/pwnvim/signs.lua similarity index 100% rename from nvim/signs.lua rename to pwnvim/signs.lua diff --git a/nvim/tasks.lua b/pwnvim/tasks.lua similarity index 100% rename from nvim/tasks.lua rename to pwnvim/tasks.lua