Lots of changes. See comment :)

- firefox: add script to automate updating user.js
- Anime4K: update version in install script to 4.0.1
- neovim:
    + remove nnn plugin (telescope's file browser has hidden files now)
    + telescope.nvim: update horizontal layout
    + nvim-cmp: update config for lsp, add more sources
    + indent-blankline: update config to use setup()
    + toggleterm, bufferline: repos moved
    + plugins: update multiple small configurations
This commit is contained in:
FollieHiyuki 2021-09-27 03:37:04 +07:00
parent 2e3a1b70a4
commit 8c725aa77c
No known key found for this signature in database
GPG Key ID: 813CF484F4993419
13 changed files with 161 additions and 123 deletions

View File

@ -1,7 +1,17 @@
CTRL+1 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Upscale_CNN_L_x2_Denoise.glsl:~~/shaders/Anime4K_Auto_Downscale_Pre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_M_x2_Deblur.glsl"; show-text "Anime4k: 480/720p (Faithful)" # Low-end computer
CTRL+2 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Upscale_CNN_L_x2_Denoise.glsl:~~/shaders/Anime4K_Auto_Downscale_Pre_x4.glsl:~~/shaders/Anime4K_DarkLines_HQ.glsl:~~/shaders/Anime4K_ThinLines_HQ.glsl:~~/shaders/Anime4K_Upscale_CNN_M_x2_Deblur.glsl"; show-text "Anime4k: 480/720p (Perceptual Quality)" CTRL+1 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode A (Fast)"
CTRL+3 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Upscale_CNN_L_x2_Denoise.glsl:~~/shaders/Anime4K_Auto_Downscale_Pre_x4.glsl:~~/shaders/Anime4K_Deblur_DoG.glsl:~~/shaders/Anime4K_DarkLines_HQ.glsl:~~/shaders/Anime4K_ThinLines_HQ.glsl:~~/shaders/Anime4K_Upscale_CNN_M_x2_Deblur.glsl"; show-text "Anime4k: 480/720p (Perceptual Quality and Deblur)" CTRL+2 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode B (Fast)"
CTRL+4 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Denoise_Bilateral_Mode.glsl:~~/shaders/Anime4K_Upscale_CNN_M_x2_Deblur.glsl"; show-text "Anime4k: 1080p (Faithful)" CTRL+3 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode C (Fast)"
CTRL+5 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Denoise_Bilateral_Mode.glsl:~~/shaders/Anime4K_DarkLines_HQ.glsl:~~/shaders/Anime4K_ThinLines_HQ.glsl:~~/shaders/Anime4K_Upscale_CNN_M_x2_Deblur.glsl"; show-text "Anime4k: 1080p (Perceptual Quality)" CTRL+4 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_Restore_CNN_S.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode A+A (Fast)"
CTRL+6 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Denoise_Bilateral_Mode.glsl:~~/shaders/Anime4K_Deblur_DoG.glsl:~~/shaders/Anime4K_DarkLines_HQ.glsl:~~/shaders/Anime4K_ThinLines_HQ.glsl:~~/shaders/Anime4K_Upscale_CNN_M_x2_Deblur.glsl"; show-text "Anime4k: 1080p (Perceptual Quality and Deblur)" CTRL+5 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_S.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode B+B (Fast)"
CTRL+6 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Restore_CNN_S.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode C+A (Fast)"
CTRL+0 no-osd change-list glsl-shaders clr ""; show-text "GLSL shaders cleared" CTRL+0 no-osd change-list glsl-shaders clr ""; show-text "GLSL shaders cleared"
# High-end computer
# CTRL+1 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode A (HQ)"
# CTRL+2 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode B (HQ)"
# CTRL+3 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode C (HQ)"
# CTRL+4 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_Restore_CNN_M.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode A+A (HQ)"
# CTRL+5 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Restore_CNN_Soft_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode B+B (HQ)"
# CTRL+6 no-osd change-list glsl-shaders set "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Restore_CNN_M.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode C+A (HQ)"
# CTRL+0 no-osd change-list glsl-shaders clr ""; show-text "GLSL shaders cleared"

View File

@ -313,6 +313,9 @@ local function highlight_plugins()
hi('DashboardShortcut', c.grey_bright, '', 'bold,italic', '') hi('DashboardShortcut', c.grey_bright, '', 'bold,italic', '')
hi('DashboardFooter' , c.purple , '', 'bold' , '') hi('DashboardFooter' , c.purple , '', 'bold' , '')
-- symbols-outline.nvim
hi('FocusedSymbol', c.black, c.yellow, 'bold', '')
-- NvimTree -- NvimTree
hi('NvimTreeIndentMarker' , c.grey3 , '', '', '') hi('NvimTreeIndentMarker' , c.grey3 , '', '', '')
hi('NvimTreeFolderIcon' , c.fg , '', '', '') hi('NvimTreeFolderIcon' , c.fg , '', '', '')

View File

@ -248,8 +248,6 @@ wk.register({
} }
}, },
n = {':NnnPicker %:p:h<CR>', 'File picker'},
r = { r = {
name = 'REST', name = 'REST',
c = {'<Plug>RestNvim', 'Run request under cursor'}, c = {'<Plug>RestNvim', 'Run request under cursor'},

View File

@ -50,7 +50,9 @@ function M.cmp_conf()
-- nuspell = '[SPELL]', -- nuspell = '[SPELL]',
spell = '[SPELL]', spell = '[SPELL]',
emoji = '[EMOJI]', emoji = '[EMOJI]',
-- treesitter = '[TS]',
nvim_lsp = '[LSP]', nvim_lsp = '[LSP]',
-- cmp_tabnine = '[TN]',
latex_symbols = '[TEX]', latex_symbols = '[TEX]',
tmux = '[TMUX]', tmux = '[TMUX]',
orgmode = '[ORG]' orgmode = '[ORG]'
@ -114,7 +116,9 @@ function M.cmp_conf()
-- {name = 'nuspell'}, -- {name = 'nuspell'},
{name = 'spell'}, {name = 'spell'},
{name = 'emoji'}, {name = 'emoji'},
-- {name = 'treesitter'},
{name = 'nvim_lsp'}, {name = 'nvim_lsp'},
-- {name = 'cmp_tabnine'},
{name = 'conjure'}, {name = 'conjure'},
{name = 'latex_symbols'}, {name = 'latex_symbols'},
{name = 'tmux'}, {name = 'tmux'},
@ -123,6 +127,16 @@ function M.cmp_conf()
} }
end end
-- function M.tabnine_conf()
-- local tabnine = require('cmp_tabnine.config')
-- tabnine:setup({
-- max_lines = 1000,
-- max_num_results = 20,
-- sort = true,
-- run_on_every_keystroke = true
-- })
-- end
function M.autopairs_conf() function M.autopairs_conf()
require('nvim-autopairs').setup {fast_wrap = {}} require('nvim-autopairs').setup {fast_wrap = {}}
require('nvim-autopairs.completion.cmp').setup({ require('nvim-autopairs.completion.cmp').setup({
@ -172,9 +186,12 @@ function M.coq_conf()
end end
function M.autotag_conf() function M.autotag_conf()
require('nvim-treesitter.configs').setup { require('nvim-ts-autotag').setup({
autotag = {enable = true} filetypes = {
'html', 'javascript', 'javascriptreact', 'typescript',
'typescriptreact', 'svelte', 'vue'
} }
})
end end
return M return M

View File

@ -17,49 +17,24 @@ function M.colorizer_conf()
end end
function M.blankline_conf() function M.blankline_conf()
vim.g.indent_blankline_char = '' require('indent_blankline').setup {
-- vim.g.indent_blankline_space_char = '·' char = '',
vim.g.indent_blankline_show_first_indent_level = true -- space_char_blankline = '·',
vim.g.indent_blankline_filetype_exclude = { show_first_indent_level = true,
'startify', filetype_exclude = {
'dashboard', 'startify', 'dashboard', 'alpha', 'log', 'gitcommit', 'packer', 'vimwiki',
'alpha', 'markdown', 'org', 'json', 'txt', 'help', 'NvimTree', 'git', 'TelescopePrompt',
'dotooagenda', 'undotree', 'dotooagenda', 'fugitive',
'log', '' -- for all buffers without a filetype
'fugitive', },
'gitcommit', buftype_exclude = {'terminal', 'nofile'},
'packer', show_trailing_blankline_indent = false,
'vimwiki', show_current_context = true,
'markdown', context_patterns = {
'org', 'class', 'function', 'method', 'block', 'list_literal', 'selector', '^if',
'json', '^table', 'if_statement', 'while', 'for'
'txt', },
'vista', use_treesitter = true
'help',
'todoist',
'NvimTree',
'peekaboo',
'git',
'TelescopePrompt',
'undotree',
'flutterToolsOutline',
'' -- for all buffers without a file type
}
vim.g.indent_blankline_buftype_exclude = {'terminal', 'nofile'}
vim.g.indent_blankline_show_trailing_blankline_indent = false
vim.g.indent_blankline_show_current_context = true
vim.g.indent_blankline_context_patterns = {
'class',
'function',
'method',
'block',
'list_literal',
'selector',
'^if',
'^table',
'if_statement',
'while',
'for'
} }
-- Refresh often, since it is lazy-loaded -- Refresh often, since it is lazy-loaded

View File

@ -46,22 +46,24 @@ function M.lsp_conf()
}, bufnr) }, bufnr)
end end
-- Add additional capabilities supported by nvim-cmp
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.documentationFormat = {'markdown', 'plaintext'}
capabilities.textDocument.completion.completionItem.snippetSupport = true -- Add additional capabilities supported by nvim-cmp
capabilities.textDocument.completion.completionItem.preselectSupport = true local completionItem = capabilities.textDocument.completion.completionItem
capabilities.textDocument.completion.completionItem.insertReplaceSupport = true completionItem.documentationFormat = {'markdown', 'plaintext'}
capabilities.textDocument.completion.completionItem.labelDetailsSupport = true completionItem.snippetSupport = true
capabilities.textDocument.completion.completionItem.deprecatedSupport = true completionItem.preselectSupport = true
capabilities.textDocument.completion.completionItem.commitCharactersSupport = true completionItem.insertReplaceSupport = true
capabilities.textDocument.completion.completionItem.tagSupport = {valueSet = {1}} completionItem.labelDetailsSupport = true
capabilities.textDocument.completion.completionItem.resolveSupport = { completionItem.deprecatedSupport = true
completionItem.commitCharactersSupport = true
completionItem.tagSupport = {valueSet = {1}}
completionItem.resolveSupport = {
properties = { properties = {
'documentation', 'documentation',
'detail', 'detail',
'additionalTextEdits', 'additionalTextEdits',
}, }
} }
--------------------------- ---------------------------

