Compare commits
22 Commits
main
..
b5d76327ed
| Author | SHA1 | Date | |
|---|---|---|---|
| b5d76327ed | |||
| 00f4cc718d | |||
| d5eb42dad8 | |||
| 961b1bd135 | |||
| 3b1b41d795 | |||
| 474ae9a869 | |||
| b8a91bc38b | |||
| a5685a3f8a | |||
| efc1b5f38f | |||
| ad5db7c29c | |||
| 65aa80b8d8 | |||
| 565cbf064a | |||
| 4c1db847d5 | |||
| 7921db8720 | |||
| 2314780ed9 | |||
| d0db80b911 | |||
| 6790f75c8a | |||
| adc26f9860 | |||
| 4a8dcfba3d | |||
| 7f46d30874 | |||
| ad7715287c | |||
| 028893231b |
@@ -0,0 +1 @@
|
||||
Xcursor.theme: posy-black
|
||||
@@ -0,0 +1,25 @@
|
||||
# Utilities
|
||||
alias cls 'clear; echo "( .-.)"'
|
||||
|
||||
alias vencord 'sh -c "$(curl -sS https://raw.githubusercontent.com/Vendicated/VencordInstaller/main/install.sh)"'
|
||||
|
||||
# Places
|
||||
alias applications 'cd ~/.local/share/applications/'
|
||||
alias dot 'cd ~/dotfiles'
|
||||
|
||||
# Layout
|
||||
alias smap layout # Switch map
|
||||
alias us 'layout -t us'
|
||||
alias sv 'layout -t se'
|
||||
|
||||
# SSH
|
||||
alias louis 'vpn --enable && ssh anton@192.168.178.48'
|
||||
|
||||
alias wgon 'echo "$(set_color red)You changed this dimwit, use \'vpn\' instead"'
|
||||
alias wgoff 'echo "$(set_color red)You changed this dimwit, use \'vpn\' instead"'
|
||||
|
||||
# Git
|
||||
#alias glog 'git log --graph --abbrev-commit --decorate --format=format:\'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)\''
|
||||
#alias gref 'git show -s --pretty=reference '
|
||||
alias glog 'git lg'
|
||||
alias gref 'git ref'
|
||||
@@ -0,0 +1,17 @@
|
||||
set fish_greeting '( .-.)'
|
||||
|
||||
set PI 3.141592653589
|
||||
set E 2.718281828459
|
||||
|
||||
fish_vi_key_bindings
|
||||
|
||||
set _TEMP /tmp/anton/
|
||||
|
||||
if not test -d $_TEMP
|
||||
mkdir -p $_TEMP
|
||||
end
|
||||
|
||||
source ~/.config/fish/alias.fish
|
||||
source ~/.config/fish/prompt.fish
|
||||
|
||||
plug --init --silent
|
||||
@@ -0,0 +1,31 @@
|
||||
# This file contains fish universal variable definitions.
|
||||
# VERSION: 3.0
|
||||
SETUVAR __fish_initialized:3800
|
||||
SETUVAR fish_color_autosuggestion:brblack
|
||||
SETUVAR fish_color_cancel:\x2dr
|
||||
SETUVAR fish_color_command:normal
|
||||
SETUVAR fish_color_comment:red
|
||||
SETUVAR fish_color_cwd:green
|
||||
SETUVAR fish_color_cwd_root:red
|
||||
SETUVAR fish_color_end:green
|
||||
SETUVAR fish_color_error:brred
|
||||
SETUVAR fish_color_escape:brcyan
|
||||
SETUVAR fish_color_history_current:\x2d\x2dbold
|
||||
SETUVAR fish_color_host:normal
|
||||
SETUVAR fish_color_host_remote:yellow
|
||||
SETUVAR fish_color_normal:normal
|
||||
SETUVAR fish_color_operator:brcyan
|
||||
SETUVAR fish_color_param:cyan
|
||||
SETUVAR fish_color_quote:yellow
|
||||
SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
|
||||
SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
|
||||
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
|
||||
SETUVAR fish_color_status:red
|
||||
SETUVAR fish_color_user:brgreen
|
||||
SETUVAR fish_color_valid_path:\x2d\x2dunderline
|
||||
SETUVAR fish_key_bindings:fish_vi_key_bindings
|
||||
SETUVAR fish_pager_color_completion:normal
|
||||
SETUVAR fish_pager_color_description:yellow\x1e\x2di
|
||||
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
||||
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
|
||||
SETUVAR fish_pager_color_selected_background:\x2dr
|
||||
@@ -0,0 +1,20 @@
|
||||
function clip
|
||||
set -g stdin
|
||||
if not tty -s >/dev/null
|
||||
read stdin
|
||||
end
|
||||
set stdin $(string trim -- $stdin)
|
||||
|
||||
set -l argv $(string trim -- $argv)
|
||||
if test -n "$argv"
|
||||
echo "$argv" | xclip -selection clipboard
|
||||
return 0
|
||||
end
|
||||
|
||||
if test -n "$stdin"
|
||||
echo "$stdin" | xclip -selection clipboard
|
||||
return 0
|
||||
end
|
||||
|
||||
xclip -selection clipboard -o
|
||||
end
|
||||
@@ -0,0 +1,3 @@
|
||||
function into
|
||||
mkdir -p "$argv" && cd "$argv"
|
||||
end
|
||||
@@ -0,0 +1,61 @@
|
||||
function layout
|
||||
argparse -n "layout" "v/verbose" "t/target=" -- $argv
|
||||
or return 1
|
||||
|
||||
set _target
|
||||
|
||||
if set -q _flag_target
|
||||
set _target "$_flag_target"
|
||||
end
|
||||
|
||||
if test -f "$_TEMP/curr-layout"
|
||||
if not set -q _flag_target
|
||||
switch (cat "$_TEMP/curr-layout")
|
||||
case us
|
||||
set _target "sv"
|
||||
case se
|
||||
set _target "us"
|
||||
case sv
|
||||
set _target "us"
|
||||
case '*'
|
||||
if set -q _flag_verbose
|
||||
echo "Unregognized layout set in /curr-layout file; stopping..."
|
||||
end
|
||||
return 1
|
||||
end
|
||||
end
|
||||
else
|
||||
if set -q _flag_verbose; and not set -q _flag_target
|
||||
echo "Could not determine current layout; defaulting to US"
|
||||
end
|
||||
echo "us" > "$_TEMP/curr-layout"
|
||||
if not set -q _flag_target
|
||||
set _target "sv"
|
||||
end
|
||||
end
|
||||
|
||||
if not set -q _target
|
||||
return 2
|
||||
end
|
||||
|
||||
if set -q _flag_verbose
|
||||
switch (echo $_target)
|
||||
case sv
|
||||
echo "Switching to Swedish layout..."
|
||||
case us
|
||||
echo "Switching to U.S. layout..."
|
||||
end
|
||||
end
|
||||
|
||||
switch (echo $_target)
|
||||
case sv
|
||||
set _target se
|
||||
case '*'
|
||||
end
|
||||
|
||||
if setxkbmap -layout $_target
|
||||
echo $_target > "$_TEMP/curr-layout"
|
||||
end
|
||||
|
||||
return $status
|
||||
end
|
||||
@@ -0,0 +1,333 @@
|
||||
# Simple custom made manager, because clearly we can't have nice things.
|
||||
# (fisher uses config folder, and plug.fish has went through a rework)
|
||||
|
||||
function plug
|
||||
set -lx plug_path "$__fish_user_data_dir/plug"
|
||||
|
||||
set -lx plug_completions "$plug_path/completions"
|
||||
set -lx plug_functions "$plug_path/functions"
|
||||
set -lx plug_meta "$plug_path/meta"
|
||||
set -lx plug_confd "$plug_path/conf.d" # startup
|
||||
set -lx plug_temp "$plug_path/tmp"
|
||||
|
||||
function _plug_ensure_dir
|
||||
if not test -e $argv
|
||||
mkdir -p $argv
|
||||
end
|
||||
end
|
||||
|
||||
_plug_ensure_dir $plug_path
|
||||
|
||||
_plug_ensure_dir $plug_completions
|
||||
_plug_ensure_dir $plug_functions
|
||||
_plug_ensure_dir $plug_meta
|
||||
_plug_ensure_dir $plug_confd
|
||||
|
||||
argparse -n plug -x i,r,u,I,l,q -x l,s 'i/install=' 'r/remove=' 'q/query=' 'u/update=' l/list I/init s/silent -- $argv
|
||||
or return 1
|
||||
|
||||
set -lx verbose true
|
||||
if set -q _flag_silent
|
||||
set verbose false
|
||||
end
|
||||
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color --bold white) "Plug v0.0.1" (set_color normal))
|
||||
end
|
||||
|
||||
if not set -q _plug_initalized
|
||||
set -g _plug_initalized
|
||||
|
||||
set fish_complete_path $fish_complete_path[1] \
|
||||
$plug_completions \
|
||||
$fish_complete_path[2..]
|
||||
|
||||
set fish_function_path $fish_function_path[1] \
|
||||
$plug_functions \
|
||||
$fish_function_path[2..]
|
||||
|
||||
for script in $plug_confd/*
|
||||
source $script
|
||||
end
|
||||
end
|
||||
|
||||
if set -q _flag_init
|
||||
return 0
|
||||
end
|
||||
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color green) " Plug ready")
|
||||
end
|
||||
|
||||
set -l cmd
|
||||
set -l target
|
||||
|
||||
if set -q _flag_install
|
||||
set target $_flag_install
|
||||
set cmd install
|
||||
else if set -q _flag_remove
|
||||
set target $_flag_remove
|
||||
set cmd remove
|
||||
else if set -q _flag_update
|
||||
set target $_flag_update
|
||||
set cmd update
|
||||
else if set -q _flag_query
|
||||
set target $_flag_query
|
||||
set cmd query
|
||||
end
|
||||
|
||||
if set -q _flag_list
|
||||
set cmd list
|
||||
end
|
||||
|
||||
if test -z $cmd
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color --bold red) " No command provided")
|
||||
end
|
||||
return 1
|
||||
end
|
||||
|
||||
function _plug_parse_url
|
||||
set -l url $argv
|
||||
|
||||
# long url
|
||||
if string match -q -r 'http(s)?:\/\/.*\..*\/.*\/.*' -- $url
|
||||
echo $url
|
||||
return 0
|
||||
end
|
||||
|
||||
# short url
|
||||
if string match -q -r '.*\/.*' -- $url
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color yellow) " Using GitHub as git provider") 1>&2
|
||||
end
|
||||
set url "https://github.com/$url"
|
||||
echo $url
|
||||
|
||||
return 0
|
||||
end
|
||||
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color --bold red) " Not yet implemented")
|
||||
end
|
||||
return 1
|
||||
end
|
||||
|
||||
function _plug_get_pack_name
|
||||
set -l url $argv
|
||||
|
||||
set -l matches $(string match -r '(^.*\/|^)(.+?\/.*?)(.git)?$' -- $url)
|
||||
|
||||
echo $matches[3]
|
||||
|
||||
return 0
|
||||
end
|
||||
|
||||
function _plug_install
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color yellow) " Installing $display")
|
||||
end
|
||||
|
||||
|
||||
set -l url $(_plug_parse_url $argv)
|
||||
|
||||
if test -e $out
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color red) " Temporary directory for $name already exists ($out)")
|
||||
echo $(string join '' -- (set_color --bold red) " Failed to prepare installation, is there another plug process open?")
|
||||
end
|
||||
return 1
|
||||
end
|
||||
mkdir -p $out
|
||||
|
||||
if test -e $journal
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color red) " Journal file $journal already exists")
|
||||
echo $(string join '' -- (set_color --bold red) " $name seems to already be installed, '--remove' it first, or use '--update' to reinstall it")
|
||||
end
|
||||
return 1
|
||||
end
|
||||
touch $journal
|
||||
|
||||
if not set -l hash $(git ls-remote $url HEAD)
|
||||
echo $(string join '' -- (set_color --bold red) " Could not retrieve latest hash from $url, did you make a typo?")
|
||||
return 0
|
||||
end
|
||||
|
||||
echo $(string match -r '(.*?)\s.*' -- $hash) >$journal
|
||||
|
||||
set_color normal
|
||||
if not git clone $url $out
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color --bold red) " Failed to clone into $url")
|
||||
end
|
||||
return 1
|
||||
end
|
||||
echo $(string join '' -- (set_color green) " Cloned $url")
|
||||
|
||||
set -l deps "$out/deps.plug"
|
||||
|
||||
if test -e $deps
|
||||
echo $(string join '' -- (set_color --bold red) " Dependency resolution is not yet implemented")
|
||||
return 1
|
||||
else
|
||||
echo $(string join '' -- (set_color green) " No dependencies found")
|
||||
end
|
||||
|
||||
function _plug_clone
|
||||
set -l from $argv[1]
|
||||
set -l to $argv[2]
|
||||
set -l label $argv[3]
|
||||
|
||||
if not test -e $from
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color yellow) " No $label scripts found") 1>&2
|
||||
end
|
||||
echo 0
|
||||
return 0
|
||||
end
|
||||
|
||||
set -l counter 0
|
||||
|
||||
for script in $from/*.fish
|
||||
set counter $(math $counter + 1)
|
||||
set -l basename $(basename $script)
|
||||
if not cp $script $to
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color --bold red) " Failed to copy $script")
|
||||
end
|
||||
return 1
|
||||
end
|
||||
echo "$to/$basename" >>$journal
|
||||
end
|
||||
|
||||
if $verbose
|
||||
echo $(string join '' -- (set_color green) " Copied $counter $label script(s)") 1>&2
|
||||
end
|
||||
|
||||
echo $counter
|
||||
return 0
|
||||
end
|
||||
|
||||
set -l functions $(_plug_clone "$out/functions" "$plug_functions" "function"; or return 1)
|
||||
set -l completions $(_plug_clone "$out/completions" "$plug_completions" "completion"; or return 1)
|
||||
set -l confd $(_plug_clone "$out/conf.d" "$plug_confd" "conf.d"; or return 1)
|
||||
|
||||
if not set -q _plug_trust_all
|
||||
echo $(string join '' -- (set_color yellow) " Prompting for permission")
|
||||
|
||||
echo ""
|
||||
set_color --bold red
|
||||
echo "-- Disclaimer --"
|
||||
set_color normal
|
||||
echo "Plugins are external scripts at the end of the day. It's a good"
|
||||
echo "practice to always ensure that you get your plugins from reputable"
|
||||
echo "sources; remember that not all scripts are always safe."
|
||||
echo ""
|
||||
echo "If you're confident you've understood the security"
|
||||
echo "implications of external plugins you can disable this prompt"
|
||||
echo "and trust all future plugins, knowing that this serves as a"
|
||||
echo "warning against malicious code. \"conf.d\" scripts run every"
|
||||
echo "time your shell starts"
|
||||
echo ""
|
||||
|
||||
set_color --bold white
|
||||
echo "Setup and allow $display to run?"
|
||||
set_color normal
|
||||
echo "(Y)es, [N]o, (T)rust all; don't ask again."
|
||||
|
||||
if not read -l -P "> " answer
|
||||
echo $(string join '' -- (set_color yellow) " Cleaning up")
|
||||
|
||||
for file in $(cat $journal)[2..]
|
||||
rm $file
|
||||
end
|
||||
|
||||
return 1
|
||||
end
|
||||
|
||||
switch $answer
|
||||
case t T trust Trust TRUST
|
||||
set -U _plug_trust_all true
|
||||
case y Y yes Yes YES
|
||||
case '*'
|
||||
echo $(string join '' -- (set_color red) " Did not acquire permission")
|
||||
echo $(string join '' -- (set_color yellow) " Cleaning up")
|
||||
|
||||
for file in $(cat $journal)[2..]
|
||||
rm $file
|
||||
end
|
||||
|
||||
echo $(string join '' -- (set_color --bold red) " Installation canceled")
|
||||
return 1
|
||||
end
|
||||
end
|
||||
|
||||
if test $confd -ne 0
|
||||
set -l scripts $(cat $journal)[2..]
|
||||
|
||||
set scripts $(string match -r '.*/conf.d/.*\.fish$' -- $scripts)
|
||||
|
||||
for script in $scripts
|
||||
source $script
|
||||
end
|
||||
|
||||
echo $(string join '' -- (set_color green) " Ran conf.d scripts")
|
||||
end
|
||||
|
||||
rm -rf $out
|
||||
echo $(string join '' -- (set_color green) " Successfully installed $display")
|
||||
end
|
||||
|
||||
function _plug_is_up_to_date # Takes in a journal file as argument
|
||||
set -l hash $(cat "$plug_meta/$argv")[1]
|
||||
set -l name $(string replace '.' '/' -- $(basename $argv))
|
||||
|
||||
set -l latest
|
||||
if not set latest $(git ls-remote $(_plug_parse_url $name))
|
||||
return false
|
||||
end
|
||||
|
||||
if test $hash = $latest
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
switch $cmd
|
||||
case install
|
||||
set -lx display $(_plug_get_pack_name $target)
|
||||
set -lx name $(string replace -a '/' '.' -- $display)
|
||||
set -lx out "$plug_temp/$name"
|
||||
set -lx journal "$plug_meta/$name"
|
||||
|
||||
if not _plug_install $target
|
||||
rm -rf $out >/dev/null 2>/dev/null
|
||||
rm $journal >/dev/null 2>/dev/null
|
||||
return 1
|
||||
end
|
||||
|
||||
return 0
|
||||
case list
|
||||
set -l files $(ls "$plug_meta")
|
||||
echo $(string join '' -- (set_color green) " Found " (count $files) " journal(s)")
|
||||
|
||||
for meta in $files
|
||||
set -l hash $(cat "$plug_meta/$meta")[1]
|
||||
echo $(string join '' -- \
|
||||
(set_color normal) " - " \
|
||||
(set_color --bold white) (string replace '.' '/' -- $(basename $meta)) (set_color normal) \
|
||||
(set_color --dim white) " (" \
|
||||
(string shorten -c '' -m 6 -- $hash) ")")
|
||||
end
|
||||
case '*'
|
||||
if not set -q _flag_silent
|
||||
echo $(string join '' -- (set_color --bold red) " Not yet implemented")
|
||||
end
|
||||
return 1
|
||||
end
|
||||
|
||||
return 2
|
||||
end
|
||||
@@ -0,0 +1,22 @@
|
||||
function round
|
||||
argparse -n "round" -i "p/precision=!_validate_int" -- $argv
|
||||
or return 1
|
||||
|
||||
set -l value $argv
|
||||
|
||||
set -l precision 0
|
||||
if set -q _flag_precision
|
||||
set precision $_flag_precision
|
||||
end
|
||||
|
||||
set precision $(math 10 ^ $precision)
|
||||
|
||||
set value $(math $value x $precision)
|
||||
|
||||
set -l right $(math $value % 1)
|
||||
|
||||
set value $(math $value - $right)
|
||||
set value $(math $value / $precision)
|
||||
|
||||
echo $value
|
||||
end
|
||||
@@ -0,0 +1,84 @@
|
||||
function vpn
|
||||
argparse -n "vpn" -x e,d -x q,s 'e/enable' 'd/disable' 's/status' 'q/quiet' 'f/force' -- $argv
|
||||
or return 1
|
||||
|
||||
set _silent false
|
||||
if set -q _flag_quiet
|
||||
set _silent true
|
||||
end
|
||||
|
||||
set _path ~/wg0.conf
|
||||
set _status false
|
||||
|
||||
if test -f "$_TEMP/vpn-status"
|
||||
switch (cat "$_TEMP/vpn-status")
|
||||
case true
|
||||
set _status true
|
||||
case false
|
||||
set _status false
|
||||
case '*'
|
||||
if not $_quiet
|
||||
echo "Unregognized /vpn-status contents, exiting!"
|
||||
end
|
||||
return 1
|
||||
end
|
||||
else
|
||||
if not $_silent
|
||||
echo "Did not find status file; creating..."
|
||||
echo "false" >> "$_TEMP/vpn-status"
|
||||
end
|
||||
end
|
||||
|
||||
if set -q _flag_status
|
||||
if $_status
|
||||
echo "VPN is active."
|
||||
else
|
||||
echo "VPN is inactive."
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
if not set -q _flag_enable; and not set -q _flag_disable
|
||||
if $_status
|
||||
set _flag_disable
|
||||
else
|
||||
set _flag_enable
|
||||
end
|
||||
end
|
||||
|
||||
if set -q _flag_enable
|
||||
if $_status; and not set -q _flag_force
|
||||
if not $_silent
|
||||
echo "Already enabled."
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
if wg-quick up $_path
|
||||
echo "true" > "$_TEMP/vpn-status"
|
||||
if not $_silent
|
||||
echo "Successfully enabled."
|
||||
end
|
||||
end
|
||||
return $status
|
||||
end
|
||||
|
||||
if set -q _flag_disable
|
||||
if not $_status; and not set -q _flag_force
|
||||
if not $_silent
|
||||
echo "Already disabled."
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
if wg-quick down $_path
|
||||
echo "false" > "$_TEMP/vpn-status"
|
||||
if not $_silent
|
||||
echo "Successfully disabled."
|
||||
end
|
||||
end
|
||||
return $status
|
||||
end
|
||||
|
||||
return 2
|
||||
end
|
||||
@@ -0,0 +1,54 @@
|
||||
function fish_mode_prompt
|
||||
end
|
||||
|
||||
function fish_prompt
|
||||
set -l last_status $status
|
||||
|
||||
set -l duration $CMD_DURATION
|
||||
|
||||
if test $CMD_DURATION -gt 700
|
||||
set -l seconds $(round -p 2 $(math $duration / 1000 % 60))
|
||||
set seconds $seconds s
|
||||
set -l minutes
|
||||
if test $duration -gt 60000
|
||||
set minutes $(round (math $duration / 60000))
|
||||
set minutes $minutes "m "
|
||||
end
|
||||
|
||||
|
||||
string join '' -- (set_color white) "took " (set_color yellow) $minutes $seconds
|
||||
end
|
||||
|
||||
set -l mode
|
||||
switch (echo $fish_bind_mode)
|
||||
case default
|
||||
set mode $(string join '' -- (set_color --bold red) '[N] ' (set_color normal))
|
||||
case insert
|
||||
set mode $(string join '' -- (set_color --bold cyan) '[I] ' (set_color normal))
|
||||
case replace_one
|
||||
set mode $(string join '' -- (set_color --bold green) '[R] ' (set_color normal))
|
||||
case visual
|
||||
set mode $(string join '' -- (set_color --bold brmagenta) '[V] ' (set_color normal))
|
||||
case '*'
|
||||
set mode $(string join '' -- (set_color --bold red) '[?] ' (set_color normal))
|
||||
end
|
||||
|
||||
|
||||
set -l cursor_color $(set_color green)
|
||||
|
||||
if test $last_status -ne 0
|
||||
set last_status $(string join '' -- (set_color red) " [$last_status]")
|
||||
set cursor_color $(set_color red)
|
||||
else
|
||||
set last_status ""
|
||||
end
|
||||
|
||||
set -l git $(string trim -- (fish_vcs_prompt))
|
||||
if test -n "$git"
|
||||
set git $(string join '' -- (set_color yellow) " " (string sub -s 2 $git -e -1) " ")
|
||||
end
|
||||
|
||||
set -l pwd $(string join '' -- (set_color green) (prompt_pwd -D 2 -d 1) (set_color normal))
|
||||
|
||||
string join '' -- $mode $pwd $last_status $git $cursor_color '|> '
|
||||
end
|
||||
@@ -0,0 +1,3 @@
|
||||
[Settings]
|
||||
gtk-cursor-theme-name=posy-black
|
||||
gtk-theme-name=Adwaita-dark
|
||||
@@ -0,0 +1,230 @@
|
||||
# i3 config file (v4)
|
||||
#
|
||||
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
|
||||
#
|
||||
# This config file uses keycodes (bindsym) and was written for the QWERTY
|
||||
# layout.
|
||||
#
|
||||
# To get a config file with the same key positions, but for your current
|
||||
# layout, use the i3-config-wizard
|
||||
#
|
||||
|
||||
# Font for window titles. Will also be used by the bar unless a different font
|
||||
# is used in the bar {} block below.
|
||||
font pango:Monaco 8
|
||||
|
||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
||||
#font pango:DejaVu Sans Mono 8
|
||||
|
||||
# Start XDG autostart .desktop files using dex. See also
|
||||
# https://wiki.archlinux.org/index.php/XDG_Autostart
|
||||
exec --no-startup-id dex --autostart --environment i3
|
||||
|
||||
# The combination of xss-lock, nm-applet and pactl is a popular choice, so
|
||||
# they are included here as an example. Modify as you see fit.
|
||||
|
||||
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
|
||||
# screen before suspend. Use loginctl lock-session to lock your screen.
|
||||
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
|
||||
|
||||
# NetworkManager is the most popular way to manage wireless networks on Linux,
|
||||
# and nm-applet is a desktop environment-independent system tray GUI for it.
|
||||
exec --no-startup-id nm-applet
|
||||
|
||||
# Use pactl to adjust volume in PulseAudio.
|
||||
# set $refresh_i3status killall -SIGUSR1 i3status
|
||||
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
|
||||
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
|
||||
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
|
||||
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
|
||||
|
||||
# use these keys for focus, movement, and resize directions when reaching for
|
||||
# the arrows is not convenient
|
||||
set $up Up
|
||||
set $down Down
|
||||
set $left Left
|
||||
set $right Right
|
||||
|
||||
# Use caps
|
||||
exec setxkbmap -option caps:super
|
||||
set $mod Mod4
|
||||
|
||||
# use Mouse+Mod1 to drag floating windows to their wanted position
|
||||
floating_modifier $mod
|
||||
|
||||
# move tiling windows via drag & drop by left-clicking into the title bar,
|
||||
# or left-clicking anywhere into the window while holding the floating modifier.
|
||||
tiling_drag modifier titlebar
|
||||
|
||||
# start a terminal
|
||||
bindsym $mod+Return exec i3-sensible-terminal
|
||||
|
||||
# start an app
|
||||
bindsym $mod+n exec "rofi -show combi -modes combi -combi-modes drun,run -combi-display-format {text}"
|
||||
|
||||
# kill focused window
|
||||
bindsym $mod+q kill
|
||||
|
||||
# Enable compose key with caps lock
|
||||
# exec setxkbmap -option compose:caps
|
||||
|
||||
# start dmenu (a program launcher)
|
||||
# bindsym $mod+d exec --no-startup-id dmenu_run
|
||||
# A more modern dmenu replacement is rofi:
|
||||
# bindsym $mod+d exec "rofi -modi drun,run -show drun"
|
||||
# There also is i3-dmenu-desktop which only displays applications shipping a
|
||||
# .desktop file. It is a wrapper around dmenu, so you need that installed.
|
||||
# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
|
||||
|
||||
# change focus
|
||||
bindsym $mod+$left focus left
|
||||
bindsym $mod+$down focus down
|
||||
bindsym $mod+$up focus up
|
||||
bindsym $mod+$right focus right
|
||||
|
||||
# move focused window
|
||||
bindsym $mod+Shift+$left move left
|
||||
bindsym $mod+Shift+$down move down
|
||||
bindsym $mod+Shift+$up move up
|
||||
bindsym $mod+Shift+$right move right
|
||||
|
||||
# move workspace
|
||||
bindsym $mod+Ctrl+$right move workspace to output right
|
||||
bindsym $mod+Ctrl+$left move workspace to output left
|
||||
|
||||
# split in horizontal orientation
|
||||
bindsym $mod+h split h
|
||||
|
||||
# split in vertical orientation
|
||||
bindsym $mod+v split v
|
||||
|
||||
# enter fullscreen mode for the focused container
|
||||
bindsym $mod+f fullscreen toggle
|
||||
|
||||
# change container layout (stacked, tabbed, toggle split)
|
||||
bindsym $mod+s layout stacking
|
||||
bindsym $mod+w layout tabbed
|
||||
bindsym $mod+e layout toggle split
|
||||
|
||||
# toggle tiling / floating
|
||||
bindsym $mod+Shift+space floating toggle
|
||||
|
||||
# change focus between tiling / floating windows
|
||||
bindsym $mod+space focus mode_toggle
|
||||
|
||||
# focus the parent container
|
||||
bindsym $mod+a focus parent
|
||||
|
||||
# focus the child container
|
||||
#bindsym $mod+d focus child
|
||||
|
||||
# move the currently focused window to the scratchpad
|
||||
bindsym $mod+Shift+minus move scratchpad
|
||||
|
||||
# Show the next scratchpad window or hide the focused scratchpad window.
|
||||
# If there are multiple scratchpad windows, this command cycles through them.
|
||||
bindsym $mod+minus scratchpad show
|
||||
|
||||
#Screenshot
|
||||
bindsym Print exec flameshot gui
|
||||
|
||||
# Define names for default workspaces for which we configure key bindings later on.
|
||||
# We use variables to avoid repeating the names in multiple places.
|
||||
set $ws1 "1"
|
||||
set $ws2 "2"
|
||||
set $ws3 "3"
|
||||
set $ws4 "4"
|
||||
set $ws5 "5"
|
||||
set $ws6 "6"
|
||||
set $ws7 "7"
|
||||
set $ws8 "8"
|
||||
set $ws9 "9"
|
||||
set $ws10 "10"
|
||||
|
||||
# switch to workspace
|
||||
bindsym $mod+1 workspace number $ws1
|
||||
bindsym $mod+2 workspace number $ws2
|
||||
bindsym $mod+3 workspace number $ws3
|
||||
bindsym $mod+4 workspace number $ws4
|
||||
bindsym $mod+5 workspace number $ws5
|
||||
bindsym $mod+6 workspace number $ws6
|
||||
bindsym $mod+7 workspace number $ws7
|
||||
bindsym $mod+8 workspace number $ws8
|
||||
bindsym $mod+9 workspace number $ws9
|
||||
bindsym $mod+0 workspace number $ws10
|
||||
|
||||
# move focused container to workspace
|
||||
bindsym $mod+Shift+1 move container to workspace number $ws1
|
||||
bindsym $mod+Shift+2 move container to workspace number $ws2
|
||||
bindsym $mod+Shift+3 move container to workspace number $ws3
|
||||
bindsym $mod+Shift+4 move container to workspace number $ws4
|
||||
bindsym $mod+Shift+5 move container to workspace number $ws5
|
||||
bindsym $mod+Shift+6 move container to workspace number $ws6
|
||||
bindsym $mod+Shift+7 move container to workspace number $ws7
|
||||
bindsym $mod+Shift+8 move container to workspace number $ws8
|
||||
bindsym $mod+Shift+9 move container to workspace number $ws9
|
||||
bindsym $mod+Shift+0 move container to workspace number $ws10
|
||||
|
||||
# reload the configuration file
|
||||
bindsym $mod+Shift+c reload
|
||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
||||
bindsym $mod+Shift+r restart
|
||||
# exit i3 (logs you out of your X session)
|
||||
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
|
||||
|
||||
# resize window (you can also use the mouse for that)
|
||||
mode "resize" {
|
||||
# These bindings trigger as soon as you enter the resize mode
|
||||
|
||||
# Pressing left will shrink the window’s width.
|
||||
# Pressing right will grow the window’s width.
|
||||
# Pressing up will shrink the window’s height.
|
||||
# Pressing down will grow the window’s height.
|
||||
bindsym $left resize shrink width 10 px or 10 ppt
|
||||
bindsym $down resize grow height 10 px or 10 ppt
|
||||
bindsym $up resize shrink height 10 px or 10 ppt
|
||||
bindsym $right resize grow width 10 px or 10 ppt
|
||||
|
||||
# same bindings, but for the arrow keys
|
||||
bindsym Left resize shrink width 10 px or 10 ppt
|
||||
bindsym Down resize grow height 10 px or 10 ppt
|
||||
bindsym Up resize shrink height 10 px or 10 ppt
|
||||
bindsym Right resize grow width 10 px or 10 ppt
|
||||
|
||||
# back to normal: Enter or Escape or $mod+r
|
||||
bindsym Return mode "default"
|
||||
bindsym Escape mode "default"
|
||||
bindsym $mod+r mode "default"
|
||||
}
|
||||
|
||||
bindsym $mod+r mode "resize"
|
||||
|
||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||
# finds out, if available)
|
||||
bar {
|
||||
status_command i3status
|
||||
}
|
||||
|
||||
# Wallpaper
|
||||
# exec --no-startup-id feh --bg-scale /home/anton/bg.png
|
||||
# exec --no-startup-id mpv wallpaper.mp4 --loop --no-audio --no-media-controls
|
||||
# exec --no-startup-id xinwrap -g 1920x1080 -ni -s -nf -b -fs -- mpv -wid WID wallpaper.mp4 --loop --no-audio --no-media-controls
|
||||
# exec --no-startup-id xwinwrap -g 1920x1080 -s -b -fdt -ni -sp -ov -- mpv wallpaper.mp4 -wid WID --loop --no-audio --gpu-api=vulkan
|
||||
# exec --no-startup-id xwinwrap -g 1920x1080+1920 -s -b -fdt -ni -sp -ov -- mpv wallpaper.mp4 -wid WID --loop --no-audio --gpu-api=vulkan
|
||||
exec --no-startup-id xwinwrap -g 1920x1080 -s -b -fdt -ni -sp -ov -nf -un -- mpv ~/wallpaper.mp4 -wid WID --loop --no-audio --gpu-api=vulkan --vo=gpu-next --framedrop=vo --profile=low-latency --hwdec=auto --no-osc --no-input-default-bindings --no-input-cursor
|
||||
exec --no-startup-id xwinwrap -g 1920x1080+1920 -s -b -fdt -ni -sp -ov -nf -un -- mpv ~/wallpaper.mp4 -wid WID --loop --no-audio --gpu-api=vulkan --vo=gpu-next --framedrop=vo --profile=low-latency --hwdec=auto --no-osc --no-input-default-bindings --no-input-cursor
|
||||
|
||||
exec --no-startup-id ~/.config/i3/startup.sh
|
||||
|
||||
#######################################################################
|
||||
# automatically start i3-config-wizard to offer the user to create a
|
||||
# keysym-based config which used their favorite modifier (alt or windows)
|
||||
#
|
||||
# i3-config-wizard will not launch if there already is a config file
|
||||
# in ~/.config/i3/config (or $XDG_CONFIG_HOME/i3/config if set) or
|
||||
# ~/.i3/config.
|
||||
#
|
||||
# Please remove the following exec line:
|
||||
#######################################################################
|
||||
# exec i3-config-wizard
|
||||
@@ -0,0 +1,25 @@
|
||||
|
||||
background #161718
|
||||
foreground #b7bcb9
|
||||
|
||||
cursor #b7bcb9
|
||||
selection_background #1e1f22
|
||||
color0 #2a2e33
|
||||
color8 #1d1e21
|
||||
color1 #b74d50
|
||||
color9 #8c2d32
|
||||
color2 #b3be5a
|
||||
color10 #788331
|
||||
color3 #e3b55e
|
||||
color11 #e5894f
|
||||
color4 #6d90b0
|
||||
color12 #4b6b88
|
||||
color5 #a07eab
|
||||
color13 #6e4f79
|
||||
color6 #7fbeb3
|
||||
color14 #4d7b73
|
||||
color7 #b5b8b6
|
||||
color15 #5a6169
|
||||
|
||||
selection_foreground #b7bcb9
|
||||
selection_background #2a2e33
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,32 @@
|
||||
-- Lazy bootstrap
|
||||
local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
|
||||
local out = vim.fn.system({ 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ 'Failed to clone lazy.nvim:\n', 'ErrorMsg' },
|
||||
{ out, 'WarningMsg' },
|
||||
{ '\nPress any key to exit...' },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require('BluePlum.set')
|
||||
require('BluePlum.keymap')
|
||||
require('BluePlum.neovide')
|
||||
|
||||
require('lazy').setup({
|
||||
-- Plugins
|
||||
spec = {
|
||||
{ import = 'plugins' },
|
||||
},
|
||||
checker = { enabled = false },
|
||||
change_detection = { notify = false },
|
||||
})
|
||||
|
||||
require('lsp')
|
||||
require('BluePlum.input')
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
|
||||
"actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"compile-mode.nvim": { "branch": "main", "commit": "8dff8d8472363e01499a4e8cc02f5f5595ce3922" },
|
||||
"cord.nvim": { "branch": "client-server", "commit": "33d20ab3ea7ea5a38a5a569abc1409d4e5a43024" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
|
||||
"formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" },
|
||||
"gruber-darker.nvim": { "branch": "main", "commit": "a2dda61d9c1225e16951a51d6b89795b0ac35cd6" },
|
||||
"inc-rename.nvim": { "branch": "main", "commit": "f9b9e5b9a75074810f40881b7e254b5bbeaf122e" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lsp-zero.nvim": { "branch": "v4.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
|
||||
"lsp_signature.nvim": { "branch": "master", "commit": "5b64964ed02098c85613ee3d20f96bed1dfb64cc" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
|
||||
"markview.nvim": { "branch": "main", "commit": "6e9f1840ba33e5318285ad97c22676f55b753479" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "51562d44fc6280f92bb9a3d87e7b3cb327377ca5" },
|
||||
"nvim-ufo": { "branch": "main", "commit": "4c64d89c2bf174d95d4ac91cc959a9e43e2f318c" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
|
||||
"oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
|
||||
"smear-cursor.nvim": { "branch": "main", "commit": "791bd7871e612b17520cbde19ddede306d83ef11" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" },
|
||||
"vim-grepper": { "branch": "master", "commit": "f1b441c23f0227b28c36be383b562ab47dbecec4" }
|
||||
}
|
||||
@@ -0,0 +1,248 @@
|
||||
local M = {
|
||||
interupt = false,
|
||||
}
|
||||
|
||||
M.Keys = {
|
||||
enter = '<CR>',
|
||||
tab = '<Tab>',
|
||||
backspace = '<BS>',
|
||||
escape = '<Esc>',
|
||||
|
||||
-- if await_key().is_arrow
|
||||
-- if key == Keys.left
|
||||
left = { is_arrow = true, this = '<Left>' },
|
||||
right = { is_arrow = true, this = '<Right>' },
|
||||
up = { is_arrow = true, this = '<Up>' },
|
||||
down = { is_arrow = true, this = '<Down>' },
|
||||
}
|
||||
|
||||
function M.await_key()
|
||||
-- local char = vim.fn.getchar()
|
||||
local char = vim.fn.getchar()
|
||||
local num = vim.fn.nr2char(char)
|
||||
local key = vim.fn.keytrans(num)
|
||||
-- vim.print(char, num, key, key == '<BS>')
|
||||
|
||||
-- Some special keys work weird..
|
||||
local is_key = function(key)
|
||||
return pcall(function(char)
|
||||
if vim.fn.keytrans(char) ~= key then
|
||||
error()
|
||||
end
|
||||
end, char)
|
||||
end
|
||||
|
||||
if is_key('<BS>') then
|
||||
return M.Keys.backspace
|
||||
elseif is_key('<Left>') then
|
||||
return M.Keys.left
|
||||
elseif is_key('<Right>') then
|
||||
return M.Keys.right
|
||||
elseif is_key('<Up>') then
|
||||
return M.Keys.up
|
||||
elseif is_key('<Down>') then
|
||||
return M.Keys.down
|
||||
elseif key == '<Space>' then
|
||||
return ' '
|
||||
elseif key == '<Lt>' then
|
||||
return '<'
|
||||
elseif key == '<Gt>' then
|
||||
return '>'
|
||||
end
|
||||
|
||||
return key
|
||||
end
|
||||
|
||||
-- vim.print(vim.fn.getcompletion('ech', 'command'))
|
||||
-- vim.fn.getchar()
|
||||
|
||||
local function refresh_completions(pattern, kind)
|
||||
local completions = vim.fn.getcompletion(pattern, kind)
|
||||
|
||||
if #completions > 25 then
|
||||
local new = {}
|
||||
for i = 1, 25 do
|
||||
new[i] = completions[i]
|
||||
end
|
||||
new[#new + 1] = '...' -- Append truncation indicator
|
||||
return new
|
||||
end
|
||||
|
||||
return completions
|
||||
end
|
||||
|
||||
local function format_completions(completions)
|
||||
local formatted = { { '{', 'Normal' } }
|
||||
for i = 1, #completions do
|
||||
table.insert(formatted, { completions[i], i == 1 and 'CursorLineNr' or 'Normal' })
|
||||
if i ~= #completions then
|
||||
table.insert(formatted, { ', ', 'Normal' })
|
||||
end
|
||||
end
|
||||
table.insert(formatted, { '}', 'Normal' })
|
||||
return formatted
|
||||
end
|
||||
|
||||
local function input(prompt, default, completion)
|
||||
vim.validate({
|
||||
prompt = { prompt, 'table' },
|
||||
default = { default, { 'string', 'nil' } },
|
||||
completion = { completion, { 'string', 'nil' } },
|
||||
})
|
||||
local using_default = default ~= nil
|
||||
local typed = default or ''
|
||||
|
||||
local completions = {}
|
||||
|
||||
local cursor = 0
|
||||
|
||||
while true do
|
||||
if completion ~= nil then
|
||||
completions = refresh_completions(typed, completion)
|
||||
end
|
||||
|
||||
vim.cmd('echo | redraw')
|
||||
vim.api.nvim_echo({
|
||||
unpack(prompt),
|
||||
{ string.sub(typed, 0, cursor), using_default and 'Visual' or 'Normal' },
|
||||
cursor == #typed and { '█', 'CursorLineNr' } or { string.sub(typed, cursor + 1, cursor + 1), 'Search' },
|
||||
{ string.sub(typed, cursor + 2), 'Normal' },
|
||||
unpack(#completions > 0 and format_completions(completions) or {}),
|
||||
}, false, {})
|
||||
local input = M.await_key()
|
||||
|
||||
if input == M.Keys.enter or input == M.Keys.escape then
|
||||
vim.cmd('echo | redraw')
|
||||
return input == M.Keys.enter, typed
|
||||
elseif input == M.Keys.backspace then
|
||||
if cursor <= 0 then
|
||||
goto continue
|
||||
end
|
||||
typed = string.sub(typed, 0, cursor - 1) .. string.sub(typed, cursor + 1)
|
||||
cursor = cursor - 1
|
||||
goto continue
|
||||
elseif input.is_arrow then
|
||||
if input == M.Keys.left then
|
||||
if cursor > 0 then
|
||||
cursor = cursor - 1
|
||||
end
|
||||
elseif input == M.Keys.right then
|
||||
if cursor < #typed then
|
||||
cursor = cursor + 1
|
||||
end
|
||||
end
|
||||
-- vim.api.nvim_win_set_cursor(0, { 1, 10 })
|
||||
goto continue
|
||||
elseif input == M.Keys.tab then
|
||||
if #completions == 0 then
|
||||
goto continue
|
||||
end
|
||||
cursor = #typed
|
||||
|
||||
local insert = completions[1]
|
||||
local offset = #typed
|
||||
|
||||
-- Find the largest overlapping slice
|
||||
while offset > 0 and not vim.startswith(insert, string.sub(typed, -offset)) do
|
||||
offset = offset - 1
|
||||
end
|
||||
|
||||
-- Replace `typed` with the completion
|
||||
typed = string.sub(typed, 1, #typed - offset) .. insert .. ' '
|
||||
cursor = #typed
|
||||
goto continue
|
||||
end
|
||||
|
||||
typed = string.sub(typed, 0, cursor) .. input .. string.sub(typed, cursor + 1)
|
||||
cursor = cursor + 1
|
||||
|
||||
::continue::
|
||||
end
|
||||
end
|
||||
|
||||
-- Safe wrapper for hiding the cursor (also captures <C-c>)
|
||||
function M.input(prompt, default, completion)
|
||||
local hl = vim.api.nvim_get_hl(0, { name = 'Cursor' })
|
||||
|
||||
hl.blend = 100
|
||||
vim.api.nvim_set_hl(0, 'Cursor', hl)
|
||||
|
||||
-- local result, success, typed = pcall(input, prompt, defaut, completion)
|
||||
local success, typed = input(prompt, default, completion)
|
||||
vim.cmd('echo | redraw')
|
||||
|
||||
hl.blend = 0
|
||||
vim.api.nvim_set_hl(0, 'Cursor', hl)
|
||||
|
||||
return success, typed, not result
|
||||
end
|
||||
|
||||
---@param opts? table
|
||||
---@param on_confirm function
|
||||
vim.ui.input = function(opts, on_confirm)
|
||||
vim.validate({
|
||||
opts = { opts, 'table' },
|
||||
on_confirm = { on_confirm, 'function' },
|
||||
})
|
||||
|
||||
opts = opts or {}
|
||||
on_confirm = on_confirm or function() end
|
||||
|
||||
vim.validate({
|
||||
-- Also supports list of HlGroup tuples
|
||||
prompt = { opts.prompt, { 'table', 'string', 'nil' } },
|
||||
|
||||
default = { opts.default, { 'string', 'nil' } },
|
||||
completion = { opts.completion, { 'string', 'nil' } },
|
||||
|
||||
highlight = {
|
||||
opts.highlight,
|
||||
function(it)
|
||||
return it == nil
|
||||
end,
|
||||
'nil (not supported)',
|
||||
},
|
||||
})
|
||||
|
||||
local prompt = opts.prompt or { { 'Enter input > ', 'Question' } }
|
||||
if type(prompt) == 'string' then
|
||||
-- Strip invalid characters
|
||||
prompt = vim.trim(prompt)
|
||||
|
||||
local is_alpha = function(char)
|
||||
local num = vim.fn.char2nr(char)
|
||||
return (num >= 65 and num <= 90) or (num >= 97 and num <= 122)
|
||||
end
|
||||
|
||||
local last = string.sub(prompt, #prompt)
|
||||
while not is_alpha(last) do
|
||||
prompt = string.sub(prompt, 0, #prompt - 1)
|
||||
prompt = vim.trim(prompt)
|
||||
last = string.sub(prompt, #prompt)
|
||||
end
|
||||
|
||||
prompt = { { prompt .. ' > ', 'Question' } }
|
||||
end
|
||||
|
||||
local finished, typed, interrupted = M.input(prompt, opts.default, opts.completion)
|
||||
if interrupted then
|
||||
return
|
||||
end
|
||||
on_confirm(finished and typed or nil)
|
||||
end
|
||||
|
||||
-- vim.ui.input({ completion = 'cmdline' }, function(a)
|
||||
-- vim.print(a)
|
||||
-- end)
|
||||
|
||||
-- vim.keymap.set('n', ';', function()
|
||||
-- vim.ui.input({ prompt = { { ':', 'Normal' } }, completion = 'cmdline' }, function(command)
|
||||
-- vim.print(command)
|
||||
-- if command then
|
||||
-- vim.cmd(command)
|
||||
-- end
|
||||
-- end)
|
||||
-- end)
|
||||
-- add cmdheight to the input function
|
||||
|
||||
return M
|
||||
@@ -0,0 +1,93 @@
|
||||
local set = vim.keymap.set
|
||||
|
||||
set('i', '<M-Up>', '<ESC>:move-2<CR>i')
|
||||
set('i', '<M-Down>', '<ESC>:move+<CR>i')
|
||||
|
||||
set('n', '<C-Up>', '<C-u>zz')
|
||||
set('n', '<C-Down>', '<C-d>zz')
|
||||
|
||||
-- yank to clipboard with leader
|
||||
set('n', '<leader>y', '"+y')
|
||||
set('v', '<leader>y', '"+y')
|
||||
|
||||
set('n', 'Q', '<nop>')
|
||||
|
||||
-- terminal
|
||||
-- set('n', '<leader>t', ':split<CR>:term<CR>')
|
||||
OpenTerminal = nil
|
||||
PreviousBuffer = -1
|
||||
set('n', '<leader>t', function()
|
||||
if vim.api.nvim_get_current_buf() == OpenTerminal and PreviousBuffer ~= -1 then
|
||||
vim.api.nvim_set_current_buf(PreviousBuffer)
|
||||
PreviousBuffer = -1
|
||||
return
|
||||
end
|
||||
|
||||
PreviousBuffer = vim.api.nvim_get_current_buf()
|
||||
if OpenTerminal ~= nil then
|
||||
vim.api.nvim_set_current_buf(OpenTerminal)
|
||||
else
|
||||
vim.cmd.term()
|
||||
OpenTerminal = vim.api.nvim_get_current_buf()
|
||||
vim.api.nvim_create_autocmd({ 'BufDelete' }, {
|
||||
callback = function(args)
|
||||
if args.buf == OpenTerminal then
|
||||
OpenTerminal = nil
|
||||
end
|
||||
end,
|
||||
})
|
||||
end
|
||||
end)
|
||||
set('t', '<ESC>', '<C-\\><C-n>')
|
||||
|
||||
-- nice additions
|
||||
set('n', '<leader>er', function()
|
||||
vim.diagnostic.open_float()
|
||||
end)
|
||||
set('n', '<leader>l', ':e#<CR>')
|
||||
-- set('n', '<leader>ca', ':CodeActionMenu<CR>')
|
||||
-- set('n', '<leader>cn', ':IncRename ')
|
||||
|
||||
set('n', '<leader>i', 'cc')
|
||||
-- peek
|
||||
set('n', '<leader>p', vim.lsp.buf.hover)
|
||||
|
||||
-- Scratch pad
|
||||
set(
|
||||
'n',
|
||||
'<leader>s',
|
||||
':bo vs<CR>:enew<CR>:setlocal noswapfile<CR>:setlocal bufhidden=hide<CR>:setlocal buftype=nofile<CR>:set filetype=markdown<CR>:set syntax=markdown<CR>'
|
||||
)
|
||||
|
||||
-- Help
|
||||
-- vim.cmd.cnoreabbrev('h vert h')
|
||||
-- set('n', '<leader>h', ':h <C-r><C-w><CR>')
|
||||
|
||||
-- Comp mode
|
||||
set('n', '<leader>c<CR>', ':Compile<CR>')
|
||||
set('n', '<leader>cs', ':CompileInterrupt<CR>')
|
||||
|
||||
set('n', '<leader>E', ':NextError<CR>')
|
||||
|
||||
-- Windows
|
||||
set('n', '<M-q>', '<C-w>q')
|
||||
set('n', '<M-left>', '<C-w><left>')
|
||||
set('n', '<M-right>', '<C-w><right>')
|
||||
set('n', '<M-up>', '<C-w><up>')
|
||||
set('n', '<M-down>', '<C-w><down>')
|
||||
|
||||
set('n', '<M-S-right>', '<C-w>t<C-w>H')
|
||||
|
||||
Fullscreen = false
|
||||
set('n', '<M-f>', function()
|
||||
if Fullscreen then
|
||||
print('full screen')
|
||||
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<C-w>_<C-w>|', true, false, true), 'm', false)
|
||||
else
|
||||
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<C-w>=', true, false, true), 'm', false)
|
||||
end
|
||||
Fullscreen = not Fullscreen
|
||||
end)
|
||||
|
||||
-- Generic
|
||||
set('n', '<leader>q', ':bd!<CR>')
|
||||
@@ -0,0 +1,24 @@
|
||||
if not vim.g.neovide then
|
||||
return
|
||||
end
|
||||
|
||||
vim.o.guifont = 'Jetbrains Mono:h17'
|
||||
|
||||
vim.g.neovide_underline_stroke_scale = 2.0
|
||||
vim.g.neovide_theme = 'dark'
|
||||
vim.g.neovide_refresh_rate_idle = 10
|
||||
vim.g.neovide_transparency = 0.6
|
||||
|
||||
-- Scroll
|
||||
vim.g.neovide_scroll_animation_length = 0.1
|
||||
vim.g.neovide_scroll_animation_far_lines = 50
|
||||
|
||||
-- Cursor
|
||||
vim.g.neovide_cursor_animation_length = 0.03
|
||||
vim.g.neovide_cursor_trail_size = 0.5
|
||||
vim.g.neovide_cursor_smooth_blink = true
|
||||
vim.cmd.set('guicursor=i-v-c:blinkwait400-blinkoff350-blinkon250,i-ci-ve:ver25,r-cr:hor20,o:hor20')
|
||||
|
||||
-- Pasting
|
||||
vim.keymap.set('i', '<SC-v>', '<C-r>+')
|
||||
vim.keymap.set('n', '<SC-v>', '"+p')
|
||||
@@ -0,0 +1,64 @@
|
||||
-- Tabs for indenting
|
||||
vim.opt.autoindent = true
|
||||
vim.g.noexpandtab = true
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
|
||||
-- Line numbers
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.cursorline = true
|
||||
vim.opt.cursorlineopt = 'number'
|
||||
|
||||
-- Folding
|
||||
vim.opt.foldlevelstart = 99
|
||||
|
||||
vim.g.mapleader = ' '
|
||||
|
||||
-- Terminal
|
||||
vim.g.termguicolors = true
|
||||
vim.opt.shell = '/bin/fish'
|
||||
|
||||
-- LSP
|
||||
vim.lsp.inlay_hint.enable()
|
||||
|
||||
-- Splitting
|
||||
-- vim.cmd.set('splitbelow')
|
||||
-- vim.cmd.set('splitright')
|
||||
vim.opt.splitright = true
|
||||
vim.opt.splitbelow = true
|
||||
|
||||
-- Make text readable
|
||||
vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
|
||||
pattern = { '*.md', '*.typ' },
|
||||
command = 'setlocal linebreak',
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
pattern = 'help',
|
||||
command = 'setlocal linebreak',
|
||||
})
|
||||
|
||||
vim.cmd.cnoreabbrev('grep', 'Grepper')
|
||||
|
||||
-- Search
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.incsearch = true
|
||||
|
||||
-- Make dotfile navigation bareble
|
||||
vim.api.nvim_create_user_command('Dot', 'edit ~/.config/nvim', {})
|
||||
|
||||
-- Git
|
||||
vim.api.nvim_create_user_command('Glog', function()
|
||||
local args = {
|
||||
'log',
|
||||
'--graph',
|
||||
'--abbrev-commit',
|
||||
'--decorate',
|
||||
}
|
||||
local str = ''
|
||||
for _, arg in pairs(args) do
|
||||
str = str .. ' ' .. arg
|
||||
end
|
||||
vim.cmd.Git(str)
|
||||
end, {})
|
||||
@@ -0,0 +1,200 @@
|
||||
local required = { 'mason', 'mason-lspconfig', 'lspconfig', 'lsp-zero', 'cmp' }
|
||||
local ready = true
|
||||
|
||||
vim.cmd.echohl('WarningMsg')
|
||||
|
||||
for _, module in ipairs(required) do
|
||||
local ok, _ = pcall(require, module)
|
||||
if not ok then
|
||||
ready = false
|
||||
vim.cmd.echo('"Module \'' .. module .. "' isn't present!\"")
|
||||
end
|
||||
end
|
||||
|
||||
if not ready then
|
||||
vim.cmd.echo('"LSP disabled!"')
|
||||
vim.cmd.echohl('None')
|
||||
return
|
||||
end
|
||||
|
||||
vim.cmd.echohl('None')
|
||||
|
||||
local zero = require('lsp-zero')
|
||||
|
||||
zero.preset('recommended')
|
||||
require('mason').setup({})
|
||||
|
||||
local settings = {
|
||||
['lua_ls'] = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = 'LuaJIT',
|
||||
},
|
||||
workspace = {
|
||||
library = { vim.env.VIMRUNTIME },
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
require('mason-lspconfig').setup({
|
||||
ensure_installed = {
|
||||
'lua_ls',
|
||||
},
|
||||
handlers = {
|
||||
-- zero.default_setup,
|
||||
function(name)
|
||||
require('lspconfig')[name].setup({
|
||||
settings = settings[name] or {},
|
||||
capabilities = require('cmp_nvim_lsp').default_capabilities(),
|
||||
})
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
zero.on_attach(function(client, bufnr)
|
||||
local opts = { buffer = bufnr, remap = false }
|
||||
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
|
||||
end)
|
||||
|
||||
-- #region CMP
|
||||
|
||||
local cmp_kind_icons = {
|
||||
Text = '',
|
||||
Method = '',
|
||||
Function = '',
|
||||
Constructor = '',
|
||||
Field = '',
|
||||
Variable = '',
|
||||
Class = '',
|
||||
Interface = '',
|
||||
Module = '',
|
||||
Property = '',
|
||||
Unit = '',
|
||||
Value = '',
|
||||
Enum = '',
|
||||
Keyword = '',
|
||||
Snippet = '',
|
||||
Color = '',
|
||||
File = '',
|
||||
Reference = '',
|
||||
Folder = '',
|
||||
EnumMember = '',
|
||||
Constant = '',
|
||||
Struct = '',
|
||||
Event = '',
|
||||
Operator = '',
|
||||
TypeParameter = '',
|
||||
}
|
||||
|
||||
local cmp = require('cmp')
|
||||
cmp.setup({
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<Tab>'] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
local luasnip = require('luasnip')
|
||||
if not luasnip then
|
||||
return
|
||||
end
|
||||
luasnip.lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
sources = {
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'calc' },
|
||||
},
|
||||
window = {
|
||||
completion = {
|
||||
winhighlight = 'Normal:Pmeny,FloatBorder:Pmenu,Search:None',
|
||||
col_offset = -3,
|
||||
side_padding = 0,
|
||||
},
|
||||
-- completion = cmp.config.window.bordered(),
|
||||
-- documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
formatting = {
|
||||
fields = { 'kind', 'abbr', 'menu' },
|
||||
|
||||
format = function(entry, vim_item)
|
||||
local kind = require('lspkind').cmp_format({ mode = 'symbol_text', maxwidth = 50 })(entry, vim_item)
|
||||
local strings = vim.split(kind.kind, '%s', { trimempty = true })
|
||||
kind.kind = ' ' .. (strings[1] or '') .. ' '
|
||||
kind.menu = ' (' .. (strings[2] or '') .. ')'
|
||||
|
||||
return kind
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'buffer' },
|
||||
}),
|
||||
})
|
||||
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' },
|
||||
}, {
|
||||
{ name = 'cmdline' },
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false },
|
||||
})
|
||||
|
||||
-- #region Highlight groups
|
||||
|
||||
-- Customization for Pmenu
|
||||
|
||||
vim.api.nvim_set_hl(0, 'PmenuSel', { bg = '#282C34', fg = 'NONE' })
|
||||
vim.api.nvim_set_hl(0, 'Pmenu', { fg = '#C5CDD9', bg = '#22252A' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemAbbrDeprecated', { fg = '#7E8294', bg = 'NONE', strikethrough = true })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemAbbrMatch', { fg = '#82AAFF', bg = 'NONE', bold = true })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemAbbrMatchFuzzy', { fg = '#82AAFF', bg = 'NONE', bold = true })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemMenu', { fg = '#C792EA', bg = 'NONE', italic = true })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindField', { fg = '#EED8DA', bg = '#B5585F' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindProperty', { fg = '#EED8DA', bg = '#B5585F' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindEvent', { fg = '#EED8DA', bg = '#B5585F' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindText', { fg = '#C3E88D', bg = '#9FBD73' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindEnum', { fg = '#C3E88D', bg = '#9FBD73' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindKeyword', { fg = '#C3E88D', bg = '#9FBD73' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindConstant', { fg = '#FFE082', bg = '#D4BB6C' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindConstructor', { fg = '#FFE082', bg = '#D4BB6C' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindReference', { fg = '#FFE082', bg = '#D4BB6C' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindFunction', { fg = '#EADFF0', bg = '#A377BF' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindStruct', { fg = '#EADFF0', bg = '#A377BF' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindClass', { fg = '#EADFF0', bg = '#A377BF' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindModule', { fg = '#EADFF0', bg = '#A377BF' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindOperator', { fg = '#EADFF0', bg = '#A377BF' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindVariable', { fg = '#C5CDD9', bg = '#7E8294' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindFile', { fg = '#C5CDD9', bg = '#7E8294' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindUnit', { fg = '#F5EBD9', bg = '#D4A959' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindSnippet', { fg = '#F5EBD9', bg = '#D4A959' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindFolder', { fg = '#F5EBD9', bg = '#D4A959' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindMethod', { fg = '#DDE5F5', bg = '#6C8ED4' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindValue', { fg = '#DDE5F5', bg = '#6C8ED4' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindEnumMember', { fg = '#DDE5F5', bg = '#6C8ED4' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindInterface', { fg = '#D8EEEB', bg = '#58B5A8' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindColor', { fg = '#D8EEEB', bg = '#58B5A8' })
|
||||
vim.api.nvim_set_hl(0, 'CmpItemKindTypeParameter', { fg = '#D8EEEB', bg = '#58B5A8' })
|
||||
|
||||
-- #endregion
|
||||
|
||||
-- #endregion
|
||||
|
||||
vim.diagnostic.config({
|
||||
severity_sort = true,
|
||||
})
|
||||
@@ -0,0 +1,42 @@
|
||||
return {
|
||||
{
|
||||
'smjonas/inc-rename.nvim',
|
||||
keys = { {
|
||||
'<leader>cn',
|
||||
':IncRename ',
|
||||
} },
|
||||
config = function()
|
||||
require('inc_rename').setup({})
|
||||
end,
|
||||
},
|
||||
{
|
||||
'aznhe21/actions-preview.nvim',
|
||||
keys = { {
|
||||
'<leader>ca',
|
||||
function()
|
||||
require('actions-preview').code_actions()
|
||||
end,
|
||||
} },
|
||||
opts = {},
|
||||
-- config = function()
|
||||
-- require('actions-preview').setup({})
|
||||
-- vim.keymap.set('n', '<leader>ca', require('actions-preview').code_actions)
|
||||
-- end,
|
||||
},
|
||||
{
|
||||
'vyfor/cord.nvim',
|
||||
event = 'VeryLazy',
|
||||
branch = 'client-server',
|
||||
build = ':Cord update',
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
'tpope/vim-fugitive',
|
||||
cmd = { 'Git' },
|
||||
},
|
||||
{
|
||||
'mhinz/vim-grepper',
|
||||
cmd = { 'GrepperRg' },
|
||||
opts = {},
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
return {
|
||||
{ 'nvim-tree/nvim-web-devicons' },
|
||||
{ 'stevearc/dressing.nvim', opts = {} },
|
||||
{
|
||||
'folke/todo-comments.nvim',
|
||||
dependencies = { 'nvim-lua/plenary.nvim' },
|
||||
config = function()
|
||||
require('todo-comments').setup()
|
||||
end,
|
||||
},
|
||||
{ 'norcalli/nvim-colorizer.lua', opts = {} },
|
||||
{
|
||||
'OXY2DEV/markview.nvim',
|
||||
dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' },
|
||||
ft = 'markdown',
|
||||
config = function()
|
||||
require('markview')
|
||||
vim.api.nvim_set_hl(0, 'MarkviewLayer', { fg = '#2a2a2a', bg = '#373737' })
|
||||
end,
|
||||
},
|
||||
{
|
||||
'sphamba/smear-cursor.nvim',
|
||||
opts = {
|
||||
time_interval = 10,
|
||||
legacy_computing_symbols_support = true,
|
||||
cursor_color = '#fcdc34',
|
||||
},
|
||||
},
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user