Browse Source

Cleaning! neovim plugins, etc.

master
Dustin Swan 3 months ago
parent
commit
a1cd2506a7
Signed by: dustinswan GPG Key ID: AB49BD6B2B3A6377
  1. 6
      bin/backup-to-thumb
  2. 10
      home-cli.nix
  3. 44
      lunar.lua

6
bin/backup-to-thumb

@ -1,6 +0,0 @@
#!/bin/sh
rsync -avhW --compress-level=0 --progress --delete --checksum Sync /Volumes/NO\ NAME/
rsync -avhW --compress-level=0 --progress --delete --checksum Pictures /Volumes/NO\ NAME/
rsync -avhW --compress-level=0 --progress --delete --checksum Contacts /Volumes/NO\ NAME/
rsync -avhW --compress-level=0 --progress --delete --checksum Calendars /Volumes/NO\ NAME/

10
home-cli.nix

@ -7,7 +7,7 @@ in
home.stateVersion = "18.09";
home.packages = with pkgs; [ # magic-wormhole
ripgrep fd wget mosh w3m nnn urlview hexyl httpie timg sox du-dust duplicati bitwarden-cli gnupg gpg-tui rage sd eva glow restic spotify-tui spotifyd slides manix amfora duf procs pandoc pastel jq jo fx jc miller visidata sc-im bandwhich nixfmt shellcheck fontconfig cacert vale weechat
ripgrep fd mosh w3m nnn urlview hexyl httpie timg sox du-dust duplicati bitwarden-cli gnupg gpg-tui rage sd eva glow restic spotify-tui spotifyd slides manix amfora duf procs pandoc pastel jq jo fx jc miller visidata sc-im bandwhich nixfmt shellcheck fontconfig cacert vale weechat
nodejs deno yarn nodePackages.typescript-language-server nodePackages.stylelint nodePackages.js-beautify nodePackages.expo-cli
ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin
rustc go cmake # racket-minimal
@ -34,13 +34,11 @@ in
newSession = true;
secureSocket = false;
plugins = with pkgs.tmuxPlugins; [
sensible
resurrect # prefix ctrl-s to save sessions; prefix ctrl-r to restore
continuum # automatically save the session every 15 minutes
# suspend # F12 to disable the "outer" nested session
tmux-fzf
sessionist # prefix g to switch sessions; prefix C to create; prefix X to kill; prefix S to switch back; prefix @ to promote
sensible
pain-control # prefix |, -, \, _ to split; prefix h, j, k, l to switch; prefix H, J, K, L to resize; prefix <, > to move
sessionist # prefix g to switch sessions; prefix C to create; prefix X to kill; prefix S to switch back; prefix @ to promote; prefix t f to join marked pane
pain-control # prefix |, -, \, _ to split; prefix h, j, k, l to switch; prefix H, J, K, L to resize; prefix <, > to move windows
fzf-tmux-url # prefix u -> fzf urls
yank # prefix y -> copy command line to clipboard; prefix Y -> copy pwd to clipboard; search + y -> copy to clipboard
open # highlight: o -> open; ctrl-o -> $EDITOR; S -> web search

44
lunar.lua

@ -3,7 +3,6 @@ lvim.format_on_save = false
lvim.leader = "space"
lvim.colorscheme = "catppuccin"
lvim.transparent_window = true
-- vim.opt.cmdheight = 1
vim.opt.conceallevel = 2 -- TODO: only for org files
lvim.builtin.alpha.mode = 'startify'
@ -11,23 +10,35 @@ lvim.builtin.notify.active = true
lvim.builtin.terminal.active = true
lvim.builtin.treesitter.highlight.enabled = true
lvim.builtin.nvimtree.setup.hijack_netrw = false -- to get gx working again
lvim.builtin.nvimtree.setup.disable_netrw = true -- TODO: but it isn't working
table.insert(lvim.builtin.cmp.sources, { name = "orgmode" })
lvim.plugins = {
{ "shaunsingh/nord.nvim" },
{ "catppuccin/nvim" },
-- { "rose-pine/neovim" },
-- { "folke/tokyonight.nvim" },
{
"catppuccin/nvim",
require("catppuccin").setup {
vim.api.nvim_create_autocmd("OptionSet", {
pattern = "background",
callback = function()
vim.cmd("Catppuccin " .. (vim.v.option_new == "light" and "latte" or "mocha"))
end,
})
},
},
{ 'dhruvasagar/vim-table-mode' },
{ 'michaelb/sniprun', run = 'bash ./install.sh' },
{ "nacro90/numb.nvim", event = "BufRead", config = function() require("numb").setup() end },
{ "npxbr/glow.nvim", ft = { "markdown" } },
{ "tpope/vim-repeat" },
{ "tpope/vim-surround" },
{ "ggandor/lightspeed.nvim", event = "BufRead" },
{
"phaazon/hop.nvim",
event = "BufRead",
branch = "v2",
config = function()
require("hop").setup()
vim.api.nvim_set_keymap("n", "s", ":HopChar2<cr>", { silent = true })
vim.api.nvim_set_keymap("n", "S", ":HopWord<cr>", { silent = true })
end,
},
{ "folke/trouble.nvim", cmd = "TroubleToggle" },
{ "folke/todo-comments.nvim", event = "BufRead", config = function() require "todo-comments".setup() end },
{ "ray-x/lsp_signature.nvim", event = "BufRead", config = function() require "lsp_signature".setup() end },
@ -70,11 +81,11 @@ lvim.plugins = {
-- local auto_dark_mode = require('auto-dark-mode')
-- auto_dark_mode.setup({
-- set_dark_mode = function()
-- -- vim.api.nvim_set_option('background', 'dark')
-- -- vim.cmd('colorscheme rose-pine')
-- vim.api.nvim_set_option('background', 'dark')
-- -- vim.cmd('Catpuccin mocha')
-- end,
-- set_light_mode = function()
-- -- vim.api.nvim_set_option('background', 'light')
-- vim.api.nvim_set_option('background', 'light')
-- -- vim.cmd('colorscheme rose-pine')
-- end
-- })
@ -83,7 +94,6 @@ lvim.plugins = {
-- },
{ "jamessan/vim-gnupg" },
{ "simrat39/symbols-outline.nvim" },
-- { "github/copilot.vim" },
{ 'alexghergh/nvim-tmux-navigation', config = function()
require'nvim-tmux-navigation'.setup {
disable_when_zoomed = true, -- defaults to false
@ -99,7 +109,11 @@ lvim.plugins = {
end
},
{ "AndrewRadev/splitjoin.vim" },
{ "azabiong/vim-highlighter" } -- f-<CR> to highlight
{ "azabiong/vim-highlighter" }, -- f-<CR> to highlight
{
"felipec/vim-sanegx",
event = "BufRead",
},
}
require('orgmode').setup_ts_grammar()

Loading…
Cancel
Save