From 31c469079f077bc2115887554ef0dbaad637a88d Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sun, 11 Dec 2022 22:14:42 +0100 Subject: init desktop branch --- .config/nvim/snippets/html.lua | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .config/nvim/snippets/html.lua (limited to '.config/nvim/snippets') diff --git a/.config/nvim/snippets/html.lua b/.config/nvim/snippets/html.lua deleted file mode 100644 index b168aca..0000000 --- a/.config/nvim/snippets/html.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - parse('sktn', '\ -\ -\ -\ - \ - \ - \ - \ -\ -\ -\ -

\ -

\ -\ -\ -\ -'), -} -- cgit v1.2.3 From c9502c9c4b61c4cab7655c484ef7e577308343cf Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 23 Dec 2022 22:01:25 +0100 Subject: readded nvim --- .config/nvim/ftplugin/javascript.vim | 9 + .config/nvim/init.lua | 14 ++ .config/nvim/lua/lib/utils.lua | 22 ++ .config/nvim/lua/user/keymaps.lua | 31 +++ .config/nvim/lua/user/misc.lua | 6 + .config/nvim/lua/user/options.lua | 24 +++ .config/nvim/lua/user/plugins.lua | 101 +++++++++ .config/nvim/lua/user/plugins/cmp.lua | 73 +++++++ .config/nvim/lua/user/plugins/dracula.lua | 13 ++ .config/nvim/lua/user/plugins/lspconfig.lua | 131 ++++++++++++ .config/nvim/lua/user/plugins/lualine.lua | 64 ++++++ .config/nvim/lua/user/plugins/luasnip.lua | 9 + .config/nvim/lua/user/plugins/nvim-tree.lua | 13 ++ .config/nvim/lua/user/plugins/telescope.lua | 25 +++ .config/nvim/lua/user/plugins/treesitter.lua | 31 +++ .config/nvim/plugin/packer_compiled.lua | 299 +++++++++++++++++++++++++++ .config/nvim/snippets/html.lua | 20 ++ 17 files changed, 885 insertions(+) create mode 100644 .config/nvim/ftplugin/javascript.vim create mode 100644 .config/nvim/init.lua create mode 100644 .config/nvim/lua/lib/utils.lua create mode 100644 .config/nvim/lua/user/keymaps.lua create mode 100644 .config/nvim/lua/user/misc.lua create mode 100644 .config/nvim/lua/user/options.lua create mode 100644 .config/nvim/lua/user/plugins.lua create mode 100644 .config/nvim/lua/user/plugins/cmp.lua create mode 100644 .config/nvim/lua/user/plugins/dracula.lua create mode 100644 .config/nvim/lua/user/plugins/lspconfig.lua create mode 100644 .config/nvim/lua/user/plugins/lualine.lua create mode 100644 .config/nvim/lua/user/plugins/luasnip.lua create mode 100644 .config/nvim/lua/user/plugins/nvim-tree.lua create mode 100644 .config/nvim/lua/user/plugins/telescope.lua create mode 100644 .config/nvim/lua/user/plugins/treesitter.lua create mode 100644 .config/nvim/plugin/packer_compiled.lua create mode 100644 .config/nvim/snippets/html.lua (limited to '.config/nvim/snippets') diff --git a/.config/nvim/ftplugin/javascript.vim b/.config/nvim/ftplugin/javascript.vim new file mode 100644 index 0000000..4ffe06d --- /dev/null +++ b/.config/nvim/ftplugin/javascript.vim @@ -0,0 +1,9 @@ +setl nospell +setl nowrap +setl tabstop=2 +setl shiftwidth=2 +setl expandtab +let b:vcm_tab_complete = 'javascript' +let b:javascript_fold = 1 +let g:javascript_plugin_jsdoc = 1 +let g:jsx_ext_required = 0 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 100644 index 0000000..f71bdb7 --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1,14 @@ +-- __ _ _ +-- ___ __ _ / _| ___ | |__ __ _| |__ ___ +-- / __| / _' | |_ / _ \| _ \ / _' | _ \ / _ \ +-- | |__ / (_| | _| __/| |_) / (_| | |_) | __/ +-- \___|\___._/_| \___||____/\___._/____/ \___/ +-- +-- Personal vim configuration of cafebabe + +require('user.options') +require('user.plugins') +require('user.keymaps') +require('user.misc') + +--vim: nospell diff --git a/.config/nvim/lua/lib/utils.lua b/.config/nvim/lua/lib/utils.lua new file mode 100644 index 0000000..8abbabd --- /dev/null +++ b/.config/nvim/lua/lib/utils.lua @@ -0,0 +1,22 @@ +local M = {} + +M.keymap = function(mode, lhs, rhs, opts) + vim.api.nvim_set_keymap( + mode, + lhs, + rhs, + vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true }) + ) +end + +M.buf_keymap = function(bufnr, mode, lhs, rhs, opts) + vim.api.nvim_buf_set_keymap( + bufnr, + mode, + lhs, + rhs, + vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true }) + ) +end + +return M diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua new file mode 100644 index 0000000..59c323c --- /dev/null +++ b/.config/nvim/lua/user/keymaps.lua @@ -0,0 +1,31 @@ +local keymap = require 'lib.utils'.keymap + +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' + +keymap('n', 'Q', ':bufdo bdelete') + +-- Allow gf to open non-existant files +keymap('n', 'gf', ':edit ') + +-- Quick navigation between splits +keymap('n', '', 'h') +keymap('n', '', 'j') +keymap('n', '', 'k') +keymap('n', '', 'l') + +-- Open the current file in the default program +keymap('n', 'x', ':!xdg-open %') + +-- Resize with arrows +keymap('n', '', ':resize +2') +keymap('n', '', ':resize -2') +keymap('n', '', ':vertical resize -2') +keymap('n', '', ':vertical resize +2') + +-- Quickly escape to normal mode +keymap('i', 'jj', '') + +keymap('n', 'cd', ':cd %:p:h:pwd') + +keymap('n', 'E', ':EslintFixAll') diff --git a/.config/nvim/lua/user/misc.lua b/.config/nvim/lua/user/misc.lua new file mode 100644 index 0000000..88d47cf --- /dev/null +++ b/.config/nvim/lua/user/misc.lua @@ -0,0 +1,6 @@ +vim.cmd [[ + augroup Indentation + autocmd! + autocmd FileType html set inde= + augroup END +]] diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua new file mode 100644 index 0000000..0c35dfc --- /dev/null +++ b/.config/nvim/lua/user/options.lua @@ -0,0 +1,24 @@ +vim.o.guicursor = 'a:block' +vim.o.expandtab = true +vim.o.shiftwidth = 4 +vim.o.tabstop = 4 +vim.o.signcolumn = 'yes:2' +vim.o.relativenumber = true +vim.o.number = true +vim.o.termguicolors = true +vim.o.ignorecase = true +vim.o.smartcase = true +vim.o.wildmode = 'longest:full,full' +vim.o.wrap = false +vim.o.scrolloff = 8 +vim.o.sidescrolloff = 8 +vim.o.cursorline = 1 +vim.o.splitright = 1 +vim.o.splitbelow = 1 +vim.o.clipboard = 'unnamedplus' -- Use Linux system clipboard +vim.o.updatetime = 250 -- Decrease CursorHold delay +vim.o.redrawtime = 10000 -- Allow more time for loading syntax on large files +vim.o.foldmethod = "expr" +vim.o.foldlevelstart = 10 +vim.o.foldexpr = "nvim_treesitter#foldexpr()" +vim.o.hlsearch = 0 diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua new file mode 100644 index 0000000..755f0e9 --- /dev/null +++ b/.config/nvim/lua/user/plugins.lua @@ -0,0 +1,101 @@ +require('packer').startup(function() + use { 'wbthomason/packer.nvim' } -- Let packer manage itself + use { 'tpope/vim-commentary' } + use { 'tpope/vim-surround' } + use { 'tpope/vim-eunuch' } + use { 'tpope/vim-sleuth' } + + use { + 'dracula/vim', + as = 'dracula', + config = function() + require('user.plugins.dracula') + end + } + use { + 'windwp/nvim-autopairs', + config = function() + require('nvim-autopairs').setup() + end + } + + use { + 'windwp/nvim-ts-autotag', + config = function() + require('nvim-ts-autotag').setup() + end + } + + use { + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', + config = function() + require('user.plugins.nvim-tree') + end + } + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate', + requires = { + 'nvim-treesitter/playground', + 'nvim-treesitter/nvim-treesitter-textobjects', + 'lewis6991/spellsitter.nvim', + 'JoosepAlviste/nvim-ts-context-commentstring', + }, + config = function() + require('spellsitter').setup() + require('user.plugins.treesitter') + end + } + + use { + 'neovim/nvim-lspconfig', + requires = { + 'b0o/schemastore.nvim', + 'folke/lsp-colors.nvim', + 'weilbith/nvim-code-action-menu', + }, + config = function() + require('user.plugins.lspconfig') + end + } + use { + 'hrsh7th/nvim-cmp', + requires = { + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-buffer', + 'jessarcher/cmp-path', + 'hrsh7th/cmp-nvim-lua', + 'L3MON4D3/LuaSnip', + 'onsails/lspkind-nvim', + 'hrsh7th/cmp-nvim-lsp-signature-help', + }, + config = function() + require('user.plugins.cmp') + end + } + use { + 'nvim-telescope/telescope.nvim', + requires = { + 'nvim-lua/popup.nvim', + 'nvim-lua/plenary.nvim', + 'kyazdani42/nvim/nvim-web-devicons', + }, + config = function() + require('user.plugins.telescope') + end + } + use { + 'nvim-lualine/lualine.nvim', + requires = 'kyazdani42/nvim-web-devicons', + config = function() + require('user.plugins.lualine') + end + } + use { + 'L3MON4D3/LuaSnip', + config = function() + require('user.plugins.luasnip') + end + } +end) diff --git a/.config/nvim/lua/user/plugins/cmp.lua b/.config/nvim/lua/user/plugins/cmp.lua new file mode 100644 index 0000000..81cd2ee --- /dev/null +++ b/.config/nvim/lua/user/plugins/cmp.lua @@ -0,0 +1,73 @@ +local has_words_before = function() + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil +end + +local luasnip = require 'luasnip' +local cmp = require 'cmp' +local lspkind = require 'lspkind' + +-- Set completeopt to have a better completion experience +vim.o.completeopt = 'menuone,longest,preview' + +cmp.setup({ + experimental = { + ghost_text = true, + }, + formatting = { + format = lspkind.cmp_format { + mode = 'symbol', + menu = { + nvim_lsp = '[LSP]', + nvim_lua = '[Lua]', + buffer = '[BUF]', + }, + }, + }, + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.replace, + select = false, + }, + [''] = cmp.mapping(function(fallback) + if luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif cmp.visible() then + cmp.select_next_item() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function(fallback) + if luasnip.jumpable(-1) then + luasnip.jump(-1) + elseif cmp.visible() then + cmp.select_prev_item() + else + fallback() + end + + end, { 'i', 's' }), + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'nvim_lsp_signature_help' }, + { name = 'nvim_lua' }, + { name = 'luasnip' }, + { name = 'path' }, + { name = 'buffer' }, + }, +}) diff --git a/.config/nvim/lua/user/plugins/dracula.lua b/.config/nvim/lua/user/plugins/dracula.lua new file mode 100644 index 0000000..3d1e91a --- /dev/null +++ b/.config/nvim/lua/user/plugins/dracula.lua @@ -0,0 +1,13 @@ +vim.cmd([[ + augroup DraculaOverrides + autocmd! + autocmd ColorScheme dracula highlight! link Pmenu DraculaBg + autocmd ColorScheme dracula highlight link NormalFloat DraculaBgLight + autocmd ColorScheme dracula highlight FloatBorder guifg=#343746 guibg=#343746 + autocmd ColorScheme dracula highlight DraculaBoundary guibg=none + autocmd ColorScheme dracula highlight DraculaDiffDelete ctermbg=none guibg=none + autocmd ColorScheme dracula highlight DraculaComment cterm=italic gui=italic + autocmd ColorScheme dracula highlight Normal guibg=#000000 + augroup end + colorscheme dracula +]]) diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua new file mode 100644 index 0000000..a63975b --- /dev/null +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -0,0 +1,131 @@ +local buf_option = vim.api.nvim_buf_set_option +local buf_keymap = require 'lib.utils'.buf_keymap + +vim.diagnostic.config { + virtual_text = false, + severity_sort = true, + float = { + source = true, + focus = false, + format = function(diagnostic) + if diagnostic.user_data ~= nil and diagnostic.user_data.lsp.code ~= nil then + return string.format("%s: %s", diagnostic.user_data.lsp.code, diagnostic.message) + end + return diagnostic.message + end, + } +} + +local on_attach = function(_, bufnr) + buf_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + buf_keymap(bufnr, 'n', 'gD', 'lua vim.lsp.buf.declaration()') + buf_keymap(bufnr, 'n', 'gd', 'lua vim.lsp.buf.definition()') + buf_keymap(bufnr, 'n', 'K', 'lua vim.lsp.buf.hover()') + buf_keymap(bufnr, 'n', 'gi', 'lua vim.lsp.buf.implementation()') + buf_keymap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()') + buf_keymap(bufnr, 'n', 'D', 'lua vim.lsp.buf.type_definition()') + buf_keymap(bufnr, 'n', 'rn', 'lua vim.lsp.buf.rename()') + buf_keymap(bufnr, 'n', 'gr', ':Telescope lsp_references') + + buf_keymap(bufnr, 'n', 'ca', ':CodeActionMenu') + buf_keymap(bufnr, 'v', 'ca', ':CodeActionMenu') + + buf_keymap(bufnr, 'n', 'd', 'lua vim.diagnostic.open_float()') + buf_keymap(bufnr, 'n', '[d', 'lua vim.diagnostic.goto_prev()') + buf_keymap(bufnr, 'n', ']d', 'lua vim.diagnostic.goto_next()') + buf_keymap(bufnr, 'n', 'F', 'lua vim.lsp.buf.format { async = true }') + + -- Autoformat on save doesn't work with server_capabilities, even + -- though it's the replacement for the deprecated resolved_capabilities. + + -- if _.server_capabilities.document_formatting then + -- vim.api.nvim_command [[augroup Format]] + -- vim.api.nvim_command [[autocmd! * ]] + -- vim.api.nvim_command [[autocmd BufWritePre lua vim.lsp.buf.formatting_seq_sync()]] + -- vim.api.nvim_command [[augroup END]] + -- end +end + +-- provide additional completion capabilities +local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) + +require 'lspconfig'.emmet_ls.setup { + on_attach = on_attach, + capabilities = capabilities, + flags = { + debounce_text_changes = 150, + }, + filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact' } +} + +local runtime_path = vim.split(package.path, ';') +table.insert(runtime_path, "lua/?.lua") +table.insert(runtime_path, "lua/?/init.lua") +require 'lspconfig'.sumneko_lua.setup { + on_attach = on_attach, + capabilities = capabilities, + flags = { + debounce_text_changes = 150, + }, + cmd = { "/home/cafebabe/.local/src/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/src/lua-language-server/bin/main.lua" }; + settings = { + Lua = { + runtime = { + -- Tell language server which version of lua is used. + version = 'LuaJIT', + -- Setup lua path + path = runtime_path, + }, + diagnostics = { + -- Recognize globals + globals = { 'vim', 'use', 'parse' }, + }, + workspace = { + -- Make server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file("", true), + }, + -- Do not send telemetry data + telemetry = { + enable = false, + }, + }, + }, +} + +require 'lspconfig'.bashls.setup { + on_attach = on_attach, + capabilities = capabilities, + flags = { + debounce_text_changes = 150, + }, +} + +require 'lspconfig'.pylsp.setup { + on_attach = on_attach, + capabilities = capabilities, + flags = { + debounce_text_changes = 150, + }, +} + +require 'lspconfig'.clangd.setup { + on_attach = on_attach, + capabilities = capabilities, + flags = { + debounce_text_changes = 150, + }, +} + + +-- suppress error messages from lang servers +vim.notify = function(msg, log_level, _) + if msg:match 'exit code' then + return + end + if log_level == vim.log.levels.ERROR then + vim.api.nvim_err_writeln(msg) + else + vim.api.nvim_echo({ { msg } }, true, {}) + end +end diff --git a/.config/nvim/lua/user/plugins/lualine.lua b/.config/nvim/lua/user/plugins/lualine.lua new file mode 100644 index 0000000..6ac5cee --- /dev/null +++ b/.config/nvim/lua/user/plugins/lualine.lua @@ -0,0 +1,64 @@ +-- local tabLineHl = vim.api.nvim_get_hl_by_name('TabLine', true) +-- local bg = '#' .. bit.tohex(tabLineHl.background, 6) +-- local fg = '#' .. bit.tohex(tabLineHl.foreground, 6) +local fg = '#F8F8F2' -- DraculaFg +local bg = '#21222C' -- DraculaBgDark +local separator = '#424450' -- DraculaSubtle +-- local fg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaFg', true).foreground, 6) +-- local bg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaBgDark', true).background, 6) +-- local separator = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaSubtle', true).foreground, 6) + +require('lualine').setup { + options = { + component_separators = '', + section_separators = '▕', + theme = { + normal = { + a = { fg = fg, bg = bg }, + b = { fg = fg, bg = bg }, + c = { fg = fg, bg = bg }, + x = { fg = fg, bg = bg }, + y = { fg = fg, bg = bg }, + z = { fg = fg, bg = bg }, + }, + inactive = { c = { fg = fg, bg = bg } }, + }, + }, + sections = { + lualine_a = { + 'mode', + { '"▏"', color = { fg = separator } }, + }, + lualine_b = { + 'branch', + 'diff', + { '"▕"', color = { fg = separator } }, + '"🖧 " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))', + { 'diagnostics', sources = { 'nvim_diagnostic' } }, + { '"▏"', color = { fg = separator } }, + }, + lualine_c = { 'filename' }, + lualine_x = { + 'filetype', + 'encoding', + 'fileformat', + }, + lualine_y = { + { '"▕"', color = { fg = separator } }, + '(vim.bo.expandtab and "␠ " or "⇥ ") .. " " .. vim.bo.shiftwidth', + { '"▏"', color = { fg = separator } }, + }, + lualine_z = { + 'location', + 'progress', + }, + }, + -- tabline = { + -- lualine_a = { + -- {'buffers'} + -- }, + -- lualine_z = { + -- {'tabs'} + -- } + -- } +} diff --git a/.config/nvim/lua/user/plugins/luasnip.lua b/.config/nvim/lua/user/plugins/luasnip.lua new file mode 100644 index 0000000..2e7462a --- /dev/null +++ b/.config/nvim/lua/user/plugins/luasnip.lua @@ -0,0 +1,9 @@ +local ls = require "luasnip" +require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" }) + +ls.config.set_config { + history = true, + updateevents = 'TextChanged,TextChangedI', + enable_autosnippets = true, +} + diff --git a/.config/nvim/lua/user/plugins/nvim-tree.lua b/.config/nvim/lua/user/plugins/nvim-tree.lua new file mode 100644 index 0000000..3c425c5 --- /dev/null +++ b/.config/nvim/lua/user/plugins/nvim-tree.lua @@ -0,0 +1,13 @@ +require('nvim-tree').setup { + renderer = { + highlight_opened_files = "all", + group_empty = true, + }, + git = { + ignore = false, + }, +} + +vim.cmd [[highlight NvimTreeIndentMarker guifg=#30323E]] + +vim.api.nvim_set_keymap('n', 'n', ':NvimTreeFindFileToggle', { silent = true, noremap = true }) diff --git a/.config/nvim/lua/user/plugins/telescope.lua b/.config/nvim/lua/user/plugins/telescope.lua new file mode 100644 index 0000000..b1d1136 --- /dev/null +++ b/.config/nvim/lua/user/plugins/telescope.lua @@ -0,0 +1,25 @@ +local telescope = require 'telescope' +local actions = require 'telescope.actions' +local keymap = require 'lib.utils'.keymap + +keymap('n', ';f', [[lua require('telescope.builtin').find_files()]]) +keymap('n', ';r', [[lua require('telescope.builtin').live_grep()]]) +keymap('n', ';\\', [[lua require('telescope.builtin').buffers()]]) + +require('telescope').setup { + defaults = { + sorting_strategy = 'ascending', + mappings = { + i = { + [""] = actions.close, + [''] = actions.cycle_history_next, + [''] = actions.cycle_history_prev, + }, + }, + file_ignore_patterns = { + '.git/', + 'node_modules/', + 'android/', + }, + } +} diff --git a/.config/nvim/lua/user/plugins/treesitter.lua b/.config/nvim/lua/user/plugins/treesitter.lua new file mode 100644 index 0000000..32c74ee --- /dev/null +++ b/.config/nvim/lua/user/plugins/treesitter.lua @@ -0,0 +1,31 @@ +require('nvim-treesitter.configs').setup { + indent = { + enable = true, + disable = { 'html' }, + }, + highlight = { + enable = true, + disable = { 'NvimTree' }, + additional_vim_regex_highlighting = true, + }, + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ['ia'] = '@parameter.inner', + -- ['aa'] = { + -- php = "" '@parameter.outer', + + -- python = "(function_definition) @function", + -- cpp = "(function_definition) @function", + -- c = "(function_definition) @function", + -- java = "(method_declaration) @function", + -- }, + }, + }, + }, + context_commentstring = { + enable = true, + }, +} diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua new file mode 100644 index 0000000..75d1f59 --- /dev/null +++ b/.config/nvim/plugin/packer_compiled.lua @@ -0,0 +1,299 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + LuaSnip = { + config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["cmp-buffer"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-nvim-lsp-signature-help"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help", + url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help" + }, + ["cmp-nvim-lua"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + url = "https://github.com/hrsh7th/cmp-nvim-lua" + }, + ["cmp-path"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/jessarcher/cmp-path" + }, + dracula = { + config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/dracula", + url = "https://github.com/dracula/vim" + }, + ["lsp-colors.nvim"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim", + url = "https://github.com/folke/lsp-colors.nvim" + }, + ["lspkind-nvim"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/lspkind-nvim", + url = "https://github.com/onsails/lspkind-nvim" + }, + ["lualine.nvim"] = { + config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, + ["nvim-autopairs"] = { + config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-autopairs", + url = "https://github.com/windwp/nvim-autopairs" + }, + ["nvim-cmp"] = { + config = { "\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-code-action-menu"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-code-action-menu", + url = "https://github.com/weilbith/nvim-code-action-menu" + }, + ["nvim-lspconfig"] = { + config = { "\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-tree.lua"] = { + config = { "\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", + url = "https://github.com/kyazdani42/nvim-tree.lua" + }, + ["nvim-treesitter"] = { + config = { "\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["nvim-treesitter-textobjects"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textobjects", + url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects" + }, + ["nvim-ts-autotag"] = { + config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag", + url = "https://github.com/windwp/nvim-ts-autotag" + }, + ["nvim-ts-context-commentstring"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring", + url = "https://github.com/JoosepAlviste/nvim-ts-context-commentstring" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/kyazdani42/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + playground = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/playground", + url = "https://github.com/nvim-treesitter/playground" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["popup.nvim"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/popup.nvim", + url = "https://github.com/nvim-lua/popup.nvim" + }, + ["schemastore.nvim"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/schemastore.nvim", + url = "https://github.com/b0o/schemastore.nvim" + }, + ["spellsitter.nvim"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/spellsitter.nvim", + url = "https://github.com/lewis6991/spellsitter.nvim" + }, + ["telescope.nvim"] = { + config = { "\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + ["vim-commentary"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-commentary", + url = "https://github.com/tpope/vim-commentary" + }, + ["vim-eunuch"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-eunuch", + url = "https://github.com/tpope/vim-eunuch" + }, + ["vim-sleuth"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-sleuth", + url = "https://github.com/tpope/vim-sleuth" + }, + ["vim-surround"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround", + url = "https://github.com/tpope/vim-surround" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) +-- Config for: dracula +time([[Config for dracula]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") +time([[Config for dracula]], false) +-- Config for: nvim-lspconfig +time([[Config for nvim-lspconfig]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") +time([[Config for nvim-lspconfig]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") +time([[Config for lualine.nvim]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) +-- Config for: nvim-ts-autotag +time([[Config for nvim-ts-autotag]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") +time([[Config for nvim-ts-autotag]], false) +-- Config for: LuaSnip +time([[Config for LuaSnip]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") +time([[Config for LuaSnip]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end diff --git a/.config/nvim/snippets/html.lua b/.config/nvim/snippets/html.lua new file mode 100644 index 0000000..b168aca --- /dev/null +++ b/.config/nvim/snippets/html.lua @@ -0,0 +1,20 @@ +return { + parse('sktn', '\ +\ +\ +\ + \ + \ + \ + \ +\ +\ +\ +

\ +

\ +\ +\ +\ +'), +} -- cgit v1.2.3 From be35ccddeb63db26949183ade5a801593918a597 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 1 Apr 2023 15:59:07 +0200 Subject: removed emacs configs --- .config/nvim/snippets/all.lua | 23 +++ .config/nvim/snippets/html.lua | 20 --- .config/picom/picom.conf | 4 +- .config/shell/aliasrc | 3 + .config/x11/xinitrc | 1 + .emacs.d/config.el | 87 ---------- .emacs.d/dracula-custom-theme.el | 52 ------ .emacs.d/functions.el | 49 ------ .emacs.d/init.el | 14 -- .emacs.d/keybinds.el | 14 -- .emacs.d/packages.el | 335 --------------------------------------- 11 files changed, 29 insertions(+), 573 deletions(-) create mode 100644 .config/nvim/snippets/all.lua delete mode 100644 .config/nvim/snippets/html.lua delete mode 100644 .emacs.d/config.el delete mode 100644 .emacs.d/dracula-custom-theme.el delete mode 100644 .emacs.d/functions.el delete mode 100644 .emacs.d/init.el delete mode 100644 .emacs.d/keybinds.el delete mode 100644 .emacs.d/packages.el (limited to '.config/nvim/snippets') diff --git a/.config/nvim/snippets/all.lua b/.config/nvim/snippets/all.lua new file mode 100644 index 0000000..78c33db --- /dev/null +++ b/.config/nvim/snippets/all.lua @@ -0,0 +1,23 @@ +return { + parse('sktn', '\ +\ +\ +\ + Website Title\ + \ + \ + \ +\ +\ +\ +

\ +

Header Text

\ +

Lorem ipsum bla, bla, bla...

\ +

\ +\ +\ +\ +'), +} diff --git a/.config/nvim/snippets/html.lua b/.config/nvim/snippets/html.lua deleted file mode 100644 index b168aca..0000000 --- a/.config/nvim/snippets/html.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - parse('sktn', '\ -\ -\ -\ - \ - \ - \ - \ -\ -\ -\ -

\ -

\ -\ -\ -\ -'), -} diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index f3eb671..a095613 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -2,8 +2,8 @@ # empty file, just so transparency works on st opacity-rule = [ - "90:class_g = 'SchildiChat' && focused", - "90:class_g = 'SchildiChat' && !focused" + "98:class_g = 'SchildiChat' && focused", + "98:class_g = 'SchildiChat' && !focused" ] # corner-radius = 6 diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index c107f4d..5d21bf7 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -10,6 +10,8 @@ alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias vi="$EDITOR" +alias em='emacsclient -c -a "emacs" &' +alias emacsd='/usr/local/bin/emacs --daemon &' alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' @@ -17,6 +19,7 @@ alias ea='vi ~/.config/shell/aliasrc' alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' alias cam='mpv --profile=low-latency --untimed /dev/video0' alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias ofn='/usr/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # setting custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index d106aa8..76a3ff5 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -20,6 +20,7 @@ xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 ibus-daemon -dxrR +/usr/local/bin/emacs --daemon & statusbar & pipewire & mpd & diff --git a/.emacs.d/config.el b/.emacs.d/config.el deleted file mode 100644 index a46bca5..0000000 --- a/.emacs.d/config.el +++ /dev/null @@ -1,87 +0,0 @@ -(add-hook 'text-mode-hook 'display-line-numbers-mode) -(add-hook 'prog-mode-hook 'display-line-numbers-mode) -(add-hook 'emacs-startup-hook 'startup/revert-file-name-handler-alist) -(add-hook 'emacs-startup-hook 'startup/reset-gc) - -;; dirty fix for having AC everywhere -(define-globalized-minor-mode real-global-auto-complete-mode - auto-complete-mode (lambda () - (if (not (minibufferp (current-buffer))) - (auto-complete-mode 1)) - )) -(real-global-auto-complete-mode t) - -;; Mutt support -(add-to-list 'auto-mode-alist '("/tmp/mutt.*" . mail-mode)) - -(show-paren-mode 1) -(tool-bar-mode -1) -(menu-bar-mode -1) -(scroll-bar-mode -1) -(global-prettify-symbols-mode t) -(electric-pair-mode t) -(global-hl-line-mode t) -(recentf-mode 1) -(savehist-mode 1) -(global-auto-revert-mode 1) - -(set-frame-parameter (selected-frame) 'alpha '(80 . 80)) -(add-to-list 'default-frame-alist '(alpha .(80 . 80))) - -(defvar startup/file-name-handler-alist file-name-handler-alist) - -(defalias 'open 'find-file-other-window) -(defalias 'clean 'eshell/clear-scrollback) -(defalias 'yes-or-no-p 'y-or-n-p) - -;; Make emacs startup faster -(setq gc-cons-threshold 402653184 - gc-cons-percentage 0.6) - -(setq-default major-mode 'text-mode) - -(setq inhibit-startup-message t) -(setq x-select-enable-clipboard t) -(setq make-backup-files nil) -(setq scroll-conservatively 100) -(setq ring-bell-function 'ignore) -(setq history-length 25) -(setq global-auto-revert-non-file-buffers t) -(setq native-comp-async-report-warnings-errors 'silent) -(setq warning-minimum-level :error) - -(setq-default tab-width 4) -(setq-default standard-indent 4) -(setq c-basic-offset tab-width) -(setq-default electric-indent-inhibit t) -(setq-default indent-tabs-mode t) -(setq backward-delete-char-untabify-method 'nil) - - -(setq electric-pair-pairs '( - (?\{ . ?\}) - (?$ . ?$) - (?\[ . ?\]) - (?\" . ?\") - )) - -(setq use-package-always-defer t) - -(setq eshell-prompt-regexp "^[^αλ\n]*[αλ] ") -(setq eshell-prompt-function - (lambda nil - (concat - (if (string= (eshell/pwd) (getenv "HOME")) - (propertize "~" 'face `(:foreground "#99CCFF")) - (replace-regexp-in-string - (getenv "HOME") - (propertize "~" 'face `(:foreground "#99CCFF")) - (propertize (eshell/pwd) 'face `(:foreground "#99CCFF")))) - (if (= (user-uid) 0) - (propertize " α " 'face `(:foreground "#FF6666")) - (propertize " λ " 'face `(:foreground "#A6E22E")))))) - -(setq eshell-highlight-prompt nil) -(setq file-name-handler-alist nil) - -(setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) diff --git a/.emacs.d/dracula-custom-theme.el b/.emacs.d/dracula-custom-theme.el deleted file mode 100644 index ee96b4c..0000000 --- a/.emacs.d/dracula-custom-theme.el +++ /dev/null @@ -1,52 +0,0 @@ -(deftheme dracula-custom - "Created 2022-11-27.") - -(custom-theme-set-faces - 'dracula-custom - '(cursor ((t (:background "#ccccc7")))) - '(fixed-pitch ((t (:family "Monospace")))) - '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif")))) - '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) - '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) - '(minibuffer-prompt ((t (:weight bold :foreground "#ff79c6")))) - '(highlight ((t (:foreground "#ccccc7" :background "#464752")))) - '(region ((t (:extend t :inherit (match))))) - '(shadow ((t (:foreground "#6272a4")))) - '(secondary-selection ((((class color) (min-colors 88) (background light)) (:extend t :background "yellow1")) (((class color) (min-colors 88) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:extend t :background "yellow")) (((class color) (min-colors 16) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 8)) (:extend t :foreground "black" :background "cyan")) (t (:inverse-video t)))) - '(trailing-whitespace ((t (:background "#ffb86c")))) - '(font-lock-builtin-face ((t (:slant italic :foreground "#8be9fd")))) - '(font-lock-comment-delimiter-face ((t (:inherit (shadow))))) - '(font-lock-comment-face ((t (:inherit (shadow))))) - '(font-lock-constant-face ((t (:foreground "#bd93f9")))) - '(font-lock-doc-face ((t (:foreground "#6272a4")))) - '(font-lock-doc-markup-face ((t (:inherit (font-lock-constant-face))))) - '(font-lock-function-name-face ((t (:weight bold :foreground "#50fa7b")))) - '(font-lock-keyword-face ((t (:foreground "#ff79c6" :weight bold)))) - '(font-lock-negation-char-face ((t (:foreground "#8be9fd")))) - '(font-lock-preprocessor-face ((t (:foreground "#ffb86c")))) - '(font-lock-regexp-grouping-backslash ((t (:foreground "#8be9fd")))) - '(font-lock-regexp-grouping-construct ((t (:foreground "#bd93f9")))) - '(font-lock-string-face ((t (:foreground "#f1fa8c")))) - '(font-lock-type-face ((t (:inherit (font-lock-builtin-face))))) - '(font-lock-variable-name-face ((t (:foreground "#d8a5f8" :weight bold)))) - '(font-lock-warning-face ((t (:background "#373844" :inherit (warning))))) - '(button ((t (:inherit (link))))) - '(link ((t (:underline (:color foreground-color :style line) :foreground "#8be9fd")))) - '(link-visited ((default (:inherit (link))) (((class color) (background light)) (:foreground "magenta4")) (((class color) (background dark)) (:foreground "violet")))) - '(fringe ((t (:foreground "#b6b6b2" :background "#282a36")))) - '(header-line ((t (:inherit 'mode-line)))) - '(tooltip ((t (:foreground "#f8f8f2" :background "#44475a")))) - '(mode-line ((t (:box (:line-width (1 . 1) :color "#44475a" :style nil) :inverse-video nil :foreground "#f8f8f2" :background "#44475a")))) - '(mode-line-buffer-id ((t (:weight bold)))) - '(mode-line-emphasis ((t (:weight bold)))) - '(mode-line-highlight ((((supports :box t) (class color) (min-colors 88)) (:box (:line-width (2 . 2) :color "grey40" :style released-button))) (t (:inherit (highlight))))) - '(mode-line-inactive ((t (:box (:line-width (1 . 1) :color "#373844" :style nil) :inverse-video nil :foreground "#b6b6b2" :background "#282a36")))) - '(isearch ((t (:weight bold :inherit (match))))) - '(isearch-fail ((t (:foreground "#282a36" :background "#ffb86c")))) - '(lazy-highlight ((t (:foreground "#e2e2dc" :background "#373844")))) - '(match ((t (:foreground "#282a36" :background "#f1fa8c")))) - '(next-error ((t (:inherit (region))))) - '(query-replace ((t (:inherit (isearch))))) - '(default ((t (:family "Hack Nerd Font" :foundry "SRC" :width normal :height 113 :weight normal :slant normal :underline nil :overline nil :extend nil :strike-through nil :box nil :inverse-video nil :foreground "#F8F8F2" :background "#262626" :stipple nil :inherit nil))))) - -(provide-theme 'dracula-custom) diff --git a/.emacs.d/functions.el b/.emacs.d/functions.el deleted file mode 100644 index cc86002..0000000 --- a/.emacs.d/functions.el +++ /dev/null @@ -1,49 +0,0 @@ -(defun startup/revert-file-name-handler-alist () - (setq file-name-handler-alist startup/file-name-handler-alist)) - -(defun startup/reset-gc () - (setq gc-cons-threshold 16777216 - gc-cons-percentage 0.1)) - -(defun split-and-follow-horizontally () - (interactive) - (split-window-below) - (balance-windows) - (other-window 1)) - -(defun split-and-follow-vertically () - (interactive) - (split-window-right) - (balance-windows) - (other-window 1)) - -(defun toggle-transparency() - (interactive) - (let ((alpha (frame-parameter nil 'alpha))) - (set-frame-parameter - nil 'alpha - (if (eql (cond ((numberp alpha) alpha) - ((numberp (cdr alpha)) (cdr alpha)) - ;; Also handle undocumented ( ) form. - ((numberp (cadr alpha)) (cadr alpha))) - 100) - '(80 . 80) '(100 . 100))))) - -(defun eshell/sudo-open (filename) - "Open a file as root in Eshell." - (let ((qual-filename (if (string-match "^/" filename) - filename - (concat (expand-file-name (eshell/pwd)) "/" filename)))) - (switch-to-buffer - (find-file-noselect - (concat "/sudo::" qual-filename))))) - -(defun eshell-other-window () - "Create or visit an eshell buffer." - (interactive) - (if (not (get-buffer "*eshell*")) - (progn - (split-window-sensibly (selected-window)) - (other-window 1) - (eshell)) - (switch-to-buffer-other-window "*eshell*"))) diff --git a/.emacs.d/init.el b/.emacs.d/init.el deleted file mode 100644 index 6079b3d..0000000 --- a/.emacs.d/init.el +++ /dev/null @@ -1,14 +0,0 @@ -(load "~/.emacs.d/packages" nil t) -(load "~/.emacs.d/functions" nil t) -(load "~/.emacs.d/keybinds" nil t) -(load "~/.emacs.d/config" nil t) - -(server-start) -(set-default-file-modes #o700) - -;; Load Witchmacs theme -(load-theme 'Witchmacs t) - -;; Move customization variables to a separate file and load it -(setq custom-file (locate-user-emacs-file "custom-vars.el")) -(load custom-file 'noerror 'nomessage) diff --git a/.emacs.d/keybinds.el b/.emacs.d/keybinds.el deleted file mode 100644 index e0fa2ed..0000000 --- a/.emacs.d/keybinds.el +++ /dev/null @@ -1,14 +0,0 @@ -;; Control X -(global-set-key (kbd "C-x 2") 'split-and-follow-horizontally) -(global-set-key (kbd "C-x 3") 'split-and-follow-vertically) - -;; Super -(global-set-key (kbd "s-C-") 'shrink-window-horizontally) -(global-set-key (kbd "s-C-") 'enlarge-window-horizontally) -(global-set-key (kbd "s-C-") 'shrink-window) -(global-set-key (kbd "s-C-") 'enlarge-window) -(global-set-key (kbd "") 'eshell-other-window) - -;; Control C -(global-set-key (kbd "C-c r") 'recentf-open-files) -(global-set-key (kbd "C-c t") 'toggle-transparency) diff --git a/.emacs.d/packages.el b/.emacs.d/packages.el deleted file mode 100644 index 9abae55..0000000 --- a/.emacs.d/packages.el +++ /dev/null @@ -1,335 +0,0 @@ -;; Initialize melpa repo -(require 'package) -(setq package-enable-at-startup nil) -(add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/")) -(package-initialize) - -;; Initialize use-package -(unless (package-installed-p 'use-package) - (package-refresh-contents) - (package-install 'use-package)) -(use-package org - :config - (add-hook 'org-mode-hook 'org-indent-mode) - (add-hook 'org-mode-hook - (lambda () - (visual-line-mode 1)))) - -(use-package org-indent - :diminish org-indent-mode) - -(use-package htmlize - :ensure t) - -(use-package auto-package-update - :defer nil - :ensure t - :config - (setq auto-package-update-delete-old-versions t) - (setq auto-package-update-hide-results t) - (auto-package-update-maybe)) - -(use-package diminish - :ensure t) - -(use-package spaceline - :ensure t) - -(use-package powerline - :ensure t - :init - (spaceline-spacemacs-theme) - :hook - ('after-init-hook) . 'powerline-reset) - -(use-package dashboard - :ensure t - :defer nil - :preface - (defun update-config () - "Update Witchmacs to the latest version." - (interactive) - (let ((dir (expand-file-name user-emacs-directory))) - (if (file-exists-p dir) - (progn - (message "Witchmacs is updating!") - (cd dir) - (shell-command "git pull") - (message "Update finished. Switch to the messages buffer to see changes and then restart Emacs")) - (message "\"%s\" doesn't exist." dir)))) - - (defun create-scratch-buffer () - "Create a scratch buffer" - (interactive) - (switch-to-buffer (get-buffer-create "*scratch*")) - (lisp-interaction-mode)) - :config - (dashboard-setup-startup-hook) - (setq dashboard-items '((recents . 5))) - (setq dashboard-banner-logo-title "W I T C H M A C S - The cutest Emacs distribution!") - (setq dashboard-startup-banner "~/.emacs.d/marivector.png") - (setq dashboard-center-content t) - (setq dashboard-show-shortcuts nil) - (setq dashboard-set-init-info t) - (setq dashboard-init-info (format "%d packages loaded in %s" - (length package-activated-list) (emacs-init-time))) - (setq dashboard-set-footer nil) - (setq dashboard-set-navigator t) - (setq dashboard-navigator-buttons - `(;; line1 - ((,nil - "Witchmacs on github" - "Open Witchmacs' github page on your browser" - (lambda (&rest _) (browse-url "https://github.com/snackon/witchmacs")) - 'default) - (nil - "Witchmacs crash course" - "Open Witchmacs' introduction to Emacs" - (lambda (&rest _) (find-file "~/.emacs.d/Witcheat.org")) - 'default) - (nil - "Update Witchmacs" - "Get the latest Witchmacs update. Check out the github commits for changes!" - (lambda (&rest _) (update-config)) - 'default) - ) - ;; line 2 - ((,nil - "Open scratch buffer" - "Switch to the scratch buffer" - (lambda (&rest _) (create-scratch-buffer)) - 'default) - (nil - "Open config.el" - "Open Witchmacs' configuration file for easy editing" - (lambda (&rest _) (find-file "~/.emacs.d/config.el")) - 'default) - (nil - "Open init.el" - "Open init file" - (lambda (&rest _) (find-file "~/.emacs.d/init.el")) - 'default))))) - - -;(insert (concat -; (propertize (format "%d packages loaded in %s" -; (length package-activated-list) (emacs-init-time)) -; 'face 'font-lock-comment-face))) -; -;(dashboard-center-line) - -(use-package which-key - :ensure t - :diminish which-key-mode - :init - (which-key-mode)) - -(use-package swiper - :ensure t - :bind ("C-s" . 'swiper)) - -(use-package evil - :ensure t - :defer nil - :init - (setq evil-want-keybinding nil) - (setq evil-want-C-u-scroll t) - :config - (evil-mode 1)) - -;(use-package evil-collection -; :after evil -; :ensure t -; :config -; (evil-collection-init)) - -(use-package beacon - :ensure t - :diminish beacon-mode - :init - (beacon-mode 1)) - -(use-package avy - :ensure t - :bind - ("M-s" . avy-goto-char)) - -(use-package switch-window - :ensure t - :config - (setq switch-window-input-style 'minibuffer) - (setq switch-window-increase 4) - (setq switch-window-threshold 2) - (setq switch-window-shortcut-style 'qwerty) - (setq switch-window-qwerty-shortcuts - '("a" "s" "d" "f" "j" "k" "l")) - :bind - ([remap other-window] . switch-window)) - -(use-package ido - :init - (ido-mode 1) - :config - (setq ido-enable-flex-matching nil) - (setq ido-create-new-buffer 'always) - (setq ido-everywhere t)) - -(use-package ido-vertical-mode - :ensure t - :init - (ido-vertical-mode 1)) -; This enables arrow keys to select while in ido mode. If you want to -; instead use the default Emacs keybindings, change it to -; "'C-n-and-C-p-only" -(setq ido-vertical-define-keys 'C-n-C-p-up-and-down) - -(use-package async - :ensure t - :init - (dired-async-mode 1)) - -(use-package page-break-lines - :ensure t - :diminish (page-break-lines-mode visual-line-mode)) - -(use-package undo-tree - :ensure t - :diminish undo-tree-mode) - -(use-package treemacs - :ensure t - :defer t - :init - (with-eval-after-load 'winum - (define-key winum-keymap (kbd "M-0") #'treemacs-select-window)) - :config - (progn - (setq treemacs-collapse-dirs (if (executable-find "python3") 3 0) - treemacs-deferred-git-apply-delay 0.5 - treemacs-display-in-side-window t - treemacs-eldoc-display t - treemacs-file-event-delay 5000 - treemacs-file-follow-delay 0.2 - treemacs-follow-after-init t - treemacs-git-command-pipe "" - treemacs-goto-tag-strategy 'refetch-index - treemacs-indentation 2 - treemacs-indentation-string " " - treemacs-is-never-other-window nil - treemacs-max-git-entries 5000 - treemacs-missing-project-action 'ask - treemacs-no-png-images nil - treemacs-no-delete-other-windows t - treemacs-project-follow-cleanup nil - treemacs-persist-file (expand-file-name ".cache/treemacs-persist" user-emacs-directory) - treemacs-recenter-distance 0.1 - treemacs-recenter-after-file-follow nil - treemacs-recenter-after-tag-follow nil - treemacs-recenter-after-project-jump 'always - treemacs-recenter-after-project-expand 'on-distance - treemacs-show-cursor nil - treemacs-show-hidden-files t - treemacs-silent-filewatch nil - treemacs-silent-refresh nil - treemacs-sorting 'alphabetic-desc - treemacs-space-between-root-nodes t - treemacs-tag-follow-cleanup t - treemacs-tag-follow-delay 1.5 - treemacs-width 30) - (treemacs-resize-icons 11) - - (treemacs-follow-mode t) - (treemacs-filewatch-mode t) - (treemacs-fringe-indicator-mode t) - (pcase (cons (not (null (executable-find "git"))) - (not (null (executable-find "python3")))) - (`(t . t) - (treemacs-git-mode 'deferred)) - (`(t . _) - (treemacs-git-mode 'simple)))) - :bind - (:map global-map - ("M-0" . treemacs-select-window) - ("C-x t 1" . treemacs-delete-other-windows) - ("C-x t t" . treemacs) - ("C-x t B" . treemacs-bookmark) - ("C-x t C-t" . treemacs-find-file) - ("C-x t M-t" . treemacs-find-tag))) - -(use-package treemacs-evil - :after treemacs evil - :ensure t) - - (use-package treemacs-icons-dired - :after treemacs dired - :ensure t - :config (treemacs-icons-dired-mode)) - -(use-package magit - :ensure t) - -(use-package eldoc - :diminish eldoc-mode) - -(use-package abbrev - :diminish abbrev-mode) - -(use-package company - :ensure t - :diminish (meghanada-mode company-mode irony-mode) - :config - (setq company-idle-delay 0) - (setq company-minimum-prefix-length 3) - (define-key company-active-map (kbd "M-n") nil) - (define-key company-active-map (kbd "M-p") nil) - (define-key company-active-map (kbd "C-n") #'company-select-next) - (define-key company-active-map (kbd "C-p") #'company-select-previous) - (define-key company-active-map (kbd "SPC") #'company-abort) - :hook - ((java-mode c-mode c++-mode) . company-mode)) - -(use-package yasnippet - :ensure t - :diminish yas-minor-mode - :hook - ((c-mode c++-mode) . yas-minor-mode) - :config - (yas-reload-all)) - -(use-package yasnippet-snippets - :ensure t) - -(use-package company-c-headers - :defer nil - :ensure t) - -(use-package company-irony - :defer nil - :ensure t - :config - (setq company-backends '((company-c-headers - company-dabbrev-code - company-irony)))) -(use-package irony - :defer nil - :ensure t - :config - :hook - ((c++-mode c-mode) . irony-mode) - ('irony-mode-hook) . 'irony-cdb-autosetup-compile-options) - -(use-package meghanada - :ensure t - :defer nil - :config - (add-hook 'java-mode-hook - (lambda () - (meghanada-mode t))) - (setq meghanada-java-path "java") - (setq meghanada-maven-path "mvn")) - -(use-package evil-surround - :ensure t - :config - (global-evil-surround-mode 1)) -- cgit v1.2.3