View File

@ -6,12 +6,13 @@ function M.telescope_conf()
prompt_prefix = '', prompt_prefix = '',
selection_caret = '', selection_caret = '',
set_env = {['COLORTERM'] = 'truecolor'}, set_env = {['COLORTERM'] = 'truecolor'},
sorting_strategy = 'ascending',
layout_strategy = 'horizontal', layout_strategy = 'horizontal',
layout_config = { layout_config = {
horizontal = { horizontal = {
prompt_position = 'top',
preview_width = 0.6 preview_width = 0.6
}, },
-- prompt_position = 'top',
width = 0.8, width = 0.8,
height = 0.8 height = 0.8
}, },
@ -24,6 +25,9 @@ function M.telescope_conf()
}, },
grep_string = { grep_string = {
opts = '--hidden' opts = '--hidden'
},
file_browser = {
hidden = true
} }
}, },
extensions = { extensions = {
@ -44,22 +48,6 @@ function M.telescope_conf()
require('telescope').load_extension('fzf') require('telescope').load_extension('fzf')
end end
function M.nnn_conf()
require('nnn').setup {
set_default_mappings = false,
session = 'global',
layout = {
window = {width = 0.8, height = 0.8, highlight = 'Debug'},
},
command = 'nnn -HUdex',
action = {
['<c-t>'] = 'tab split',
['<c-h>'] = 'split',
['<c-v>'] = 'vsplit'
}
}
end
function M.octo_conf() function M.octo_conf()
require('octo').setup() require('octo').setup()
end end
@ -93,6 +81,7 @@ function M.markdown_preview_conf()
'pandoc.markdown', 'pandoc.markdown',
'rmd' 'rmd'
} }
-- vim.g.mkdp_browser = 'qutebrowser'
-- vim.g.mkdp_page_title = '「${name}」' -- vim.g.mkdp_page_title = '「${name}」'
-- vim.g.mkdp_echo_preview_url = 1 -- vim.g.mkdp_echo_preview_url = 1
end end
@ -223,8 +212,8 @@ function M.toggleterm_conf()
} }
end end
function M.wilder_conf() -- function M.wilder_conf()
vim.api.nvim_command [[ call wilder#setup({'modes': [':', '/', '?']}) ]] -- vim.api.nvim_command [[ call wilder#setup({'modes': [':', '/', '?']}) ]]
-- Doesn't work yet. Bugs in Neovim (see neovim/neovim#14809 and gelguy/wilder.nvim#53) -- Doesn't work yet. Bugs in Neovim (see neovim/neovim#14809 and gelguy/wilder.nvim#53)
-- so can't do multi-line config inside vim.cmd [[ ]] with \ -- so can't do multi-line config inside vim.cmd [[ ]] with \
@ -255,7 +244,7 @@ function M.wilder_conf()
-- \ ) -- \ )
-- \ ]) -- \ ])
-- ]] -- ]]
end -- end
function M.neoscroll_conf() function M.neoscroll_conf()
require('neoscroll').setup() require('neoscroll').setup()

