From 5946ad43140ce73512054905fa8a7d1aa141a23f Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Fri, 6 Aug 2021 14:46:49 +0200 Subject: [PATCH] asdf --- nvim/.config/nvim/fnl/dots/keybinds.fnl | 9 +++++++-- nvim/.config/nvim/fnl/dots/plugins.fnl | 4 ++-- nvim/.config/nvim/fnl/dots/plugins/lsp.fnl | 1 + .../nvim/fnl/dots/plugins/nvim-dap.fnl | 20 ++++++++++--------- .../nvim/fnl/dots/plugins/telescope.fnl | 1 + 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl index 1321410..e79494a 100644 --- a/nvim/.config/nvim/fnl/dots/keybinds.fnl +++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl @@ -22,6 +22,7 @@ (fn cmd [s desc] [(.. "" s "") desc]) +(fn sel-cmd [s desc] [(.. "'<,'>" s "") desc]) (fn rebind [s desc] [s desc]) @@ -76,8 +77,7 @@ "n" (cmd "set relativenumber!" "toggle relative numbers") "m" (cmd "set nonumber! norelativenumber" "toggle numbers") "g" (cmd "Goyo | set linebreak" "toggle focus mode") - "i" (cmd "IndentGuidesToggle" "toggle indent guides") - "s" (cmd "VSSplit" "keep selection visible in split")} + "i" (cmd "IndentGuidesToggle" "toggle indent guides")} "b" {:name "+buffers" "b" (cmd "Buffers" "select open buffer") @@ -97,6 +97,11 @@ (wk.register {"" "which_key_ignore"} {:mode "i"}) + +(wk.register + {"s" (sel-cmd "VSSplit" "keep selection visible in split")} + {:prefix "" + :mode "v"}) (wk.register {:name "+Selection" diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl index 5d4c0b2..f20c6b9 100644 --- a/nvim/.config/nvim/fnl/dots/plugins.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins.fnl @@ -23,9 +23,9 @@ :nvim-telescope/telescope.nvim {:mod "dots.plugins.telescope" :cmd ["Telescope"] :requires [:nvim-lua/popup.nvim - :nvim-lua/plenary.nvim - :nvim-telescope/telescope.nvim]} + :nvim-lua/plenary.nvim]} + :nvim-telescope/telescope-packer.nvim {} :nvim-telescope/telescope-frecency.nvim {:requires [:tami5/sql.nvim] :opt false} ;:config #((. (require :telescope) :load_extension) "frecency")} diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl index 220c423..1c4ab32 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl @@ -95,6 +95,7 @@ (let [rust-tools (require "rust-tools")] (rust-tools.setup {:tools {:inlay_hints {:show_parameter_hints false} :autoSetHints false}})) + ;:server {:cmd ["/home/leon/coding/prs/rust-analyzer/target/release/rust-analyzer"]}})) (let [sumneko_root_path (.. vim.env.HOME "/.local/share/lua-language-server") sumneko_binary (.. sumneko_root_path "/bin/Linux/lua-language-server")] diff --git a/nvim/.config/nvim/fnl/dots/plugins/nvim-dap.fnl b/nvim/.config/nvim/fnl/dots/plugins/nvim-dap.fnl index 799e425..c23957e 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/nvim-dap.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/nvim-dap.fnl @@ -12,15 +12,17 @@ :name "lldb"}) ;; TODO This does not really work,.. REEEEEEEEEEEEEEE -(set dap.adapters.rust - {:type "executable" - :attach {:pidProperty "pid" :pidSelect "ask"} - :command "lldb-vscode" - :env {:LLDB_LAUNCH_FLAG_LAUNCH_IN_TTY "yes"} - :name "lldb" - :initCommands ["command script import \"/home/leon/.rustup/toolchains/nightly-2021-03-18-x86_64-unknown-linux-gnu/lib/rustlib/etc/lldb_lookup.py\"" - "type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" - "type category enable Rust"]}) + + +;(set dap.adapters.rust + ;{:type "executable" + ;:attach {:pidProperty "pid" :pidSelect "ask"} + ;:command "lldb-vscode" + ;:env {:LLDB_LAUNCH_FLAG_LAUNCH_IN_TTY "yes"} + ;:name "lldb" + ;:initCommands ["command script import \"/home/leon/.rustup/toolchains/nightly-2021-03-18-x86_64-unknown-linux-gnu/lib/rustlib/etc/lldb_lookup.py\"" + ;"type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust" + ;"type category enable Rust"]}) (set dap.adapters.node2 {:type "executable" diff --git a/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl b/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl index bc926b9..1c628eb 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/telescope.fnl @@ -10,5 +10,6 @@ (telescope.load_extension "frecency") (telescope.load_extension "dap") +(telescope.load_extension "packer") (utils.keymap :n : ":Telescope find_files")