diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 223ce39..274c0be 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,5 +1,5 @@ import = [ - "~/.config/alacritty/themes/kanagawa_wave.toml" + "~/.config/alacritty/themes/flow.toml" ] [env] diff --git a/.config/alacritty/themes/ayu_dark.toml b/.config/alacritty/themes/ayu_dark.toml new file mode 100644 index 0000000..a2ea740 --- /dev/null +++ b/.config/alacritty/themes/ayu_dark.toml @@ -0,0 +1,28 @@ +# Colors (Ayu Dark) + +# Default colors +[colors.primary] +background = '#0A0E14' +foreground = '#B3B1AD' + +# Normal colors +[colors.normal] +black = '#01060E' +red = '#EA6C73' +green = '#91B362' +yellow = '#F9AF4F' +blue = '#53BDFA' +magenta = '#FAE994' +cyan = '#90E1C6' +white = '#C7C7C7' + +# Bright colors +[colors.bright] +black = '#686868' +red = '#F07178' +green = '#C2D94C' +yellow = '#FFB454' +blue = '#59C2FF' +magenta = '#FFEE99' +cyan = '#95E6CB' +white = '#FFFFFF' diff --git a/.config/alacritty/themes/flow.toml b/.config/alacritty/themes/flow.toml new file mode 100644 index 0000000..5755f35 --- /dev/null +++ b/.config/alacritty/themes/flow.toml @@ -0,0 +1,67 @@ +# Flow colorscheme | Alacritty +# https://github.com/0xstepit/flow.nvim + +# Black and white +[colors.primary] +background = '#1B2228' +foreground = '#B2C1CC' + +# Normal colors +[colors.normal] +black = '#0D0D0D' +red = '#F07580' +green = '#80F075' +yellow = '#F0E575' +blue = '#75BDF0' +magenta = '#A875F0' +cyan = '#75F0E6' +white = '#F2F2F2' + +# Bright colors +[colors.bright] +black = '#0D0D0D' +red = '#F07580' +green = '#80F075' +yellow = '#F0E575' +blue = '#75BDF0' +magenta = '#A875F0' +cyan = '#75F0E6' +white = '#F2F2F2' + +# Search colors +[colors.search.matches] +foreground = '#FF007C' +background = '#0D0D0D' + +[colors.search.focused_match] +foreground = '#0D0D0D' +background = '#FF007C' + +# Selection colors +[colors.selection] +background = '#FF007C' +text = '#0D0D0D' + +# Cursors +# If you don't want to override original behavior, which is nice, +# remove [colors.cursor] and [colors.vi_mode_cursor]. +[colors.cursor] +cursor = '#FF007C' +text = '#0D0D0D' + +[colors.vi_mode_cursor] +cursor = '#FF007C' +text = '#0D0D0D' + +[colors.footer_bar] +foreground = '#FF007C' +background = '#0D0D0D' + +[[colors.indexed_colors]] +index = 93 +color = '#A875F0' + +# Fluo Colors +[[colors.indexed_colors]] +index = 198 +color = '#FF007C' diff --git a/.config/alacritty/themes/tokyo-night.toml b/.config/alacritty/themes/tokyo-night.toml new file mode 100644 index 0000000..0642a90 --- /dev/null +++ b/.config/alacritty/themes/tokyo-night.toml @@ -0,0 +1,29 @@ +# Colors (Tokyo Night) +# Source https//github.com/zatchheems/tokyo-night-alacritty-theme + +# Default colors +[colors.primary] +background = '#1a1b26' +foreground = '#a9b1d6' + +# Normal colors +[colors.normal] +black = '#32344a' +red = '#f7768e' +green = '#9ece6a' +yellow = '#e0af68' +blue = '#7aa2f7' +magenta = '#ad8ee6' +cyan = '#449dab' +white = '#787c99' + +# Bright colors +[colors.bright] +black = '#444b6a' +red = '#ff7a93' +green = '#b9f27c' +yellow = '#ff9e64' +blue = '#7da6ff' +magenta = '#bb9af7' +cyan = '#0db9d7' +white = '#acb0d0' diff --git a/.config/aliasrc b/.config/aliasrc index 615360f..20b0d4a 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -11,7 +11,6 @@ alias va='nvim ~/.config/aliasrc && source ~/.zshrc' alias sz='source ~/.zshrc' alias c="xclip -selection clipboard" alias v="xclip -selection clipboard -o" -alias lf="lfcd" alias ducks='du -cks * | sort -rn | head' # Docker diff --git a/.config/nvim/lua/tovi/plugins/colorscheme.lua b/.config/nvim/lua/tovi/plugins/colorscheme.lua index 6e4e562..aebb5d8 100644 --- a/.config/nvim/lua/tovi/plugins/colorscheme.lua +++ b/.config/nvim/lua/tovi/plugins/colorscheme.lua @@ -53,9 +53,10 @@ return { }, }) - -- vim.cmd("colorscheme catppuccin") + vim.cmd("colorscheme catppuccin") end }, + { "ellisonleao/gruvbox.nvim", enabled = false, @@ -65,8 +66,10 @@ return { vim.cmd("colorscheme gruvbox") end, }, + { "rebelot/kanagawa.nvim", + enabled = false, priority = 1000 , config = function () -- Default options: @@ -99,4 +102,48 @@ return { vim.cmd("colorscheme kanagawa") end }, + { + "folke/tokyonight.nvim", + enabled = false, + lazy = false, + priority = 1000, + config = function () + require('tokyonight').setup() + vim.cmd("colorscheme tokyonight") + end + }, + + { + "Shatur/neovim-ayu", + enabled = false, + lazy = false, + priority = 1000, + config = function () + require('ayu').setup({ + mirage = false, -- Set to `true` to use `mirage` variant instead of `dark` for dark background. + terminal = true, -- Set to `false` to let terminal manage its own colors. + overrides = {}, + }) + vim.cmd("colorscheme ayu-dark") + end + + }, + + { + "0xstepit/flow.nvim", + enabled = true, + lazy = false, + priority = 1000, + opts = {}, + config = function() + require("flow").setup{ + transparent = false, -- Set transparent background. + fluo_color = "pink", -- Fluo color: pink, yellow, orange, or green. + mode = "normal", -- Intensity of the palette: normal, bright, desaturate, or dark. Notice that dark is ugly! + aggressive_spell = false, -- Display colors for spell check. + } + + vim.cmd("colorscheme flow") + end, + } } diff --git a/.config/nvim/lua/tovi/plugins/linting.lua b/.config/nvim/lua/tovi/plugins/linting.lua index e5f6d60..d92b296 100644 --- a/.config/nvim/lua/tovi/plugins/linting.lua +++ b/.config/nvim/lua/tovi/plugins/linting.lua @@ -10,6 +10,7 @@ return { } lint.linters.phpcs = { + name = 'phpcs', cmd = 'phpcs', stdin = true, args = { diff --git a/.config/nvim/lua/tovi/plugins/lualine.lua b/.config/nvim/lua/tovi/plugins/lualine.lua index 0f090fc..9b5eb17 100644 --- a/.config/nvim/lua/tovi/plugins/lualine.lua +++ b/.config/nvim/lua/tovi/plugins/lualine.lua @@ -19,9 +19,10 @@ return { lualine.setup({ options = { - theme = "kanagawa", + theme = "flow", component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, + globalstatus = true, }, sections = { lualine_b = { diff --git a/.config/nvim/lua/tovi/plugins/nvim-cmp.lua b/.config/nvim/lua/tovi/plugins/nvim-cmp.lua index eaf042d..b3c1406 100644 --- a/.config/nvim/lua/tovi/plugins/nvim-cmp.lua +++ b/.config/nvim/lua/tovi/plugins/nvim-cmp.lua @@ -1,90 +1,91 @@ return { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - { - "L3MON4D3/LuaSnip", - build = (function() - if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then - return - end - return "make install_jsregexp" - end)(), - dependencies = { - { - "rafamadriz/friendly-snippets", - config = function() - require("luasnip.loaders.from_vscode").lazy_load() - end, - }, - }, - }, - "saadparwaiz1/cmp_luasnip", + "hrsh7th/nvim-cmp", + event = "InsertEnter", + dependencies = { + -- Snippet Engine & its associated nvim-cmp source + { + "L3MON4D3/LuaSnip", + build = (function() + if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then + return + end + return "make install_jsregexp" + end)(), + dependencies = { + { + "rafamadriz/friendly-snippets", + config = function() + require("luasnip.loaders.from_vscode").lazy_load() + end, + }, + }, + }, + "saadparwaiz1/cmp_luasnip", - "onsails/lspkind.nvim", - "kristijanhusak/vim-dadbod-completion", + "onsails/lspkind.nvim", + "kristijanhusak/vim-dadbod-completion", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-nvim-lsp-signature-help", - }, - config = function() - -- See `:help cmp` - local cmp = require("cmp") - local luasnip = require("luasnip") - local lspkind = require("lspkind") - luasnip.config.setup({}) + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-nvim-lsp-signature-help", + }, + config = function() + -- See `:help cmp` + local cmp = require("cmp") + local luasnip = require("luasnip") + local lspkind = require("lspkind") + luasnip.config.setup({}) - cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { completeopt = "menu,menuone,noinsert", }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping.complete({}), - [""] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { "i", "s" }), - [""] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { "i", "s" }), - }), - sources = { - { name = "nvim_lsp" }, - -- { name = "nvim_lsp_signature_help" }, -- TODO: Get this working so hover() doesnt open twice - { name = "luasnip" }, - { name = "buffer" }, - { name = "path" }, - { name = "vim-dadbod-completion" }, - }, - formatting = { - format = lspkind.cmp_format({ - mode = "symbol_text", - menu = { - nvim_lua = "[API]", - nvim_lsp = "[LSP]", - luasnip = "[SNIP]", - vim_dadbod_completion = "[DBUI]", - path = "[PATH]", - buffer = "[BUFF]", - }, - }), - }, - }) - end, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.complete({}), + [""] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { "i", "s" }), + [""] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { "i", "s" }), + }), + sources = { + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "buffer" }, + { name = "path" }, + { name = "vim-dadbod-completion" }, + }, + formatting = { + expandable_indicator = true, + fields = { "abbr", "kind", "menu" }, + format = lspkind.cmp_format({ + mode = "symbol_text", + menu = { + nvim_lua = "[API]", + nvim_lsp = "[LSP]", + luasnip = "[SNIP]", + vim_dadbod_completion = "[DBUI]", + path = "[PATH]", + buffer = "[BUFF]", + }, + }), + }, + }) + end, } diff --git a/.tmux.conf b/.tmux.conf index 829d1f8..035ad4e 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -61,23 +61,53 @@ bind K confirm kill-session bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer" +# Flow colorscheme | Tmux +# https://github.com/0xstepit/flow.nvim + +## Statusbar style + +set -g status-position top +set -g status-right-length "100" +set -g status-left-length "100" +set -g status-style bg=#141A1F,fg=#3D4F5C +set -g window-status-style fg=#3D4F5C,bg=#141A1F +setw -g window-status-separator " " +set -g window-status-current-style fg=colour198 +set -g window-status-format "(#I) #W" +set -g window-status-current-format "(#I) #W" +set -g status-left "#[fg=#0D0D0D,bg=#75BDF0] #S #[bg=#3D4F5C,fg=#75BDF0] #h #[bg=#141A1F] " +set -g status-right "#[bg=#3D4F5C,fg=#75BDF0] %H:%M #[fg=#0D0D0D,bg=#75BDF0] %A %d. %b %Y " + +set -g message-command-style fg=#FF007C +set -g message-style "fg=#FF007C, bg=#141A1F" # color used in the message popup. + +set -g mode-style "fg=#FF007C" + +## Borders +set -g pane-border-style "fg=#3D4F5C" +set -g pane-active-border-style "fg=#3D4F5C" + +# Set below the rest of your config +# ... + # List of plugins set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'Nybkox/tmux-kanagawa' +# set -g @plugin "janoamaral/tokyo-night-tmux" +# set -g @tokyo-night-tmux_window_id_style digital -set -g @kanagawa-show-powerline true +# set -g @plugin 'Nybkox/tmux-kanagawa' +# set -g @kanagawa-show-powerline true +# set -g @kanagawa-theme 'wave' -set -g @kanagawa-theme 'wave' +# set -g @plugin 'jibingeo/tmux-colors-ayu' # set -g @plugin 'egel/tmux-gruvbox' # set -g @tmux-gruvbox 'dark' # or 'light' # set -g @plugin 'catppuccin/tmux' -# # set -g @catppuccin_flavour 'mocha' -# # set -g @catppuccin_status_left_separator "" # set -g @catppuccin_window_middle_separator " " # set -g @catppuccin_status_modules_right "application session directory date_time" diff --git a/.zshrc b/.zshrc index 7695f56..dd8035c 100644 --- a/.zshrc +++ b/.zshrc @@ -105,7 +105,9 @@ source ~/.config/aliasrc # Source fzf for Ctrl+r source <(fzf --zsh) -. "$HOME/.cargo/env" +if [ -f "$HOME/.cargo/env" ]; then + . "$HOME/.cargo/env" +fi # Speed debugging # zprof