View File

@ -127,6 +127,13 @@ function M.statusline_conf()
return icon .. os return icon .. os
end end
local function buffer_not_empty()
if vim.fn.empty(vim.fn.expand('%:t')) ~= 1 then
return true
end
return false
end
local vi_mode_utils = require('feline.providers.vi_mode') local vi_mode_utils = require('feline.providers.vi_mode')
local comps = { local comps = {
@ -147,6 +154,7 @@ function M.statusline_conf()
}, },
filesize = { filesize = {
provider = 'file_size', provider = 'file_size',
enabled = buffer_not_empty,
hl = {fg = colors.fg, style = 'bold'}, hl = {fg = colors.fg, style = 'bold'},
right_sep = ' ' right_sep = ' '
}, },
@ -155,10 +163,11 @@ function M.statusline_conf()
name = 'file_info', name = 'file_info',
opts = { opts = {
file_modified_icon = '', file_modified_icon = '',
file_readonly_icon = '🔒', file_readonly_icon = '',
type = 'base-only' -- relative, unique type = 'base-only' -- relative, unique, full-path, short-path, relative-short, unique-short
} }
}, },
enabled = buffer_not_empty,
hl = {fg = colors.blue, style = 'bold'}, hl = {fg = colors.blue, style = 'bold'},
right_sep = ' ' right_sep = ' '
}, },
@ -282,10 +291,12 @@ function M.statusline_conf()
force_inactive = { force_inactive = {
filetypes = { filetypes = {
'packer', 'packer',
'NvimTree', 'dashboard',
'alpha', 'alpha',
'NvimTree',
'undotree', 'undotree',
'DIFF', 'DIFF',
'TROUBLE',
'Outline' 'Outline'
}, },
buftypes = {'terminal', 'nofile'}, buftypes = {'terminal', 'nofile'},
@ -309,8 +320,8 @@ function M.bufferline_conf()
show_buffer_close_icons = true, show_buffer_close_icons = true,
always_show_bufferline = true, always_show_bufferline = true,
offsets = { offsets = {
{filetype = 'NvimTree', text = 'NvimTree', text_align = 'left'}, {filetype = 'NvimTree', text = 'NvimTree', text_align = 'center'},
{filetype = 'packer', text = 'Packer', text_align = 'left'} {filetype = 'packer', text = 'Packer', text_align = 'center'}
}, },
separator_style = 'thin' separator_style = 'thin'
}, },
@ -328,9 +339,7 @@ function M.nvimtree_conf()
vim.g.nvim_tree_respect_buf_cwd = 1 vim.g.nvim_tree_respect_buf_cwd = 1
vim.g.nvim_tree_indent_markers = 1 vim.g.nvim_tree_indent_markers = 1
vim.g.nvim_tree_git_hl = 1 vim.g.nvim_tree_git_hl = 1
vim.g.nvim_tree_auto_resize = 0 vim.g.nvim_tree_add_trailing = 0
-- vim.g.nvim_tree_add_trailing = 1
vim.g.nvim_tree_lsp_diagnostics = 1
vim.g.nvim_tree_icons = { vim.g.nvim_tree_icons = {
default = '', default = '',
symlink = '', symlink = '',

View File

@ -111,7 +111,7 @@ function M.load_options()
opt.wildmenu = true opt.wildmenu = true
opt.wildmode = 'full' opt.wildmode = 'full'
opt.complete = '.,w,b,k' opt.complete = '.,w,b,k'
opt.completeopt = 'menuone,noselect' opt.completeopt = 'menu,menuone,noselect'
opt.pumheight = 16 opt.pumheight = 16
opt.helpheight = 12 opt.helpheight = 12
opt.previewheight = 12 opt.previewheight = 12

View File

@ -35,7 +35,7 @@ return require('packer').startup(
config = ui.statusline_conf config = ui.statusline_conf
} }
use { use {
'akinsho/nvim-bufferline.lua', 'akinsho/bufferline.nvim',
event = {'BufRead', 'BufNewFile'}, event = {'BufRead', 'BufNewFile'},
config = ui.bufferline_conf config = ui.bufferline_conf
} }
@ -49,7 +49,11 @@ return require('packer').startup(
open_on_setup = false, open_on_setup = false,
auto_close = true, auto_close = true,
hijack_cursor = true, hijack_cursor = true,
update_cwd = true update_cwd = true,
lsp_diagnostics = true,
view = {
auto_resize = false
}
} }
end end
} }
@ -80,7 +84,7 @@ return require('packer').startup(
} }
use { use {
'lukas-reineke/indent-blankline.nvim', 'lukas-reineke/indent-blankline.nvim',
event = 'BufRead', after = 'nvim-treesitter',
config = editor.blankline_conf config = editor.blankline_conf
} }
use { -- TODO: config (lua -> fennel) + learn clojure, fennel, guile scheme use { -- TODO: config (lua -> fennel) + learn clojure, fennel, guile scheme
@ -215,8 +219,15 @@ return require('packer').startup(
-- use {'f3fora/cmp-nuspell', after = 'nvim-cmp', rocks={'lua-nuspell'}} -- use {'f3fora/cmp-nuspell', after = 'nvim-cmp', rocks={'lua-nuspell'}}
use {'f3fora/cmp-spell', after = 'nvim-cmp'} use {'f3fora/cmp-spell', after = 'nvim-cmp'}
use {'hrsh7th/cmp-emoji', after = 'nvim-cmp'} use {'hrsh7th/cmp-emoji', after = 'nvim-cmp'}
use {'hrsh7th/cmp-nvim-lsp', after = 'nvim-cmp'} -- use {'ray-x/cmp-treesitter', after = {'nvim-cmp', 'nvim-treesitter'}}
use {'kdheepak/cmp-latex-symbols', after = 'nvim-cmp'} use {'hrsh7th/cmp-nvim-lsp', after = {'nvim-cmp', 'nvim-lspconfig'}}
-- use {
-- 'tzachar/cmp-tabnine',
-- after = 'nvim-cmp',
-- run = './install.sh',
-- config = completion.tabnine_conf
-- }
use {'kdheepak/cmp-latex-symbols', after = {'nvim-cmp', 'vimtex'}}
use {'andersevenrud/compe-tmux', after = 'nvim-cmp', branch = 'cmp'} use {'andersevenrud/compe-tmux', after = 'nvim-cmp', branch = 'cmp'}
use {'PaterJason/cmp-conjure', after = {'conjure', 'nvim-cmp'}} use {'PaterJason/cmp-conjure', after = {'conjure', 'nvim-cmp'}}
use { use {
@ -236,15 +247,8 @@ return require('packer').startup(
use { use {
'windwp/nvim-ts-autotag', 'windwp/nvim-ts-autotag',
ft = { ft = {
'html', 'html', 'javascript', 'javascriptreact', 'typescript',
'xml', 'typescriptreact', 'vue', 'svelte'
'javascript',
'javascriptreact',
'typescript',
'typescriptreact',
'vue',
'svelte',
'php'
}, },
wants = 'nvim-treesitter', wants = 'nvim-treesitter',
config = completion.autotag_conf config = completion.autotag_conf
@ -271,11 +275,6 @@ return require('packer').startup(
}, },
config = tools.telescope_conf config = tools.telescope_conf
} }
use { -- Telescope file browser doesn't support dotfiles
'mcchrish/nnn.vim',
cmd = 'NnnPicker',
config = tools.nnn_conf
}
use { -- TODO: colors + config use { -- TODO: colors + config
'pwntester/octo.nvim', 'pwntester/octo.nvim',
cmd = 'Octo', cmd = 'Octo',
@ -353,7 +352,7 @@ return require('packer').startup(
setup = tools.undotree_conf setup = tools.undotree_conf
} }
use { use {
'akinsho/nvim-toggleterm.lua', 'akinsho/toggleterm.nvim',
cmd = 'ToggleTerm', cmd = 'ToggleTerm',
config = tools.toggleterm_conf config = tools.toggleterm_conf
} }
@ -390,8 +389,9 @@ return require('packer').startup(
event = 'BufEnter', event = 'BufEnter',
config = tools.session_conf config = tools.session_conf
} }
use {'tweekmonster/startuptime.vim', cmd = 'StartupTime'} -- Just for benchmarking -- use {'dstein64/vim-startuptime', cmd = 'StartupTime'} -- Just for benchmarking
-- TODO: dial.nvim, rust-tools.nvim, crates.nvim, go.nvim, clojure-vim/*, vim-pandoc, nvim-bqf -- TODO: dial.nvim, rust-tools.nvim, crates.nvim, go.nvim, clojure-vim/*,
-- vim-pandoc, nvim-bqf, todo-comments.nvim, nvim-comment-frame
end end
) )

View File

@ -0,0 +1,12 @@
/* override recipe: these are some preferences that I like */
user_pref("ui.systemUsesDarkTheme", 1); // [FF67+] [HIDDEN PREF]
// 0=light, 1=dark: with RFP this only affects chrome
user_pref("ui.prefersReducedMotion", 1); // [FF77+] [RESTART] [HIDDEN PREF]
// disable chrome animations
user_pref("privacy.firstparty.isolate", false); // 4001
user_pref("network.cookie.cookieBehavior", 5); // 2701
user_pref("browser.contentblocking.category", "strict"); // 2701
// ETP Strict mode (Total cookie protection + Smart block)

23
home/firefox/userjs-update.sh Executable file
View File

@ -0,0 +1,23 @@
#!/bin/sh -e
# Use in conjunction with `firefox-sync` script
# (need to open Firefox at least once to generate a profile)
cur_dir="$PWD"
profile_dir=$(find ~/.var/app/org.mozilla.firefox/.mozilla/firefox/ -type d -name "static-*" | head -n 1)
profile=$(echo "${profile_dir}" | sed 's/^.*static-//g')
~/.local/bin/firefox-sync ${profile}
if [ ! -f "${profile_dir}/updater.sh" ]; then
curl -fLo "${profile_dir}/updater.sh" https://raw.githubusercontent.com/arkenfox/user.js/master/updater.sh
chmod 755 "${profile_dir}/updater.sh"
fi
cd ${profile_dir}
bash ./updater.sh
# To be sure both directories are synced
cp -f ./user.js ../${profile}/user.js
cp -f ./updater.sh ../${profile}/updater.sh
cd "${cur_dir}"

View File

@ -14,13 +14,13 @@ cp -f bin/Anime4KCPP_CLI ~/.local/bin/
cd ../.. cd ../..
# ----------------- Anime4K shaders ---------------------- # # ----------------- Anime4K shaders ---------------------- #
echo "Version of Anime4K shaders: " | tr -d '\n' # 3.1 echo "Version of Anime4K shaders: " | tr -d '\n' # 4.0.1
read -r version read -r version
mkdir shaders && cd shaders if [ -d "$HOME/.config/mpv/shaders" ]; then
curl -fLo Anime4K.zip https://github.com/bloc97/Anime4K/releases/download/${version}/Anime4K_v${version}.zip rm -rf ~/.config/mpv/shaders
unzip Anime4K.zip && rm Anime4K.zip fi
cd .. curl -fLo Anime4K.zip https://github.com/bloc97/Anime4K/releases/download/${version}/Anime4K_v4.0.zip
cp -rfv shaders ~/.config/mpv/ unzip Anime4K.zip -d ~/.config/mpv/shaders && rm Anime4K.zip
# ------------------- PyWrapper -------------------------- # # ------------------- PyWrapper -------------------------- #
# Need pymkv, pymediainfo, simple-term-menu (use pip inside a virtualenv) # Need pymkv, pymediainfo, simple-term-menu (use pip inside a virtualenv)
@ -43,4 +43,4 @@ cd ../..
#git clone https://github.com/k4yt3x/video2x.git #git clone https://github.com/k4yt3x/video2x.git
#cp -rfv video2x/src ~/.local/bin/video2x #cp -rfv video2x/src ~/.local/bin/video2x
# -- Dandere2x, waifu2x, waifu2x-ncnn-vulkan -- # f*** Nvidia, you need it for waifu2x stuff # -- Dandere2x, waifu2x, waifu2x-ncnn-vulkan -- #