diff --git a/.flake.nix.swp b/.flake.nix.swp deleted file mode 100644 index d31d0b2..0000000 Binary files a/.flake.nix.swp and /dev/null differ 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