From 9f83a86aca363ecb786f017ca5d534d836566636 Mon Sep 17 00:00:00 2001 From: ksyasuda Date: Fri, 28 Jan 2022 17:16:40 -0800 Subject: [PATCH] updates --- dotfiles/.bash_aliases | 37 +++++++++++++++++++++----- dotfiles/.p10k.zsh | 12 ++++----- dotfiles/.vimrc | 44 ++++++++++++++++++------------- picom/picom-hightransparency.conf | 6 ++--- 4 files changed, 64 insertions(+), 35 deletions(-) diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index b508b71..ba10e2e 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -1,5 +1,13 @@ +alias sudo='sudo -v; sudo ' alias suda='sudo' +alias vi=vim + +alias qutebrowser="qutebrowser --qt-arg stylesheet $HOME/.local/share/qutebrowser/fix-tooltips.qss" + +# Aniwrapper +alias aniwrapper='aniwrapper -qD 144' + ## Colorls alias lca='colorls -A --sd --gs -X' alias lc='colorls --sd --gs -X' @@ -7,7 +15,7 @@ alias lcl='colorls --sd --gs -Xl' alias lcla='colorls -lA --sd --gs -X' alias lcal='colorls -lA --sd --gs -X' alias lct='colorls --gs --tree=5' -alias ls='colorls --sd -Xl' +alias ls='colorls --sd -X' ## Pacman/Yay # update without noconfirm @@ -24,9 +32,10 @@ alias ys='yarn start' alias yi='yarn install' ## Git -alias gs='git status' -alias gc='git commit' -alias gp='git push' +alias gst='git status' +alias gcmt='git commit' +alias gpush='git push' +alias gpull='git pull' ## Helpful alias count='ls -l | wc -l' @@ -53,6 +62,9 @@ alias drop_cache="sudo sh -c \"echo 3 >'/proc/sys/vm/drop_caches' && swapoff -a # mkdir alias mkdir='mkdir -p' +# wallpapers +alias mysan='feh --bg-scale ~/.wallpapers/MYSanGun-Inverted.png ~/.wallpapers/MYSanGun.png' + ## I'm Lazy alias scripts='cd /home/sudacode/scripts' alias freud='cd /home/sudacode/' @@ -78,12 +90,23 @@ alias ncdu='ncdu --color dark' alias updates='~/SudacodeRice/scripts/package-updates' alias aliases='cat ~/.bash_aliases' alias sauce='~/Videos/sauce/' -alias aniedit='emc ~/Projects/Scripts/ani-cli/' alias wmedit='emc ~/.config/i3/config' -alias ani='cd $HOME/Projects/Scripts/ani-cli' +alias ani='cd $HOME/Projects/Scripts/aniwrapper' alias archvm='VBoxManage startvm "arch-vm"' alias chrome='google-chrome-beta --profile-directory="Profile 1" &>/dev/null &' alias bar='~/SudacodeRice/scripts/launch_desktop.sh' +alias nord=nordvpn +alias lzd=lazydocker +alias lzg=lazygit +alias mounts='sudo ~/scripts/mounts.sh' +alias dc=docker-compose # sorry calculator +alias vimconf='vim ~/.vimrc' +alias sctl=systemctl +alias pyex='python -m' ## Rice -alias config='/usr/bin/git --git-dir=$HOME/rice/ --work-tree=$HOME' +alias config='/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME' +alias pushdots='config push senpai' +alias commitdots='config commit' +alias cs='config status' +alias f=floaterm diff --git a/dotfiles/.p10k.zsh b/dotfiles/.p10k.zsh index 1754477..3af2e00 100644 --- a/dotfiles/.p10k.zsh +++ b/dotfiles/.p10k.zsh @@ -214,19 +214,19 @@ # Current directory background color. typeset -g POWERLEVEL9K_DIR_BACKGROUND=4 # Default current directory foreground color. - typeset -g POWERLEVEL9K_DIR_FOREGROUND=254 + typeset -g POWERLEVEL9K_DIR_FOREGROUND=15 # If directory is too long, shorten some of its segments to the shortest possible unique # prefix. The shortened directory can be tab-completed to the original. typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique # Replace removed segment suffixes with this symbol. typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= # Color of the shortened directory segments. - typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=250 + typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=15 # Color of the anchor directory segments. Anchor segments are never shortened. The first # segment is always an anchor. - typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=255 + typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=15 # Display anchor directory segments in bold. - typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true + typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=false # Don't shorten directories that contain any of these files. They are anchors. local anchor_files=( .bzr @@ -1559,14 +1559,14 @@ typeset -g POWERLEVEL9K_VPN_IP_BACKGROUND=6 # When on VPN, show just an icon without the IP address. # Tip: To display the private IP address when on VPN, remove the next line. - typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION='VPN' + # typeset -g POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION='VPN' # Regular expression for the VPN network interface. Run `ifconfig` or `ip -4 a show` while on VPN # to see the name of the interface. typeset -g POWERLEVEL9K_VPN_IP_INTERFACE='(globalprotect|gpd|wg|(.*tun)|tailscale)[0-9]*' # If set to true, show one segment per matching network interface. If set to false, show only # one segment corresponding to the first matching network interface. # Tip: If you set it to true, you'll probably want to unset POWERLEVEL9K_VPN_IP_CONTENT_EXPANSION. - typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=false + typeset -g POWERLEVEL9K_VPN_IP_SHOW_ALL=true # Custom icon. # typeset -g POWERLEVEL9K_VPN_IP_VISUAL_IDENTIFIER_EXPANSION='⭐' diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc index 810da07..ccf287b 100644 --- a/dotfiles/.vimrc +++ b/dotfiles/.vimrc @@ -53,25 +53,25 @@ call plug#begin('~/.vim/plugged') Plug 'tpope/vim-fugitive' Plug 'tpope/vim-commentary' Plug 'tpope/vim-surround' +Plug 'preservim/nerdtree' | Plug 'Xuyuanp/nerdtree-git-plugin' Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' +Plug 'itchyny/lightline.vim' +Plug 'dense-analysis/ale' +Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'wakatime/vim-wakatime' +Plug 'voldikss/vim-floaterm' Plug 'ryanoasis/vim-devicons' Plug 'pechorin/any-jump.vim' Plug 'jiangmiao/auto-pairs' Plug 'ap/vim-css-color' Plug 'ap/vim-buftabline' -Plug 'itchyny/lightline.vim' -Plug 'wakatime/vim-wakatime' -Plug 'preservim/nerdtree' | Plug 'Xuyuanp/nerdtree-git-plugin' Plug 'prettier/vim-prettier', { 'do': 'yarn install' } Plug 'sheerun/vim-polyglot' -Plug 'dense-analysis/ale' -Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'maximbaz/lightline-ale' Plug 'liuchengxu/vim-which-key', { 'on': ['WhichKey', 'WhichKey!'] } Plug 'osyo-manga/vim-over' -Plug 'voldikss/vim-floaterm' -" Plug 'windwp/vim-floaterm-repl' +Plug 'mhinz/vim-startify' " colorschemes Plug 'joshdick/onedark.vim' @@ -599,31 +599,37 @@ command! Reload execute "source ~/.vimrc" command! Config execute ":e ~/.vimrc" command! Env execute ":Dotenv .env" command! MakeTags !ctags -R . +command! Ovewrite execute ":w !sudo tee %" +command! Aniwrapper execute ":FloatermNew aniwrapper -qtdoomone -D 144" "------------------------------------------------------------------------------ "KEYBINDINGS "------------------------------------------------------------------------------ let g:mapleader = "\" let g:maplocalleader = ',' -nnoremap :WhichKey '' -nnoremap :WhichKey ',' -map :! -map :NERDTreeToggle -map :LivedownToggle +nmap :WhichKey '' +nmap :WhichKey ',' +nmap :! +nmap :NERDTreeToggle " nnoremap :wa:vertical botright term ++kill=term -nnoremap :wa:FloatermToggle +nmap :wa:FloatermToggle +nmap Q !!$SHELL + " fzf -nmap // :CocCommand fzf-preview.Lines -nmap ?? :CocCommand fzf-preview.BufferLines +nnoremap // :CocCommand fzf-preview.Lines +nnoremap ?? :CocCommand fzf-preview.BufferLines " search fzf, refs, impls, defs nmap ff :FloatermNew --title=fzf fzf +" aniwrapper/ani-cli (until i find better use for a keys) +nmap as :FloatermNew --title=aniwrapper aniwrapper -qtdoomone -D144 +nmap ad :FloatermNew --title=aniwrapper ani-cli -q720p -cd/home/sudacode/Videos/sauce -D144 " buffers nmap bB :CocCommand fzf-preview.AllBuffers nmap bb :CocCommand fzf-preview.Buffers nmap bk :bdelete nmap bn :bnext nmap bp :bprev -map :bnext -map :bprev +nmap :bnext +nmap :bprev " git nmap gc :CocCommand fzf-preview.GitLogs nmap gf :CocCommand fzf-preview.GitFiles @@ -645,5 +651,5 @@ nmap or :FloatermNew --title=ranger ranger --cmd="cd $PWD" nmap ot :vertical botright ter ++kill=terminal ++close " search nmap sc :nohls -"toggle coc outline -noremap to :CocOutline +" toggle coc outline +nmap to :CocOutline diff --git a/picom/picom-hightransparency.conf b/picom/picom-hightransparency.conf index 382a3e7..dbfe360 100644 --- a/picom/picom-hightransparency.conf +++ b/picom/picom-hightransparency.conf @@ -163,7 +163,6 @@ opacity-rule = [ "100:class_g = 'mpv'", "95:class_g = 'firefoxdeveloperedition' && focused", - "90:class_g = 'firefoxdeveloperedition' && !focused", "90:class_g = 'Alacritty' && focused", "90:class_g = 'Emacs' && focused", @@ -171,10 +170,11 @@ opacity-rule = [ "90:class_g = 'Thunderbird' && focused", "90:class_g = 'qutebrowser' && focused", + "90:class_g = 'DBeaver' && !focused", + "90:class_g = 'firefoxdeveloperedition' && !focused", "85:class_g = 'Alacritty' && !focused", "85:class_g = 'Bitwarden' && !focused", - "85:class_g = 'DBeaver' && !focused", "85:class_g = 'Emacs' && !focused", "85:class_g = 'Joplin' && !focused", "85:class_g = 'Microsoft Teams - Preview' && !focused", @@ -487,7 +487,7 @@ rounded-corners-exclude = [ blur: { method = "dual_kawase"; # method = "kawase"; - strength = 3; + strength = 2; background = true; background-frame = false; background-fixed = false;