diff --git a/awesome/autorun.sh b/awesome/autorun.sh index 1542f25..2f9af70 100755 --- a/awesome/autorun.sh +++ b/awesome/autorun.sh @@ -19,4 +19,3 @@ run "xscreensaver -no-splash" run "sleep 4" run "wmctrl -r bottom -t 8" run "keepassxc" - diff --git a/bin/start-tuis.sh b/bin/start-tuis.sh new file mode 100755 index 0000000..7a3e1b3 --- /dev/null +++ b/bin/start-tuis.sh @@ -0,0 +1,9 @@ +#!/bin/sh +# +# start-tuis.sh +# +# Convenience script to start up my usual TUIs + +alacritty msg create-window --title joplin --command $NVM_BIN/joplin +alacritty msg create-window --title newsboat --command newsboat +alacritty msg create-window --title aerc --command aerc diff --git a/neovim/init.lua b/neovim/init.lua index 0a23c30..8eef575 100644 --- a/neovim/init.lua +++ b/neovim/init.lua @@ -139,7 +139,38 @@ require("lazy").setup({ opts = {}, config = function(_, opts) require 'lsp_signature'.setup(opts) end }, - { "folke/neodev.nvim", opts = {} }, + { + "folke/lazydev.nvim", + ft = "lua", -- only load on lua files + opts = { + library = { + -- See the configuration section for more details + -- Load luvit types when the `vim.uv` word is found + { path = "luvit-meta/library", words = { "vim%.uv" } }, + }, + }, + }, + { "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings + { -- optional completion source for require statements and module annotations + "hrsh7th/nvim-cmp", + opts = function(_, opts) + opts.sources = opts.sources or {} + table.insert(opts.sources, { + name = "lazydev", + group_index = 0, -- set group index to 0 to skip loading LuaLS completions + }) + end, + event = "InsertEnter", + dependencies = { + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-vsnip", + "hrsh7th/vim-vsnip", + "hrsh7th/cmp-nvim-lsp-signature-help", + }, + }, { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }, @@ -336,19 +367,6 @@ require("lazy").setup({ }, }, }, - { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - "hrsh7th/cmp-vsnip", - "hrsh7th/vim-vsnip", - "hrsh7th/cmp-nvim-lsp-signature-help", - }, - }, { "tpope/vim-fugitive", event = "VeryLazy" }, { "lewis6991/gitsigns.nvim", event = "VeryLazy" }, { @@ -364,6 +382,20 @@ require("lazy").setup({ event = "VeryLazy", }, { "famiu/bufdelete.nvim", event = "VeryLazy" }, + -- { "vlime/vlime", config = function() rtp = 'vim/' end }, + --[[ + { + 'windwp/nvim-autopairs', + event = "InsertEnter", + config = true, + -- use opts = {} for passing setup options + -- this is equalent to setup({}) function + }, + --]] + --{ "bhurlow/vim-parinfer", event = "VeryLazy" }, + { "kovisoft/paredit" }, + --{ "monkoose/parsley", event = "VeryLazy" }, + { "monkoose/nvlime", ft = { "lisp" }, dependencies = { "monkoose/parsley" } }, }) --[[ mason @@ -466,11 +498,6 @@ cmp.setup.cmdline(':', { }) }) --- Neodev -require("neodev").setup({ - library = { plugins = { "nvim-dap-ui" }, types = true }, -}) - --[[ nvim-lspconfig --]] @@ -776,5 +803,23 @@ vim.api.nvim_create_autocmd( } ) +--[[ + let g:nvlime_cl_impl = "ros" + function! NvlimeBuildServerCommandFor_ros(nvlime_loader, nvlime_eval) + return ["ros", "run", + \ "--load", a:nvlime_loader, + \ "--eval", a:nvlime_eval] + endfunction +--]] +-- Roswell +vim.g.nvlime_cl_impl = "ros" +vim.cmd([[ + function! NvlimeBuildServerCommandFor_ros(nvlime_loader, nvlime_eval) + return ["ros", "run", + \ "--load", a:nvlime_loader, + \ "--eval", a:nvlime_eval] + endfunction +]]) + -- Switch syntax highlighting on vim.cmd("syntax enable") diff --git a/zsh/.zshenv b/zsh/.zshenv index d7f5410..3ed9e82 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -42,5 +42,12 @@ export DDGR_COLORS="MBdexy" export NAVI_TAG_COLOR=6 export NAVI_COMMENT_COLOR=3 +# gomphotherium +export GOMPHOTHERIUM_SERVER='https://toot.cat' +export GOMPHOTHERIUM_ACCESS_TOKEN='qqscVpLBugWAv6cFUqu1vBm0QMbgsWTiafg7TwZsTec' + +# roswell +export ROSWELL_HOME="/home/adam/.config/roswell" + # Consolidate PATH # export PATH="$(consolidate-path "$PATH")" diff --git a/zsh/.zshrc b/zsh/.zshrc index de7fa0a..0997d2b 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -140,10 +140,6 @@ source /home/adam/.config/broot/launcher/bash/br # tea PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source "/home/adam/.config/tea/autocomplete.zsh" -# gomphotherium -export GOMPHOTHERIUM_SERVER='https://toot.cat' -export GOMPHOTHERIUM_ACCESS_TOKEN='qqscVpLBugWAv6cFUqu1vBm0QMbgsWTiafg7TwZsTec' - # ripgrep-all rga-fzf() { RG_PREFIX="rga --files-with-matches"