From fbd9ed01d656b4a8b12b458b5228875b1b743b9f Mon Sep 17 00:00:00 2001 From: mintycube <90507714+mintycube@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:58:36 +0500 Subject: [PATCH] tokyonigt-moon,keymaps, and options --- .config/dunst/dunstrc | 10 ++-- .config/kitty/colors.conf | 38 ++++++------ .config/lf/lfrc | 8 +-- .config/nvim/lazy-lock.json | 27 +++++---- .config/nvim/lua/ascii.lua | 16 ++--- .config/nvim/lua/mappings.lua | 4 ++ .config/nvim/lua/options.lua | 5 ++ .config/nvim/lua/plugins/colors.lua | 91 ++++++++++++++--------------- .config/nvim/lua/plugins/doc.lua | 3 +- .config/nvim/lua/plugins/ui.lua | 71 ++++++++++++++++++---- .config/suckless/dwmblocks | 2 +- .config/x11/colors/tokyonight-moon | 55 +++++++++++++++++ .config/x11/xresources | 2 +- .config/zsh/.zshrc | 17 +++++- .local/bin/fetch.sh | 24 ++++---- 15 files changed, 252 insertions(+), 121 deletions(-) create mode 100644 .config/x11/colors/tokyonight-moon diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 5bb0b72..85feb44 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -58,24 +58,24 @@ icon = default_icon = icon_position=off timeout = 2 -background = "#1e1e2e" +background = "#222436" foreground = "#a6adc8" -frame_color = "#cba6f7" +frame_color = "#c099ff" [urgency_normal] icon = default_icon = icon_position=off timeout = 5 -background = "#1e1e2e" +background = "#222436" foreground = "#a6adc8" -frame_color = "#cba6f7" +frame_color = "#c099ff" [urgency_critical] icon = default_icon = icon_position=off timeout = 0 -background = "#1e1e2e" +background = "#222436" foreground = "#a6adc8" frame_color = "#f38bab" diff --git a/.config/kitty/colors.conf b/.config/kitty/colors.conf index 7496862..7265fdc 100644 --- a/.config/kitty/colors.conf +++ b/.config/kitty/colors.conf @@ -1,20 +1,20 @@ # Colors generated from xresources file using the kitty_colors script -background #14161B -foreground #CDD6F4 -cursor #CDD6F4 -color0 #45475A -color1 #F38BA8 -color2 #A6E3A1 -color3 #F9E2AF -color4 #89B4FA -color5 #cba6f7 -color6 #94E2D5 -color7 #BAC2DE -color8 #585B70 -color9 #F38BA8 -color10 #A6E3A1 -color11 #F9E2AF -color12 #89B4FA -color13 #cba6f7 -color14 #94E2D5 -color15 #A6ADC8 +background #222436 +foreground #c8d3f5 +cursor +color0 #1b1d2b +color1 #ff757f +color2 #c3e88d +color3 #ffc777 +color4 #82aaff +color5 #c099ff +color6 #86e1fc +color7 #828bb8 +color8 +color9 #ff757f +color10 #c3e88d +color11 #ffc777 +color12 #82aaff +color13 #c099ff +color14 #86e1fc +color15 #c8d3f5 diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 7ecafde..1101c7f 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -72,8 +72,8 @@ cmd extract ${{ clear; tput cup $(($(tput lines)/3)); tput bold set -f printf "%s\n\t" "$fx" - ans=$(echo -e "Cancel\nOk" | fzf --prompt="Extract?" --ansi --border=rounded --margin=0,35% --no-info --height=7) - [ $ans = "Ok" ] && { + ans=$(echo -e "No\nYes" | fzf --prompt="Extract?" --ansi --border=rounded --margin=0,35% --no-info --height=7) + [ $ans = "Yes" ] && { case $fx in *.tar.bz2) tar xjf $fx ;; *.tar.gz) tar xzf $fx ;; @@ -95,8 +95,8 @@ cmd delete ${{ clear; tput cup $(($(tput lines)/3)); tput bold set -f printf "%s\n\t" "$fx" - ans=$(echo -e "Cancel\nOk" | fzf --prompt="Delete?" --ansi --border=rounded --margin=0,35% --no-info --height=7) - [ $ans = "Ok" ] && trash-put $fx + ans=$(echo -e "No\nYes" | fzf --prompt="Delete?" --ansi --border=rounded --margin=0,35% --no-info --height=7) + [ $ans = "Yes" ] && trash-put $fx }} cmd moveto ${{ diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 74069fc..050703f 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -11,12 +11,12 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "flit.nvim": { "branch": "main", "commit": "a9be4e76c30a128f1e51af448c8321bf8366bcd4" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "fzf-lua": { "branch": "main", "commit": "3b91c1a471160bd8620bdca8f18743d954994daa" }, + "fzf-lua": { "branch": "main", "commit": "72752f7d783b3a56f4e27c8592600646b991a928" }, "gitsigns.nvim": { "branch": "main", "commit": "39b5b6f48bde0595ce68007ffce408c5d7ac1f79" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "cea5920abb202753004440f94ec39bcf2927e02e" }, - "leap.nvim": { "branch": "main", "commit": "eca8108dcd5f41fbde2a674dceb58b81ed887dc8" }, + "lazy.nvim": { "branch": "main", "commit": "894cd193e9ffc05dcb75ff0093c1b72880d5d9c1" }, + "leap.nvim": { "branch": "main", "commit": "75c246f562ab34a92c359c3c4d2eb138768b92ec" }, "lf.nvim": { "branch": "master", "commit": "69ab1efcffee6928bf68ac9bd0c016464d9b2c8b" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "87701af045b3032515776abeb47eb8c2ddb5e679" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, @@ -29,7 +29,9 @@ "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" }, "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" }, + "noice.nvim": { "branch": "main", "commit": "f26515c768a4b8eb39b4ec6b04d244ad4bc7cfc9" }, "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, @@ -40,27 +42,28 @@ "nvim-markdown": { "branch": "master", "commit": "bf5c87788156f072cfb87b994844424b164b5b44" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, - "nvim-treesitter": { "branch": "master", "commit": "acc1708b962e12cc1d671cd530782727801804c3" }, + "nvim-treesitter": { "branch": "master", "commit": "a8c082b4f5b3b70bde2ffb08cc112dfd7e515fb3" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe" }, "nvim-ufo": { "branch": "main", "commit": "aa2e676af592b4e99c105d80d6eafd1afc215d99" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "outline.nvim": { "branch": "main", "commit": "028e0bc8ad3d511e9fc1f0678594a608eb908ee5" }, - "persistence.nvim": { "branch": "main", "commit": "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96" }, + "outline.nvim": { "branch": "main", "commit": "2175b6da5b7b5be9de14fd3f54383a17f5e4609c" }, + "persistence.nvim": { "branch": "main", "commit": "04599f36b5fa9b2bb0fca09c7b5ac2d1fda5a8e1" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "qalc.nvim": { "branch": "main", "commit": "1b800b5d8f956c4780f079333cba4d8fb8c335a3" }, + "qalc.nvim": { "branch": "scratch_buffer", "commit": "1463a59e85067e8524a2146b9cdfbe3554359153" }, "qalculate.vim": { "branch": "main", "commit": "d0269924bfa623bf0f73218041241cc83e97379e" }, - "refactoring.nvim": { "branch": "master", "commit": "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4" }, - "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, + "refactoring.nvim": { "branch": "master", "commit": "d07218748c48e756c27aa6859bfa6e62a3d271af" }, + "todo-comments.nvim": { "branch": "main", "commit": "92e180db74102057263bd5a1dc30056b03424a08" }, "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "trouble.nvim": { "branch": "main", "commit": "42dcb58e95723f833135d5cf406c38bd54304389" }, + "tokyonight.nvim": { "branch": "main", "commit": "17dd14745b56def3ba31f729734f2331151fefc8" }, + "trouble.nvim": { "branch": "main", "commit": "34be821abfd5ee0aba337a1869d2161c36c45b1d" }, "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vimtex": { "branch": "master", "commit": "2dc2a5435809c13f6f4aa07964be4ef19a7864f5" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }, - "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } + "which-key.nvim": { "branch": "main", "commit": "c13a5fb71b5b05d21c15b317d90269d7c7774892" }, + "zen-mode.nvim": { "branch": "main", "commit": "abe7784f0413fc464da43f68c870a39677418e38" } } \ No newline at end of file diff --git a/.config/nvim/lua/ascii.lua b/.config/nvim/lua/ascii.lua index 853b63b..4976c92 100644 --- a/.config/nvim/lua/ascii.lua +++ b/.config/nvim/lua/ascii.lua @@ -216,17 +216,17 @@ M.suckless = { -- } -- -- M.hydra = { --- [[ ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣭⣿⣶⣿⣦⣼⣆ ]], +-- [[ ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣿⣶⣿⣦⣼⣆ ]], -- [[ ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦ ]], --- [[ ⠈⢿⣿⣟⠦⠄⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ ]], --- [[ ⣸⣿⣿⢧⠄⢻⠻⣿⣿⣷⣄⣀ ⣀⡀⠈⠙⠿ ]], --- [[ ⢀ ⢠⣿⣿⣿⠈ ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀ ]], --- [[ ⢠⣧⣶⣥⡤ ⣸⣿⣿⠘ ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄ ]], --- [[ ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷ ⢊⣿⣿⡏ ⢸⣿⣿⡇ ⢀⣠⣄⣾ ]], +-- [[ ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ ]], +-- [[ ⣸⣿⣿⢧ ⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄ ]], +-- [[ ⢠⣿⣿⣿⠈ ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀ ]], +-- [[ ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘ ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄ ]], +-- [[ ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷ ⢊⣿⣿⡏ ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄ ]], -- [[⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄ ]], -- [[⠙⠃ ⣼⣿⡟ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄]], --- [[ ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ ⠁]], --- [[ ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃ ]], +-- [[ ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ ]], +-- [[ ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣾⡿⠃ ]], -- } -- -- M.spider = { diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index 48ff83a..0891204 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -22,11 +22,15 @@ vim.keymap.set("n", "y", "%yank", { desc = "Yank buffer" }) vim.keymap.set("n", "", "miA;`i") vim.keymap.set("n", "q", ":lua vim.diagnostic.open_float()", { noremap = true, silent = true }) vim.keymap.set("n", "", ":bd", { silent = true }) +vim.keymap.set("n", "[b", "bprevious", { desc = "Prev Buffer" }) +vim.keymap.set("n", "]b", "bnext", { desc = "Next Buffer" }) vim.keymap.set("n", "", ":vsplit", { silent = true }) vim.keymap.set("n", "", ":split", { silent = true }) vim.keymap.set("n", "", ":w") vim.keymap.set('n', "gl", ':lua vim.diagnostic.open_float()') vim.keymap.set("n", "cg", ":setlocal spell! spelllang=en_us", { desc = "Spellcheck", silent = true }) +vim.keymap.set("n", "gco", "oVcxnormal gccfxa", { desc = "Add Comment Below" }) +vim.keymap.set("n", "gcO", "OVcxnormal gccfxa", { desc = "Add Comment Above" }) vim.keymap.set("x", "p", 'p:let @+=@0:let @"=@0', { silent = true }) vim.keymap.set("x", "K", ":m '<-2gv=gv") diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index 4650b16..0a20bcb 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -77,3 +77,8 @@ vim.g.neovide_padding_top = 5 vim.g.neovide_padding_bottom = 0 vim.g.neovide_padding_right = 10 vim.g.neovide_padding_left = 10 + +vim.opt.virtualedit = "block" +vim.opt.smoothscroll = true +vim.opt.pumblend = 10 -- Popup blend +vim.opt.pumheight = 10 -- Maximum number of entries in a popup diff --git a/.config/nvim/lua/plugins/colors.lua b/.config/nvim/lua/plugins/colors.lua index a9a4851..6a1343e 100644 --- a/.config/nvim/lua/plugins/colors.lua +++ b/.config/nvim/lua/plugins/colors.lua @@ -105,50 +105,49 @@ return { -- colorscheme -- hl(0, "DiagnosticUnderlineHint", { underline = true, sp = "#858694" }) -- end, -- }, - -- { - -- "folke/tokyonight.nvim", - -- lazy = false, - -- priority = 1000, - -- config = function() - -- require("tokyonight").setup({ - -- style = "night", - -- styles = { - -- sidebars = "dark", - -- floats = "dark", - -- }, - -- sidebars = { "qf", "help", "Outline" }, - -- on_colors = function(colors) - -- colors.bg = "#16161E" - -- colors.bg_dark = "#0d0d12" - -- end, - -- on_highlights = function(hl, colors) - -- hl.DiagnosticVirtualTextError = { - -- fg = colors.comment - -- } - -- hl.DiagnosticVirtualTextHint = { - -- fg = colors.comment - -- } - -- hl.DiagnosticVirtualTextInfo = { - -- fg = colors.comment - -- } - -- hl.DiagnosticVirtualTextWarn = { - -- fg = colors.comment - -- } - -- hl.DiagnosticSignError = { - -- fg = colors.comment - -- } - -- hl.DiagnosticSignHint = { - -- fg = colors.comment - -- } - -- hl.DiagnosticSignInfo = { - -- fg = colors.comment - -- } - -- hl.DiagnosticSignWarn = { - -- fg = colors.comment - -- } - -- end, - -- }) - -- -- vim.cmd.colorscheme("tokyonight") - -- end, - -- }, + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + config = function() + require("tokyonight").setup({ + styles = { + sidebars = "dark", + floats = "dark", + }, + sidebars = { "qf", "help", "Outline" }, + -- on_colors = function(colors) + -- colors.bg = "#16161E" + -- colors.bg_dark = "#0d0d12" + -- end, + on_highlights = function(hl, colors) + hl.DiagnosticVirtualTextError = { + fg = colors.comment + } + hl.DiagnosticVirtualTextHint = { + fg = colors.comment + } + hl.DiagnosticVirtualTextInfo = { + fg = colors.comment + } + hl.DiagnosticVirtualTextWarn = { + fg = colors.comment + } + -- hl.DiagnosticSignError = { + -- fg = colors.comment + -- } + -- hl.DiagnosticSignHint = { + -- fg = colors.comment + -- } + -- hl.DiagnosticSignInfo = { + -- fg = colors.comment + -- } + -- hl.DiagnosticSignWarn = { + -- fg = colors.comment + -- } + end, + }) + vim.cmd.colorscheme("tokyonight") + end, + }, } diff --git a/.config/nvim/lua/plugins/doc.lua b/.config/nvim/lua/plugins/doc.lua index 57a0bde..edd6142 100644 --- a/.config/nvim/lua/plugins/doc.lua +++ b/.config/nvim/lua/plugins/doc.lua @@ -20,7 +20,8 @@ return { -- event = "BufEnter *.qalc", -- }, { - "Apeiros-46B/qalc.nvim", + "grueslayer/qalc.nvim", + branch = "scratch_buffer", event = "BufEnter *.qalc", cmd = { "QalcAttach", "QalcYank" }, dependencies = { diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua index d575cd5..11f5e01 100644 --- a/.config/nvim/lua/plugins/ui.lua +++ b/.config/nvim/lua/plugins/ui.lua @@ -1,5 +1,60 @@ return { - -- icons + { + "folke/noice.nvim", + enabled = true, + event = "VeryLazy", + opts = { + lsp = { + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + signature = { enabled = false }, + hover = { enabled = false } + }, + routes = { + { + filter = { + event = "msg_show", + any = { + { find = "%d+L, %d+B" }, + { find = "; after #%d+" }, + { find = "; before #%d+" }, + }, + }, + view = "mini", + }, + }, + presets = { + bottom_search = true, + command_palette = true, + long_message_to_split = true, + }, + }, + -- stylua: ignore + keys = { + { "sn", "", desc = "+noice"}, + { "", function() require("noice").redirect(vim.fn.getcmdline()) end, mode = "c", desc = "Redirect Cmdline" }, + { "snl", function() require("noice").cmd("last") end, desc = "Noice Last Message" }, + { "snh", function() require("noice").cmd("history") end, desc = "Noice History" }, + { "sna", function() require("noice").cmd("all") end, desc = "Noice All" }, + { "snd", function() require("noice").cmd("dismiss") end, desc = "Dismiss All" }, + { "snt", function() require("noice").cmd("pick") end, desc = "Noice Picker (Telescope/FzfLua)" }, + { "", function() if not require("noice.lsp").scroll(4) then return "" end end, silent = true, expr = true, desc = "Scroll Forward", mode = {"i", "n", "s"} }, + { "", function() if not require("noice.lsp").scroll(-4) then return "" end end, silent = true, expr = true, desc = "Scroll Backward", mode = {"i", "n", "s"}}, + }, + config = function(_, opts) + -- HACK: noice shows messages from before it was enabled, + -- but this is not ideal when Lazy is installing plugins, + -- so clear the messages in this case. + if vim.o.filetype == "lazy" then + vim.cmd([[messages clear]]) + end + require("noice").setup(opts) + end, + }, + -- icons { "nvim-tree/nvim-web-devicons", }, @@ -17,11 +72,11 @@ return { fg = "#908caa", active_buf = "#e0def4", } - elseif colorscheme == "tokyonight" then + elseif colorscheme == "tokyonight-moon" then return { - bg = '#16161e', - fg = '#3B4261', - active_buf = "#c0caf5", + bg = '#222436', + fg = '#636DA6', + active_buf = "#C8D3F5", } elseif colorscheme == "tokyodark" then return { @@ -118,12 +173,6 @@ return { table.insert(config.sections.lualine_x, component) end - ins_left({ - function() - return "" - end - }) - ins_left({ "mode", }) diff --git a/.config/suckless/dwmblocks b/.config/suckless/dwmblocks index 32145ca..bd2594e 160000 --- a/.config/suckless/dwmblocks +++ b/.config/suckless/dwmblocks @@ -1 +1 @@ -Subproject commit 32145ca97ca555355df7ff3227dd1fdf910a9853 +Subproject commit bd2594edee18145b982f2c69a5aca98f4f4c3ace diff --git a/.config/x11/colors/tokyonight-moon b/.config/x11/colors/tokyonight-moon new file mode 100644 index 0000000..78b6988 --- /dev/null +++ b/.config/x11/colors/tokyonight-moon @@ -0,0 +1,55 @@ +!! vim: filetype=xdefaults + +*.background: #222436 +*.foreground: #c8d3f5 +*.color0: #1b1d2b +*.color1: #ff757f +*.color2: #c3e88d +*.color3: #ffc777 +*.color4: #82aaff +*.color5: #c099ff +*.color6: #86e1fc +*.color7: #828bb8 +*.color9: #ff757f +*.color10: #c3e88d +*.color11: #ffc777 +*.color12: #82aaff +*.color13: #c099ff +*.color14: #86e1fc +*.color15: #c8d3f5 + +dwm.normbordercolor: #313244 +dwm.normbgcolor: #222436 +dwm.normfgcolor: #a6adc8 +dwm.selbordercolor: #585b70 +dwm.selbgcolor: #7f849c +dwm.selfgcolor: #a6adc8 +dwm.tagsnormfgcolor: #a6adc8 +dwm.tagsnormbgcolor: #222436 +dwm.tagsselfgcolor: #a6adc8 +dwm.tagsselbgcolor: #313244 +dwm.normfloatcolor: #313244 +dwm.selfloatcolor: #585b70 + +dwm.titlenormfgcolor: #a6adc8 +dwm.titlenormbgcolor: #222436 +dwm.titlenormbordercolor: #444444 +dwm.titlenormfloatcolor: #c099ff +dwm.titleselfgcolor: #eeeeee +dwm.titleselbgcolor: #313244 +dwm.titleselbordercolor: #313244 +dwm.titleselfloatcolor: #313244 +dwm.hidnormfgcolor: #a6adc8 +dwm.hidselfgcolor: #a6adc8 +dwm.hidnormbgcolor: #222222 +dwm.hidselbgcolor: #222222 + +dmenu.foreground: #a6adc8 +dmenu.background: #222436 +dmenu.selforeground: #222436 +dmenu.selbackground: #c099ff +dmenu.bordercolor: #c099ff + +slock.locked: #45475a +slock.input: #a6adc8 +slock.failed: #89b4fa diff --git a/.config/x11/xresources b/.config/x11/xresources index 361e81c..a1e76cc 100644 --- a/.config/x11/xresources +++ b/.config/x11/xresources @@ -2,7 +2,7 @@ ! Choices: tokyonight, rose-pine, onedark, monochrome ! evergarden, nord, oxocarbon, catpuccin, tokyodark -#include "colors/catpuccin" +#include "colors/tokyonight-moon" Xcursor.theme: Bibata-Modern-Ice Xcursor.size: 24 diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 67bc7c6..26166d7 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -53,7 +53,22 @@ export TERMINAL_PROG="st" export BROWSER="firefox" export MANPAGER="nvim +Man!" export XDG_SESSION_TYPE="x11" -export FZF_DEFAULT_OPTS="--height=50% --reverse --prompt='  ' --pointer=' ' --ellipsis='' --color='16'" +export FZF_DEFAULT_OPTS="--height=50% --reverse --prompt='  ' --pointer=' ' --ellipsis='' \ + --color=bg+:#2d3f76 \ + --color=bg:#1e2030 \ + --color=border:#589ed7 \ + --color=fg:#c8d3f5 \ + --color=gutter:#1e2030 \ + --color=header:#ff966c \ + --color=hl+:#65bcff \ + --color=hl:#65bcff \ + --color=info:#545c7e \ + --color=marker:#ff007c \ + --color=pointer:#ff007c \ + --color=prompt:#65bcff \ + --color=query:#c8d3f5:regular \ + --color=spinner:#ff007c \ + " # ~/ Clean-up: export XDG_CONFIG_HOME="$HOME/.config" diff --git a/.local/bin/fetch.sh b/.local/bin/fetch.sh index 56de88c..ab78b80 100755 --- a/.local/bin/fetch.sh +++ b/.local/bin/fetch.sh @@ -30,18 +30,18 @@ if [ $random_number -eq 0 ]; then echo -e "\e[90m⠀⠀ ⠀⠀⠿⣿⣿⣿⠿⠿⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⠿⠇⠀⠀⠀⠀ \e[90m│ \e[33m󰮯 \e[31m󰊠 \e[32m󰊠 \e[34m󰊠 \e[35m󰊠 \e[36m󰊠 \e[37m󰊠 \e[90m󰊠 │" echo -e "\e[90m \e[90m╰───────────────────────────────────╯" elif [ $random_number -eq 1 ]; then - echo -e "\e[90m \e[90m╭─────┬─────────────────────────────╮" - echo -e "\e[90m ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣿⣶⣿⣦⣼⣆ \e[90m│ \e[34m \e[90m│ \e[32m$user_host${pad:${#user_host}}\e[90m│" - echo -e "\e[90m ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦ \e[90m│ \e[34m \e[90m│ \e[37m$distro${pad:${#distro}}\e[90m│" - echo -e "\e[90m ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ \e[90m│ \e[34m \e[90m│ \e[37m$kernel${pad:${#kernel}}\e[90m│" - echo -e "\e[90m ⣸⣿⣿⢧ ⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄ \e[90m│ \e[34m󰙀 \e[90m│ \e[37m$wm${pad:${#wm}}\e[90m│" - echo -e "\e[90m ⢠⣿⣿⣿⠈ ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀ \e[90m│ \e[34m \e[90m│ \e[37m$memory${pad:${#memory}}\e[90m│" - echo -e "\e[90m ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘ ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄ \e[90m│ \e[34m \e[90m│ \e[37m$term${pad:${#term}}\e[90m│" - echo -e "\e[90m ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷ ⢊⣿⣿⡏ ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄ \e[90m│ \e[34m󰔚 \e[90m│ \e[37m$up_time${pad:${#up_time}}\e[90m│" - echo -e "\e[90m ⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄ \e[90m│ \e[34m \e[90m│ \e[37m$pkg_count${pad:${#pkg_count}}\e[90m│" - echo -e "\e[90m ⠙⠃ ⣼⣿⡟ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ \e[90m├─────┴─────────────────────────────┤" - echo -e "\e[90m ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ \e[90m│ \e[33m󰮯 \e[31m󰊠 \e[32m󰊠 \e[34m󰊠 \e[35m󰊠 \e[36m󰊠 \e[37m󰊠 \e[90m󰊠 │" - echo -e "\e[90m ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃ \e[90m╰───────────────────────────────────╯" + echo -e "\e[90m \e[90m╭─────┬─────────────────────────────╮" + echo -e "\e[90m ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣿⣶⣿⣦⣼⣆ \e[90m│ \e[34m \e[90m│ \e[32m$user_host${pad:${#user_host}}\e[90m│" + echo -e "\e[90m ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦ \e[90m│ \e[34m \e[90m│ \e[37m$distro${pad:${#distro}}\e[90m│" + echo -e "\e[90m ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ \e[90m│ \e[34m \e[90m│ \e[37m$kernel${pad:${#kernel}}\e[90m│" + echo -e "\e[90m ⣸⣿⣿⢧ ⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄ \e[90m│ \e[34m󰙀 \e[90m│ \e[37m$wm${pad:${#wm}}\e[90m│" + echo -e "\e[90m ⢠⣿⣿⣿⠈ ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀ \e[90m│ \e[34m \e[90m│ \e[37m$memory${pad:${#memory}}\e[90m│" + echo -e "\e[90m ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘ ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄ \e[90m│ \e[34m \e[90m│ \e[37m$term${pad:${#term}}\e[90m│" + echo -e "\e[90m ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷ ⢊⣿⣿⡏ ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄ \e[90m│ \e[34m󰔚 \e[90m│ \e[37m$up_time${pad:${#up_time}}\e[90m│" + echo -e "\e[90m ⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄ \e[90m│ \e[34m \e[90m│ \e[37m$pkg_count${pad:${#pkg_count}}\e[90m│" + echo -e "\e[90m ⠙⠃ ⣼⣿⡟ ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ \e[90m├─────┴─────────────────────────────┤" + echo -e "\e[90m ⢻⣿⣿⣄ ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆ \e[90m│ \e[33m󰮯 \e[31m󰊠 \e[32m󰊠 \e[34m󰊠 \e[35m󰊠 \e[36m󰊠 \e[37m󰊠 \e[90m󰊠 │" + echo -e "\e[90m ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣤⣾⡿⠃ \e[90m╰───────────────────────────────────╯" elif [ $random_number -eq 2 ]; then echo -e "\e[90m ⣀⣤⣴⣶⣶⣶⣶⣶⣶⣤⣄⣀ \e[90m╭─────┬─────────────────────────────╮" echo -e "\e[90m ⢀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄ \e[90m│ \e[34m \e[90m│ \e[32m$user_host${pad:${#user_host}}\e[90m│"