From 104c0f773c5a394a00149ed4273bee95d81bd976 Mon Sep 17 00:00:00 2001 From: Uttarayan Mondal Date: Mon, 18 Dec 2023 15:47:09 +0530 Subject: [PATCH] [feat] Change stuff --- config/fish/conf.d/abbr.fish | 2 ++ config/nushell/conf.d/alias.nu | 1 + config/nushell/env.nu | 15 ++++----- config/nvim/lazy-lock.json | 55 +++++++++++++++++---------------- config/nvim/lua/plugins.lua | 3 +- config/tmux/sessions/aftershoot | 0 config/tmux/sessions/default | 13 ++++++-- config/tmux/tmux.conf | 4 +++ config/wezterm/wezterm.lua | 10 ++++-- 9 files changed, 64 insertions(+), 39 deletions(-) mode change 100755 => 100644 config/tmux/sessions/aftershoot diff --git a/config/fish/conf.d/abbr.fish b/config/fish/conf.d/abbr.fish index f4585782..827a8fdf 100644 --- a/config/fish/conf.d/abbr.fish +++ b/config/fish/conf.d/abbr.fish @@ -31,4 +31,6 @@ end if not type -q wget abbr wget curl -O end + abbr rpc 'patch -p0 < ~/.local/share/console.diff' +abbr yy yazi diff --git a/config/nushell/conf.d/alias.nu b/config/nushell/conf.d/alias.nu index 24f75560..d94ef4d9 100644 --- a/config/nushell/conf.d/alias.nu +++ b/config/nushell/conf.d/alias.nu @@ -1,3 +1,4 @@ alias ll = ls -al alias cd = z alias t = ~/.config/tmux/start-tmux +alias yy = yazi diff --git a/config/nushell/env.nu b/config/nushell/env.nu index a2d65941..b4fa8816 100644 --- a/config/nushell/env.nu +++ b/config/nushell/env.nu @@ -74,12 +74,13 @@ if ($os | str contains Linux) { $env.PATH = ($env.PATH | split row (char esep) | prepend '/home/linuxbrew/.linuxbrew/bin') } -if ($os | str contains Windows) { - $env.Path = ($env.Path | prepend $"($env.FNM_MULTISHELL_PATH)/bin") -} else { - $env.PATH = ($env.PATH | prepend $"($env.FNM_MULTISHELL_PATH)/bin") - $env.PATH = ($env.PATH | prepend $"($env.HOME)/local/bin") -} - +$env.PATH = ($env.PATH | prepend $"($env.FNM_MULTISHELL_PATH)/bin") $env.EDITOR = "nvim" $env.VISUAL = "nvim" + +if ($os | str contains Windows) { +} else { + $env.PATH = ($env.PATH | prepend $"($env.HOME)/local/bin") + $env.PATH = ($env.PATH | prepend $"($env.HOME)/.local/vcpkg") +} + diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 74ca8f7e..419421e2 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,43 +1,44 @@ { - "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" }, + "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-git": { "branch": "main", "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "688762a3999eeee54b78f447719854f52672ec02" }, + "copilot.lua": { "branch": "master", "commit": "dcaaed5b58e6c2d395bca18d25d34e6384856722" }, "d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" }, - "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" }, - "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" }, + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, + "fidget.nvim": { "branch": "main", "commit": "7b9c383438a2e490e37d57b07ddeae3ab4f4cf69" }, + "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" }, "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" }, "git-conflict.nvim": { "branch": "main", "commit": "4e0191c9a0ae05d7fbdcdc7f15cd358f56d23bfb" }, "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" }, - "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, - "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" }, - "lazygit.nvim": { "branch": "main", "commit": "de35012036d43bca03628d40d083f7c02a4cda3f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d4c718467d35bc93714425a7102d82e7e5065280" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lazygit.nvim": { "branch": "main", "commit": "1e08e3f5ac1152339690140e61a4a32b3bdc7de5" }, "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, - "lspsaga.nvim": { "branch": "main", "commit": "7ebd0cc5923c81516c1c050fc9aea70bec23fd02" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, - "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" }, - "neorg": { "branch": "main", "commit": "9ffc5ac49dbb5ea6f008b6fbc6e3c1e85e66911c" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "e32701cd26c590be614fc85d7cf36c9994c3a936" }, - "nvim-cmp": { "branch": "main", "commit": "51260c02a8ffded8e16162dcf41a23ec90cfba62" }, + "lspsaga.nvim": { "branch": "main", "commit": "335805d4f591f5bb71cabb6aa4dc58ccef8e8617" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, + "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, + "neorg": { "branch": "main", "commit": "baaf13a3145534144b795ad37db22bfffd2ad343" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "baf3efd1a1785a96a0568e1fdd6aefa4a59e5edc" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "4048f37bc8b1a36fe1f5fde0df7d84aef71380e4" }, + "nvim-dap": { "branch": "master", "commit": "e64ebf3309154b578a03c76229ebf51c37898118" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, - "nvim-lspconfig": { "branch": "master", "commit": "d0467b9574b48429debf83f8248d8cee79562586" }, + "nvim-lspconfig": { "branch": "master", "commit": "eb81c7ea08d6f01d5fa4cf09e58c708efadf9b2f" }, "nvim-nu": { "branch": "main", "commit": "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b" }, - "nvim-treesitter": { "branch": "master", "commit": "051ce73fcd4d6b77a313e87e1113fcd42cf54cd1" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2806d83e3965017382ce08792ee527e708fa1bd4" }, - "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, - "octo.nvim": { "branch": "master", "commit": "e933611c74cb735c00d0db8ca94533bec1444bf0" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-treesitter": { "branch": "master", "commit": "25ddfde8d7167d7d81403d6809242439037d2b68" }, + "nvim-treesitter-context": { "branch": "master", "commit": "c9f2b429a1d63023f7a33b5404616f4cd2a109c5" }, + "nvim-web-devicons": { "branch": "master", "commit": "a1425903ab52a0a0460622519e827f224e5b4fee" }, + "octo.nvim": { "branch": "master", "commit": "4a60f50bb886572a59fde095b990fa28e2b50dba" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "rest.nvim": { "branch": "main", "commit": "f13ae54ae2545d4d612593d4a442cbb33a1b5b65" }, + "rest.nvim": { "branch": "main", "commit": "84e81a19ab24ccf05c9233d34d4dfce61c233abe" }, "ron.vim": { "branch": "master", "commit": "f749e543975a82e8dd9a6e7df9600a1c098ae800" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "sonokai": { "branch": "master", "commit": "bdce098fc9e7202d3c555e2dc98c755ca1c23835" }, @@ -45,15 +46,15 @@ "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "b0015e6e4b46a64192c64b68dec9a9ac5a4e5690" }, - "telescope.nvim": { "branch": "master", "commit": "4522d7e3ea75ffddabdc39957168a8a7060b5df0" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" }, + "toggleterm.nvim": { "branch": "main", "commit": "91be5f327e42aa016da13b277540de8dba0b14e3" }, "tree-sitter-just": { "branch": "main", "commit": "4e5f5f3ff37b12a1bbf664eb3966b3019e924594" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" }, - "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, "vim-mergetool": { "branch": "master", "commit": "0275a85256ad173e3cde586d54f66566c01b607f" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" }, diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 112037ff..07742613 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -45,6 +45,7 @@ return require('lazy').setup({ { 'rest-nvim/rest.nvim', event = "BufEnter" }, -- 'b0o/SchemaStore.nvim', -- 'rcarriga/nvim-notify', + { 'echasnovski/mini.nvim', version = '*' }, { 'folke/todo-comments.nvim', event = "BufEnter", @@ -513,7 +514,7 @@ return require('lazy').setup({ }, { "j-hui/fidget.nvim", - tag = "legacy", + -- tag = "", event = "LspAttach", opts = {}, }, diff --git a/config/tmux/sessions/aftershoot b/config/tmux/sessions/aftershoot old mode 100755 new mode 100644 diff --git a/config/tmux/sessions/default b/config/tmux/sessions/default index 1def2131..4679c3c0 100755 --- a/config/tmux/sessions/default +++ b/config/tmux/sessions/default @@ -1,5 +1,14 @@ tmux new-session -d -s 'default' -n 'neovim' tmux new-window -t default -n 'shell' -# tmux new-window -t default -n 'IRC' -# tmux send-keys -t default:IRC "irssi" Enter +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'shell' +tmux new-window -t default -n 'IRC' +tmux send-keys -t default:IRC "irssi" Enter tmux select-window -t default:0 diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index c2345dd5..b7b4bb49 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -68,6 +68,10 @@ bind C-q last-window bind m send-keys -t.- 'mpcfzf' Enter bind o set status +set -g allow-passthrough on +set -ga update-environment TERM +set -ga update-environment TERM_PROGRAM + bind-key -n C-\\ run-shell '~/.config/tmux/scratch' if-shell 'uname | grep -q Darwin' { set -s copy-command 'pbcopy' } if-shell 'uname | grep -q Linux' { set -s copy-command 'wl-copy' } diff --git a/config/wezterm/wezterm.lua b/config/wezterm/wezterm.lua index 8eea6b52..96150c1f 100644 --- a/config/wezterm/wezterm.lua +++ b/config/wezterm/wezterm.lua @@ -1,7 +1,13 @@ local wezterm = require 'wezterm'; +-- wezterm.font("Hasklug Nerd Font", {weight="Regular", stretch="Normal", style="Normal"}) -- /Users/fs0c131y/Library/Fonts/Hasklug Nerd Font Complete.otf, CoreText return { - font = wezterm.font_with_fallback { "Hasklug Nerd Font", "Hasklug Nerd Font Mono" }, + -- -- font = wezterm.font("Hasklug Nerd Font Mono", { weight = "Regular", stretch = "Normal", style = "Normal" }), + -- font = wezterm.font_with_fallback({ + -- "Hasklig", + -- "Symbols Nerd Font Mono" + -- }), + font_size = 16, colors = { -- The default text color @@ -41,7 +47,7 @@ return { window_background_opacity = 0.8, cursor_blink_rate = 8, default_cursor_style = "BlinkingBlock", - default_prog = { "fish", "-l" }, + default_prog = { "/opt/homebrew/bin/fish", "-l" }, window_padding = { left = 2, right = 0,