From 7e1032434d90db737e319d3eb21721b7fed388be Mon Sep 17 00:00:00 2001 From: marcellus Date: Tue, 2 May 2023 18:30:47 +0200 Subject: add: scripts from ratakor's repo --- zsh/.zshenv | 2 +- zsh/.zshrc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'zsh') diff --git a/zsh/.zshenv b/zsh/.zshenv index 1d51105..5ff4c81 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,2 +1,2 @@ -export PATH="$HOME/.config/scripts:$PATH" +PATH="$HOME/.config/scripts:$PATH" TERMINAL="st" diff --git a/zsh/.zshrc b/zsh/.zshrc index eec2395..f8c830d 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -19,6 +19,9 @@ alias poule="git pull" alias bri5="xrandr --output eDP-1 --brightness 0.5" alias bri6="xrandr --output eDP-1 --brightness 0.6" alias ascii="ascii -d" +alias cf="$HOME/.config/" +alias cspt="$HOME/.config/scripts" +alias cz="$HOME/.config/zsh" autoload -U compinit zstyle ':completion:*' menu select -- cgit v1.2.3 From 13535011bb12163a4f9035cf2f231e856565e950 Mon Sep 17 00:00:00 2001 From: marcellus Date: Thu, 4 May 2023 00:13:20 +0200 Subject: fix: overall patches --- .gitignore | 4 + dwmblocks/config | 6 +- fontconfig/fonts.conf | 2 +- mpv/input.conf | 6 ++ mpv/music/local.lua | 30 ++++++++ mpv/music/online.lua | 9 +++ mpv/scripts/sponsorblock_minimal.lua | 145 +++++++++++++++++++++++++++++++++++ scripts/musiccmd | 6 +- sxhkd/sxhkdrc | 6 +- zsh/.zshenv | 7 +- 10 files changed, 210 insertions(+), 11 deletions(-) create mode 100644 mpv/input.conf create mode 100644 mpv/music/local.lua create mode 100644 mpv/music/online.lua create mode 100644 mpv/scripts/sponsorblock_minimal.lua (limited to 'zsh') diff --git a/.gitignore b/.gitignore index d9840c3..6b195dd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,14 @@ gtk-3.0/ procps/ dconf/ Tracktion/ +qBittorrent/ +vlc/ +MuseScore/ ## trashfiles .zcompdump *~ +QtProject.conf ## other stuff scummvm/ diff --git a/dwmblocks/config b/dwmblocks/config index a0112c5..613e2de 100644 --- a/dwmblocks/config +++ b/dwmblocks/config @@ -1,8 +1,8 @@ /*Name State Update Signal + 34*/ -music = false // 35 +music = true // 35 cputemp = false // 36 fanspeed = false // 37 -memory = true // 38 +memory = false // 38 battery = true // 39 wifi = true // 40 ethernet = false // 41 @@ -13,6 +13,6 @@ mic = false // 45 news = false // 46 mail = false // 47 weather = false // 48 -daypercent = true // 49 +daypercent = false // 49 date = true // 50 time = true // 51 diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf index 6867100..903102f 100644 --- a/fontconfig/fonts.conf +++ b/fontconfig/fonts.conf @@ -25,7 +25,7 @@ monospace - Cousine Nerd Font + Cousine Nerd Font Noto Emoji diff --git a/mpv/input.conf b/mpv/input.conf new file mode 100644 index 0000000..c5065c7 --- /dev/null +++ b/mpv/input.conf @@ -0,0 +1,6 @@ +WHEEL_UP add volume 2 +WHEEL_DOWN add volume -2 +l seek 5 +h seek -5 +j seek 60 +k seek -60 \ No newline at end of file diff --git a/mpv/music/local.lua b/mpv/music/local.lua new file mode 100644 index 0000000..dfb9e2d --- /dev/null +++ b/mpv/music/local.lua @@ -0,0 +1,30 @@ +local utils = require "mp.utils" + +function notify_current_media() + local path = mp.get_property_native("path") + local origin, title = utils.split_path(path) + + local metadata = mp.get_property_native("metadata") + if metadata then + function tag(name) + return metadata[string.upper(name)] or metadata[name] + end + + title = tag("title") or title + origin = tag("artist_credit") or tag("artist") or "" + + local album = tag("album") + if album then + origin = string.format("%s — %s", origin, album) + end + + local year = tag("original_year") or tag("year") + if year then + origin = string.format("%s (%s)", origin, year) + end + end + mp.command_native({"run", "pkill", "-RTMIN+1", "dwmblocks"}) + return mp.command_native({"run", "env", "HERBE_ID=/music", "herbe", title, origin}) +end + +mp.register_event("file-loaded", notify_current_media) \ No newline at end of file diff --git a/mpv/music/online.lua b/mpv/music/online.lua new file mode 100644 index 0000000..bcd5d18 --- /dev/null +++ b/mpv/music/online.lua @@ -0,0 +1,9 @@ +local utils = require "mp.utils" + +function notify_current_media(key) + local title = mp.get_property(key) + mp.command_native({"run", "pkill", "-RTMIN+1", "dwmblocks"}) + return mp.command_native({"run", "env", "HERBE_ID=/music", "herbe", title}) +end + +mp.observe_property("media-title", string, notify_current_media) \ No newline at end of file diff --git a/mpv/scripts/sponsorblock_minimal.lua b/mpv/scripts/sponsorblock_minimal.lua new file mode 100644 index 0000000..8ac0cca --- /dev/null +++ b/mpv/scripts/sponsorblock_minimal.lua @@ -0,0 +1,145 @@ +-- sponsorblock_minimal.lua +-- https://codeberg.org/jouni/mpv_sponsorblock_minimal +-- LICENSE: GPLv3 +-- +-- b toggles between on/off +-- +-- This script skips sponsored segments of YouTube videos +-- using data from https://github.com/ajayyy/SponsorBlock + +local opt = require 'mp.options' +local utils = require 'mp.utils' + +local options = { + server = "https://sponsor.ajay.app/api/skipSegments", + + -- Categories to fetch and skip + categories = '"sponsor"', + + -- Set this to "true" to use sha256HashPrefix instead of videoID + hash = "" +} + +opt.read_options(options) + +function getranges(url) + local luacurl_available, cURL = pcall(require,'cURL') + + local res = "" + if not(luacurl_available) then -- if Lua-cURL is not available on this system + local sponsors = mp.command_native{ + name = "subprocess", + capture_stdout = true, + playback_only = false, + args = {"curl", "-L", "-s", "-g", url} + } + res = sponsors.stdout + else -- otherwise use Lua-cURL (binding to libcurl) + local buf={} + local c = cURL.easy_init() + c:setopt_followlocation(1) + c:setopt_url(url) + c:setopt_writefunction(function(chunk) table.insert(buf,chunk); return true; end) + c:perform() + res = table.concat(buf) + end + + local json = utils.parse_json(res) + if options.hash == "true" and json ~= nil then + for _, i in pairs(json) do + if i.videoID == youtube_id then + return i.segments + end + end + else + return json + end + + return nil +end + +function skip_ads(name,pos) + if pos ~= nil then + for _, i in pairs(ranges) do + v = i.segment[2] + if i.segment[1] <= pos and v > pos then + --this message may sometimes be wrong + --it only seems to be a visual thing though + mp.osd_message(("[sponsorblock] skipping forward %ds"):format(math.floor(v-mp.get_property("time-pos")))) + --need to do the +0.01 otherwise mpv will start spamming skip sometimes + --example: https://www.youtube.com/watch?v=4ypMJzeNooo + mp.set_property("time-pos",v+0.01) + return + end + end + end + return +end + +function file_loaded() + local video_path = mp.get_property("path", "") + local video_referer = string.match(mp.get_property("http-header-fields", ""), "Referer:([^,]+)") or "" + + local urls = { + "ytdl://youtu%.be/([%w-_]+).*", + "ytdl://w?w?w?%.?youtube%.com/v/([%w-_]+).*", + "https?://youtu%.be/([%w-_]+).*", + "https?://w?w?w?%.?youtube%.com/v/([%w-_]+).*", + "/watch.*[?&]v=([%w-_]+).*", + "/embed/([%w-_]+).*", + "^ytdl://([%w-_]+)$", + "-([%w-_]+)%." + } + youtube_id = nil + local purl = mp.get_property("metadata/by-key/PURL", "") + for i,url in ipairs(urls) do + youtube_id = youtube_id or string.match(video_path, url) or string.match(video_referer, url) or string.match(purl, url) + end + + if not youtube_id or string.len(youtube_id) < 11 then return end + youtube_id = string.sub(youtube_id, 1, 11) + + local url = "" + if options.hash == "true" then + local sha = mp.command_native{ + name = "subprocess", + capture_stdout = true, + args = {"sha256sum"}, + stdin_data = youtube_id + } + url = ("%s/%s?categories=[%s]"):format(options.server, string.sub(sha.stdout, 0, 4), options.categories) + else + url = ("%s?videoID=%s&categories=[%s]"):format(options.server, youtube_id, options.categories) + end + + ranges = getranges(url) + if ranges ~= nil then + ON = true + mp.add_key_binding("b","sponsorblock",toggle) + mp.observe_property("time-pos", "native", skip_ads) + end + return +end + +function end_file() + if not ON then return end + mp.unobserve_property(skip_ads) + ranges = nil + ON = false +end + +function toggle() + if ON then + mp.unobserve_property(skip_ads) + mp.osd_message("[sponsorblock] off") + ON = false + return + end + mp.observe_property("time-pos", "native", skip_ads) + mp.osd_message("[sponsorblock] on") + ON = true + return +end + +mp.register_event("file-loaded", file_loaded) +mp.register_event("end-file", end_file) \ No newline at end of file diff --git a/scripts/musiccmd b/scripts/musiccmd index 73c961b..ecaf437 100755 --- a/scripts/musiccmd +++ b/scripts/musiccmd @@ -3,8 +3,8 @@ # dependencies: music, mpv, socat, yt-dlp, ffmpeg, imagemagick # optional dependencies: dwmblocks, libnotify, herbe -FAVDIR="${XDG_MUSIC_DIR:-$HOME/Music}/favorite" -DLDIR="${XDG_MUSIC_DIR:-$HOME/Music}/download" +FAVDIR="${XDG_MUSIC_DIR:-$HOME/music}/favorite" +DLDIR="${XDG_MUSIC_DIR:-$HOME/music}/download" CACHE="${XDG_CACHE_HOME:-$HOME/.cache}" IMG="nsxiv" @@ -113,4 +113,4 @@ main() { esac } -main "$@" \ No newline at end of file +main "$@" diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 83ee55a..b20942c 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -17,8 +17,10 @@ XF86AudioMute pamixer -t; kill {F7,super + n,super + shift + n} $TERMINAL -e {dmenurecord,lfub "$XDG_DATA_HOME/notes",newsboat} -super + {m, shift + m} - {music,musiccmd} +{super + m, XF86Tools} + music +super + shift + m + musiccmd XF86Audio{Prev,Next,Play,Stop} musiccmd {prev,next,cycle,stop} super + {s,a,y,w,e} diff --git a/zsh/.zshenv b/zsh/.zshenv index 5ff4c81..c168554 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,2 +1,5 @@ -PATH="$HOME/.config/scripts:$PATH" -TERMINAL="st" +export PATH="$HOME/.config/scripts:$PATH" +export TERMINAL="st" +export EDITOR="emacs" + +export XDG_CONFIG_HOME="$HOME/.config" -- cgit v1.2.3 From e3ac37b99035567aedbb6d44a1151049a572f9ee Mon Sep 17 00:00:00 2001 From: marcellus Date: Wed, 10 May 2023 20:34:08 +0200 Subject: fix: minor changes --- .gitignore | 1 + dwmblocks/config | 2 +- htop/htoprc | 8 ++--- mpv/mpv.conf | 1 + scripts/dmenusearch | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sxhkd/sxhkdrc | 4 +-- zsh/.zshenv | 2 ++ zsh/.zshrc | 1 + 8 files changed, 112 insertions(+), 7 deletions(-) create mode 100644 mpv/mpv.conf create mode 100755 scripts/dmenusearch (limited to 'zsh') diff --git a/.gitignore b/.gitignore index 6b195dd..436061f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ JetBrains/ discord/ github-copilot/ gtk-3.0/ +gtk-2.0/ procps/ dconf/ Tracktion/ diff --git a/dwmblocks/config b/dwmblocks/config index 613e2de..ad869c2 100644 --- a/dwmblocks/config +++ b/dwmblocks/config @@ -1,6 +1,6 @@ /*Name State Update Signal + 34*/ music = true // 35 -cputemp = false // 36 +cputemp = true // 36 fanspeed = false // 37 memory = false // 38 battery = true // 39 diff --git a/htop/htoprc b/htop/htoprc index d23d23f..21bd0a1 100644 --- a/htop/htoprc +++ b/htop/htoprc @@ -40,18 +40,18 @@ column_meters_1=Tasks LoadAverage Uptime column_meter_modes_1=2 2 2 tree_view=1 sort_key=46 -tree_sort_key=49 +tree_sort_key=1 sort_direction=-1 -tree_sort_direction=-1 +tree_sort_direction=1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command .sort_key=PERCENT_CPU -.tree_sort_key=TIME +.tree_sort_key=Command .tree_view=1 .tree_view_always_by_pid=0 .sort_direction=-1 -.tree_sort_direction=-1 +.tree_sort_direction=1 .all_branches_collapsed=0 screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command .sort_key=IO_RATE diff --git a/mpv/mpv.conf b/mpv/mpv.conf new file mode 100644 index 0000000..f7d945c --- /dev/null +++ b/mpv/mpv.conf @@ -0,0 +1 @@ +stop-screensaver = "no" \ No newline at end of file diff --git a/scripts/dmenusearch b/scripts/dmenusearch new file mode 100755 index 0000000..b1ed9d6 --- /dev/null +++ b/scripts/dmenusearch @@ -0,0 +1,100 @@ +#!/bin/sh +# search web, arch wiki, aur, youtube man pages or emoji with dmenu +# websearch dependencies : shuf, curl, /tmp needs to be temporary +# wiki dependency: arch-wiki-docs +# youtube dependency: ytfzf +# man dependencies: man-db, zathura +# emoji dependency: xclip + +set -e + +web() { + NETWORK=clearnet # clearnet, tor or i2p + if [ ! -f "/tmp/instances" ]; then + curl -s "https://librex.ratakor.com/instances.json" > /tmp/instances.json || + (notify-send "No internet connection"; exit 1) + + strip() { + tmp="${1##" \"$NETWORK\": \""}" + printf '%s\n' "${tmp%%"\","}" + } + + while IFS= read -r line || [ -n "$line" ]; do + case $line in + *"$NETWORK"*null,) + continue ;; + *"$NETWORK"*) + strip "$line" >> /tmp/instances ;; + esac + done < /tmp/instances.json + fi + + instance="$(shuf -n 1 /tmp/instances)" + query="${instance}search.php?q=${1:-$(printf "" | dmenu -p "Search:" -l 0)}&t=0" +} + +wiki() { + WIKIDIR="/usr/share/doc/arch-wiki/html/en" + + strip() { + tmp="${1##"$WIKIDIR/"}" + printf '\n%s' "${tmp%%".html"}" + } + + for file in "$WIKIDIR"/*.html; do + [ -f "$file" ] || continue + wikidocs="$wikidocs$(strip "$file")" + done + + wikidocs="${wikidocs#* +}" # remove a trailing newline + + query="$WIKIDIR/$(printf '%s\n' "$wikidocs" | sed -e 's/_/ /g' | sort |\ + dmenu -i -l 10 -p 'Search Wiki: ').html" + query="$(printf '%s\n' "$query" | sed 's/ /_/g')" # separate otherwise set -e fails +} + +aur() { + AURSITE="https://aur.archlinux.org/packages?O=0&K=" + query="$AURSITE$(printf "" | dmenu -p "AUR:" -l 0)" +} + +manpdf() { + INPUT=${1:-$(/usr/bin/man -k . | dmenu -i -l 20 | awk '{print $1}')} + [ -n "$INPUT" ] && /usr/bin/man -Tpdf "$INPUT" | zathura - +} + +emoji() { + CHOSEN=$(cut -d ';' -f1 "$XDG_DATA_HOME/emoji" | dmenu -i -l 30 | sed "s/ .*//") + + [ -z "$CHOSEN" ] && return 1 + + printf '%s' "$CHOSEN" | xclip -selection clipboard + # notify-send "'$CHOSEN' copied to clipboard." +} + +main() { + case ${1:-$(printf 'web\naur\nyoutube\nman\nemoji' | dmenu -i)} in + web) + web "$2" ;; + #wiki) + # wiki ;; + aur) + aur ;; + youtube) + ytfzf -D + return ;; + man) + manpdf "$2" + return ;; + emoji) + emoji + return ;; + *) + return 1 ;; + esac + + "$BROWSER" "$query" 2> /dev/null +} + +main "$@" \ No newline at end of file diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 199ad3c..97e3410 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -15,8 +15,8 @@ XF86AudioLowerVolume pamixer -d 5; kill -44 $(pidof dwmblocks) XF86AudioMute pamixer -t; kill -{F7,super + n,super + shift + n} - $TERMINAL -e {dmenurecord,lfub "$XDG_DATA_HOME/notes",newsboat} +{super + n,super + shift + n} + $TERMINAL -e {lfub "$XDG_DATA_HOME/notes",newsboat} super + m music super + shift + m diff --git a/zsh/.zshenv b/zsh/.zshenv index c168554..d0d02ef 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,5 +1,7 @@ export PATH="$HOME/.config/scripts:$PATH" export TERMINAL="st" export EDITOR="emacs" +export BROWSER="librewolf" export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/data" diff --git a/zsh/.zshrc b/zsh/.zshrc index f8c830d..efbfb96 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -22,6 +22,7 @@ alias ascii="ascii -d" alias cf="$HOME/.config/" alias cspt="$HOME/.config/scripts" alias cz="$HOME/.config/zsh" +alias gs="git status" autoload -U compinit zstyle ':completion:*' menu select -- cgit v1.2.3 From d9bcc3bf93ff3192818c20770dec6b9198cf0ae7 Mon Sep 17 00:00:00 2001 From: marcellus Date: Thu, 11 May 2023 23:16:00 +0200 Subject: feat/fix: minor adjustments and addition of a new dmenu script --- dwmblocks/config | 4 ++-- htop/htoprc | 8 ++++---- scripts/dmenutimer | 6 ++++++ scripts/speedtest | 8 ++++++++ sxhkd/sxhkdrc | 4 +++- zsh/.zshenv | 2 ++ zsh/.zshrc | 2 ++ 7 files changed, 27 insertions(+), 7 deletions(-) create mode 100755 scripts/dmenutimer create mode 100755 scripts/speedtest (limited to 'zsh') diff --git a/dwmblocks/config b/dwmblocks/config index ad869c2..a75740d 100644 --- a/dwmblocks/config +++ b/dwmblocks/config @@ -1,8 +1,8 @@ /*Name State Update Signal + 34*/ music = true // 35 -cputemp = true // 36 +cputemp = false // 36 fanspeed = false // 37 -memory = false // 38 +memory = true // 38 battery = true // 39 wifi = true // 40 ethernet = false // 41 diff --git a/htop/htoprc b/htop/htoprc index 21bd0a1..dff7b74 100644 --- a/htop/htoprc +++ b/htop/htoprc @@ -40,24 +40,24 @@ column_meters_1=Tasks LoadAverage Uptime column_meter_modes_1=2 2 2 tree_view=1 sort_key=46 -tree_sort_key=1 +tree_sort_key=46 sort_direction=-1 tree_sort_direction=1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command .sort_key=PERCENT_CPU -.tree_sort_key=Command +.tree_sort_key=PERCENT_CPU .tree_view=1 .tree_view_always_by_pid=0 .sort_direction=-1 .tree_sort_direction=1 .all_branches_collapsed=0 screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command -.sort_key=IO_RATE +.sort_key=IO_PRIORITY .tree_sort_key=PID .tree_view=0 .tree_view_always_by_pid=0 -.sort_direction=-1 +.sort_direction=1 .tree_sort_direction=1 .all_branches_collapsed=0 diff --git a/scripts/dmenutimer b/scripts/dmenutimer new file mode 100755 index 0000000..0def2e1 --- /dev/null +++ b/scripts/dmenutimer @@ -0,0 +1,6 @@ +#!/bin/sh +# dmenu script for an arttime timer + +TIME=$(printf '' | dmenu -i -sb '#FCFBF4' -nb "#000000" -p 'New timer: ') + +st -e arttime --nolearn --random all --style 1 -t "Timer" -g $TIME diff --git a/scripts/speedtest b/scripts/speedtest new file mode 100755 index 0000000..a93b63a --- /dev/null +++ b/scripts/speedtest @@ -0,0 +1,8 @@ +#!/bin/sh +# usage: time speedtest cmd + +i=0 +while [ $i -lt 100000 ]; do + "$@" + i=$((i+1)) +done diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 97e3410..705c75c 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -33,5 +33,7 @@ super + u dmenuhandler "$(xclip -o)" {super + shift + u,button2} plumber --sel +super + t + dmenutimer button9 - xdo kill \ No newline at end of file + xdo kill diff --git a/zsh/.zshenv b/zsh/.zshenv index d0d02ef..1075e19 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -5,3 +5,5 @@ export BROWSER="librewolf" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/data" +# Following line was automatically added by arttime installer +export PATH="$HOME/.local/bin:$PATH" diff --git a/zsh/.zshrc b/zsh/.zshrc index efbfb96..6c7e5c9 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -23,6 +23,8 @@ alias cf="$HOME/.config/" alias cspt="$HOME/.config/scripts" alias cz="$HOME/.config/zsh" alias gs="git status" +alias rps="echo help | nc ratakor.com 9998" +alias nv="nvim" autoload -U compinit zstyle ':completion:*' menu select -- cgit v1.2.3 From 13673af51e280878478940148971717491822ffc Mon Sep 17 00:00:00 2001 From: marcellus Date: Fri, 12 May 2023 17:49:56 +0200 Subject: fix: small patch of dmenutimer --- scripts/dmenutimer | 2 +- zsh/.zshrc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'zsh') diff --git a/scripts/dmenutimer b/scripts/dmenutimer index 9a28f04..00ccb4e 100755 --- a/scripts/dmenutimer +++ b/scripts/dmenutimer @@ -3,4 +3,4 @@ TIME=$(printf '' | dmenu -i -sb '#4E3524' -p 'New timer: ') -st -c "arttime" -e arttime --nolearn --random all --style 1 -t "Timer" -g $TIME +st -c "arttime" -o - -e arttime --nolearn --random all --style 1 -t "Timer" -g $TIME 2>/dev/null | grep goal diff --git a/zsh/.zshrc b/zsh/.zshrc index 6c7e5c9..6f2b0b5 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -25,6 +25,7 @@ alias cz="$HOME/.config/zsh" alias gs="git status" alias rps="echo help | nc ratakor.com 9998" alias nv="nvim" +alias cdmnt="sudo mount -t iso9660 -o ro /dev/sr0 $HOME/cdrom" autoload -U compinit zstyle ':completion:*' menu select -- cgit v1.2.3 From ca1fba1ef518b2f55bc168e9782b500dfec67c16 Mon Sep 17 00:00:00 2001 From: marcellus Date: Sun, 14 May 2023 02:10:52 +0200 Subject: add: nvim config files (totally not stolen from ratakor) --- .gitignore | 1 + nvim/.gitignore | 16 +++++ nvim/appearance.vim | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++ nvim/basics.vim | 38 ++++++++++ nvim/header.vim | 142 +++++++++++++++++++++++++++++++++++++ nvim/init.vim | 87 +++++++++++++++++++++++ nvim/lsp.vim | 163 ++++++++++++++++++++++++++++++++++++++++++ zsh/.zshrc | 2 + 8 files changed, 647 insertions(+) create mode 100644 nvim/.gitignore create mode 100644 nvim/appearance.vim create mode 100644 nvim/basics.vim create mode 100644 nvim/header.vim create mode 100644 nvim/init.vim create mode 100644 nvim/lsp.vim (limited to 'zsh') diff --git a/.gitignore b/.gitignore index 436061f..a9bf51c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ QtProject.conf ## other stuff scummvm/ +paliasrc diff --git a/nvim/.gitignore b/nvim/.gitignore new file mode 100644 index 0000000..189fa64 --- /dev/null +++ b/nvim/.gitignore @@ -0,0 +1,16 @@ +# . :-. . +# author: marcellus :*==*%%%#%+=---: +# :#%%%*+%#=+%*:. +# created: Sun, 14 May 2023 01:29:10 +0200 :%%%. . -*%- +# updated: Sun, 14 May 2023 01:30:06 +0200 =## . :#%*=:. +# -#*#%:=#%%%#- +# description: *:*%%%%%%%#- +# .-#%%%%%%+ +# %%%--%%%%*- +# ##%= +%%=:.. +# #* #%# +# :# -==* +# :: .: + +plugged/ +autoload/ diff --git a/nvim/appearance.vim b/nvim/appearance.vim new file mode 100644 index 0000000..14afd8d --- /dev/null +++ b/nvim/appearance.vim @@ -0,0 +1,198 @@ +set background=dark + +lua << EOF +local colors = require('dracula.palette') + +require("dracula").setup { + show_end_of_buffer = true, + lualine_bg_color = "#44475a", + transparent_bg = true, +} + +require("gruvbox").setup { + italic = { + strings = false, + comments = false + }, + transparent_mode = true, +} + +--require("catppuccin").setup({ +-- flavour = "macchiato", +-- transparent_background = true, +-- show_end_of_buffer = true, +--}) +-- +--require("everforest").setup({ +-- transparent_background_level = 1, +--}) + +local empty = require('lualine.component'):extend() +function empty:draw(default_highlight) + self.status = '' + self.applied_separator = '' + self:apply_highlights(default_highlight) + self:apply_section_separators() + return self.status +end + +-- Put proper separators and gaps between components in sections +local function process_sections(sections) + for name, section in pairs(sections) do + local left = name:sub(9, 10) < 'x' + for pos = 1, name ~= 'lualine_z' and #section or #section - 1 do + table.insert(section, pos * 2, { empty, color = { fg = colors.white, bg = colors.white } }) + end + for id, comp in ipairs(section) do + if type(comp) ~= 'table' then + comp = { comp } + section[id] = comp + end + comp.separator = left and { right = '' } or { left = '' } + end + end + return sections +end + +local function modified() + if vim.bo.modified then + return '+' + elseif vim.bo.modifiable == false or vim.bo.readonly == true then + return '-' + end + return '' +end + +local transparent = require'lualine.themes.dracula' +transparent.inactive.c.bg = 'nil' +transparent.visual.c.bg = 'nil' +transparent.replace.c.bg = 'nil' +transparent.normal.c.bg = 'nil' +transparent.insert.c.bg = 'nil' +transparent.command.c.bg = 'nil' + +require('lualine').setup { + options = { + theme = transparent, + component_separators = '', + section_separators = { left = '', right = '' }, + }, + sections = process_sections { + lualine_a = { 'mode' }, + lualine_b = { + 'branch', + 'diff', + { 'filename', file_status = false, path = 1 }, + { + 'diagnostics', + source = { 'nvim' }, + sections = { 'error' }, + symbols = {error = 'E '}, + diagnostics_color = { error = { bg = colors.red, fg = colors.black, gui = 'bold' } }, + --on_click = function() + -- vim.diagnostic.goto_prev() + -- end + }, + { + 'diagnostics', + source = { 'nvim' }, + sections = { 'warn' }, + symbols = {warn = 'W '}, + diagnostics_color = { warn = { bg = colors.orange, fg = colors.black, gui = 'bold' } }, + --on_click = function() + -- vim.diagnostic.goto_next() + -- end + }, + { modified, color = { bg = colors.purple } }, + { + '%w', + cond = function() + return vim.wo.previewwindow + end, + }, + { + '%r', + cond = function() + return vim.bo.readonly + end, + }, + { + '%q', + cond = function() + return vim.bo.buftype == 'quickfix' + end, + }, + }, + lualine_c = {}, + lualine_x = { 'fileformat' }, + lualine_y = { 'filetype', 'progress' }, + lualine_z = { 'location' }, + }, +} + +require('hlargs').setup { + color = colors.orange +} + +require("scrollbar").setup({ + marks = { + Search = { color = colors.orange }, + Error = { color = colors.red }, + Warn = { color = colors.yellow }, + Info = { color = colors.pink }, + Hint = { color = colors.cyan }, + Misc = { color = colors.purple }, + }, + handlers = { + cursor = false, + handle = false, + }, +}) + +--vim.cmd [[highlight IndentBlanklineIndent1 guifg=#bd93f9 gui=nocombine]] +--vim.cmd [[highlight IndentBlanklineIndent2 guifg=#50fa7b gui=nocombine]] +--vim.cmd [[highlight IndentBlanklineIndent3 guifg=#8be9fd gui=nocombine]] +--vim.cmd [[highlight IndentBlanklineIndent4 guifg=#f1fa8c gui=nocombine]] +--vim.cmd [[highlight IndentBlanklineIndent5 guifg=#ffb86c gui=nocombine]] +--vim.cmd [[highlight IndentBlanklineIndent6 guifg=#ff5555 gui=nocombine]] +-- +--require("indent_blankline").setup { +-- space_char_blankline = " ", +-- +-- --show_current_context = true, +-- --show_current_context_start = true, +-- +-- char_highlight_list = { +-- "IndentBlanklineIndent1", +-- "IndentBlanklineIndent2", +-- "IndentBlanklineIndent3", +-- "IndentBlanklineIndent4", +-- "IndentBlanklineIndent5", +-- "IndentBlanklineIndent6", +-- }, +--} + +require("nvim-web-devicons").setup {} + +require("nvim-treesitter.configs").setup { + ensure_installed = { + "bash", "c", "c_sharp", "comment", "css", "diff", "git_rebase", + "gitattributes", "gitcommit", "gitignore", "html", "latex", + "lua", "make", "markdown", "python", "rust", "vim", "vimdoc", + "zig" + }, + + highlight = { + enable = true, + }, + + additional_vim_regex_highlighting = false, + + rainbow = { + enable = true, + extended_mode = true, + } +} +EOF + +colorscheme dracula diff --git a/nvim/basics.vim b/nvim/basics.vim new file mode 100644 index 0000000..bf1706e --- /dev/null +++ b/nvim/basics.vim @@ -0,0 +1,38 @@ +" Indent +set autoindent smartindent +set tabstop=8 " n of whitespace in \t +set shiftwidth=8 " n of whitespace for indent +set softtabstop=8 " n of whitespace to delete with backspace +"set expandtab " \t -> whitespaces +"set list +"set lcs=tab:\|\ ,space:⋅,eol:$ "↴ + +" Disable the mouse, btw use shift for highlighting +"set mouse= +map +imap +aunmenu PopUp + +" better and +nnoremap zz +nnoremap zz + +" Autocorrect +abbr hte the + +" Misc +set nu rnu +set cc=80 +set tw=79 +set title +set nohls +set tgc +set clipboard+=unnamedplus +autocmd FileType * setl fo-=ro fo+=tc + +" Language specific +autocmd FileType python setl ts=4 sw=4 sts=4 expandtab +autocmd FileType lisp,html setl ts=2 sw=2 sts=2 expandtab +autocmd FileType html,markdown setl spell +autocmd FileType tex setl spell spl=fr +autocmd BufWritePost *.c silent! !astyle -A3 -t8 -p -xg -H -xB -n %:p diff --git a/nvim/header.vim b/nvim/header.vim new file mode 100644 index 0000000..a96db90 --- /dev/null +++ b/nvim/header.vim @@ -0,0 +1,142 @@ +" . :-. . +" author: ratakor :*==*%%%#%+=---: +" :#%%%*+%#=+%*:. +" created: Sat, 06 May 2023 18:54:06 +0200 :%%%. . -*%- +" updated: Sun, 14 May 2023 01:43:30 +0200 =## . :#%*=:. +" -#*#%:=#%%%#- +" description: *:*%%%%%%%#- +" script to produce an header like this one .-#%%%%%%+ +" use .local/bin/updateheader to change the %%%--%%%%*- +" letter shown ##%= +%%=:.. +" #* #%# +" :# -==* +" :: .: + +let s:ascii = [ + \"", + \"███╗ ███╗", + \"████╗ ████║", + \"██╔████╔██║", + \"██║╚██╔╝██║", + \"██║ ╚═╝ ██║", + \"╚═╝ ╚═╝", + \] + +let s:start = '#' +let s:mid = '#' +let s:end = '' +let s:size = 20 " ascii width +let s:length = len(s:ascii) " header length +let s:width = 80 " header width +let s:margin = 5 + +let s:types = { + \'\.c$\|\.h$\|\.cc$\|\.hh$\|\.cpp$\|\.hpp$\|\.cs$\|\.php$': + \['/*', ' *', ' */'], + \'\.htm$\|\.html$\|\.xml$': + \[''], + \'\.js$': + \['//', '//', ''], + \'\.tex$': + \['%', '%', ''], + \'\.ml$\|\.mli$\|\.mll$\|\.mly$': + \['(*', ' ', '*)'], + \'\.vim$\|\vimrc$': + \['"', '"', ''], + \'\.f90$\|\.f95$\|\.f03$\|\.f$\|\.for$': + \['!', '!', ''], + \} + +function! s:filetype() + let l:f = expand("%:t") + + for type in keys(s:types) + if l:f =~ type + let s:start = s:types[type][0] + let s:mid = s:types[type][1] + let s:end = s:types[type][2] + endif + endfor + +endfunction + +function! s:textline(txt, pos) + let l:txt = strpart(a:txt, 0, s:width - s:margin * 2 - s:size) + + if a:pos == 1 + return s:start . repeat(' ', s:margin - strlen(s:start)) . l:txt . repeat(' ', s:width - s:margin * 2 - strlen(l:txt) - s:size) . s:ascii[a:pos] + elseif a:pos == s:length + return s:end + else + return s:mid . repeat(' ', s:margin - strlen(s:start)) . l:txt . repeat(' ', s:width - s:margin * 2 - strlen(l:txt) - s:size) . s:ascii[a:pos] +endfunction + +function! s:line(n) + if a:n == 2 + return s:textline("author: " . s:user() . " <" . s:mail() . ">", a:n) +" elseif a:n == 3 +" return s:textline("license: " . "ICS license", a:n) + elseif a:n == 4 + return s:textline("created: " . s:date(), a:n) + elseif a:n == 5 + return s:textline("updated: " . s:date(), a:n) + elseif a:n == 7 + return s:textline("description: ", a:n) + else + return s:textline('', a:n) + endif +endfunction + +function! s:user() + let l:user = $USER + if strlen(l:user) == 0 + let l:user = "user" + endif + return l:user +endfunction + +function! s:mail() + let l:mail = $MAIL + if strlen(l:mail) == 0 + let l:mail = "user@mail.org" + endif + return l:mail +endfunction + +function! s:date() + return strftime("%a, %d %b %Y %H:%M:%S %z") +endfunction + +function! s:insert() + let l:line = s:length + + while l:line > 0 + call append(0, s:line(l:line)) + let l:line = l:line - 1 + endwhile +endfunction + +function! s:update() + let line = 0 + call s:filetype() + if getline(5) =~ s:start . repeat(' ', s:margin - strlen(s:start)) . "updated: " + let line = 5 + elseif getline(6) =~ s:start . repeat(' ', s:margin - strlen(s:start)) . "updated: " + let line = 6 + endif + if line > 0 && &mod + call setline(line, s:line(5)) + return 0 + endif + return 1 +endfunction + +function! s:header() + if s:update() + call s:insert() + endif +endfunction + +command! Header call s:header () +autocmd BufNewFile * call s:header () +autocmd BufWritePre * call s:update () diff --git a/nvim/init.vim b/nvim/init.vim new file mode 100644 index 0000000..f5a6781 --- /dev/null +++ b/nvim/init.vim @@ -0,0 +1,87 @@ +" Automatic vim-plug installation +if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"')) + echo "Downloading junegunn/vim-plug to manage plugins..." + silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/ + silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim + autocmd VimEnter * PlugInstall +endif + +call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"')) +" Appearance +Plug 'Mofiqul/dracula.nvim' " dracula theme +Plug 'ellisonleao/gruvbox.nvim' " gruvbox theme +"Plug 'catppuccin/nvim', { 'as': 'catppuccin' } " catppuccin theme +"Plug 'neanias/everforest-nvim' " everforest theme +Plug 'ratakor/vim-startify' " start screen +Plug 'nvim-lualine/lualine.nvim' " bottom bar +Plug 'kyazdani42/nvim-web-devicons' " fancy icons +Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " syntax color +Plug 'p00f/nvim-ts-rainbow' " funny brackets +"Plug 'lukas-reineke/indent-blankline.nvim' " funny indentation +Plug 'm-demare/hlargs.nvim' " highlight arguments + +" LSP Support and Autocompletion Engine +Plug 'neovim/nvim-lspconfig' +Plug 'hrsh7th/nvim-cmp' +Plug 'hrsh7th/cmp-nvim-lsp' +Plug 'hrsh7th/cmp-nvim-lsp-signature-help' +"Plug 'hrsh7th/cmp-nvim-lsp-document-symbol' +Plug 'hrsh7th/cmp-buffer' +Plug 'hrsh7th/cmp-path' +Plug 'hrsh7th/cmp-calc' +Plug 'ray-x/cmp-treesitter' +Plug 'saadparwaiz1/cmp_luasnip' +Plug 'L3MON4D3/LuaSnip', {'do': 'make install_jsregexp'} +Plug 'ratakor/vim-snippets' + +" Misc +Plug 'bronson/vim-trailing-whitespace' " FixWhitespace +Plug 'airblade/vim-gitgutter' " hud for git in vim +Plug 'nvim-lua/plenary.nvim' " dependency for telescope +Plug 'nvim-telescope/telescope.nvim', { 'tag': '0.1.0' } " fuzzy finder +Plug 'preservim/nerdtree' " vs code be like +Plug 'mbbill/undotree' " history visualizer +Plug 'tpope/vim-commentary' " gc/gcc magic comment +Plug 'ziglang/zig.vim' +Plug 'kovetskiy/sxhkd-vim' +Plug 'petertriho/nvim-scrollbar' +Plug 'andrewferrier/debugprint.nvim' +"Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install' } +call plug#end() + +source $XDG_CONFIG_HOME/nvim/basics.vim +source $XDG_CONFIG_HOME/nvim/header.vim +source $XDG_CONFIG_HOME/nvim/appearance.vim +source $XDG_CONFIG_HOME/nvim/lsp.vim + +" Telescope config +nnoremap :Telescope find_files +nnoremap :Telescope git_files + +" NerdTree config +nnoremap :NERDTreeToggle + +" Undotree config +nnoremap :UndotreeToggle + +" custom vim-commentary +autocmd FileType zig setl commentstring=//\ %s +autocmd FileType cs setl commentstring=/*\ %s\ */ + +lua << EOF +require("debugprint").setup() +EOF + +"let g:startify_custom_header = [ +let g:cow = [ +\" /\\_\\/\\_\\ _ / /\\ /\\ \\ /\\ \\ /\\ \\ _\\ \\ _\\ \\ /\\_\\ / /\\", +\" / / / / //\\_\\ / / \\ / \\ \\ / \\ \\ / \\ \\ /\\__ \\ /\\__ \\ / / / _ / / \\ ", +\" /\\ \\/ \\ \\/ / // / /\\ \\ / /\\ \\ \\ / /\\ \\ \\ / /\\ \\ \\ / /_ \\_\\ / /_ \\_\\ \\ \\ \\__ /\\_\\ / / /\\ \\__ ", +\" / \\____\\__/ // / /\\ \\ \\ / / /\\ \\_\\ / / /\\ \\ \\ / / /\\ \\_\\ / / /\\/_/ / / /\\/_/ \\ \\___\\ / / // / /\\ \\___\\ ", +\" / /\\/________// / / \\ \\ \\ / / /_/ / / / / / \\ \\_\\ / /_/_ \\/_/ / / / / / / \\__ / / / / \\ \\ \\ \\/___/ ", +\" / / /\\/_// / // / /___/ /\\ \\ / / /__\\/ / / / / \\/_/ / /____/\\ / / / / / / / / / / / / \\ \\ \\ ", +\" / / / / / // / /_____/ /\\ \\ / / /_____/ / / / / /\\____\\/ / / / ____ / / / ____ / / / / / /_ \\ \\ \\ ", +\"/ / / / / // /_________/\\ \\ \\ / / /\\ \\ \\ / / /________ / / /______ / /_/_/ ___/\\ / /_/_/ ___/\\ / / /___/ / //_/\\__/ / / ", +\"\\/_/ / / // / /_ __\\ \\_\\/ / / \\ \\ \\/ / /_________\\/ / /_______\\/_______/\\__\\//_______/\\__\\// / /____\\/ / \\ \\/___/ / ", +\" \\/_/ \\_\\___\\ /____/_/\\/_/ \\_\\/\\/____________/\\/__________/\\_______\\/ \\_______\\/ \\/_________/ \\_____\\/ ", +\] diff --git a/nvim/lsp.vim b/nvim/lsp.vim new file mode 100644 index 0000000..80ac5c2 --- /dev/null +++ b/nvim/lsp.vim @@ -0,0 +1,163 @@ +" . :-. . +" author: marcellus :*==*%%%#%+=---: +" :#%%%*+%#=+%*:. +" created: Sun, 14 May 2023 01:07:47 +0200 :%%%. . -*%- +" updated: Sun, 14 May 2023 01:08:07 +0200 =## . :#%*=:. +" -#*#%:=#%%%#- +" description: *:*%%%%%%%#- +" .-#%%%%%%+ +" %%%--%%%%*- +" ##%= +%%=:.. +" #* #%# +" :# -==* +" :: .: + +" . :-. . +" author: ratakor :*==*%%%#%+=---: +" :#%%%*+%#=+%*:. +" created: Sat, 06 May 2023 18:54:06 +0200 :%%%. . -*%- +" updated: Sat, 13 May 2023 13:16:03 +0200 =## . :#%*=:. +" -#*#%:=#%%%#- +" description: *:*%%%%%%%#- +" script to produce an header like this one .-#%%%%%%+ +" use .local/bin/updateheader to change the %%%--%%%%*- +" letter shown ##%= +%%=:.. +" #* #%# +" :# -==* +" :: .: + +let s:ascii = [ + \"", + \". :-. .", + \":*==*%%%#%+=---:", + \" :#%%%*+%#=+%*:.", + \" :%%%. . -*%-", + \" =## . :#%*=:.", + \" -#*#%:=#%%%#-", + \" *:*%%%%%%%#-", + \" .-#%%%%%%+", + \" %%%--%%%%*-", + \" ##%= +%%=:..", + \" #* #%#", + \" :# -==*", + \" :: .:", + \] + +let s:start = '#' +let s:mid = '#' +let s:end = '' +let s:size = 20 " ascii width +let s:length = len(s:ascii) " header length +let s:width = 80 " header width +let s:margin = 5 + +let s:types = { + \'\.c$\|\.h$\|\.cc$\|\.hh$\|\.cpp$\|\.hpp$\|\.cs$\|\.php$': + \['/*', ' *', ' */'], + \'\.htm$\|\.html$\|\.xml$': + \[''], + \'\.js$': + \['//', '//', ''], + \'\.tex$': + \['%', '%', ''], + \'\.ml$\|\.mli$\|\.mll$\|\.mly$': + \['(*', ' ', '*)'], + \'\.vim$\|\vimrc$': + \['"', '"', ''], + \'\.f90$\|\.f95$\|\.f03$\|\.f$\|\.for$': + \['!', '!', ''], + \} + +function! s:filetype() + let l:f = expand("%:t") + + for type in keys(s:types) + if l:f =~ type + let s:start = s:types[type][0] + let s:mid = s:types[type][1] + let s:end = s:types[type][2] + endif + endfor + +endfunction + +function! s:textline(txt, pos) + let l:txt = strpart(a:txt, 0, s:width - s:margin * 2 - s:size) + + if a:pos == 1 + return s:start . repeat(' ', s:margin - strlen(s:start)) . l:txt . repeat(' ', s:width - s:margin * 2 - strlen(l:txt) - s:size) . s:ascii[a:pos] + elseif a:pos == s:length + return s:end + else + return s:mid . repeat(' ', s:margin - strlen(s:start)) . l:txt . repeat(' ', s:width - s:margin * 2 - strlen(l:txt) - s:size) . s:ascii[a:pos] +endfunction + +function! s:line(n) + if a:n == 2 + return s:textline("author: " . s:user() . " <" . s:mail() . ">", a:n) +" elseif a:n == 3 +" return s:textline("license: " . "ICS license", a:n) + elseif a:n == 4 + return s:textline("created: " . s:date(), a:n) + elseif a:n == 5 + return s:textline("updated: " . s:date(), a:n) + elseif a:n == 7 + return s:textline("description: ", a:n) + else + return s:textline('', a:n) + endif +endfunction + +function! s:user() + let l:user = $USER + if strlen(l:user) == 0 + let l:user = "user" + endif + return l:user +endfunction + +function! s:mail() + let l:mail = $MAIL + if strlen(l:mail) == 0 + let l:mail = "user@mail.org" + endif + return l:mail +endfunction + +function! s:date() + return strftime("%a, %d %b %Y %H:%M:%S %z") +endfunction + +function! s:insert() + let l:line = s:length + + while l:line > 0 + call append(0, s:line(l:line)) + let l:line = l:line - 1 + endwhile +endfunction + +function! s:update() + let line = 0 + call s:filetype() + if getline(5) =~ s:start . repeat(' ', s:margin - strlen(s:start)) . "updated: " + let line = 5 + elseif getline(6) =~ s:start . repeat(' ', s:margin - strlen(s:start)) . "updated: " + let line = 6 + endif + if line > 0 && &mod + call setline(line, s:line(5)) + return 0 + endif + return 1 +endfunction + +function! s:header() + if s:update() + call s:insert() + endif +endfunction + +command! Header call s:header () +autocmd BufNewFile * call s:header () +autocmd BufWritePre * call s:update () diff --git a/zsh/.zshrc b/zsh/.zshrc index 6f2b0b5..2edb3c6 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -5,6 +5,7 @@ flashfetch quand +[ -f "$ZDOTDIR/paliasrc" ] && source "$ZDOTDIR/paliasrc" # Private aliases autoload -U colors && colors # Load colors PS1="%B%(?.0.%F{red}%?) %F{blue}%n %F{green}%~ %f$%b " @@ -22,6 +23,7 @@ alias ascii="ascii -d" alias cf="$HOME/.config/" alias cspt="$HOME/.config/scripts" alias cz="$HOME/.config/zsh" +alias cn="$XDG_CONFIG_HOME/nvim" alias gs="git status" alias rps="echo help | nc ratakor.com 9998" alias nv="nvim" -- cgit v1.2.3