From 198c656d8d4aa8010de53b8cb5c4025f352088f2 Mon Sep 17 00:00:00 2001 From: ElKowar <5300871+elkowar@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:15:28 +0100 Subject: [PATCH] work adjustments --- alacritty/.config/alacritty/alacritty.yml | 3 +- nvim/.config/nvim/fnl/dots/keybinds.fnl | 14 +++- nvim/.config/nvim/fnl/dots/plugins/lsp.fnl | 27 +++--- nvim/.config/nvim/fnl/dots/plugins/noice.fnl | 13 ++- .../nvim/fnl/dots/plugins/treesitter.fnl | 5 +- nvim/.config/nvim/fnl/init.fnl | 1 + nvim/.config/nvim/lazy-lock.json | 82 +++++++++---------- scripts/scripts/preview.sh | 2 +- zsh/.config/zsh/.zshrc | 27 ++++++ zsh/.config/zsh/keybinds.zsh | 1 + 10 files changed, 110 insertions(+), 65 deletions(-) diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 26340bc..e8c4c9c 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -31,6 +31,7 @@ cursor: font: #normal: { "family": "APL 385 Unicode" } normal: { "family": "Fira Code" } + normal: { "family": "Fira Code" } #normal: { "family": "Jetbrains Mono" } #normal: { "family": "Victor Mono" } #normal: { "family": "Monoid" } @@ -38,7 +39,7 @@ font: #normal: { "family": "cherry" } #normal: { "family": "scientifica" } #normal: { "family": "cozette" } - #normal: { "family": "xos4 Terminus" } + #normal: { "family": "Terminus" } offset: { "x": 0, "y": 0 } size: 12 diff --git a/nvim/.config/nvim/fnl/dots/keybinds.fnl b/nvim/.config/nvim/fnl/dots/keybinds.fnl index 04e8bbc..f73927b 100644 --- a/nvim/.config/nvim/fnl/dots/keybinds.fnl +++ b/nvim/.config/nvim/fnl/dots/keybinds.fnl @@ -6,7 +6,8 @@ wk which-key treesitter-selection nvim-treesitter.incremental_selection lspactions lspactions - glance glance} + glance glance + crates crates} require-macros [macros]}) ; undo autopairs fuckup @@ -41,6 +42,8 @@ (utils.keymap :i : "(copilot-previous)") (utils.keymap :i : "Copilot panel") +(utils.keymap :n : "RustMoveItemDownj") +(utils.keymap :n : "RustMoveItemUpk") ; Fix keybinds in linewrapped mode @@ -117,7 +120,14 @@ "d" [#(glance.open "definitions") "Definitions"] "r" [#(glance.open "references") "References"] "t" [#(glance.open "type_definitions") "Type definitions"] - "i" [#(glance.open "implementations") "Implementations"]}} + "i" [#(glance.open "implementations") "Implementations"]} + "c" {:name "+Crates" + "j" [crates.show_popup "crates popup"] + "f" [crates.show_features_popup "crate features"] + "v" [crates.show_versions_popup "crate versions"] + "d" [crates.show_dependencies_popup "crate dependencies"] + "h" [crates.open_documentation "crate documentation"]}} + "f" {:name "+folds" "o" (cmd "foldopen" "open fold") diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl index d606120..49247ff 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl @@ -124,23 +124,22 @@ :procMacro {:enable true} :diagnostics {:enable false ;; native rust analyzer diagnostics :experimental {:enable false}} - :checkOnSave {:overrideCommand ["cargo" "clippy" "--workspace" "--message-format=json" "--all-targets"]}}}}})) - - ; "--all-features" + :checkOnSave {:overrideCommand ["cargo" "clippy" "--workspace" "--message-format=json" "--all-targets" "--all-features"]}}}}})) ;: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")] - (init-lsp - :lua_ls - {:cmd [sumneko_binary "-E" (.. sumneko_root_path "/main.lua")] - :settings {:Lua {:runtime {:version "LuaJIT" - :path (vim.split package.path ";")} - :diagnostics {:globals ["vim"]} - :workspace {:library {(vim.fn.expand "$VIMRUNTIME/lua") true - (vim.fn.expand "$VIMRUNTIME/lua/vim/lsp") true}} - :telemetry false}}})) + +; (let [sumneko_root_path (.. vim.env.HOME "/.local/share/lua-language-server") +; sumneko_binary (.. sumneko_root_path "/bin/Linux/lua-language-server")) +; (init-lsp +; :lua_ls +; {:cmd [sumneko_binary "-E" (.. sumneko_root_path "/main.lua")] +; :settings {:Lua {:runtime {:version "LuaJIT" +; :path (vim.split package.path ";")} +; :diagnostics {:globals ["vim"]} +; :workspace {:library {(vim.fn.expand "$VIMRUNTIME/lua") true +; (vim.fn.expand "$VIMRUNTIME/lua/vim/lsp") true}} +; :telemetry false}}})) (comment (when (not lsp.prolog_lsp) diff --git a/nvim/.config/nvim/fnl/dots/plugins/noice.fnl b/nvim/.config/nvim/fnl/dots/plugins/noice.fnl index 74c971f..b45224a 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/noice.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/noice.fnl @@ -22,19 +22,24 @@ :popupmenu {:relative "editor" :border {:style "none" :padding [1 1]} :position {:row 8 :col "50%"} - :size {:width 60 :height 10}}} + :size {:width 60 :height 10}} + :mini {:max_height 5}} :cmdline {:view "cmdline_popup" ; change to cmdline :format {:cmdline {:icon ":"} :lua false :help false}} :messages {:view "mini" - :view_error "mini" + :view_error "cmdline_output" :view_warn "mini" :view_search "virtualtext"} :markdown {:hover {"|(%S-)|" vim.cmd.help}} - :routes [{:view "notify" :filter {:event "msg_showmode"}}]}) - + :routes [{:view "notify" :filter {:event "msg_showmode"}} + {:view "mini" + :filter {:error true :max_height 5}} + {:view "cmdline_output" + :filter {:error true :min_height 6}}]}) +(+ 1 b) (defn- setup-noice-theme [] (utils.highlight-add :NoicePopupmenu {:bg colors.dark0_hard}) (utils.highlight-add :NoiceCmdline {:bg "#1f2324"}) diff --git a/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl b/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl index afd8185..d432b04 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl @@ -5,7 +5,7 @@ require-macros [macros]}) (configs.setup - {:ensure_installed ["rust" "fennel" "commonlisp"] + {:ensure_installed ["rust" "fennel" "commonlisp" "vim" "regex" "lua" "bash" "markdown" "markdown_inline"] ; :ensure_installed "maintained" :highlight {:enable true :disable ["fennel" "rust" "haskell"]} @@ -17,6 +17,7 @@ :scope_incremental "gsj" :scope_decremental "gsk"}} :textsubjects {:enable true + :disable ["noice"] :prev_selection "," :keymaps {"." "textsubjects-smart"}} @@ -26,7 +27,7 @@ :context_commentstring {:enable true :disable ["rust" "fennel"]} :playground - {:enable true + {:enable false :disable ["fennel"] :updatetime 25 ; Debounced time for highlighting nodes in the playground from source code :persist_queries false ; Whether the query persists across vim sessions diff --git a/nvim/.config/nvim/fnl/init.fnl b/nvim/.config/nvim/fnl/init.fnl index 9aa7109..e144c0a 100644 --- a/nvim/.config/nvim/fnl/init.fnl +++ b/nvim/.config/nvim/fnl/init.fnl @@ -65,6 +65,7 @@ (set vim.opt.background "dark") (set vim.opt.swapfile false) (set vim.opt.undolevels 10000) +(set vim.opt.keywordprg "rusty-man") (set vim.g.AutoPairsMultilineClose 0) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 12d243d..365d77f 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" }, - "aniseed": { "branch": "develop", "commit": "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2" }, + "aniseed": { "branch": "master", "commit": "a7445c340fb7a0529f3c413eb99d3f8d29f50ba2" }, "antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" }, "any-jump.vim": { "branch": "master", "commit": "9768403b6381ce3758cebac9613910c0160969e3" }, "ats-vim": { "branch": "master", "commit": "8e3e722b6d09ed81313573b4e7b108b265628ff1" }, @@ -8,77 +8,77 @@ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "50792f34a628ea6eb31d2c90e8df174671e4e7a0" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" }, + "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "d2768cb1b83de649d57d967085fe73c5e01f8fd7" }, "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" }, "cmp-omni": { "branch": "main", "commit": "8457e4144ea2fc5efbadb7d22250d5ee8f8862ba" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" }, "conjure": { "branch": "master", "commit": "d2e69a13b32e8574decfe81ea275292234eba6ea" }, - "copilot.vim": { "branch": "release", "commit": "c7d166ebda265370f38cec374e33f02eeec2f857" }, - "crates.nvim": { "branch": "main", "commit": "3fc7ddac13ddf65914a733ef074317c4c72ef05b" }, - "diffview.nvim": { "branch": "main", "commit": "11827d46e939b4748dbdb7e0df4982a63bd59d26" }, - "editorconfig-vim": { "branch": "master", "commit": "1d54632f7fcad38df8e428f349bc58b15af4b206" }, + "copilot.vim": { "branch": "release", "commit": "324ec9eb69e20971b58340d0096c3caac7bc2089" }, + "crates.nvim": { "branch": "main", "commit": "707ed7d6f8927a5ec0c241aa793f694f1b05f731" }, + "diffview.nvim": { "branch": "main", "commit": "5bbcf162d03287296fe393f88da6065db3cf9fd0" }, + "editorconfig-vim": { "branch": "master", "commit": "1953c0f2541446e8a56ba4e2f4477e91e78f6d13" }, "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, "fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" }, - "friendly-snippets": { "branch": "main", "commit": "1645e7cd98ed99e766c84ab3cf13a1612c77dcee" }, + "friendly-snippets": { "branch": "main", "commit": "7ab483b355613ef4f74189c7789278d765724d12" }, "gh.nvim": { "branch": "main", "commit": "bc731bb53909481995ac2edb4bf6418c051fec1a" }, - "gitsigns.nvim": { "branch": "main", "commit": "f29f0b22fd66c910b892aae3bc18a4872c002738" }, - "glance.nvim": { "branch": "master", "commit": "7a0ad2d169b5a76734e9ba6cb7774e76cdd948dd" }, + "gitsigns.nvim": { "branch": "main", "commit": "addd6e174a85fc1c4007ab0b65d77e6555b417bf" }, + "glance.nvim": { "branch": "master", "commit": "611478d2b36beb3c416c92f77e7c116d7bd25ee6" }, "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" }, "hop.nvim": { "branch": "master", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" }, "idris2-vim": { "branch": "master", "commit": "964cebee493c85f75796e4f4e6bbb4ac54e2da9e" }, "impatient.nvim": { "branch": "main", "commit": "c90e273f7b8c50a02f956c24ce4804a47f18162e" }, - "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" }, + "inc-rename.nvim": { "branch": "main", "commit": "48c4aa2be19f79e79b465a9bb37ee9fbe6c606f5" }, "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" }, "lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" }, - "lazy.nvim": { "branch": "main", "commit": "06f835d0b4b62d9d26fe0ec4190b981f2f5632d2" }, + "lazy.nvim": { "branch": "main", "commit": "0d0d5870a3265f1c92a89dccef4a592c44e70179" }, "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" }, - "lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" }, - "neoformat": { "branch": "master", "commit": "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81" }, - "neogit": { "branch": "master", "commit": "089d388876a535032ac6a3f80e19420f09e4ddda" }, - "nerdcommenter": { "branch": "master", "commit": "d069f7fb562fb9eb6911fe23cda7aca2a387043e" }, - "noice.nvim": { "branch": "main", "commit": "d8a1f3056ad713b5d471048f8d029264828e22c0" }, - "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" }, + "lsp_signature.nvim": { "branch": "master", "commit": "1979f1118e2b38084e7c148f279eed6e9300a342" }, + "neoformat": { "branch": "master", "commit": "ec601d38a2e9309109f405ce038c5a6ce774f1a9" }, + "neogit": { "branch": "master", "commit": "981207efd10425fef82ca09fa8bd22c3ac3e622d" }, + "nerdcommenter": { "branch": "master", "commit": "98cc4a2d64ca67cccbf5b5cf47c682ebadaaff58" }, + "noice.nvim": { "branch": "main", "commit": "3d4b80d720fea1905a9df004e70a329f58b3f2b7" }, + "nui.nvim": { "branch": "main", "commit": "257da38029d3859ed111804f9d4e95b0fa993a31" }, "nvim-bufferline.lua": { "branch": "main", "commit": "874f869a24e568980294b3200fc9dd842db65a36" }, - "nvim-cmp": { "branch": "main", "commit": "aae0c3e4e778ca4be6fabc52e388cbd5b844b7a5" }, + "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" }, "nvim-code-action-menu": { "branch": "main", "commit": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "401f5f22b2d7f9bdbb9294d0235136091458816a" }, - "nvim-dap-ui": { "branch": "master", "commit": "100c67dd63c870819fb998fec4867b17d02db4b7" }, - "nvim-lspconfig": { "branch": "master", "commit": "1712672e4da3003a0dd9f771d30389600b360f42" }, + "nvim-dap": { "branch": "master", "commit": "5a1479c5d633daa0db06988ed44663f07f10f5dd" }, + "nvim-dap-ui": { "branch": "master", "commit": "b80227ea56a48177786904f6322abc8b2dc0bc36" }, + "nvim-lspconfig": { "branch": "master", "commit": "8ebe6894dddaeb1459e1397c865f54fa5ecaac80" }, "nvim-scrollbar": { "branch": "main", "commit": "6a2065fbcd032075a06d2ab54508b69842bc4496" }, - "nvim-treesitter": { "branch": "master", "commit": "2c2430d42f30d1aef8715aed933272c9a6898f4e" }, + "nvim-treesitter": { "branch": "master", "commit": "1c89f9b5bc885ff0e2b1cdb7ff40847784b1436b" }, "nvim-treesitter-textsubjects": { "branch": "master", "commit": "b913508f503527ff540f7fe2dcf1bf1d1f259887" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, - "nvim-web-devicons": { "branch": "master", "commit": "bd7a222287c5828cd0607cd0a5605e52f0460074" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "4a42b30376c1bd625ab5016c2079631d531d797a" }, + "nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" }, "nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" }, - "octo.nvim": { "branch": "master", "commit": "7900dc0cd37e7bb5d4175a37c9c4c3dfb94a1f7b" }, + "octo.nvim": { "branch": "master", "commit": "cb9314d358dc9f1d50e553a3c8e237ce713cbc57" }, "parinfer-rust": { "branch": "master", "commit": "55ce1e0c6e2465ce7f883972bb0feb1e4e8bdfa0" }, - "persistence.nvim": { "branch": "main", "commit": "d8a3eda0e19b4d5f3180fc832c25baab1709f2a1" }, - "playground": { "branch": "master", "commit": "c481c660fa903a0e295902b1765ecfbd6e76a556" }, - "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" }, + "persistence.nvim": { "branch": "main", "commit": "8484fdaa284207f77ec69b9627316bf334ad653f" }, + "playground": { "branch": "master", "commit": "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6" }, + "plenary.nvim": { "branch": "master", "commit": "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, - "rust-tools.nvim": { "branch": "master", "commit": "bd1aa99ffb911a1cf99b3fcf3b44c0391c57e3ef" }, + "purescript-vim": { "branch": "main", "commit": "7af25a840d38dc6767c85edd1f35c1f835618071" }, + "rust-tools.nvim": { "branch": "master", "commit": "df584e84393ef255f5b8cbd709677d6a3a5bf42f" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" }, "stabilize.nvim": { "branch": "master", "commit": "34069870a8e72632c5447188e638e1c6bfebc353" }, "startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" }, - "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, + "symbols-outline.nvim": { "branch": "master", "commit": "6a3ed24c5631da7a5d418bced57c16b32af7747c" }, "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" }, "targets.vim": { "branch": "master", "commit": "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d" }, "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, - "telescope.nvim": { "branch": "master", "commit": "203bf5609137600d73e8ed82703d6b0e320a5f36" }, - "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" }, - "trouble.nvim": { "branch": "main", "commit": "556ef3089709a6e253df1e500381fec5eb48e48a" }, - "twilight.nvim": { "branch": "main", "commit": "9410252bed96887ca5a86bf16435a3a51a0e6ce5" }, + "telescope.nvim": { "branch": "master", "commit": "b69b33eded07341253bc1f0b4ae6bbc5c411a2ab" }, + "todo-comments.nvim": { "branch": "main", "commit": "077c59586d9d0726b0696dc5680eb863f4e04bc5" }, + "trouble.nvim": { "branch": "main", "commit": "83ec606e7065adf134d17f4af6bae510e3c491c1" }, + "twilight.nvim": { "branch": "main", "commit": "8bb7fa7b918baab1ca81b977102ddb54afa63512" }, "typescript-vim": { "branch": "master", "commit": "52f3ca3474d51f5021696ffb7297d989e49121ac" }, "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, "vim-exchange": { "branch": "master", "commit": "784d63083ad7d613aa96f00021cd0dfb126a781a" }, - "vim-fugitive": { "branch": "master", "commit": "62f42f013d866139fa23068ac2651b3f7e05a56f" }, + "vim-fugitive": { "branch": "master", "commit": "9c5f675db54139c18ed4a1a18989ea2da37d6cae" }, "vim-gh-line": { "branch": "master", "commit": "fbf368bdfad7e5478009a6dc62559e6b2c72d603" }, "vim-gruvbox8": { "branch": "master", "commit": "f94afba273ec544e1e73e82c78674eed4ccb1c8c" }, "vim-indent-guides": { "branch": "master", "commit": "765084d38bf102a95ab966fb06472e83fa7deff7" }, @@ -88,7 +88,7 @@ "vim-nix": { "branch": "master", "commit": "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee" }, "vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, - "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "vim-sleuth": { "branch": "master", "commit": "8332f123a63c739c870c96907d987cc3ff719d24" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, @@ -100,8 +100,8 @@ "vimtex": { "branch": "master", "commit": "3a9180f1d2cc984fe24bc7afaf9d4d00b3e4c20a" }, "vlime": { "branch": "master", "commit": "3205f02306314ab8cfc9034cf72097891c923e9d" }, "webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" }, - "which-key.nvim": { "branch": "main", "commit": "5224c261825263f46f6771f1b644cae33cd06995" }, + "which-key.nvim": { "branch": "main", "commit": "e4fa445065a2bb0bbc3cca85346b67817f28e83e" }, "yats.vim": { "branch": "master", "commit": "4bf3879055847e675335f1c3050bd2dd11700c7e" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, - "zen-mode.nvim": { "branch": "main", "commit": "3c92f503823088862ca2a7809d1c7edc90fb92fa" } -} \ No newline at end of file + "zen-mode.nvim": { "branch": "main", "commit": "4313a5828e4d48c5f2f135f29d46f769a59dcfdc" } +} diff --git a/scripts/scripts/preview.sh b/scripts/scripts/preview.sh index 44d9b82..34c760b 100755 --- a/scripts/scripts/preview.sh +++ b/scripts/scripts/preview.sh @@ -6,7 +6,7 @@ esac case "$(file --mime-type "$1")" in *text*) - bat --color always --plain --theme gruvbox "$1" + bat --color always --plain --theme gruvbox-dark "$1" ;; *image* | *pdf) if command -v timg; then diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index 122d5be..2a93cf9 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -90,3 +90,30 @@ source "$ZDOTDIR/prompt.zsh" if command -v direnv >/dev/null; then eval "$(direnv hook zsh)" fi + +export EDITOR=nvim +export VISUAL=nvim + +export ANDROID_HOME="/home/leon/Android/Sdk" +export ANDROID_NDK="/home/leon/Android/Sdk/ndk/21.4.7075529" +export JAVA_HOME="/usr/lib/jvm/java-1.19.0-openjdk-amd64/" + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/home/leon/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/home/leon/anaconda3/etc/profile.d/conda.sh" ]; then + . "/home/leon/anaconda3/etc/profile.d/conda.sh" + else + export PATH="/home/leon/anaconda3/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< + + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" diff --git a/zsh/.config/zsh/keybinds.zsh b/zsh/.config/zsh/keybinds.zsh index ebc29d0..6bd6a3b 100644 --- a/zsh/.config/zsh/keybinds.zsh +++ b/zsh/.config/zsh/keybinds.zsh @@ -62,6 +62,7 @@ bindkey '^W' my-backward-delete-word # C-w bindkey '^H' my-backward-delete-word # C-backspace bindkey "^[." insert-last-word # alt-. bindkey "^[[3~" delete-char # DEL +bindkey "^R" history-incremental-search-backward # C-R bindkey '^[[A' history-substring-search-up bindkey '^[[B' history-substring-search-down