Switched back to zsh, hurl installation and slightly better zsh configs

master
Wynd 2024-12-13 11:23:48 +02:00
parent 3f441c3c09
commit c70f2b6149
13 changed files with 191 additions and 79 deletions

View File

@ -6,7 +6,7 @@ TERM = "xterm-256color"
XCURSOR_THEME = "Bibata-Modern-Classic"
[terminal]
shell = { program = "/home/wynd/.cargo/bin/nu", args = [] }
shell = { program = "/usr/bin/zsh", args = [] }
[window]
decorations = "None"

View File

@ -69,7 +69,7 @@ proc_colors = True
proc_gradient = True
#* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
proc_per_core = False
proc_per_core = True
#* Show process memory as bytes instead of percent.
proc_mem_bytes = True

View File

@ -26,11 +26,19 @@ alias ff = fastfetch
# quick helpers
alias untar = tar -xvzf
alias diskspace = df -ht ext4
alias ytda = yt-dlp -x --audio-format wav
alias ytwav = yt-dlp -x --audio-format wav
alias ytmp3 = yt-dlp -x --audio-format mp3
alias ytdv = yt-dlp
alias docker-clean = docker system prune -a --filter "until=72h"
alias flatpak-clean = flatpak uninstall --user --unused
def system-clean [] {
docker-clean;
flatpak-clean;
cargo clean-all;
}
def repos [] { ^clear; git-heatmap -a="Wynd" --root-dir $env.WORK_DIR --split-months }
def reposn [] { ^clear; git-heatmap -a="Wynd" --root-dir $env.WORK_DIR --split-months --months-per-row 6 --format numbers }
def reposn [] { ^clear; git-heatmap -a="Wynd" --root-dir $env.WORK_DIR --split-months --months-per-row 7 --format numbers }
def uuid [] { ^uuidgen | tr -d '\n' | xclip -selection c }
def psm [] { ps | sort-by -r mem | select pid name mem | first 30}
@ -437,6 +445,15 @@ $env.config = {
]
keybindings: [
# For some reason, the enter key on the keypad is seen as ctrl + j, so we're rebinding that to send an enter
# yes this also means that actually pressing ctrl + j will send an enter but how often does that happen ?
{
name: broken_kp_enter
modifier: control
keycode: char_j
mode: emacs
event: { send: enter }
}
{
name: completion_menu
modifier: none

View File

@ -2,39 +2,40 @@
## plugins used
- [LuaSnip](https://github.com/L3MON4D3/LuaSnip.git)
- [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter.git)
- [cmp_luasnip](https://github.com/saadparwaiz1/cmp_luasnip.git)
- [Comment.nvim](https://github.com/numToStr/Comment.nvim.git)
- [todo-comments.nvim](https://github.com/folke/todo-comments.nvim.git)
- [catppuccin](https://github.com/catppuccin/nvim.git)
- [dressing.nvim](https://github.com/stevearc/dressing.nvim.git)
- [nvim-surround](https://github.com/kylechui/nvim-surround.git)
- [nvim-notify](https://github.com/rcarriga/nvim-notify.git)
- [mini.pairs](https://github.com/echasnovski/mini.pairs.git)
- [lazy.nvim](https://github.com/folke/lazy.nvim.git)
- [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim.git)
- [vim-cool](https://github.com/romainl/vim-cool.git)
- [hurl.nvim](https://github.com/jellydn/hurl.nvim.git)
- [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim.git)
- [conform.nvim](https://github.com/stevearc/conform.nvim.git)
- [plenary.nvim](https://github.com/nvim-lua/plenary.nvim.git)
- [neo-tree.nvim](https://github.com/nvim-neo-tree/neo-tree.nvim.git)
- [vim-cool](https://github.com/romainl/vim-cool.git)
- [nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons.git)
- [nui.nvim](https://github.com/MunifTanjim/nui.nvim.git)
- [dressing.nvim](https://github.com/stevearc/dressing.nvim.git)
- [image.nvim](https://github.com/3rd/image.nvim.git)
- [nvim-notify](https://github.com/rcarriga/nvim-notify.git)
- [lazy.nvim](https://github.com/folke/lazy.nvim.git)
- [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig.git)
- [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim.git)
- [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter.git)
- [twilight.nvim](https://github.com/folke/twilight.nvim.git)
- [lsp-zero.nvim](https://github.com/VonHeikemen/lsp-zero.nvim.git)
- [lazydev.nvim](https://github.com/folke/lazydev.nvim.git)
- [luvit-meta](https://github.com/Bilal2453/luvit-meta.git)
- [nvim-cmp](https://github.com/hrsh7th/nvim-cmp.git)
- [lspkind.nvim](https://github.com/onsails/lspkind.nvim.git)
- [cmp-nvim-lsp](https://github.com/hrsh7th/cmp-nvim-lsp.git)
- [mini.map](https://github.com/echasnovski/mini.map.git)
- [cmp-path](https://github.com/hrsh7th/cmp-path.git)
- [cmp-buffer](https://github.com/hrsh7th/cmp-buffer.git)
- [LuaSnip](https://github.com/L3MON4D3/LuaSnip.git)
- [zen-mode.nvim](https://github.com/folke/zen-mode.nvim.git)
- [which-key.nvim](https://github.com/folke/which-key.nvim.git)
- [nvim-ts-autotag](https://github.com/windwp/nvim-ts-autotag.git)
- [cmp_luasnip](https://github.com/saadparwaiz1/cmp_luasnip.git)
- [trouble.nvim](https://github.com/folke/trouble.nvim.git)
- [Comment.nvim](https://github.com/numToStr/Comment.nvim.git)
- [catppuccin](https://github.com/catppuccin/nvim.git)
- [todo-comments.nvim](https://github.com/folke/todo-comments.nvim.git)
- [fidget.nvim](https://github.com/j-hui/fidget.nvim.git)
- [twilight.nvim](https://github.com/folke/twilight.nvim.git)
- [conform.nvim](https://github.com/stevearc/conform.nvim.git)
- [trouble.nvim](https://github.com/folke/trouble.nvim.git)
- [lsp-zero.nvim](https://github.com/VonHeikemen/lsp-zero.nvim.git)
- [nvim-cmp](https://github.com/hrsh7th/nvim-cmp.git)
- [lazydev.nvim](https://github.com/folke/lazydev.nvim.git)
- [which-key.nvim](https://github.com/folke/which-key.nvim.git)
- [lspkind.nvim](https://github.com/onsails/lspkind.nvim.git)
- [luvit-meta](https://github.com/Bilal2453/luvit-meta.git)
- [cmp-nvim-lsp](https://github.com/hrsh7th/cmp-nvim-lsp.git)
- [nvim-ts-autotag](https://github.com/windwp/nvim-ts-autotag.git)
- [cmp-path](https://github.com/hrsh7th/cmp-path.git)
- [tree-sitter-nu](https://github.com/nushell/tree-sitter-nu.git)
- [cmp-buffer](https://github.com/hrsh7th/cmp-buffer.git)
- [mini.map](https://github.com/echasnovski/mini.map.git)

View File

@ -1,39 +1,40 @@
{
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
"catppuccin": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" },
"LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
"catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" },
"dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
"fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
"image.nvim": { "branch": "master", "commit": "88e9693e188b8464b1c426aebb4389fd9db2fcbf" },
"lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
"lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
"lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
"lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "e76afe8f7976071fae308e31bf426f557a8ef339" },
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
"hurl.nvim": { "branch": "main", "commit": "bc8d748a3754f63d50ee8dfd54e20de80f22754c" },
"image.nvim": { "branch": "master", "commit": "b3e1af829a56bb038e5f81bf97798a2950064b62" },
"lazy.nvim": { "branch": "main", "commit": "b97ee167f594c69656f985f919a00435a7bc7045" },
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
"lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" },
"mini.map": { "branch": "main", "commit": "4c58e755d75f9999abcd3b3c6e934734b6a8b098" },
"mini.pairs": { "branch": "main", "commit": "694d9beb488ff1afaf3d1977b067e53c827d9af5" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
"nvim-lspconfig": { "branch": "master", "commit": "d3f169f436e1b44538bfe7e13b4721eec48dbc59" },
"nui.nvim": { "branch": "main", "commit": "b1b9b75a2d8041e1c2234f7448c61f8468a4258d" },
"nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" },
"nvim-lspconfig": { "branch": "master", "commit": "5a812abc65d529ea7673059a348814c21d7f87ff" },
"nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"nvim-treesitter": { "branch": "master", "commit": "9d2acd49976e2a9da72949008df03436f781fd23" },
"nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
"nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
"nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
"nvim-treesitter": { "branch": "master", "commit": "337b503688eccb3046547661e4c738e674548fcf" },
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"nvim-web-devicons": { "branch": "master", "commit": "87c34abe5d1dc7c1c0a95aaaf888059c614c68ac" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"telescope.nvim": { "branch": "master", "commit": "dc6fc321a5ba076697cca89c9d7ea43153276d81" },
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"tree-sitter-nu": { "branch": "main", "commit": "1561a947a5505d373e11ca337898e048ac2e389e" },
"trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" },
"tree-sitter-nu": { "branch": "main", "commit": "a94fdf1df5deba1aa1a3fff23e1276333b5ab666" },
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
"vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" },
"which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" },
"zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
}

View File

@ -2,10 +2,13 @@ require("nvwynd.autocmds")
require("nvwynd.options")
require("lazy").setup({
{
spec = {
-- imports plugins from the /plugins folder, file names don't matter only whats inside them
import = "nvwynd.plugins",
},
-- rocks = {
-- hererocks = true,
-- },
})
require("nvwynd.keymaps")

View File

@ -22,6 +22,7 @@ o.undofile = true
-- sync clipboard between OS and Neovim.
o.clipboard = "unnamedplus"
o.scrolloff = 8
o.sidescrolloff = 16
o.updatetime = 100
o.colorcolumn = "100"
o.cursorline = true

View File

@ -12,7 +12,6 @@ return {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
"3rd/image.nvim",
},
lazy = false,
init = function()

View File

@ -48,6 +48,7 @@ return {
"yaml",
"markdown",
"dockerfile",
"nu",
-- vim
"vim",
@ -63,6 +64,7 @@ return {
"zig",
"nim",
"bash",
"hurl",
-- the not so cool stuff
"c",

View File

@ -51,4 +51,68 @@ return {
"romainl/vim-cool",
init = function() end,
},
{
"jellydn/hurl.nvim",
dependencies = {
"MunifTanjim/nui.nvim",
"nvim-lua/plenary.nvim",
"nvim-treesitter/nvim-treesitter",
-- {
-- "MeanderingProgrammer/render-markdown.nvim",
-- opts = {
-- file_types = { "markdown" },
-- },
-- ft = { "markdown" },
-- },
},
ft = "hurl",
opts = {
debug = false,
show_notification = false,
mode = "split",
env_file = {
".env",
},
formatters = {
json = { "jq" },
html = {
"prettier",
"--parser",
"html",
},
xml = {
"tidy",
"-xml",
"-i",
"-q",
},
},
mappings = {
close = "q",
next_panel = "<C-n>",
prev_panel = "<C-p>",
},
},
keys = {
-- Run API request
{ "<F5>", "<cmd>HurlRunner<CR>", desc = "Run All requests" },
{ "<F5>a", "<cmd>HurlRunnerAt<CR>", desc = "Run Api request" },
-- { "<leader>te", "<cmd>HurlRunnerToEntry<CR>", desc = "Run Api request to entry" },
-- { "<leader>tE", "<cmd>HurlRunnerToEnd<CR>", desc = "Run Api request from current entry to end" },
-- { "<leader>tm", "<cmd>HurlToggleMode<CR>", desc = "Hurl Toggle Mode" },
-- { "<leader>tv", "<cmd>HurlVerbose<CR>", desc = "Run Api in verbose mode" },
-- { "<leader>tV", "<cmd>HurlVeryVerbose<CR>", desc = "Run Api in very verbose mode" },
-- Run Hurl request in visual mode
-- { "<leader>h", ":HurlRunner<CR>", desc = "Hurl Runner", mode = "v" },
},
},
-- {
-- "3rd/image.nvim",
-- event = "VeryLazy",
-- opts = {
-- backend = "ueberzug",
-- },
-- },
}

View File

@ -7,7 +7,7 @@ set -g @plugin 'catppuccin/tmux'
set -g @catppuccin_flavour 'macchiato'
# Setting the default shell
set-option -g default-shell "/home/wynd/.cargo/bin/nu"
set-option -g default-shell "/usr/bin/zsh"
# Change the prefix and unbind the old one
unbind C-b

View File

@ -39,7 +39,7 @@ while getopts "s: r: i: h" args; do
esac
done
if [ $OPTIND -eq 1 ]; then
if [ $OPTIND -eq 1 ]; then
usage
exit
fi

64
.zshrc
View File

@ -4,16 +4,22 @@ autoload -Uz promptinit
#promptinit
#prompt adam1
setopt histignorespace histignorealldups sharehistory
# Disable ctrl-s to freeze terminal.
stty stop undef
# Use emacs keybindings even if our EDITOR is set to vi
bindkey -e
# Keep 1000 lines of history within the shell and save it to ~/.zsh_history:
HISTSIZE=1000
SAVEHIST=1000
HISTSIZE=10000000
SAVEHIST=10000000
HISTFILE=~/.zsh_history
setopt hist_ignore_space
setopt hist_ignore_all_dups
setopt share_history
setopt inc_append_history
# Use modern completion system
autoload -Uz compinit
compinit
@ -22,14 +28,14 @@ zstyle ':completion:*' auto-description 'specify: %d'
zstyle ':completion:*' completer _expand _complete _correct _approximate
zstyle ':completion:*' format 'Completing %d'
zstyle ':completion:*' group-name ''
zstyle ':completion:*' menu select=2
zstyle ':completion:*' menu select
eval "$(dircolors -b)"
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
zstyle ':completion:*' list-colors ''
zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
zstyle ':completion:*' menu select=long
zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
zstyle ':completion:*' complete-options true
zstyle ':completion:*' use-compctl false
zstyle ':completion:*' verbose true
@ -44,21 +50,26 @@ source ~/antigen.zsh
source $HOME/.cargo/env
# Ruby setup & setting ~/.gems as default path for gems
export GEM_HOME="$HOME/.gems"
export PATH="$HOME/.gems/bin:$PATH"
export PATH="$HOME/.nimble/bin:$PATH"
export GEMS_HOME="$HOME/.gems"
export PATH="$GEMS_HOME/bin:$PATH"
# Nimble path setup
export NIMBLE_HOME="$HOME/.nimble"
export PATH="$NIMBLE_HOME/bin:$PATH"
# bun
export BUN_HOME="$HOME/.bun"
export PATH="$BUN_HOME/bin:$PATH"
[ -s "$BUN_HOME/_bun" ] && source "/$BUN_HOME/_bun"
# asdf setup
source "$HOME/.asdf/asdf.sh"
fpath=(${ASDF_DIR}/completions $fpath)
# autoload -Uz compinit && compinit
# fzf setup
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# antigen bundles
antigen bundle git
antigen bundle pip
antigen bundle command-not-found
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle zsh-users/zsh-autosuggestions
@ -80,9 +91,26 @@ alias untar="tar -xvzf"
alias myip="curl http://ipecho.net/plain; echo"
alias diskspace="df -ht ext4"
alias since="days_since"
alias ytd="yt-dlp -x --audio-format wav"
alias ytwav="yt-dlp -x --audio-format wav"
alias ytmp3="yt-dlp -x --audio-format mp3"
alias ytdv="yt-dlp"
alias docker-clean="docker system prune -a --filter \"until=72h\""
alias flatpak-clean="flatpak uninstall --user --unused"
alias system-clean="docker-clean && flatpak-cean && cargo clean-all"
# git shortcuts
alias gst="git status"
alias gaa="git add --all"
alias gc="git commit -v"
alias gm="git merge"
alias gb="git branch"
alias gco="git checkout"
alias gcb="git checkout -b"
alias gp="git push"
alias gpl="git pull"
alias gd='git diff'
alias gdc="git diff --cached"
alias glg="git log --graph --pretty='%Cred%h%Creset %C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
alias glo="git log --pretty='format:%C(yellow)%as %C(blue)%cn %C(green)%h %C(reset)%s' --no-merges"
alias glm="git_last_modified"
@ -97,6 +125,9 @@ function days_since() {(
echo $(( ( now - input )/(60*60*24) ))
)}
alias repos="~/.local/bin/repos.sh"
alias reposn="~/.local/bin/reposn.sh"
# private SSH stuff
source ~/.piwrc
@ -107,7 +138,7 @@ alias use-java17='export JAVA_HOME=/usr/lib/jvm/java-17-temurin;export PATH=$JAV
# changing GREP highlight color
export GREP_COLORS='ms=01;04;32'
# changing time's format
export TIMEFMT=$'real\t%E\nuser\t%U\nsys\t%S'
# some wayland specific setup
@ -122,13 +153,6 @@ fi
# change cd for zoxide
eval "$(zoxide init --cmd cd zsh)"
# bun completions
[ -s "/home/wynd/.bun/_bun" ] && source "/home/wynd/.bun/_bun"
# bun
export BUN_INSTALL="$HOME/.bun"
export PATH="$BUN_INSTALL/bin:$PATH"
# clears the screen and displays the figlet
clear
figlet -f 'Red Phoenix' Wynd | lolcat