diff options
| l--------- | .Xresources | 1 | ||||
| -rw-r--r-- | .aliases | 28 | ||||
| -rw-r--r-- | .config/alacritty/alacritty.yml | 50 | ||||
| -rw-r--r-- | .config/i3/config | 43 | ||||
| -rw-r--r-- | .config/wpg/sequences | 2 | ||||
| -rw-r--r-- | .config/wpg/templates/i3.base | 6 | ||||
| -rw-r--r-- | .pkglist | 91 | ||||
| -rw-r--r-- | .pkgunlist | 12 | ||||
| -rw-r--r-- | .vim/coc-settings.json | 1 | ||||
| -rw-r--r-- | .vim/spell/en.utf-8.add | 8 | ||||
| -rw-r--r-- | .vim/spell/en.utf-8.add.spl | bin | 234 -> 316 bytes | |||
| -rw-r--r-- | .vimrc | 7 | ||||
| -rw-r--r-- | .xinitrc | 4 | ||||
| -rw-r--r-- | .zshrc | 2 |
14 files changed, 71 insertions, 184 deletions
diff --git a/.Xresources b/.Xresources deleted file mode 120000 index fb407bb..0000000 --- a/.Xresources +++ /dev/null @@ -1 +0,0 @@ -.Xdefaults
\ No newline at end of file @@ -1,5 +1,6 @@ # Aliases +alias monero-wallet-cli='monero-wallet-cli --config-file=/home/atc/.config/bitmonero/monero-wallet-cli.conf ' alias cp="cp -i" alias dd="dd status=progress" alias define="dict -d gcide" @@ -53,7 +54,7 @@ function o() { i3-swallow && mupdf "$@" && i3-unswallow ;; *.jpg|*.png|*.bmp|*.gif|*.jpeg|*.JPG|*.JPEG|*.webp|*.tiff) - i3-swallow && sxiv -a "$(dirname $1)" "$@" && i3-unswallow + i3-swallow && sxiv -a "$@" "$(dirname $1)" && i3-unswallow ;; *.xcf) gimp "$@" 2>/dev/null & @@ -82,29 +83,6 @@ function o() { esac } -theme_add() { - indir="${1:-~/downloads}" - [ -d "$indir" ] || exit - - outdir=~/.local/share/wallpapers - [ -d "$outdir" ] || mkdir -p "$outdir" - - sxiv -rot "$indir" | while read infile; do - outfile="$outdir/$(echo ${infile##*/} | tr -s [:blank:] - | tr [:upper:] [:lower:])" - convert "$infile" -geometry '2560x1440^' -gravity center -crop 2560x1440+0+0 "$outfile" - wpg -a "$outfile" - done -} - -theme_set() { - theme="$(sxiv -rot ~/.config/wpg/wallpapers | head -1)" - [ -f "$theme" ] && wpg -s "$theme" -} - -theme_reset() { - wpg -s "$(wpg -c)" -} - bak() { mv -n "$1" "$1".bak } @@ -115,5 +93,5 @@ rename() { dst="$(mktemp -t rename)" printf '%s\n' "$@" | tee "$src" > "$dst" $EDITOR "$dst" - diff -s "$src" "$dst" > /dev/null || paste "$src" "$dst" | sed -e "s/\t/' '/" -e "s/^/mv -i '/" -e "s/$/'/" | sh + diff -s "$src" "$dst" > /dev/null || paste "$src" "$dst" | sed -e "s/\t/' '/" -e "s/^/mv -i '/" -e "s/$/'/" | sh } diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 4481802..ce4da80 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -182,12 +182,12 @@ font: # If `true`, bold text is drawn using the bright color variants. #draw_bold_text_with_bright_colors: true -# Colors (Tomorrow Night Bright) -#colors: +# Colors +colors: # Default colors - #primary: - # background: '0x000000' - # foreground: '0xeaeaea' + primary: + background: '0x002b36' + foreground: '0x657b83' # Bright and dim foreground colors # @@ -201,9 +201,9 @@ font: # # Colors which should be used to draw the terminal cursor. If these are unset, # the cursor color will be the inverse of the cell color. - #cursor: + cursor: # text: '0x000000' - # cursor: '0xffffff' + cursor: '0xeee8d5' # Selection colors # @@ -215,26 +215,26 @@ font: # background: '0x404040' # Normal colors - #normal: - # black: '0x000000' - # red: '0xd54e53' - # green: '0xb9ca4a' - # yellow: '0xe6c547' - # blue: '0x7aa6da' - # magenta: '0xc397d8' - # cyan: '0x70c0ba' - # white: '0xeaeaea' + normal: + black: '0x073642' + red: '0xdc322f' + green: '0x859900' + yellow: '0xb58900' + blue: '0x268bd2' + magenta: '0xd33682' + cyan: '0x2aa198' + white: '0xeee8d5' # Bright colors - #bright: - # black: '0x666666' - # red: '0xff3334' - # green: '0x9ec400' - # yellow: '0xe7c547' - # blue: '0x7aa6da' - # magenta: '0xb77ee0' - # cyan: '0x54ced6' - # white: '0xffffff' + bright: + black: '0x586e75' + red: '0xcb4b16' + green: '0x586e75' + yellow: '0x657b83' + blue: '0x839496' + magenta: '0x6c71c4' + cyan: '0x93a1a1' + white: '0xfdf6e3' # Dim colors # diff --git a/.config/i3/config b/.config/i3/config index 88b7cde..5993d57 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -3,8 +3,8 @@ ## Please see https://i3wm.org/docs/userguide.html for a complete reference! ## GENERAL -default_border pixel 2 -default_floating_border pixel 2 +default_border pixel 1 +default_floating_border pixel 1 font pango:sans-serif 13 force_display_urgency_hint 500 ms hide_edge_borders smart @@ -52,19 +52,21 @@ bindsym $mod+shift+9 move container to workspace $ws9 bindsym $mod+shift+0 move container to workspace $ws10 ## COLORS -# base colors -- set by WPG -set $coloract "#344cc1" -set $colorin "#243484" -set_from_resource $color0 i3wm.color0 "#02031E" -set_from_resource $color15 i3wm.color15 "#eef3ff" -set_from_resource $color8 i3wm.color8 "#03064e" -set_from_resource $coloru i3wm.color2 "#565463" -set_from_resource $split i3wm.color10 "#67618c" +set_from_resource $color0 i3wm.color0 +set_from_resource $color15 i3wm.color15 +set_from_resource $color8 i3wm.color8 +set_from_resource $coloru i3wm.color2 +set_from_resource $color4 i3wm.color4 +set_from_resource $split i3wm.color4 +set_from_resource $color_active i3wm.color4 +set_from_resource $colorin i3wm.color10 +set_from_resource $color_bar_urgent i3wm.color2 +set_from_resource $color_workspace_urgent i3wm.color1 -# class border backgr text indicator child_border client.background $color0 -client.focused $coloract $coloract $color15 $split $coloract -client.focused_inactive $coloract $coloract $color15 $split $colorin +# class border backgr text indicator child_border +client.focused $color_active $color_active $color15 $split $color_active +client.focused_inactive $color_active $color_active $color15 $split $colorin client.placeholder $color0 $color8 $color15 $color0 $color8 client.unfocused $colorin $colorin $color15 $split $colorin client.urgent $coloru $coloru $color15 $coloru $coloru @@ -115,6 +117,7 @@ bindsym $mod+shift+s floating toggle; sticky toggle bindsym $mod+space focus mode_toggle ## SHORTCUTS +bindsym $mod+F1 exec dockd.sh bindsym $mod+shift+F1 exec firefox /usr/local/share/doc/freebsd/handbook/book.html bindsym $mod+F2 exec firefox bindsym $mod+shift+F2 exec firefox --private-window @@ -202,10 +205,10 @@ bar { statusline $color15 separator $colorin # class border background foreground - focused_workspace $color15 $coloract $color15 - active_workspace $color15 $coloract $color15 - inactive_workspace $split $colorin $color15 - urgent_workspace $coloru $coloru $color15 + focused_workspace $color15 $color_active $color15 + active_workspace $color15 $color_active $color15 + inactive_workspace $colorin $color8 $color15 + urgent_workspace $color_bar_urgent $color_bar_urgent $color15 } } @@ -217,8 +220,8 @@ for_window [title = "pwcview"] border pixel 1; floating enable; sticky enable; m #for_window [title = "sxiv"] floating enable ## STARTUP -exec --no-startup-id picom +exec --no-startup-id dockd.sh +exec --no-startup-id wal.sh exec --no-startup-id dunst -exec --no-startup-id ~/.local/scripts/dockd.sh exec firefox -exec nextcloud +#exec nextcloud diff --git a/.config/wpg/sequences b/.config/wpg/sequences index ad96706..8f773ed 100644 --- a/.config/wpg/sequences +++ b/.config/wpg/sequences @@ -1 +1 @@ -]4;0;#02031E\]4;1;#443F46\]4;2;#565463\]4;3;#3D4265\]4;4;#3E52AF\]4;5;#4D516E\]4;6;#636891\]4;7;#b7bbd0\]4;8;#03064e\]4;9;#5c4963\]4;10;#67618c\]4;11;#444d8d\]4;12;#4160f2\]4;13;#57609b\]4;14;#707acc\]4;15;#eef3ff\]10;#eef3ff\]11;[90]#02031E\]12;#eef3ff\]13;#eef3ff\]17;#eef3ff\]19;#02031E\]4;232;#02031E\]4;256;#eef3ff\]708;[90]#02031E\
\ No newline at end of file +]4;0;#0c0c0d\]4;1;#935944\]4;2;#6E5449\]4;3;#B78F71\]4;4;#827F7C\]4;5;#AB9F92\]4;6;#946755\]4;7;#ddd0c2\]4;8;#232327\]4;9;#cd6d4a\]4;10;#9a6853\]4;11;#ffb77f\]4;12;#b9a590\]4;13;#f2cfa9\]4;14;#cf7f5f\]4;15;#ffffee\]10;#ffffee\]11;[90]#0c0c0d\]12;#ffffee\]13;#ffffee\]17;#ffffee\]19;#0c0c0d\]4;232;#0c0c0d\]4;256;#ffffee\]708;[90]#0c0c0d\
\ No newline at end of file diff --git a/.config/wpg/templates/i3.base b/.config/wpg/templates/i3.base index 50e5383..179c66a 100644 --- a/.config/wpg/templates/i3.base +++ b/.config/wpg/templates/i3.base @@ -217,8 +217,8 @@ for_window [title = "pwcview"] border pixel 1; floating enable; sticky enable; m #for_window [title = "sxiv"] floating enable ## STARTUP -exec --no-startup-id picom +#exec --no-startup-id picom exec --no-startup-id dunst -exec --no-startup-id ~/.local/scripts/dockd.sh +#exec --no-startup-id ~/.local/scripts/dockd.sh exec firefox -exec nextcloud +#exec nextcloud diff --git a/.pkglist b/.pkglist deleted file mode 100644 index 7f09b25..0000000 --- a/.pkglist +++ /dev/null @@ -1,91 +0,0 @@ -## Uncomment the ports you want configured/built in bulk. -archivers/unace -audio/abcde -audio/cdparanoia -audio/mixertui -audio/virtual_oss -databases/sqlite3 -deskutils/anydesk -devel/git -devel/libnotify -devel/py-gobject -devel/py-pip -devel/xdg-utils -editors/vim -emulators/dosbox -emulators/vice -emulators/vice -ftp/curl -games/asciiquarium -games/chocolate-doom -games/ecwolf -games/eduke32 -games/minecraft-client -games/residualvm -games/scummvm -games/vvvvvv -graphics/ImageMagick7 -graphics/feh -graphics/gimp -graphics/mupdf -graphics/scrot -graphics/sxiv -lang/cbmbasic -mail/mutt -misc/fortune-mod-freebsd-classic -misc/vifm -multimedia/ffmpeg -multimedia/handbrake -multimedia/makemkv -multimedia/mpv -net/rsync -ports-mgmt/poudriere -security/doas -security/py-cryptography -security/py-openssl -shells/zsh -shells/zsh-autosuggestions -shells/zsh-completions -shells/zsh-navigation-tools -shells/zsh-syntax-highlighting -sysutils/bastille -sysutils/cmdwatch -sysutils/dunst -sysutils/entr -sysutils/fusefs-sshfs -sysutils/fusefs-webdavfs -sysutils/grub2-bhyve -sysutils/htop -sysutils/pidof -sysutils/rename -sysutils/testdisk -sysutils/tmux -sysutils/tree -sysutils/vm-bhyve -textproc/dict -textproc/libsass -textproc/p5-docx2txt -www/firefox -www/newsboat -www/node -www/yarn -www/youtube_dl -x11-drivers/xf86-input-libinput -x11-fonts/fontconfig -x11-fonts/iosevka -x11-fonts/material-icons-ttf -x11-fonts/twemoji-color-font-ttf -x11-servers/xorg-server -x11-wm/i3 -x11/alacritty -x11/arandr -x11/i3blocks -x11/i3lock -x11/nvidia-driver-340 -x11/nvidia-settings -x11/rofi -x11/xauth -x11/xautolock -x11/xclip -x11/xinit -x11/xrandr diff --git a/.pkgunlist b/.pkgunlist deleted file mode 100644 index 28e9c1e..0000000 --- a/.pkgunlist +++ /dev/null @@ -1,12 +0,0 @@ -cargo/cobalt-bin -cargo/crowbook -cargo/ripgrep -github/iosevka -github/material-design-icons -npm/htmlhint -npm/prettier -npm/vue@cli -pip/wpgtk -rustup/clippy -rustup/rls -rustup/rustup diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json index 75fceba..c3d77a9 100644 --- a/.vim/coc-settings.json +++ b/.vim/coc-settings.json @@ -14,6 +14,7 @@ ], "rust-analyzer.checkOnSave.command": "clippy", "rust-analyzer.server.path": "/usr/local/bin/rust-analyzer", + "rust-analyzer.completion.autoimport.enable": true, "diagnostic.warningSign": "", "diagnostic.errorSign": "", "prettier.trailingComma": "none", diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index b0017ea..91b56b4 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -12,3 +12,11 @@ Amberly Vierne badass LLC +the +Hudsons +V8 +I6 +tarpits +tarpit +Angelshark +Avaya diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl Binary files differindex d39b460..8380d85 100644 --- a/.vim/spell/en.utf-8.add.spl +++ b/.vim/spell/en.utf-8.add.spl @@ -1,4 +1,5 @@ " General options +set wrap linebreak " break on words not chars set ruler " show the cursor position all the time set showcmd " display incomplete commands set ttimeout " time out for key codes @@ -15,12 +16,12 @@ set fillchars+=vert:\ syntax on " switch syntax highlighting on " Matching and key mappings -:match ErrorMsg '\%>80v.\+' " right-hand drift warning +":match ErrorMsg '\%>80v.\+' " right-hand drift warning " Automatically finish closing tags augroup html_vue_hbs au! - autocmd BufNewFile,BufRead *.html|*.vue|*.hbs :inoremap <lt>/ </<C-x><C-o><Esc>==gi + autocmd BufNewFile,BufRead *.php|*.html|*.vue|*.hbs :inoremap <lt>/ </<C-x><C-o><Esc>==gi autocmd BufNewFile,BufRead *.hbs set filetype=handlebars syntax=html augroup END @@ -53,7 +54,7 @@ Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'} call plug#end() " COC.VIM -let g:coc_global_extensions = ['coc-html', 'coc-rust-analyzer', 'coc-vetur', 'coc-prettier'] +let g:coc_global_extensions = ['coc-rust-analyzer', 'coc-vetur', 'coc-prettier'] inoremap <silent><expr> <TAB> \ pumvisible() ? "\<C-n>" : @@ -1,3 +1,3 @@ -~/.config/wpg/wp_init.sh && -xrdb -merge ~/.Xresources && +xrdb -merge ~/.config/solarized.Xresources && +xrdb -merge ~/.config/Xresources && exec i3 2>&1 > /var/log/xinit/i3wm.log @@ -1,5 +1,5 @@ ## Theming section -(cat $HOME/.config/wpg/sequences &) +#(cat $HOME/.config/wpg/sequences &) autoload -U compinit colors zcalc compinit -d colors |