From fc808ae714f1e629081c5d5cfc240e3f444598f2 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Wed, 22 Nov 2023 15:02:31 +0100 Subject: went back to vim --- .vim/vimrc | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 .vim/vimrc (limited to '.vim/vimrc') diff --git a/.vim/vimrc b/.vim/vimrc new file mode 100644 index 0000000..bc71bcf --- /dev/null +++ b/.vim/vimrc @@ -0,0 +1,77 @@ +filetype plugin indent on +syntax enable +set nocompatible +set modeline +set modelines=5 +set nobackup +set nowritebackup +set updatetime=300 +set hidden +set noswapfile +set laststatus=2 +set shortmess+=c + +let g:markdown_fenced_languages = ['javascript', 'js=javascript', 'json=javascript'] + +let $RTP=split(&runtimepath, ',')[0] +let $RC="$HOME/.vim/vimrc" + +call plug#begin() + +Plug 'dracula/vim', { 'as': 'dracula' } +Plug 'tpope/vim-commentary' +Plug 'tpope/vim-surround' + +call plug#end() + +colorscheme dracula + +hi Normal ctermbg=black + +set autoindent +set smartindent +set expandtab +set tabstop=4 +set shiftwidth=4 + +set number +set relativenumber +set showcmd +set cmdheight=1 +set completeopt=menuone,noinsert,noselect +set splitright +set splitbelow +set ignorecase +set smartcase +set showmatch +set signcolumn=yes +set incsearch +set diffopt+=vertical + +" Use ^] to jump to tag under cursor +" Use g^] for ambiguous tags +" Use ^t to jump back up the tag stack +command! MakeTags !ctags -R * + +let mapleader="\" + +nmap h +nmap j +nmap k +nmap l + +nmap Q :bufdo bdelete + +nmap ve :edit $MYVIMRC +nmap vr :source $MYVIMRC :doautocmd BufRead + +nnoremap m :MaximizerToggle! +nnoremap F :ALEFix +nnoremap d :cd %:p:h:pwd + +vnoremap "+y +nnoremap "+p + +map gf :edit + +nmap x :!xdg-open % -- cgit v1.2.3 From c82f4cdc9a403fedce61fabeed5272a9bf8f1df0 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 9 Mar 2024 01:35:35 +0100 Subject: finally remembered to update this, lol --- .Xresources | 23 +++++++----- .config/i3/config | 6 ++- .config/i3status/config | 22 ++++++++--- .config/mpv/mpv.conf | 18 ++++++--- .config/picom/picom.conf | 9 +---- .config/shell/aliasrc | 94 ++++++++++++++++------------------------------- .config/shell/profile | 5 +-- .config/tmux/tmux.conf | 2 + .config/x11/xinitrc | 9 +++-- .config/zathura/zathurarc | 4 ++ .config/zsh/.zshrc | 2 +- .ncmpcpp/config | 4 +- .vim/vimrc | 1 + .xinitrc | 2 +- .zprofile | 2 +- 15 files changed, 100 insertions(+), 103 deletions(-) (limited to '.vim/vimrc') diff --git a/.Xresources b/.Xresources index badf203..270c6ab 100644 --- a/.Xresources +++ b/.Xresources @@ -1,17 +1,20 @@ -/* URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 */ +URxvt.preeditType:Root +! input method +URxvt.imLocale: ja_JP.utf8 +URxvt.imFont: xft:WenQuanYi Micro Hei Mono:size=12 +URxvt.inputMethod: ibus -URxvt.font: xft:Iosevka:style=Regular:size=13:antialias=True,xft:JoyPixels:pixelsize=10,xft:WenQuanYi Micro Hei Mono:size=12 -URxvt.boldFont: xft:Iosevka:style=Bold:size=13:antialias=True -URxvt.italicFont: xft:Iosevka:style=Italic:size=13:antialias=True -URxvt.boldItalicFont: xft:Iosevka:style=Bold Italic:size=13:antialias=True +URxvt.*font: xft:Iosevka Term Custom:style=Regular:size=13:antialias=True,xft:JoyPixels:pixelsize=10 -!! colors and stuff -/* URxvt.letterSpace: 0 */ -URxvt.letterSpace: 1 -URxvt.scrollBar: False +!! true transparency URxvt.depth: 32 URxvt.background: [90]#000000 URxvt.foreground: #ffffff + +!! visuals and colors +/* URxvt.letterSpace: 0 */ +URxvt.letterSpace: 2 +URxvt.scrollBar: False URxvt.externalBorder: 0 URxvt.internalBorder: 0 URxvt.backgroundBorder: 0 @@ -43,7 +46,7 @@ URxvt.color15: #cccccc !! perl extensions -URxvt.perl-ext-common: default,url-select,resize-font,selection-to-clipboard +URxvt.perl-ext-common: default,url-select,resize-font,selection-to-clipboard,-confirm-paste URxvt.matcher.button: 1 URxvt.keysym.M-u: perl:url-select:select_next URxvt.url-select.launcher: /usr/bin/xdg-open diff --git a/.config/i3/config b/.config/i3/config index 9cff316..b67d6a0 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -6,13 +6,15 @@ set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Iosevka 10 +font pango:Iosevka Term Custom 10 for_window [class="floating"] floating enable # no_focus [all] # focus_on_window_activation none +# focus_follows_mouse no + # Use wpctl to adjust volume in Pipewire. set $refresh_i3status killall -SIGUSR1 i3status bindsym XF86AudioRaiseVolume exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 5%+ && $refresh_i3status @@ -43,8 +45,10 @@ bindsym $mod+Shift+C kill bindsym $mod+Shift+F exec firefox -P default-release bindsym $mod+Shift+B exec firefox -P less-strict bindsym $mod+Shift+E exec emacsclient -c -a "emacs" +bindsym $mod+z exec boomer bindsym $mod+c exec mpdmenu bindsym $mod+Shift+M exec mpdinfo +bindsym $mod+b exec bm bindsym --release Print exec scrot -u -e 'mv $f ~/pics/' bindsym --release $mod+Print exec scrot -s -e 'mv $f ~/pics/' diff --git a/.config/i3status/config b/.config/i3status/config index 22eba0c..903d43d 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -11,20 +11,32 @@ general { interval = 5 } -order += "ethernet enp39s0" +order += "ethernet br0" +order += "ethernet tun0" +order += "cpu_temperature 0" order += "disk /" order += "load" order += "memory" order += "volume master" order += "tztime local" -ethernet enp39s0 { - format_up = "enp39s0: %ip (%speed)" - format_down = "enp39s0: down" +ethernet br0 { + format_up = "E: %ip" + format_down = "E: down" +} + +ethernet tun0 { + format_up = "VPN: %ip" + format_down = "VPN: down" +} + +cpu_temperature 0 { + format = "CPU Temp: %degrees °C" + path = "/sys/devices/platform/nct6775.2592/hwmon/hwmon3/temp1_input" } disk "/" { - format = "total: %used" + format = "Porn Folder: %used" } load { diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 421f269..8dcfc78 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,14 +1,22 @@ -profile=gpu-hq -#scale=ewa_lanczossharp -#cscale=ewa_lanczossharp +profile=high-quality -vo=gpu +vo=gpu-next +gpu-api=vulkan hwdec=vdpau +scale=ewa_lanczossharp +cscale=ewa_lanczossharp +dscale=ewa_lanczossharp + +ao=pipewire +pipewire-buffer=16 +audio-swresample-o=resampler=soxr,precision=28 +audio-samplerate=192000 +audio-format=float keep-open=yes -stop-screensaver border=no no-border +scale-antiring=0.7 msg-color=yes term-osd-bar=yes diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index fa4d989..2fdb8f4 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,8 +1 @@ -# just very slightly rounded corners -# empty file, just so transparency works on st - -# corner-radius = 6 - -# rounded-corners-exclude = [ -# "class_g = 'dwm'" -# ]; +# empty file, just so transparency works. diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 68e4818..1385f11 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -4,25 +4,25 @@ alias reboot='doas reboot' alias poweroff='doas poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias zzz='doas loginctl suspend' -alias fuck='doas $(fc -Lln -1)' -alias open='xdg-open' alias mutt='cd ~/.mutt/attachments; mutt; cd -' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias emd='/usr/bin/emacs --daemon &' alias emc='emacsclient -c -a "emacs"' -alias vi='$EDITOR' alias z='zathura' alias nnn='nnn -Hde' alias cn='clear;neofetch' -alias ea='vi ~/.config/shell/aliasrc' -alias ez='vi ~/.config/zsh/.zshrc' +alias ea='$EDITOR ~/.config/shell/aliasrc' +alias ez='$EDITOR ~/.config/zsh/.zshrc' +alias ep='$EDITOR ~/.config/shell/profile' alias lr='su - root' alias cam='mpv --profile=low-latency --untimed /dev/video0' alias df='df -h' alias tma='tmux a -t' alias tmn='tmux new-session -s' +# compiler +alias clang='clang -march=native -O3 -flto=thin' + # rename files in pwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' @@ -30,16 +30,18 @@ alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04 # alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' # set my preferred keyboard options -alias setkeys='xset r rate 250 30 && setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' +alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' alias setus='setxkbmap -layout us -option "ctrl:nocaps"' # pad numbers in filenames with zeros -alias padz='rename "s/\d+/sprintf(\"%02d\",$&)/e"' +alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' # set custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' # cp mv and rm always verbose +# alias cp='cp -iv' +# alias mv='mv -iv' alias cp='cp -iv' alias mv='mv -iv' alias rm='rm -Iv' @@ -49,65 +51,21 @@ alias mkd='mkdir -pv' alias grep='grep --color=auto -i' # ls shortcuts -alias ls='ls -hl --color=always --group-directories-first' -alias la='ls -a' -alias lc='ls | tail -n +2 | wc -l' - -lsd() { - if [ "$1" = "" ]; then - ls -d */; - else - ls -d $1/*/ | sed "s|$1/||"; - fi -} - -gls() { - if [ "$2" = "" ]; then - ls | grep "$1" - else - ls "$2" | grep "$1" - fi -} +alias ls='ls --color=always --group-directories-first' +alias ll='ls -lh' +alias la='ll -A' +alias lc='ls | wc -l' # control audio alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)" alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)" -# monitor settings -alias rmlr='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' -alias rmmr='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary' -alias rmdr='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary' -alias lmlr='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0' -alias lmmr='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0' -alias lmdr='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0' -alias mbl='ddcutil --display 1 setvcp 10 10 && ddcutil --display 2 setvcp 10 10' -alias mbm='ddcutil --display 1 setvcp 10 50 && ddcutil --display 2 setvcp 10 50' -alias mbh='ddcutil --display 1 setvcp 10 80 && ddcutil --display 2 setvcp 10 80' - -# function for timer and stopwatch -timer() { - date1=$((`date +%s` + $1)); - while [ "$date1" -ge `date +%s` ]; do - echo -ne "$(date -u --date @$(($date1 - `date +%s`)) +%H:%M:%S)\r"; - sleep 0.1 - done - notify-send "Time Up"; pw-play "/usr/share/sounds/freedesktop/stereo/complete.oga" -} - -stopwatch() { - date1=`date +%s`; - while true; do - echo -ne "$(date -u --date @$((`date +%s` - $date1)) +%H:%M:%S)\r"; - sleep 0.1 - done -} - ## FUNCTIONS FOR CONVERTING DATE TO ISO 8601 # convert date from YYYYMMDD to YYYY-MM-DD date-convert() { for i in *; do - mv "${i}" "$(echo "${i}" | + /bin/mv "${i}" "$(echo "${i}" | sed 's/\([0-9][0-9][0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)/\1-\2-\3/')" done; } @@ -115,7 +73,7 @@ date-convert() { # reverse date from DD-MM-YYYY to YYYY-MM-DD date-reverse() { for i in *; do - mv "${i}" "$(echo "${i}" | + /bin/mv "${i}" "$(echo "${i}" | sed 's/\([0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9][0-9][0-9]\)/\3-\1-\2/')" done; } @@ -124,7 +82,11 @@ date-reverse() { # convert video files to webm mkwebm() { - ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 32 -b:v 300K -c:a libvorbis "${1%.*}".webm + ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 12 -b:v 1M -c:a libvorbis "${1%.*}".webm +} + +mkmp4() { + ffmpeg -i "${1}" -c:v libx264 -crf 32 -b:v 1M -c:a aac "${1%.*}".mp4 } ## GIT @@ -147,9 +109,15 @@ alias dpush='dfiles push origin' alias qu='equery u' alias qd='equery d' alias qg='equery g' -alias emup='doas emerge -avuND @world' -alias pemup='emerge -pvuNDt @world' -alias emin='doas emerge -av' +alias qf='equery f' +alias qb='equery b' +alias qy='equery y' +alias eli='eix -c --installed' +alias els='eix -c --selected' +alias pemup='emerge -pvuND @world' +alias emup='doas emerge -vuND @world' alias pemin='emerge -pv' -alias emrm='doas emerge -avc' +alias emin='doas emerge -v' +alias pemrm='emerge -pvc' +alias emrm='doas emerge -vc' alias emsr='emerge -s' diff --git a/.config/shell/profile b/.config/shell/profile index a762e89..7b86bda 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -2,7 +2,7 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="vim" -export TERMINAL="st" +export TERMINAL="urxvt" export BROWSER="firefox" export XDG_CONFIG_HOME="$HOME/.config" @@ -30,6 +30,5 @@ export LC_ALL=en_US.utf8 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib64/pkgconfig" +export MANPATH="$MANPATH:/usr/local/man" export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.npm/bin:/sbin:/usr/sbin" - -neofetch diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 8bd037f..389f1ff 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -43,6 +43,8 @@ bind C-w killp bind C-q killw bind C-p previous-window bind C-n next-window +bind -n M-n swap-window -t +1\; select-window -t +1 +bind -n M-p swap-window -t -1\; select-window -t -1 bind -n M-h resize-pane -L 5 bind -n M-j resize-pane -D 5 bind -n M-k resize-pane -U 5 diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 3dd9c9a..091a42d 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -7,18 +7,21 @@ fi eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" -xrandr --auto --output DisplayPort-2 --mode 1920x1080 --primary -xrandr --auto --output HDMI-A-0 --mode 1600x900 --left-of DisplayPort-2 +xrandr --addmode HDMI-A-0 1280x960 +xrandr --output HDMI-A-0 --mode 1280x960 --primary +xrandr --output DisplayPort-1 --mode 1920x1080 --right-of HDMI-A-0 +xrandr --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 xset r rate 250 30 xset s off -dpms -setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" +setxkbmap -option "ctrl:nocaps" xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & /usr/bin/emacs --daemon & urxvtd -q -o -f & +ibus-daemon -d -r -x pipewire & picom & mpd & diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 6ea7831..fac9838 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -8,6 +8,10 @@ map u scroll half-up map d scroll half-down map n scroll full-down map p scroll full-up +map [fullscreen] u scroll half-up +map [fullscreen] d scroll half-down +map [fullscreen] n scroll full-down +map [fullscreen] p scroll full-up map D toggle_page_mode map r reload map R rotate diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 0ed250f..6a5661f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -25,7 +25,7 @@ bindkey "^[[3~" delete-char bindkey '^x^e' edit-command-line -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%m%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' +PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%m%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%15<..<%~%<<]%{$reset_color%}%b ' setopt extendedGlob diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 085037e..a2b23af 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -15,10 +15,10 @@ playlist_show_remaining_time = yes browser_display_mode = columns autocenter_mode = yes follow_now_playing_lyrics = yes -lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, internet +lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, genius, internet # UI and colors -external_editor = nvim +external_editor = vim colors_enabled = yes current_item_prefix = $(blue)$r current_item_suffix = $/r$(end) diff --git a/.vim/vimrc b/.vim/vimrc index bc71bcf..16d60ea 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -10,6 +10,7 @@ set hidden set noswapfile set laststatus=2 set shortmess+=c +set clipboard=unnamedplus let g:markdown_fenced_languages = ['javascript', 'js=javascript', 'json=javascript'] diff --git a/.xinitrc b/.xinitrc index 518bb5d..de9369a 120000 --- a/.xinitrc +++ b/.xinitrc @@ -1 +1 @@ -.config/x11/xinitrc \ No newline at end of file +/home/cafebabe/.config/x11/xinitrc \ No newline at end of file diff --git a/.zprofile b/.zprofile index 8486fca..57ff7d6 120000 --- a/.zprofile +++ b/.zprofile @@ -1 +1 @@ -.config/shell/profile \ No newline at end of file +/home/cafebabe/.config/shell/profile \ No newline at end of file -- cgit v1.2.3