mirror of
https://github.com/frebib/dotfiles.git
synced 2024-06-14 12:57:23 +00:00
Unstaged changes
Signed-off-by: Joe Groocock <me@frebib.net>
This commit is contained in:
parent
ea5f537303
commit
fea0831c13
@ -16,8 +16,8 @@ export MOZ_USE_XINPUT2=1 # enable pixel-accurate scrolling in firefox
|
|||||||
|
|
||||||
|
|
||||||
# Load Xorg resources and set the DPI
|
# Load Xorg resources and set the DPI
|
||||||
xrdb -merge $XDG_CONFIG_HOME/X11/xresources
|
xrdb -merge "$XDG_CONFIG_HOME/X11/xresources"
|
||||||
xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
|
#"$XDG_CONFIG_HOME/scripts/dpi" "$(xrdb -query | grep -i xft.dpi | cut -d: -f2 | xargs)"
|
||||||
|
|
||||||
setxkbmap -option caps:none
|
setxkbmap -option caps:none
|
||||||
xset r rate 200 18
|
xset r rate 200 18
|
||||||
|
2
aliases
2
aliases
@ -53,7 +53,7 @@ alias scp='scp -r'
|
|||||||
alias dd='dd status=progress'
|
alias dd='dd status=progress'
|
||||||
alias wget='wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file'
|
alias wget='wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file'
|
||||||
alias vi=vim
|
alias vi=vim
|
||||||
alias grip='grip --user=frebib --pass=$GRIP_API_KEY'
|
alias grip='grip --pass=$GRIP_API_KEY'
|
||||||
alias acme.sh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'
|
alias acme.sh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'
|
||||||
alias acmesh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'
|
alias acmesh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'
|
||||||
alias alpine-sdk="docker run -ti --rm \
|
alias alpine-sdk="docker run -ti --rm \
|
||||||
|
@ -22,6 +22,6 @@ WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
|
|||||||
XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
|
XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
|
||||||
ZDOTDIR="$XDG_CONFIG_HOME/zsh"
|
ZDOTDIR="$XDG_CONFIG_HOME/zsh"
|
||||||
|
|
||||||
PATH="${PATH}:${GOPATH}/bin:${GEM_HOME}/bin"
|
PATH="${PATH}:${GOPATH}/bin:${GEM_HOME}/ruby/3.0.0/bin"
|
||||||
|
|
||||||
# vim: ft=sh
|
# vim: ft=sh
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
[core]
|
[core]
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
excludesfile = /home/frebib/.config/git/gitignore
|
excludesfile = /home/frebib/.config/git/gitignore
|
||||||
pager = diff-highlight | $PAGER
|
pager = delta --diff-so-fancy --color-only
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
[interactive]
|
[interactive]
|
||||||
diffFilter = diff-highlight
|
diffFilter = delta --diff-so-fancy --color-only
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[fetch]
|
[fetch]
|
||||||
@ -38,6 +38,7 @@
|
|||||||
unpushed = !git log --oneline @{u}..HEAD
|
unpushed = !git log --oneline @{u}..HEAD
|
||||||
leaders = !git shortlog -s -n --all --no-merges
|
leaders = !git shortlog -s -n --all --no-merges
|
||||||
defbranch = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\"
|
defbranch = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\"
|
||||||
|
rbranch = for-each-ref --sort='committerdate' --format="%20%20%(refname:short)" refs/heads/
|
||||||
[advice]
|
[advice]
|
||||||
statusHints = false
|
statusHints = false
|
||||||
pushUpdateRejected = false
|
pushUpdateRejected = false
|
||||||
|
@ -139,18 +139,18 @@ bindsym $mod+v exec systemd-run-i3 -n alacritty -e sh -c "($SHE
|
|||||||
bindsym $mod+Ctrl+v exec systemd-run-i3 -n alacritty --class floating -e sh -c "($SHELL -c $EDITOR || : ) && $SHELL"
|
bindsym $mod+Ctrl+v exec systemd-run-i3 -n alacritty --class floating -e sh -c "($SHELL -c $EDITOR || : ) && $SHELL"
|
||||||
bindsym $mod+l exec dm-tool switch-to-greeter
|
bindsym $mod+l exec dm-tool switch-to-greeter
|
||||||
bindsym $mod+space exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window -run-command 'systemd-run-i3 -n {cmd}'"
|
bindsym $mod+space exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window -run-command 'systemd-run-i3 -n {cmd}'"
|
||||||
bindsym $mod+Shift+p exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g'
|
bindsym $mod+Shift+p exec systemd-run-i3 -n rofi-rbw
|
||||||
bindsym $mod+Shift+e exec "pkill rofi; rofi -show emoji -modi emoji -normal-window"
|
bindsym $mod+Shift+e exec "pkill rofi; rofi -show emoji -modi emoji -normal-window"
|
||||||
bindsym $mod+Shift+i exec rofi-fontawesome
|
bindsym $mod+Shift+i exec rofi-fontawesome
|
||||||
bindsym --release Print exec screenshot
|
bindsym --release Print exec screenshot --clip
|
||||||
bindsym --release $mod+Print exec screenshot --clip
|
bindsym --release $mod+Print exec screenshot
|
||||||
bindsym --release Shift+Print exec screenshot --active
|
bindsym --release Shift+Print exec screenshot --active
|
||||||
bindsym --release $mod+Shift+Print exec screenshot --active --clip
|
bindsym --release $mod+Shift+Print exec screenshot --active --clip
|
||||||
bindsym $mod+Shift+x exec systemd-run-i3 -n i3-sensible-terminal --class floating-term --hold -e /bin/echo "$(xprop -id $(xdotool getactivewindow))"
|
bindsym $mod+Shift+x exec systemd-run-i3 -n i3-sensible-terminal --class floating-term --hold -e /bin/echo "$(xprop -id $(xdotool getactivewindow))"
|
||||||
bindsym $mod+$alt+space exec systemd-run-i3 -s background -n ~/.config/i3/cycleaudio.py
|
bindsym $mod+$alt+space exec systemd-run-i3 -s background -n ~/.config/i3/cycleaudio.py
|
||||||
bindsym $mod+numbersign exec systemd-run-i3 -n i3-sensible-terminal --hold -e sh -c 'xclip -o | gpg --decrypt 2>&1'
|
bindsym $mod+numbersign exec systemd-run-i3 -n i3-sensible-terminal --hold -e sh -c 'xclip -o | gpg --decrypt 2>&1'
|
||||||
bindsym $mod+r exec bash -c 'pwgen -snc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i -r'
|
bindsym $mod+r exec bash -c 'pwgen -snc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i -r'
|
||||||
bindsym $mod+g exec systemd-run-i3 -n notify-send -c transfer "$(gist -PRpc)"
|
bindsym $mod+g exec systemd-run-i3 -n bash -xc 'xclip -o | gh gist create -d Paste - 2>&1 | grep -vE "^[-✓] Creat(ing|ed) gist" | tee >(xclip -i >&2 >/dev/null) | xargs -I% --null -r notify-send -c transfer -- %'
|
||||||
bindsym --release $mod+i exec systemd-run-i3 -s background -n sh -c 'sleep 0.5 && xdotool getactivewindow type --delay 10 -- "$(xclip -o -selection clipboard)"'
|
bindsym --release $mod+i exec systemd-run-i3 -s background -n sh -c 'sleep 0.5 && xdotool getactivewindow type --delay 10 -- "$(xclip -o -selection clipboard)"'
|
||||||
bindsym $mod+z exec otp | rofi -dmenu -p otp | xargs otp
|
bindsym $mod+z exec otp | rofi -dmenu -p otp | xargs otp
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ case $option in
|
|||||||
power\ off) systemctl poweroff;;
|
power\ off) systemctl poweroff;;
|
||||||
reboot) systemctl reboot;;
|
reboot) systemctl reboot;;
|
||||||
windows)
|
windows)
|
||||||
windows=`efibootmgr | grep -Po -m1 'Boot\K(\d{4}).*Windows.*' | head -c4`
|
windows="$(efibootmgr | grep -Po -m1 'Boot\K(\d{4}).*Windows.*' | head -c4)"
|
||||||
sudo efibootmgr -n $windows
|
sudo efibootmgr -n $windows
|
||||||
reboot;;
|
systemctl reboot;;
|
||||||
esac
|
esac
|
||||||
|
@ -6,8 +6,8 @@ log-level = "info";
|
|||||||
shadow = true;
|
shadow = true;
|
||||||
shadow-radius = 30;
|
shadow-radius = 30;
|
||||||
shadow-offset-x = -30;
|
shadow-offset-x = -30;
|
||||||
shadow-offset-y = -26;
|
shadow-offset-y = -24;
|
||||||
shadow-opacity = 0.35;
|
shadow-opacity = 0.4;
|
||||||
shadow-color = "#000000";
|
shadow-color = "#000000";
|
||||||
shadow-exclude = [
|
shadow-exclude = [
|
||||||
"class_g = 'slop'",
|
"class_g = 'slop'",
|
||||||
@ -79,6 +79,11 @@ focus-exclude = [
|
|||||||
"class_g = 'steam_app_271590'"
|
"class_g = 'steam_app_271590'"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
transition-length = 350;
|
||||||
|
transition-pow-x = 0.3;
|
||||||
|
transition-pow-y = 0.3;
|
||||||
|
size-transition = true;
|
||||||
|
|
||||||
# Other
|
# Other
|
||||||
# https://github.com/yshui/picom/blob/next/picom.sample.conf#L203
|
# https://github.com/yshui/picom/blob/next/picom.sample.conf#L203
|
||||||
backend = "glx";
|
backend = "glx";
|
||||||
@ -131,4 +136,17 @@ wintypes: {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#animations = true;
|
||||||
|
#animation-clamping = false;
|
||||||
|
#animation-dampening = 1.0;
|
||||||
|
#animation-window-mass = 0.125;
|
||||||
|
#animation-unmap = "fade-out";
|
||||||
|
#animation-for-unmap-window = "zoom";
|
||||||
|
#animation-for-open-window = "auto";
|
||||||
|
#animation-workspace-in = "slide-left";
|
||||||
|
#animation-workspace-out = "slide-left";
|
||||||
|
#animation-for-workspace-switch-in = "auto";
|
||||||
|
#animation-for-workspace-switch-out = "auto";
|
||||||
|
#animation-for-transient-window = "zoom";
|
||||||
|
|
||||||
# vim: ft=conf noet
|
# vim: ft=conf noet
|
||||||
|
@ -267,7 +267,7 @@ ramp-capacity-1-foreground = ${colours.warning}
|
|||||||
|
|
||||||
[module/cputemp]
|
[module/cputemp]
|
||||||
type = internal/temperature
|
type = internal/temperature
|
||||||
hwmon-path = /sys/devices/platform/nct6775.656/hwmon/hwmon1/temp2_input
|
hwmon-path = /sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon1/temp2_input
|
||||||
base-temperature = 25
|
base-temperature = 25
|
||||||
|
|
||||||
format = <ramp> <label>
|
format = <ramp> <label>
|
||||||
|
@ -5,8 +5,8 @@ configuration {
|
|||||||
/* show-icons: true; */
|
/* show-icons: true; */
|
||||||
separator-style: "solid";
|
separator-style: "solid";
|
||||||
modi: "window,run,ssh";
|
modi: "window,run,ssh";
|
||||||
kb-row-tab: "Shift-Tab";
|
/* kb-row-tab: "Shift-Tab"; */
|
||||||
kb-row-select: "Tab";
|
/* kb-row-select: "Tab"; */
|
||||||
terminal: "i3-sensible-terminal";
|
terminal: "i3-sensible-terminal";
|
||||||
|
|
||||||
matching: "glob";
|
matching: "glob";
|
||||||
|
@ -59,7 +59,7 @@ function notify() {
|
|||||||
function display() {
|
function display() {
|
||||||
update=$'\tUpdate Font Awesome cache'
|
update=$'\tUpdate Font Awesome cache'
|
||||||
fontawesome=$(grep -v '#\|^[[:space:]]*$' "$FONTAWESOME_FILE"; printf "$update\n")
|
fontawesome=$(grep -v '#\|^[[:space:]]*$' "$FONTAWESOME_FILE"; printf "$update\n")
|
||||||
line=$(echo "$fontawesome" | rofi -dmenu -i -p fontawesome -normal-window -kb-custom-1 Ctrl+c -kb-row-tab '' -kb-row-select Tab $@)
|
line=$(echo "$fontawesome" | rofi -dmenu -i -p fontawesome -normal-window -kb-custom-1 Ctrl+c -kb-row-tab '' $@)
|
||||||
exit_code=$?
|
exit_code=$?
|
||||||
|
|
||||||
if [ "${line[@]}" == "$update" ]; then
|
if [ "${line[@]}" == "$update" ]; then
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Load Xorg configuration
|
Description=Load Xorg configuration
|
||||||
|
# this is a bit weird, but I guess it works
|
||||||
PartOf=xorg.target
|
PartOf=xorg.target
|
||||||
After=xorg.target
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# This file is written by xdg-user-dirs-update
|
# This file is written by xdg-user-dirs-update
|
||||||
# If you want to change or add directories, just edit the line you're
|
# If you want to change or add directories, just edit the line you're
|
||||||
# interested in. All local changes will be retained on the next run
|
# interested in. All local changes will be retained on the next run.
|
||||||
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
|
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
|
||||||
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
|
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
|
||||||
# absolute path. No other format is supported.
|
# absolute path. No other format is supported.
|
||||||
|
10
vim/vimrc
10
vim/vimrc
@ -53,8 +53,9 @@ function! SaveIfExist()
|
|||||||
write
|
write
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
set autowrite
|
set autowrite
|
||||||
autocmd CursorHold,CursorHoldI,InsertLeave,FocusGained,FocusLost * call SaveIfExist()
|
autocmd InsertLeave <buffer> :write
|
||||||
|
|
||||||
" Search options
|
" Search options
|
||||||
set hlsearch
|
set hlsearch
|
||||||
@ -89,7 +90,6 @@ endif
|
|||||||
|
|
||||||
call plug#begin('$XDG_CONFIG_HOME/vim/plug')
|
call plug#begin('$XDG_CONFIG_HOME/vim/plug')
|
||||||
|
|
||||||
Plug 'scrooloose/nerdtree', { 'on': 'NERTreeToggle' }
|
|
||||||
Plug 'tpope/vim-sensible'
|
Plug 'tpope/vim-sensible'
|
||||||
Plug 'tpope/vim-fugitive'
|
Plug 'tpope/vim-fugitive'
|
||||||
Plug 'tpope/vim-rhubarb'
|
Plug 'tpope/vim-rhubarb'
|
||||||
@ -134,6 +134,10 @@ let g:use_dvorak = 1
|
|||||||
call deoplete#custom#option({
|
call deoplete#custom#option({
|
||||||
\ 'camel_case': v:true,
|
\ 'camel_case': v:true,
|
||||||
\ })
|
\ })
|
||||||
|
" Use ALE as completion sources for all code.
|
||||||
|
"call deoplete#custom#option('sources', {
|
||||||
|
"\ '_': ['ale'],
|
||||||
|
"\})
|
||||||
call deoplete#enable()
|
call deoplete#enable()
|
||||||
|
|
||||||
" Vim-Airline config
|
" Vim-Airline config
|
||||||
@ -151,8 +155,10 @@ let vim_markdown_preview_use_xdg_open=1
|
|||||||
let vim_markdown_preview_github=1
|
let vim_markdown_preview_github=1
|
||||||
|
|
||||||
" LaTeX config
|
" LaTeX config
|
||||||
|
"let g:vimtex_view_method='zathura'
|
||||||
let g:tex_flavor='xelatex'
|
let g:tex_flavor='xelatex'
|
||||||
let g:vimtex_indent_enabled = 0 " auto-indentation is wrong and annoying
|
let g:vimtex_indent_enabled = 0 " auto-indentation is wrong and annoying
|
||||||
|
let g:syntastic_tex_checkers = ['chktex']
|
||||||
autocmd FileType tex silent VimtexCompile
|
autocmd FileType tex silent VimtexCompile
|
||||||
autocmd FileType tex setlocal spell
|
autocmd FileType tex setlocal spell
|
||||||
augroup vimtex
|
augroup vimtex
|
||||||
|
@ -128,3 +128,10 @@ trysource() { for f in "$@"; do source "$f" 2>/dev/null && return; done; }
|
|||||||
trysource /usr/share/fzf/key-bindings.zsh \
|
trysource /usr/share/fzf/key-bindings.zsh \
|
||||||
/usr/share/doc/fzf/examples/key-bindings.zsh
|
/usr/share/doc/fzf/examples/key-bindings.zsh
|
||||||
trysource /usr/share/doc/pkgfile/command-not-found.zsh # pkgfile on Arch
|
trysource /usr/share/doc/pkgfile/command-not-found.zsh # pkgfile on Arch
|
||||||
|
|
||||||
|
if command -v kubectl >/dev/null 2>&1; then
|
||||||
|
autoload -Uz compinit
|
||||||
|
compinit
|
||||||
|
source <(kubectl completion zsh)
|
||||||
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user