diff --git a/config/git/.github/README.md b/config/git/.github/README.md new file mode 100644 index 00000000..affa9d51 --- /dev/null +++ b/config/git/.github/README.md @@ -0,0 +1,3 @@ +
diff --git a/config/git/.github/title.png b/config/git/.github/title.png new file mode 100644 index 00000000..29d2774d Binary files /dev/null and b/config/git/.github/title.png differ diff --git a/config/git/config b/config/git/config new file mode 100644 index 00000000..96c8f7c3 --- /dev/null +++ b/config/git/config @@ -0,0 +1,259 @@ +[user] + name = Sankalp Tharu + email = sankalptharu50028@gmail.com + signingKey = /home/sankalp/.ssh/id_ed25519.pub + +[safe] + directory = ~/Repos/ + +[credential "https://github.com"] + username = S4NKALP + +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true + +[init] + defaultBranch = main + +[protocol "file"] + allow = always + +[credential] + helper = libsecret + +[core] + editor = nvim + pager = diff-so-fancy | less --tabs=4 -RFX + excludesfile = ~/.config/git/ignore + +[interactive] + diffFilter = diff-so-fancy --patch + +[merge] + tool = nvimdiff + conflictstyle = diff3 + +[pager] + blame = diff-so-fancy | less --tabs=4 -RFX + +[diff] + colorMoved = default + +[pull] + rebase = false + +[commit] + gpgsign = true + +[gpg] + program = /sbin/gpg + +[includeIf "gitdir:~/Repos/Work/"] + path = ~/.config/git/config-work + +[alias] + aliases = config --get-regexp alias + + a = add --all + ai = add -i + + ap = apply + as = apply --stat + ac = apply --check + + ama = am --abort + amr = am --resolved + ams = am --skip + + b = branch + ba = branch -a + bd = branch -d + bdd = branch -D + br = branch -r + bc = rev-parse --abbrev-ref HEAD + bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}" + bs = !git-branch-status + + c = commit + ca = commit -a + cm = commit -m + cam = commit -am + cem = commit --allow-empty -m + cd = commit --amend + cad = commit -a --amend + ced = commit --allow-empty --amend + + cl = clone + cld = clone --depth 1 + clg = !sh -c 'git clone https://github.com/$1 $(basename $1)' - + clgp = !sh -c 'git clone git@github.com:$1 $(basename $1)' - + clgu = !sh -c 'git clone git@github.com:$(git config --get user.username)/$1 $1' - + + cp = cherry-pick + cpa = cherry-pick --abort + cpc = cherry-pick --continue + + d = diff + dp = diff --patience + dc = diff --cached + dk = diff --check + dck = diff --cached --check + dt = difftool + dct = difftool --cached + + f = fetch + fo = fetch origin + fu = fetch upstream + + fp = format-patch + + fk = fsck + + g = grep -p + + l = log --oneline --graph --decorate + lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' + + ls = ls-files + lsf = !git ls-files | grep -i + + m = merge + mm = merge --no-ff -m "🔀 merge: Merge branch '$(git symbolic-ref --short HEAD)' into '$(git branch --show-current)'" + ma = merge --abort + mc = merge --continue + ms = merge --skip + + o = checkout + om = checkout master + ob = checkout -b + opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1' + + pr = prune -v + + ps = push + psf = push -f + psu = push -u + pst = push --tags + + pso = push origin + psao = push --all origin + psfo = push -f origin + psuo = push -u origin + + psom = push origin master + psaom = push --all origin master + psfom = push -f origin master + psuom = push -u origin master + psoc = !git push origin $(git bc) + psaoc = !git push --all origin $(git bc) + psfoc = !git push -f origin $(git bc) + psuoc = !git push -u origin $(git bc) + psdc = !git push origin :$(git bc) + + pl = pull + pb = pull --rebase + + plo = pull origin + pbo = pull --rebase origin + plom = pull origin master + ploc = !git pull origin $(git bc) + pbom = pull --rebase origin master + pboc = !git pull --rebase origin $(git bc) + + plu = pull upstream + plum = pull upstream master + pluc = !git pull upstream $(git bc) + pbum = pull --rebase upstream master + pbuc = !git pull --rebase upstream $(git bc) + + rb = rebase + rba = rebase --abort + rbc = rebase --continue + rbi = rebase --interactive + rbs = rebase --skip + + re = reset + rh = reset HEAD + reh = reset --hard + rem = reset --mixed + res = reset --soft + rehh = reset --hard HEAD + remh = reset --mixed HEAD + resh = reset --soft HEAD + rehom = reset --hard origin/master + + r = remote + ra = remote add + rr = remote rm + rv = remote -v + rn = remote rename + rp = remote prune + rs = remote show + rao = remote add origin + rau = remote add upstream + rro = remote remove origin + rru = remote remove upstream + rso = remote show origin + rsu = remote show upstream + rpo = remote prune origin + rpu = remote prune upstream + + rmf = rm -f + rmrf = rm -r -f + + s = status + sb = status -s -b + + sa = stash apply + sc = stash clear + sd = stash drop + sl = stash list + sp = stash pop + ss = stash save + ssk = stash save -k + sw = stash show + st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*' + + t = tag + td = tag -d + + w = show + wp = show -p + wr = show -p --no-color + + svnr = svn rebase + svnd = svn dcommit + svnl = svn log --oneline --show-commit + + subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' - + subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' - + subup = submodule update --init --recursive + subpull = submodule foreach 'git pull --tags -f origin master || git pull --tags -f origin main' + + assume = update-index --assume-unchanged + unassume = update-index --no-assume-unchanged + assumed = !git ls -v | grep ^h | cut -c 3- + unassumeall = !git assumed | xargs git unassume + assumeall = !git status -s | awk {'print $2'} | xargs git assume + + bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' - + release = !sh -c 'git tag v$1 && git pst' - + unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' - + merged = !sh -c 'git o master && git plom && git bd $1 && git rpo' - + aliases = !git config -l | grep alias | cut -c 7- + snap = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}' + bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' - + whois = !sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' - + serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git + + behind = !git rev-list --left-only --count $(git bu)...HEAD + ahead = !git rev-list --right-only --count $(git bu)...HEAD + + ours = "!f() { git checkout --ours $@ && git add $@; }; f" + theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" + subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' - + human = name-rev --name-only --refs=refs/heads/* + ig = "!f() { gitignore \"$@\"; }; f" diff --git a/config/git/config-work b/config/git/config-work new file mode 100644 index 00000000..b4052070 --- /dev/null +++ b/config/git/config-work @@ -0,0 +1,4 @@ +[user] + name = Sankalp Tharu + email = sankalptharu50028@gmail.com + signingKey = /home/sankalp/.ssh/id_ed25519.pub diff --git a/config/git/ignore b/config/git/ignore new file mode 100644 index 00000000..a979dde2 --- /dev/null +++ b/config/git/ignore @@ -0,0 +1,80 @@ +# OS files +.DS_Store +.AppleDouble +.LSOverride +Thumbs.db +ehthumbs.db +Desktop.ini + +# Editor Files +*.swp +*.swo +*.swn +*.swm +*.swl +*.swk +*.bak +*.backup +*.orig +*.ref +*~ +.vscode +.idea +.iml +*.sublime-workspace + +# Logs +*.log +*.sqlite +log.txt + +# Generated files +build/ +target/ +dist/ + +# Sensitive files +*.env +*.key +*.pem +*.credentials +*.password +*.secret + +# Scratch files +.scratch/ + +# PhpStorm HTTP Requests +.http/ + +# Temp files +tmp/ + +# Web files +node_modules/ +npm-debug.log* +yarn-error.log* +package-lock.json +vendor/ + +# Compressed files +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip +*.msi + +# Compiled Python files +__pycache__/ +*.pyc + +# Python +*.pyc + +# Rust +**/*.rs.bk +**/*.rl.bk diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf index e2e83fb5..cfbb4488 100644 --- a/config/hypr/UserConfigs/Startup_Apps.conf +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -29,9 +29,6 @@ exec-once = nm-applet --indicator & exec-once = udiskie & exec-once = blueman-applet & -# screen sharing -exec-once = xwaylandvideobridge & - #clipboard manager exec-once = wl-paste --type text --watch cliphist store exec-once = wl-paste --type image --watch cliphist store diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index d1656530..08c37b0e 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -11,7 +11,7 @@ $scriptsDir = $HOME/.config/hypr/scripts $UserScripts = $HOME/.config/hypr/UserScripts -bindr = ALT, ALT_L, exec, pkill rofi || $UserScripts/Xmenu.sh +bindr = ALT, D, exec, pkill rofi || $UserScripts/Xmenu.sh # rofi App launcher bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window -config ~/.config/rofi/launcher.rasi diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index c476266a..65a4cb30 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -233,14 +233,6 @@ windowrulev2 = float, title:(File Operation Progress) windowrulev2 = center, title:(File Operation Progress) -## Specific App Rules -$videobridge = class:^(.*xwaylandvideobridge.*)$ -windowrulev2 = opacity 0.0 override 0.0 override, $videobridge -windowrulev2 = noanim, $videobridge -windowrulev2 = nofocus, $videobridge -windowrulev2 = noinitialfocus, $videobridge - - diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md index 54e8529a..f1f01bce 100644 --- a/config/nvim/.github/README.md +++ b/config/nvim/.github/README.md @@ -1,3 +1,4 @@ + # :herb: ‎ About diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 63259456..f583546a 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -15,15 +15,15 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "codeium.vim": { "branch": "main", "commit": "4063291e335e74e9ee2be04beb47d40b376312fa" }, - "comment-box.nvim": { "branch": "main", "commit": "80857fa3ec01f9d43431cbc4042f9a5ebd9a8811" }, + "comment-box.nvim": { "branch": "main", "commit": "a4312e3a169ed532d6df780c32446d2de9bf15cc" }, "compiler.nvim": { "branch": "main", "commit": "e82a48e9528edc769b1329b753eb9e3926f25595" }, "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, - "crates.nvim": { "branch": "main", "commit": "6d779c7b85139d89d92a4a0bcf0afbdcf0cd961a" }, + "crates.nvim": { "branch": "main", "commit": "330d8049f1d359dad28c93ea2664b4823643b7db" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "debugprint.nvim": { "branch": "main", "commit": "13378f67edc112bf0d043bc0c018f8923dc2198d" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "dooku.nvim": { "branch": "main", "commit": "6b94ccc0e73f26e6d01bd906893eeb719f01d0d6" }, + "dooku.nvim": { "branch": "main", "commit": "1f0d61b3c9930c694d0b462795a321fd3d80a0ef" }, "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" }, "dropbar.nvim": { "branch": "master", "commit": "bfba257774f78de384cca898d88cc1bb14c5a228" }, "edgy.nvim": { "branch": "main", "commit": "8355be45610afdf79a0bab32b91ee297997455b4" }, @@ -40,7 +40,7 @@ "icon-picker.nvim": { "branch": "master", "commit": "b94b9d30f2bf31ec3b35e15d778c1707c24ff9bf" }, "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, - "kitty-scrollback.nvim": { "branch": "main", "commit": "1b6c841bc14604b687da924bb5b6e6e8c699e111" }, + "kitty-scrollback.nvim": { "branch": "main", "commit": "b37611b5bfc657c5a68de73195f2406e432a5ea2" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, @@ -86,7 +86,7 @@ "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-puppeteer": { "branch": "main", "commit": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7" }, "nvim-recorder": { "branch": "main", "commit": "daaae505862e816a7efe578e22d6f3d10cd7a2e6" }, - "nvim-scissors": { "branch": "main", "commit": "111e703db38df23689eaee0ed8bc3a7691519de8" }, + "nvim-scissors": { "branch": "main", "commit": "221c07c7be7e6752518792016b3dc60140bd3533" }, "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" }, @@ -98,6 +98,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, "nvim_context_vt": { "branch": "master", "commit": "a14f9292b4bd68ceed433fc513f287641816dc6d" }, "octo.nvim": { "branch": "master", "commit": "b5371003f209764c9d1cc43cf20b6dc52961f0e8" }, + "oil.nvim": { "branch": "master", "commit": "c4cc8240f1c71defcb67c45da96e44b968d29e5f" }, "openingh.nvim": { "branch": "main", "commit": "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc" }, "outline.nvim": { "branch": "main", "commit": "8c6b11e4c27bca690bfde0c6ce35ba66a805dfa3" }, "overseer.nvim": { "branch": "master", "commit": "68a2d344cea4a2e11acfb5690dc8ecd1a1ec0ce0" }, @@ -107,8 +108,8 @@ "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "739a034046465d2b100151037401c24c42cb09cf" }, - "refactoring.nvim": { "branch": "master", "commit": "28c5a33a0c489eb559396d9424b042ccfdb03b14" }, - "rustaceanvim": { "branch": "master", "commit": "207f2845f3cfb15840c8a94b2fb3077068ab25ac" }, + "refactoring.nvim": { "branch": "master", "commit": "c067e44b8171494fc1b5206ab4c267cd74c043b1" }, + "rustaceanvim": { "branch": "master", "commit": "e4020e72a5562b9e7cd09e9cd025467f7b0ea76a" }, "satellite.nvim": { "branch": "main", "commit": "1a20861227eba8bf2d8282ab4ec5fc071e8b20e2" }, "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, @@ -142,7 +143,7 @@ "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-uppercase-sql": { "branch": "master", "commit": "58bfde1d679a1387dabfe292b38d51d84819b267" }, - "vim-wakatime": { "branch": "master", "commit": "8c8856327815a077cbebeba8c7456312a3d2c39c" }, + "vim-wakatime": { "branch": "master", "commit": "cae21a19c3db4d9aadd5d320de3da0c99dfd0f62" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }, "yanky.nvim": { "branch": "main", "commit": "6bb9ffd3cad4c9876bda54e19d0659de28a4f84f" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index d3abf0bf..dc5f28b8 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -92,5 +92,4 @@ "NEWS.md": "2123" }, "version": 2 -} - +} \ No newline at end of file diff --git a/config/nvim/lua/plugins/extras/editor/oil.lua b/config/nvim/lua/plugins/extras/editor/oil.lua index 355eeef0..622f01e0 100644 --- a/config/nvim/lua/plugins/extras/editor/oil.lua +++ b/config/nvim/lua/plugins/extras/editor/oil.lua @@ -3,6 +3,10 @@ return { dependencies = "nvim-tree/nvim-web-devicons", opts = { delete_to_trash = true, + float = { + max_height = 45, + max_width = 90, + }, keymaps = { ["q"] = "actions.close", },