diff --git a/configs/.zshrc b/configs/.zshrc index 548101a..edc43f0 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -92,6 +92,8 @@ if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then # tmux attach-session -t $USER || tmux new-session -s $USER fi +export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock + export PNPM_HOME="$HOME/.local/share/pnpm" export PATH="$PNPM_HOME:$PATH" diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index 937b7bc..c96451c 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -1,26 +1,13 @@ -local has_impatient, impatient = pcall(require, "impatient") -if has_impatient then - impatient.enable_profile() -end +require("impatient") require("core.plugins") -local status_ok = pcall(require, "nightfox") -if not status_ok then - return -end - -require("hologram").setup({ - auto_display = true, -- WIP automatic markdown image display, may be prone to breaking -}) - --- Require and call setup function somewhere in your init.lua - require("core.options") require("core.autocommands") require("core.theme") require("core.keymappings") +require("configs.autocomplete") require("configs.dashboard") require("configs.dap") require("configs.command-center") diff --git a/configs/nvim/lua/configs/autocomplete.lua b/configs/nvim/lua/configs/autocomplete.lua index fe891a9..6e0f0df 100644 --- a/configs/nvim/lua/configs/autocomplete.lua +++ b/configs/nvim/lua/configs/autocomplete.lua @@ -3,8 +3,6 @@ local luasnip = require("luasnip") local lspkind = require("lspkind") local cmp = require("cmp") local cmp_autopairs = require("nvim-autopairs.completion.cmp") -local compare = require("cmp.config.compare") -local cmp_buffer = require("cmp_buffer") local tabnine = require("cmp_tabnine.config") local source_mapping = { @@ -29,19 +27,14 @@ tabnine:setup({ }) cmp.setup({ - sorting = { - comparators = { - compare.score, - compare.recently_used, - compare.kind, - compare.offset, - }, + window = { + documentation = cmp.config.window.bordered(), }, experimental = { ghost_text = true, }, completion = { - completeopt = "menu,menuone", + completeopt = "menu,menuone,noselect", }, snippet = { expand = function(args) diff --git a/configs/nvim/lua/configs/autoformat.lua b/configs/nvim/lua/configs/autoformat.lua new file mode 100644 index 0000000..e5d3e32 --- /dev/null +++ b/configs/nvim/lua/configs/autoformat.lua @@ -0,0 +1,20 @@ +local prettier = require("prettier") + +prettier.setup({ + bin = "prettier", -- or `prettierd` + filetypes = { + "css", + "graphql", + "html", + "svelte", + "javascript", + "javascriptreact", + "json", + "less", + "markdown", + "scss", + "typescript", + "typescriptreact", + "yaml", + }, +}) diff --git a/configs/nvim/lua/configs/lsp.lua b/configs/nvim/lua/configs/lsp.lua index f354e62..c0625cf 100644 --- a/configs/nvim/lua/configs/lsp.lua +++ b/configs/nvim/lua/configs/lsp.lua @@ -159,6 +159,7 @@ lsp.ltex.setup({ cmd = { os.getenv("HOME") .. "/.local/share/nvim/lsp_servers/ltex/ltex-ls/bin/ltex-ls" }, settings = { ltex = { + language = "de", disabledRules = { ["en-US"] = { "PROFANITY" } }, dictionary = { ["en-US"] = { "perf", "ci", "neovim" }, diff --git a/configs/nvim/lua/configs/lualine.lua b/configs/nvim/lua/configs/lualine.lua index b817eac..3b3c923 100644 --- a/configs/nvim/lua/configs/lualine.lua +++ b/configs/nvim/lua/configs/lualine.lua @@ -7,7 +7,7 @@ -- Credit: glepnir -- Credit: Elai -local lualine = require "lualine" +local lualine = require("lualine") -- Color table for highlights -- stylua: ignore @@ -27,14 +27,14 @@ local colors = { local conditions = { buffer_not_empty = function() - return vim.fn.empty(vim.fn.expand('%:t')) ~= 1 + return vim.fn.empty(vim.fn.expand("%:t")) ~= 1 end, hide_in_width = function() return vim.fn.winwidth(0) > 80 end, check_git_workspace = function() - local filepath = vim.fn.expand('%:p:h') - local gitdir = vim.fn.finddir('.git', filepath .. ';') + local filepath = vim.fn.expand("%:p:h") + local gitdir = vim.fn.finddir(".git", filepath .. ";") return gitdir and #gitdir > 0 and #gitdir < #filepath end, } @@ -43,8 +43,8 @@ local conditions = { local config = { options = { -- Disable sections and component separators - component_separators = '', - section_separators = '', + component_separators = "", + section_separators = "", theme = { -- We are going to use lualine_c an lualine_x as left and -- right section. Both are highlighted by c theme . So we @@ -95,25 +95,24 @@ end -- } -- Icon Of Diffrent Mode: -- normal -- | -- insert -- | -- visual -- -ins_left { +ins_left({ -- mode component function() - return '' + return "" end, color = function() - -- auto change color according to neovims mode local mode_color = { n = colors.green, i = colors.blue, v = colors.magenta, - [''] = colors.blue, + [""] = colors.blue, V = colors.blue, c = colors.red, no = colors.red, s = colors.orange, S = colors.orange, - [''] = colors.orange, + [""] = colors.orange, ic = colors.yellow, R = colors.violet, Rv = colors.violet, @@ -121,18 +120,18 @@ ins_left { ce = colors.red, r = colors.cyan, rm = colors.cyan, - ['r?'] = colors.cyan, - ['!'] = colors.red, + ["r?"] = colors.cyan, + ["!"] = colors.red, t = colors.red, } return { fg = mode_color[vim.fn.mode()] } end, padding = { right = 1 }, -} +}) -- File Name -ins_left { - 'filename', +ins_left({ + "filename", file_status = true, -- Displays file status (readonly status, modified status) path = 2, -- 0: Just the filename -- 1: Relative path @@ -140,11 +139,11 @@ ins_left { shorting_target = 100, -- Shortens path to leave 40 spaces in the window -- for other components. (terrible name, any suggestions?) symbols = { - modified = '  ', -- Text to show when the file is modified. - readonly = ' ', -- Text to show when the file is non-modifiable or readonly. - unnamed = '[No Name]', -- Text to show for unnamed buffers. - } -} + modified = "  ", -- Text to show when the file is modified. + readonly = " ", -- Text to show when the file is non-modifiable or readonly. + unnamed = "[No Name]", -- Text to show for unnamed buffers. + }, +}) -- Git Diff local function diff_source() @@ -153,39 +152,39 @@ local function diff_source() return { added = gitsigns.added, modified = gitsigns.changed, - removed = gitsigns.removed + removed = gitsigns.removed, } end end -ins_right { 'diff', source = diff_source } +ins_right({ "diff", source = diff_source }) -- Git Branch -ins_right { - 'branch', - icon = '', +ins_right({ + "branch", + icon = "", -- icon = '', -- color = { fg = colors.green }, -- padding = { right = 1 }, -- padding = { left = 1 }, -} +}) -- File Type -ins_right { - 'filetype', +ins_right({ + "filetype", icon_only = true, - padding = { right = 2, left = 1 } -} + padding = { right = 2, left = 1 }, +}) -- File Encoding -ins_right { - 'o:encoding', -- option component same as &encoding in viml +ins_right({ + "o:encoding", -- option component same as &encoding in viml fmt = string.upper, -- I'm not sure why it's upper case either ;) cond = conditions.hide_in_width, padding = { right = 2 }, -- color = { fg = colors.green, gui = 'bold' }, -- Add components to right sections -} +}) -- File Format -- ins_right { @@ -198,33 +197,33 @@ ins_right { -- } -- File Size -ins_right { +ins_right({ -- filesize component - 'filesize', + "filesize", padding = { right = 2 }, cond = conditions.buffer_not_empty, -} +}) -- Text Progress -ins_right { - 'progress', +ins_right({ + "progress", padding = { right = 1 }, -- padding = { left = 1 }, -} +}) -- File Location -ins_right { - 'location', +ins_right({ + "location", padding = { right = 0 }, -} +}) -- Insert mid section. You can make any number of sections in neovim :) -- for lualine it's any number greater then 2 -ins_left { +ins_left({ function() - return '%=' + return "%=" end, -} +}) -- End Of The Status Bar -- ins_right { diff --git a/configs/nvim/lua/configs/snippets.lua b/configs/nvim/lua/configs/snippets.lua index ec3ca77..77a1feb 100644 --- a/configs/nvim/lua/configs/snippets.lua +++ b/configs/nvim/lua/configs/snippets.lua @@ -11,55 +11,55 @@ local d = ls.dynamic_node local types = require("luasnip.util.types") -require("luasnip.loaders.from_vscode").load({ include = { "typescript", "javascript", "html" } }) +require("luasnip.loaders.from_vscode").load() -- Every unspecified option will be set to the default. -ls.config.set_config( - { +ls.config.set_config({ history = true, -- Update more often, :h events for more info. updateevents = "TextChanged,TextChangedI", ext_opts = { [types.choiceNode] = { active = { - virt_text = { { "choiceNode", "Comment" } } - } - } + virt_text = { { "choiceNode", "Comment" } }, + }, + }, }, -- treesitter-hl has 100, use something higher (default is 200). ext_base_prio = 300, -- minimal increase in priority. ext_prio_increase = 1, - enable_autosnippets = true -} -) + enable_autosnippets = true, +}) ls.add_snippets("all", { s({ trig = "b(%d)", regTrig = true, wordTrig = true }, { - f(function(args) return { "Captured Text: " .. args[1].captures[1] .. "." } end, {}), - i(0) - }) + f(function(args) + return { "Captured Text: " .. args[1].captures[1] .. "." } + end, {}), + i(0), + }), }) ls.add_snippets("svelte", { s("slt", { - t('") + t(""), }), s("sc", { - t('") - }) + t(""), + }), }) ls.add_snippets("typescript", { s("sget", { - t('export async function get({'), + t("export async function get({"), i(1, "params"), t("}) {"), i(2), t("}"), - }) + }), }) diff --git a/configs/nvim/lua/configs/telescope.lua b/configs/nvim/lua/configs/telescope.lua index cb017cb..1c03898 100644 --- a/configs/nvim/lua/configs/telescope.lua +++ b/configs/nvim/lua/configs/telescope.lua @@ -2,68 +2,68 @@ local telescope = require("telescope") local actions = require("telescope.actions") local trouble = require("trouble.providers.telescope") -telescope.setup { - defaults = { - }, -} +telescope.setup({ + defaults = {}, +}) local default = { - defaults = { - vimgrep_arguments = { - "rg", - "--color=never", - "--no-heading", - "--with-filename", - "--line-number", - "--column", - "--smart-case", - "--ignore-file", - "workerMain.js" - }, - prompt_prefix = "  ", - selection_caret = " ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "ascending", - layout_strategy = "horizontal", - layout_config = { - horizontal = { - prompt_position = "top", - preview_width = 0.55, - results_width = 0.8 - }, - vertical = { - mirror = false - }, - width = 0.87, - height = 0.80, - preview_cutoff = 120 - }, - file_sorter = require("telescope.sorters").get_fuzzy_file, - file_ignore_patterns = { "node_modules" }, - generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - path_display = { "truncate" }, - winblend = 0, - border = {}, - mappings = { - i = { [""] = trouble.open_with_trouble }, - n = { [""] = trouble.open_with_trouble }, - }, - borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, - color_devicons = true, - use_less = true, - set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil, - file_previewer = require("telescope.previewers").vim_buffer_cat.new, - grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new, - qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new, - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker - } + defaults = { + vimgrep_arguments = { + "rg", + "--color=never", + "--no-heading", + "--with-filename", + "--line-number", + "--column", + "--smart-case", + "--ignore-file", + "workerMain.js", + }, + prompt_prefix = "  ", + selection_caret = " ", + entry_prefix = " ", + initial_mode = "insert", + selection_strategy = "reset", + sorting_strategy = "ascending", + layout_strategy = "horizontal", + layout_config = { + horizontal = { + prompt_position = "top", + preview_width = 0.55, + results_width = 0.8, + }, + vertical = { + mirror = false, + }, + width = 0.87, + height = 0.80, + preview_cutoff = 120, + }, + file_sorter = require("telescope.sorters").get_fuzzy_file, + file_ignore_patterns = { "node_modules" }, + generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, + path_display = { "truncate" }, + winblend = 0, + border = {}, + mappings = { + i = { [""] = trouble.open_with_trouble }, + n = { [""] = trouble.open_with_trouble }, + }, + borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, + color_devicons = true, + use_less = true, + set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil, + file_previewer = require("telescope.previewers").vim_buffer_cat.new, + grep_previewer = require("telescope.previewers").vim_buffer_vimgrep.new, + qflist_previewer = require("telescope.previewers").vim_buffer_qflist.new, + -- Developer configurations: Not meant for general override + buffer_previewer_maker = require("telescope.previewers").buffer_previewer_maker, + }, } telescope.setup(default) -- telescope.load_extension("themes"); -- +telescope.load_extension("harpoon") telescope.load_extension("session-lens") -telescope.load_extension("command_center"); -telescope.load_extension("notify"); +telescope.load_extension("command_center") +telescope.load_extension("notify") diff --git a/configs/nvim/lua/core/keymappings.lua b/configs/nvim/lua/core/keymappings.lua index 960be78..43ba965 100644 --- a/configs/nvim/lua/core/keymappings.lua +++ b/configs/nvim/lua/core/keymappings.lua @@ -9,7 +9,7 @@ g.mapleader = " " map("n", "", ":Telescope git_files", options) map("n", "", ":lua require'telescope.builtin'.live_grep{ cwd = vim.fn.getcwd() }", options) map("n", "", ":Telescope command_center", options) -map("n", "", "za", remap) +map("n", "", "za", remap) -- LSP Functionality map("n", "n", ":lua vim.diagnostic.goto_next()", options) @@ -39,6 +39,10 @@ map("n", "3", "3gt", options) map("n", "4", "4gt", options) map("n", "0", ":tablast", options) +map("n", "", ":lua require('harpoon.mark').add_file()", options) +-- Navigate Files +map("n", "", ":Telescope harpoon marks", options) + -- Handling Splits map("n", "h", ":sp", remap) -- horizontal map("n", "v", ":vs", remap) -- vertical @@ -101,6 +105,3 @@ map("n", "", ":NvimTreeToggle", options) -- Make ctrl+s work map("n", "", ":w", options) map("i", "", ":wi", options) - --- Update vim config -map("n", "", ":source $MYVIMRC", options) diff --git a/configs/nvim/lua/core/options.lua b/configs/nvim/lua/core/options.lua index 4bd927d..44c9b2f 100644 --- a/configs/nvim/lua/core/options.lua +++ b/configs/nvim/lua/core/options.lua @@ -47,6 +47,9 @@ set.laststatus = 3 -- Always display the status line set.title = true -- Show current txt that you editing set.relativenumber = false -- Vim’s absolute, relative and hybrid line numbers set.cursorline = false -- Enable highlighting of the current line +set.synmaxcol = 128 +vim.cmd("syntax sync minlines=256") +set.mousescroll = "ver:1,hor:1" set.shiftwidth = 2 -- Change the number of space characters inserted for indentation set.showtabline = 1 -- Always show tabs set.cmdheight = 1 -- More space for displaying messages diff --git a/configs/nvim/lua/core/plugins.lua b/configs/nvim/lua/core/plugins.lua index 212dd9d..2f0e9fa 100644 --- a/configs/nvim/lua/core/plugins.lua +++ b/configs/nvim/lua/core/plugins.lua @@ -2,135 +2,140 @@ local fn = vim.fn local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" local packer_bootstrap = false if fn.empty(fn.glob(install_path)) > 0 then - packer_bootstrap = - fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }) - vim.cmd("packadd packer.nvim") + packer_bootstrap = + fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }) + vim.cmd("packadd packer.nvim") end local packer = require("packer") packer.init({ - display = { - open_fn = function() - return require("packer.util").float({ border = "rounded" }) - end, - }, + display = { + open_fn = function() + return require("packer.util").float({ border = "rounded" }) + end, + }, }) return packer.startup(function(use) - -- Let packer manage itself - use("wbthomason/packer.nvim") - use("lewis6991/impatient.nvim") + -- Let packer manage itself + use("wbthomason/packer.nvim") + use("lewis6991/impatient.nvim") - -- General Helper Functions - use("nvim-lua/plenary.nvim") + -- General Helper Functions + use("nvim-lua/plenary.nvim") - -- Theming Section - use("rktjmp/fwatch.nvim") -- Used to check dark/light theme - use("EdenEast/nightfox.nvim") - use("nvim-lualine/lualine.nvim") + -- Theming Section + use("rktjmp/fwatch.nvim") -- Used to check dark/light theme + use("EdenEast/nightfox.nvim") + use({ "catppuccin/nvim", as = "catppuccin" }) + use("nvim-lualine/lualine.nvim") - -- Layout Plugins - use("dstein64/nvim-scrollview") -- ScrollBars - use("akinsho/nvim-toggleterm.lua") - use({ - "folke/zen-mode.nvim", - config = function() - require("zen-mode").setup({}) - end, - }) - use("rcarriga/nvim-notify") - use("kyazdani42/nvim-web-devicons") - use("kyazdani42/nvim-tree.lua") - use("nvim-lua/popup.nvim") - use("goolord/alpha-nvim") - use({ - "terrortylor/nvim-comment", - config = function() - require("nvim_comment").setup() - end, - }) - use({ - "windwp/nvim-autopairs", - config = function() - require("nvim-autopairs").setup() - end, - }) - use("gfeiyou/command-center.nvim") + -- Layout Plugins + use("dstein64/nvim-scrollview") -- ScrollBars + use("akinsho/nvim-toggleterm.lua") + use({ + "folke/zen-mode.nvim", + config = function() + require("zen-mode").setup({}) + end, + }) + use("rcarriga/nvim-notify") + use("kyazdani42/nvim-web-devicons") + use("kyazdani42/nvim-tree.lua") + use("nvim-lua/popup.nvim") + use("goolord/alpha-nvim") + use({ + "terrortylor/nvim-comment", + config = function() + require("nvim_comment").setup() + end, + }) + use({ + "windwp/nvim-autopairs", + config = function() + require("nvim-autopairs").setup() + end, + }) + use("gfeiyou/command-center.nvim") - -- Code Navigation - use("junegunn/fzf") - use("nvim-telescope/telescope.nvim") + -- Code Navigation + use("junegunn/fzf") + use("nvim-telescope/telescope.nvim") - -- Lsp Errors - use("folke/lsp-colors.nvim") - use("kosayoda/nvim-lightbulb") - use({ - "folke/trouble.nvim", - requires = "kyazdani42/nvim-web-devicons", - config = function() - require("trouble").setup({}) - end, - }) - use({ - "https://git.sr.ht/~whynothugo/lsp_lines.nvim", - config = function() - require("lsp_lines").setup() - end, - }) + -- Lsp Errors + use("folke/lsp-colors.nvim") + use("kosayoda/nvim-lightbulb") + use({ + "folke/trouble.nvim", + requires = "kyazdani42/nvim-web-devicons", + config = function() + require("trouble").setup({}) + end, + }) + use({ + "https://git.sr.ht/~whynothugo/lsp_lines.nvim", + config = function() + require("lsp_lines").setup() + end, + }) - -- Syntax / Autocomplete - use("tpope/vim-surround") - use("neovim/nvim-lspconfig") - use("hrsh7th/nvim-cmp") - use("onsails/lspkind.nvim") - use({ "tzachar/cmp-tabnine", run = "./install.sh", requires = "hrsh7th/nvim-cmp" }) - -- use({ "hrsh7th/cmp-copilot", requires = "github/copilot.vim" }) - use("hrsh7th/cmp-nvim-lsp") - use("hrsh7th/cmp-path") - use("hrsh7th/cmp-calc") - use("hrsh7th/cmp-buffer") - use("hrsh7th/cmp-cmdline") - use("rafamadriz/friendly-snippets") - use("L3MON4D3/LuaSnip") - use("saadparwaiz1/cmp_luasnip") + -- Syntax / Autocomplete + use("tpope/vim-surround") + use("neovim/nvim-lspconfig") + use("hrsh7th/nvim-cmp") + use("onsails/lspkind.nvim") + use({ "tzachar/cmp-tabnine", run = "./install.sh", requires = "hrsh7th/nvim-cmp" }) + -- use({ "hrsh7th/cmp-copilot", requires = "github/copilot.vim" }) + use("hrsh7th/cmp-nvim-lsp") + use("hrsh7th/cmp-path") + use("hrsh7th/cmp-calc") + use("hrsh7th/cmp-buffer") + use("hrsh7th/cmp-cmdline") + use("rafamadriz/friendly-snippets") + use("L3MON4D3/LuaSnip") + use("saadparwaiz1/cmp_luasnip") - use({ "williamboman/mason.nvim" }) - use({ "williamboman/mason-lspconfig.nvim" }) - use({ "jose-elias-alvarez/null-ls.nvim" }) - use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) + use({ "williamboman/mason.nvim" }) + use({ "williamboman/mason-lspconfig.nvim" }) + use({ "jose-elias-alvarez/null-ls.nvim" }) + use("MunifTanjim/prettier.nvim") + use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) - -- Dap Debugger - use({ "mfussenegger/nvim-dap" }) - use({ "rcarriga/nvim-dap-ui" }) + -- Dap Debugger + use({ "mfussenegger/nvim-dap" }) + use({ "rcarriga/nvim-dap-ui" }) - -- More IDE like features - use({ - "rmagatti/session-lens", - requires = { "rmagatti/auto-session", "nvim-telescope/telescope.nvim" }, - config = function() - require("session-lens").setup({ path_display = { "shorten" } }) - end, - }) + -- FIle Navigation + use({ "ThePrimeagen/harpoon" }) - use({ - "edluffy/hologram.nvim", - config = function() end, - }) + -- More IDE like features + use({ + "rmagatti/session-lens", + requires = { "rmagatti/auto-session", "nvim-telescope/telescope.nvim" }, + config = function() + require("session-lens").setup({ path_display = { "shorten" } }) + end, + }) - use({ - "nvim-neotest/neotest", - requires = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - "antoinemadec/FixCursorHold.nvim", - }, - }) + use({ + "edluffy/hologram.nvim", + config = function() end, + }) - -- Database Feature - use("tpope/vim-dadbod") - use("kristijanhusak/vim-dadbod-ui") + use({ + "nvim-neotest/neotest", + requires = { + "nvim-lua/plenary.nvim", + "nvim-treesitter/nvim-treesitter", + "antoinemadec/FixCursorHold.nvim", + }, + }) - if packer_bootstrap then - packer.sync() - end + -- Database Feature + use("tpope/vim-dadbod") + use("kristijanhusak/vim-dadbod-ui") + + if packer_bootstrap then + packer.sync() + end end) diff --git a/configs/nvim/lua/core/theme.lua b/configs/nvim/lua/core/theme.lua index 7226cb5..bed0c07 100644 --- a/configs/nvim/lua/core/theme.lua +++ b/configs/nvim/lua/core/theme.lua @@ -1,9 +1,48 @@ -- Enable Theming / Syntax +vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha + +local cat = require("catppuccin") +cat.setup({ + transparent_background = true, + compile = { + enabled = true, + path = vim.fn.stdpath("cache") .. "/catppuccin", + }, + styles = { + comments = { "italic" }, + strings = { "italic" }, + }, + integrations = { + gitsigns = true, + telescope = true, + treesitter = true, + cmp = true, + nvimtree = { + enabled = true, + show_root = false, + }, + dap = { + enabled = true, + enable_ui = true, + }, + native_lsp = { + enabled = true, + }, + ts_rainbow = true, + indent_blankline = { + enabled = true, + colored_indent_levels = false, + }, + }, +}) + require("nightfox").setup({ options = { - transparent = true - } + transparent = true, + }, }) -vim.cmd("colorscheme nightfox") -require "utils.theme-reloader" -require "configs.lualine" + +vim.cmd("colorscheme catppuccin") + +require("utils.theme-reloader") +require("configs.lualine") diff --git a/configs/nvim/lua/utils/theme-reloader.lua b/configs/nvim/lua/utils/theme-reloader.lua index 8d80fb3..c9db2b7 100644 --- a/configs/nvim/lua/utils/theme-reloader.lua +++ b/configs/nvim/lua/utils/theme-reloader.lua @@ -1,30 +1,36 @@ -- see if the file exists local function file_exists(file) local f = io.open(file, "rb") - if f then f:close() end + if f then + f:close() + end return f ~= nil end -- get all lines from a file, returns an empty -- list/table if the file does not exist local function line_from(file) - if not file_exists(file) then return "" end + if not file_exists(file) then + return "" + end local f = io.open(file) -- 'r' is unnecessary because it's a default value. - if f == nil then return "" end + if f == nil then + return "" + end local line = f:read() -- '*l' is unnecessary because it's a default value. f:close() - return line; + return line end -local filePath = os.getenv("HOME") .. "/.cache/dark-mode"; +local filePath = os.getenv("HOME") .. "/.cache/dark-mode" local function updateTheme() - local line = line_from(filePath); + local line = line_from(filePath) if line then - local light = string.find(line, "light"); + local light = string.find(line, "light") if light then - vim.cmd("colorscheme dayfox") + -- vim.cmd("colorscheme dayfox") else - vim.cmd("colorscheme nightfox") + -- vim.cmd("colorscheme nightfox") end end end diff --git a/configs/nvim/t.txt b/configs/nvim/t.txt deleted file mode 100644 index 6405bba..0000000 --- a/configs/nvim/t.txt +++ /dev/null @@ -1,314 +0,0 @@ - - -times in msec - clock self+sourced self: sourced script - clock elapsed: other lines - -000.031 000.031: --- NVIM STARTING --- -000.860 000.829: locale set -001.970 001.109: inits 1 -002.009 000.039: window checked -002.028 000.019: parsing arguments -009.740 007.713: expanding arguments -009.820 000.080: inits 2 -011.463 001.643: init highlight -011.471 000.008: waiting for UI -013.849 002.379: done waiting for UI -013.970 000.121: init screen for UI -014.074 000.104: init default mappings -014.195 000.121: init default autocommands -017.180 000.329 000.329: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/ftplugin.vim -017.747 000.331 000.331: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/indent.vim -017.847 002.992: sourcing vimrc file(s) -018.526 000.509 000.509: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.lua -060.588 041.846 041.846: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.vim -061.231 000.310 000.310: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/synload.vim -061.728 000.979 000.669: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/syntax.vim -064.514 001.112 001.112: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/gzip.vim -064.663 000.056 000.056: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/health.vim -065.100 000.367 000.367: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/man.vim -067.058 000.823 000.823: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/pack/dist/opt/matchit/plugin/matchit.vim -067.508 002.303 001.480: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchit.vim -068.159 000.575 000.575: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchparen.vim -070.069 001.826 001.826: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/netrwPlugin.vim -070.764 000.039 000.039: sourcing /home/max/.local/share/nvim/rplugin.vim -070.793 000.581 000.542: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/rplugin.vim -071.320 000.427 000.427: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/shada.vim -071.555 000.126 000.126: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/spellfile.vim -072.469 000.777 000.777: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tarPlugin.vim -073.060 000.414 000.414: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tohtml.vim -073.289 000.104 000.104: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tutor.vim -074.229 000.833 000.833: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/zipPlugin.vim -075.277 004.597: loading rtp plugins -075.758 000.481: loading packages -076.842 001.084: loading after plugins -076.892 000.049: inits 3 -076.913 000.021: reading ShaDa -077.199 000.286: opening buffers -077.294 000.095: BufEnter autocommands -077.302 000.008: editing files in windows -077.594 000.291: VimEnter autocommands -077.603 000.010: UIEnter autocommands -077.609 000.005: before starting main loop -079.070 001.461: first screen update -079.080 000.010: --- NVIM STARTED --- - - -times in msec - clock self+sourced self: sourced script - clock elapsed: other lines - -000.034 000.034: --- NVIM STARTING --- -000.923 000.889: locale set -001.956 001.033: inits 1 -001.994 000.037: window checked -002.002 000.009: parsing arguments -009.661 007.659: expanding arguments -009.735 000.074: inits 2 -011.473 001.738: init highlight -011.481 000.008: waiting for UI -013.996 002.514: done waiting for UI -014.106 000.110: init screen for UI -014.207 000.101: init default mappings -014.329 000.122: init default autocommands -021.387 000.272 000.272: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/ftplugin.vim -022.675 000.175 000.175: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/indent.vim -073.960 000.516 000.516: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/synload.vim -075.616 000.094 000.094: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.lua -094.253 000.025 000.025: sourcing /home/max/.local/share/nvim/site/pack/packer/start/LuaSnip/ftdetect/snippets.vim -095.184 019.480 019.455: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.vim -097.451 001.206 001.206: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/scripts.vim -097.660 025.331 004.035: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/syntax.vim -103.981 004.859 004.859: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nightfox.nvim/colors/nightfox.vim -106.510 002.331 002.331: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nightfox.nvim/colors/nightfox.vim -164.803 141.731 109.210: sourcing /home/max/.config/nvim/init.lua -164.825 008.318: sourcing vimrc file(s) -166.334 000.249 000.249: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/gzip.vim -166.383 000.019 000.019: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/health.vim -166.506 000.100 000.100: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/man.vim -167.194 000.265 000.265: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/pack/dist/opt/matchit/plugin/matchit.vim -167.342 000.811 000.545: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchit.vim -167.545 000.177 000.177: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchparen.vim -168.094 000.522 000.522: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/netrwPlugin.vim -168.304 000.012 000.012: sourcing /home/max/.local/share/nvim/rplugin.vim -168.312 000.177 000.165: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/rplugin.vim -168.468 000.122 000.122: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/shada.vim -168.536 000.034 000.034: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/spellfile.vim -168.739 000.173 000.173: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tarPlugin.vim -168.888 000.109 000.109: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tohtml.vim -168.946 000.028 000.028: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tutor.vim -169.200 000.225 000.225: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/zipPlugin.vim -171.507 002.176 002.176: sourcing /home/max/.config/nvim/plugin/packer_compiled.lua -171.795 002.047: loading rtp plugins -173.036 000.727 000.727: sourcing /home/max/.local/share/nvim/site/pack/packer/start/LuaSnip/plugin/luasnip.vim -173.536 000.298 000.298: sourcing /home/max/.local/share/nvim/site/pack/packer/start/auto-session/plugin/auto-session.vim -173.910 000.010 000.010: sourcing /home/max/.local/share/nvim/site/pack/packer/start/fwatch.nvim/plugin/fwatch.vim -174.733 000.668 000.668: sourcing /home/max/.local/share/nvim/site/pack/packer/start/fzf/plugin/fzf.vim -175.169 000.246 000.246: sourcing /home/max/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim/plugin/lsp-colors.vim -175.405 000.038 000.038: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nightfox.nvim/plugin/nightfox.vim -176.084 000.480 000.480: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-cmp/plugin/cmp.lua -176.353 000.112 000.112: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer/plugin/nvim-lsp-installer.vim -176.580 000.084 000.084: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-lspconfig/plugin/lspconfig.vim -178.543 001.798 001.798: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-scrollview/plugin/scrollview.vim -178.771 000.066 000.066: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-toggleterm.lua/plugin/toggleterm.vim -179.818 000.857 000.857: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-treesitter/plugin/nvim-treesitter.lua -179.986 000.052 000.052: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-web-devicons/plugin/nvim-web-devicons.vim -180.220 000.052 000.052: sourcing /home/max/.local/share/nvim/site/pack/packer/start/plenary.nvim/plugin/plenary.vim -180.442 000.069 000.069: sourcing /home/max/.local/share/nvim/site/pack/packer/start/session-lens/plugin/session-lens.vim -180.902 000.283 000.283: sourcing /home/max/.local/share/nvim/site/pack/packer/start/telescope.nvim/plugin/telescope.lua -181.125 000.125 000.125: sourcing /home/max/.local/share/nvim/site/pack/packer/start/trouble.nvim/plugin/trouble.vim -181.426 000.170 000.170: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-dadbod/plugin/dadbod.vim -181.837 000.270 000.270: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-dadbod-ui/plugin/db_ui.vim -182.421 000.443 000.443: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-surround/plugin/surround.vim -182.606 000.026 000.026: sourcing /home/max/.local/share/nvim/site/pack/packer/start/zen-mode.nvim/plugin/zen-mode.vim -182.819 004.147: loading packages -184.900 000.227 000.227: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-buffer/after/plugin/cmp_buffer.lua -185.062 000.076 000.076: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-calc/after/plugin/cmp_calc.lua -185.313 000.166 000.166: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-cmdline/after/plugin/cmp_cmdline.lua -185.615 000.181 000.181: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp/after/plugin/cmp_nvim_lsp.lua -185.844 000.135 000.135: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-path/after/plugin/cmp_path.lua -186.249 000.298 000.298: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp_luasnip/after/plugin/cmp_luasnip.lua -186.259 002.356: loading after plugins -186.276 000.017: inits 3 -187.420 001.144: reading ShaDa -187.739 000.319: opening buffers -187.973 000.234: BufEnter autocommands -187.976 000.003: editing files in windows -196.449 008.473: VimEnter autocommands -196.460 000.011: UIEnter autocommands -197.106 000.370 000.370: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/autoload/provider/clipboard.vim -197.121 000.291: before starting main loop -197.927 000.807: first screen update -197.931 000.004: --- NVIM STARTED --- - - -times in msec - clock self+sourced self: sourced script - clock elapsed: other lines - -000.057 000.057: --- NVIM STARTING --- -001.070 001.014: locale set -002.117 001.047: inits 1 -002.156 000.039: window checked -002.164 000.008: parsing arguments -011.783 009.618: expanding arguments -011.864 000.081: inits 2 -013.601 001.737: init highlight -013.610 000.008: waiting for UI -015.927 002.317: done waiting for UI -016.015 000.088: init screen for UI -016.089 000.073: init default mappings -016.182 000.094: init default autocommands -021.448 000.232 000.232: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/ftplugin.vim -022.352 000.135 000.135: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/indent.vim -057.388 034.764 034.764: sourcing /home/max/.config/nvim/init.lua -057.442 006.130: sourcing vimrc file(s) -058.650 000.103 000.103: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.lua -083.815 000.086 000.086: sourcing /home/max/.local/share/nvim/site/pack/packer/start/LuaSnip/ftdetect/snippets.vim -085.536 026.796 026.710: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.vim -086.459 000.228 000.228: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/synload.vim -086.688 000.939 000.711: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/syntax.vim -090.329 000.671 000.671: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/gzip.vim -090.444 000.045 000.045: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/health.vim -090.785 000.283 000.283: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/man.vim -092.332 000.578 000.578: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/pack/dist/opt/matchit/plugin/matchit.vim -092.707 001.863 001.285: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchit.vim -093.135 000.367 000.367: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchparen.vim -094.075 000.893 000.893: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/netrwPlugin.vim -094.443 000.020 000.020: sourcing /home/max/.local/share/nvim/rplugin.vim -094.458 000.307 000.287: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/rplugin.vim -094.730 000.217 000.217: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/shada.vim -094.855 000.061 000.061: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/spellfile.vim -095.214 000.301 000.301: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tarPlugin.vim -095.471 000.192 000.192: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tohtml.vim -095.574 000.050 000.050: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tutor.vim -096.023 000.398 000.398: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/zipPlugin.vim -108.415 012.162 012.162: sourcing /home/max/.config/nvim/plugin/packer_compiled.lua -108.833 005.743: loading rtp plugins -112.436 002.882 002.882: sourcing /home/max/.local/share/nvim/site/pack/packer/start/LuaSnip/plugin/luasnip.vim -113.216 000.513 000.513: sourcing /home/max/.local/share/nvim/site/pack/packer/start/auto-session/plugin/auto-session.vim -113.678 000.012 000.012: sourcing /home/max/.local/share/nvim/site/pack/packer/start/fwatch.nvim/plugin/fwatch.vim -114.682 000.829 000.829: sourcing /home/max/.local/share/nvim/site/pack/packer/start/fzf/plugin/fzf.vim -115.379 000.446 000.446: sourcing /home/max/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim/plugin/lsp-colors.vim -115.656 000.047 000.047: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nightfox.nvim/plugin/nightfox.vim -116.838 000.915 000.915: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-cmp/plugin/cmp.lua -117.197 000.138 000.138: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer/plugin/nvim-lsp-installer.vim -117.927 000.434 000.434: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-lspconfig/plugin/lspconfig.vim -120.738 002.580 002.580: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-scrollview/plugin/scrollview.vim -121.090 000.078 000.078: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-toggleterm.lua/plugin/toggleterm.vim -122.979 001.684 001.684: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-treesitter/plugin/nvim-treesitter.lua -123.168 000.057 000.057: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-web-devicons/plugin/nvim-web-devicons.vim -123.383 000.050 000.050: sourcing /home/max/.local/share/nvim/site/pack/packer/start/plenary.nvim/plugin/plenary.vim -123.618 000.068 000.068: sourcing /home/max/.local/share/nvim/site/pack/packer/start/session-lens/plugin/session-lens.vim -124.202 000.409 000.409: sourcing /home/max/.local/share/nvim/site/pack/packer/start/telescope.nvim/plugin/telescope.lua -124.578 000.274 000.274: sourcing /home/max/.local/share/nvim/site/pack/packer/start/trouble.nvim/plugin/trouble.vim -124.902 000.175 000.175: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-dadbod/plugin/dadbod.vim -125.310 000.270 000.270: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-dadbod-ui/plugin/db_ui.vim -125.882 000.428 000.428: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-surround/plugin/surround.vim -126.069 000.026 000.026: sourcing /home/max/.local/share/nvim/site/pack/packer/start/zen-mode.nvim/plugin/zen-mode.vim -126.284 005.136: loading packages -130.264 001.983 001.983: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-buffer/after/plugin/cmp_buffer.lua -130.546 000.167 000.167: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-calc/after/plugin/cmp_calc.lua -130.770 000.129 000.129: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-cmdline/after/plugin/cmp_cmdline.lua -131.212 000.338 000.338: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp/after/plugin/cmp_nvim_lsp.lua -131.426 000.120 000.120: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-path/after/plugin/cmp_path.lua -132.148 000.623 000.623: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp_luasnip/after/plugin/cmp_luasnip.lua -132.158 002.513: loading after plugins -132.174 000.016: inits 3 -133.228 001.055: reading ShaDa -133.450 000.221: opening buffers -133.597 000.147: BufEnter autocommands -133.601 000.003: editing files in windows -135.563 001.708 001.708: sourcing /home/max/.local/share/nvim/sessions/%home%max%.dotfiles%configs%nvim.vim -77727.959 77592.650: VimEnter autocommands -77727.986 000.027: UIEnter autocommands -77727.994 000.008: before starting main loop - - -times in msec - clock self+sourced self: sourced script - clock elapsed: other lines - -000.029 000.029: --- NVIM STARTING --- -000.856 000.827: locale set -001.890 001.034: inits 1 -001.928 000.038: window checked -001.936 000.008: parsing arguments -010.740 008.804: expanding arguments -010.819 000.079: inits 2 -012.561 001.742: init highlight -012.572 000.011: waiting for UI -015.004 002.432: done waiting for UI -015.102 000.098: init screen for UI -015.203 000.102: init default mappings -015.300 000.097: init default autocommands -020.619 000.218 000.218: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/ftplugin.vim -021.489 000.145 000.145: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/indent.vim -069.345 000.575 000.575: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/synload.vim -071.364 000.148 000.148: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.lua -108.695 000.056 000.056: sourcing /home/max/.local/share/nvim/site/pack/packer/start/LuaSnip/ftdetect/snippets.vim -111.734 040.237 040.181: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/filetype.vim -114.792 001.460 001.460: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/scripts.vim -115.004 047.375 004.955: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/syntax/syntax.vim -125.021 008.106 008.106: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nightfox.nvim/colors/nightfox.vim -130.484 005.111 005.111: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nightfox.nvim/colors/nightfox.vim -196.048 174.271 113.678: sourcing /home/max/.config/nvim/init.lua -196.071 006.137: sourcing vimrc file(s) -197.624 000.261 000.261: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/gzip.vim -197.673 000.018 000.018: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/health.vim -197.800 000.105 000.105: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/man.vim -198.477 000.265 000.265: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/pack/dist/opt/matchit/plugin/matchit.vim -198.624 000.798 000.533: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchit.vim -198.822 000.173 000.173: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/matchparen.vim -199.357 000.508 000.508: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/netrwPlugin.vim -199.568 000.012 000.012: sourcing /home/max/.local/share/nvim/rplugin.vim -199.576 000.175 000.163: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/rplugin.vim -199.729 000.121 000.121: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/shada.vim -199.798 000.033 000.033: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/spellfile.vim -200.017 000.189 000.189: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tarPlugin.vim -200.168 000.109 000.109: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tohtml.vim -200.225 000.028 000.028: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/tutor.vim -200.476 000.222 000.222: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/plugin/zipPlugin.vim -202.789 002.181 002.181: sourcing /home/max/.config/nvim/plugin/packer_compiled.lua -203.067 002.075: loading rtp plugins -204.302 000.711 000.711: sourcing /home/max/.local/share/nvim/site/pack/packer/start/LuaSnip/plugin/luasnip.vim -204.790 000.283 000.283: sourcing /home/max/.local/share/nvim/site/pack/packer/start/auto-session/plugin/auto-session.vim -205.168 000.009 000.009: sourcing /home/max/.local/share/nvim/site/pack/packer/start/fwatch.nvim/plugin/fwatch.vim -206.010 000.695 000.695: sourcing /home/max/.local/share/nvim/site/pack/packer/start/fzf/plugin/fzf.vim -206.477 000.249 000.249: sourcing /home/max/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim/plugin/lsp-colors.vim -206.754 000.043 000.043: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nightfox.nvim/plugin/nightfox.vim -207.416 000.431 000.431: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-cmp/plugin/cmp.lua -207.702 000.115 000.115: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer/plugin/nvim-lsp-installer.vim -207.955 000.085 000.085: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-lspconfig/plugin/lspconfig.vim -209.958 001.816 001.816: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-scrollview/plugin/scrollview.vim -210.224 000.071 000.071: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-toggleterm.lua/plugin/toggleterm.vim -211.281 000.824 000.824: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-treesitter/plugin/nvim-treesitter.lua -211.465 000.054 000.054: sourcing /home/max/.local/share/nvim/site/pack/packer/start/nvim-web-devicons/plugin/nvim-web-devicons.vim -211.703 000.052 000.052: sourcing /home/max/.local/share/nvim/site/pack/packer/start/plenary.nvim/plugin/plenary.vim -211.950 000.071 000.071: sourcing /home/max/.local/share/nvim/site/pack/packer/start/session-lens/plugin/session-lens.vim -212.402 000.237 000.237: sourcing /home/max/.local/share/nvim/site/pack/packer/start/telescope.nvim/plugin/telescope.lua -212.639 000.126 000.126: sourcing /home/max/.local/share/nvim/site/pack/packer/start/trouble.nvim/plugin/trouble.vim -212.966 000.171 000.171: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-dadbod/plugin/dadbod.vim -213.434 000.298 000.298: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-dadbod-ui/plugin/db_ui.vim -214.063 000.464 000.464: sourcing /home/max/.local/share/nvim/site/pack/packer/start/vim-surround/plugin/surround.vim -214.277 000.031 000.031: sourcing /home/max/.local/share/nvim/site/pack/packer/start/zen-mode.nvim/plugin/zen-mode.vim -214.539 004.636: loading packages -216.925 000.253 000.253: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-buffer/after/plugin/cmp_buffer.lua -217.124 000.088 000.088: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-calc/after/plugin/cmp_calc.lua -217.342 000.118 000.118: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-cmdline/after/plugin/cmp_cmdline.lua -217.781 000.323 000.323: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp/after/plugin/cmp_nvim_lsp.lua -217.977 000.094 000.094: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp-path/after/plugin/cmp_path.lua -218.359 000.282 000.282: sourcing /home/max/.local/share/nvim/site/pack/packer/start/cmp_luasnip/after/plugin/cmp_luasnip.lua -218.368 002.670: loading after plugins -218.388 000.020: inits 3 -219.482 001.095: reading ShaDa -219.717 000.234: opening buffers -219.858 000.141: BufEnter autocommands -219.861 000.003: editing files in windows -227.058 001.510 001.510: sourcing /home/max/.local/share/nvim/sessions/%home%max%.dotfiles%configs%nvim.vim -227.188 005.817: VimEnter autocommands -227.192 000.004: UIEnter autocommands -227.675 000.260 000.260: sourcing /home/max/.asdf/installs/neovim/nightly/share/nvim/runtime/autoload/provider/clipboard.vim -227.688 000.236: before starting main loop -228.227 000.538: first screen update -228.231 000.004: --- NVIM STARTED --- diff --git a/configs/sway/config b/configs/sway/config index 56a9c5c..31e9792 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -30,7 +30,7 @@ set $screenshot wl-copy < "$($grimshot --notify save screen $screenshot_dir/scrn set $windowshot wl-copy < "$($grimshot --notify save window $screenshot_dir/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png)" # Default Programs -set $term kitty -e "tmux" +set $term wezterm set $explorer nautilus set $mail org.gnome.Geary set $browser google-chrome-beta --enable-features=UseOzonePlatform --ozone-platform=wayland diff --git a/configs/waybar/config b/configs/waybar/config index 05245ea..dbc8598 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -15,7 +15,7 @@ "modules-right": [ "custom/power-consumption", "custom/power-profile", - // "custom/dpi", + "custom/dpi", "custom/theme", "pulseaudio", "network", @@ -49,11 +49,11 @@ "on-click": "~/.config/waybar/scripts/power-profile --toggle", "interval": 2 }, - // "custom/dpi": { - // "exec": "~/.config/waybar/scripts/toggle-hdpi", - // "on-click": "~/.config/waybar/scripts/toggle-hdpi --toggle", - // "restart-interval": 2 - // }, + "custom/dpi": { + "exec": "~/.config/waybar/scripts/toggle-hdpi", + "on-click": "~/.config/waybar/scripts/toggle-hdpi --toggle", + "restart-interval": 2 + }, "clock": { "interval": 60, "format": "{:%H:%M}", diff --git a/configs/wezterm/wezterm.lua b/configs/wezterm/wezterm.lua index ed95d52..a608d89 100644 --- a/configs/wezterm/wezterm.lua +++ b/configs/wezterm/wezterm.lua @@ -1,10 +1,21 @@ local wezterm = require("wezterm") +local padding = 30 + return { font = wezterm.font("FiraCodeNerdFont"), font_size = 13, -- You can specify some parameters to influence the font selection; -- for example, this selects a Bold, Italic font variant. + -- color_scheme = "Batman", use_fancy_tab_bar = false, hide_tab_bar_if_only_one_tab = true, + alternate_buffer_wheel_scroll_speed = 1, + window_close_confirmation = "AlwaysPrompt", + window_padding = { + left = padding, + right = padding, + top = padding, + bottom = padding, + }, } diff --git a/configs/zsh/aliases.sh b/configs/zsh/aliases.sh index 0730510..90d03db 100644 --- a/configs/zsh/aliases.sh +++ b/configs/zsh/aliases.sh @@ -26,3 +26,5 @@ alias p="git pull" alias lt="tree -L 2 --filelimit 150 --dirsfirst" alias dc="docker-compose" + +alias t="tmux"