diff options
| -rw-r--r-- | .aliases | 1 | ||||
| -rw-r--r-- | .config/mutt/muttrc | 26 | ||||
| -rw-r--r-- | .config/rofi/config | 8 | ||||
| -rw-r--r-- | .config/wpg/schemes/_home_atc__config_wpg_wallpapers_d5qht16-7016b58c-8321-4b2e-8a2a-565a299bcbb2_jpg_dark_wal__1.1.0.json | 28 | ||||
| -rw-r--r-- | .config/wpg/schemes/_home_atc__config_wpg_wallpapers_dcaa6ao-7cff8fa3-29d5-4fbf-aaa0-dc7bb7a27a81_jpg_dark_wal__1.1.0.json | 28 | ||||
| -rw-r--r-- | .config/wpg/schemes/_home_atc__config_wpg_wallpapers_matte_painting_3_cc_jpg_dark_wal__1.1.0.json | 28 | ||||
| -rw-r--r-- | .config/wpg/sequences | 2 | ||||
| -rw-r--r-- | .config/wpg/templates/i3.base | 22 | ||||
| -rw-r--r-- | .pkglist | 7 | ||||
| -rw-r--r-- | .urlview | 4 | ||||
| -rw-r--r-- | .vimrc | 34 | ||||
| -rw-r--r-- | .zshrc | 8 |
12 files changed, 122 insertions, 74 deletions
@@ -27,5 +27,4 @@ alias sudo='doas' alias synonym="dict -d moby-thesaurus" alias tar='tar -v' alias watch="cmdwatch" -alias weather="curl wttr.in" alias youpick="shuf .restaurants | head" diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index d732932..9cddda3 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -2,6 +2,8 @@ # System configuration file for Mutt # +source "cat mutt_smtp_pass |" + #mailboxes = +INBOX auto_view text/html alternative_order text/plain text/html @@ -19,12 +21,16 @@ hdr_order date from to cc subject # imitate the old search-body function macro index \eb "<search>~b " "search in message bodies" +# urlview +macro index \cb |urlview\n +macro pager \cb |urlview\n + # simulate the old url menu -macro index,pager,attach,compose \cb "\ -<enter-command> set my_pipe_decode=\$pipe_decode pipe_decode<Enter>\ -<pipe-message> urlview<Enter>\ -<enter-command> set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<Enter>" \ -"call urlview to extract URLs out of a message" +#macro index,pager,attach,compose \cb "\ +#<enter-command> set my_pipe_decode=\$pipe_decode pipe_decode<Enter>\ +#<pipe-message> urlview<Enter>\ +#<enter-command> set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<Enter>" \ +#"call urlview to extract URLs out of a message" # Show documentation when pressing F1 macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation" @@ -4159,7 +4165,7 @@ set message_cachedir=~/.cache/mutt # If set, all folders are opened in read-only mode. # # -# set realname="" +set realname="Adam T. Carpenter" # # Name: realname # Type: string @@ -5441,7 +5447,7 @@ set message_cachedir=~/.cache/mutt # if you are the only one who can read the file. # # -# set smtp_url="" +set smtp_url="smtps://53hornet@smtp.gmail.com:465" # # Name: smtp_url # Type: string @@ -5618,7 +5624,7 @@ set spoolfile=+/ # key. # # -# set ssl_force_tls=no +set ssl_force_tls=yes # # Name: ssl_force_tls # Type: boolean @@ -5644,7 +5650,7 @@ set spoolfile=+/ # the default from the GNUTLS library. (GnuTLS only) # # -# set ssl_starttls=yes +set ssl_starttls=yes # # Name: ssl_starttls # Type: quadoption @@ -6207,7 +6213,7 @@ set spoolfile=+/ # executable pointed to by $sendmail doesn't support the -f switch. # # -# set use_from=yes +set use_from=yes # # Name: use_from # Type: boolean diff --git a/.config/rofi/config b/.config/rofi/config index 7ee01c9..60de733 100644 --- a/.config/rofi/config +++ b/.config/rofi/config @@ -3,10 +3,10 @@ rofi.width: 25 rofi.lines: 25 rofi.columns: 1 rofi.font: Iosevka Etoile 14 -rofi.color-normal: #0f2030, #fffffc, #0f2030, #9fc1cb, #fffffc -rofi.color-urgent: #0f2030, #d6b48d, #22231D, #d6b48d, #fffffc -rofi.color-active: #0f2030, #ade2f9, #0f2030, #ade2f9, #0f2030 -rofi.color-window: #0f2030, #9fc1cb, #6d858c +rofi.color-normal: #0c0c0d, #ffffee, #0c0c0d, #938373, #ffffee +rofi.color-urgent: #0c0c0d, #d6b48d, #22231D, #d6b48d, #ffffee +rofi.color-active: #0c0c0d, #cf7f5f, #0c0c0d, #cf7f5f, #0c0c0d +rofi.color-window: #0c0c0d, #938373, #655a4f rofi.bw: 5 rofi.location: 0 rofi.padding: 5 diff --git a/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_d5qht16-7016b58c-8321-4b2e-8a2a-565a299bcbb2_jpg_dark_wal__1.1.0.json b/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_d5qht16-7016b58c-8321-4b2e-8a2a-565a299bcbb2_jpg_dark_wal__1.1.0.json new file mode 100644 index 0000000..5668fde --- /dev/null +++ b/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_d5qht16-7016b58c-8321-4b2e-8a2a-565a299bcbb2_jpg_dark_wal__1.1.0.json @@ -0,0 +1,28 @@ +{ + "wallpaper": "/home/atc/.config/wpg/wallpapers/d5qht16-7016b58c-8321-4b2e-8a2a-565a299bcbb2.jpg", + "alpha": "90", + + "special": { + "background": "#04050E", + "foreground": "#ffffda", + "cursor": "#ffffda" + }, + "colors": { + "color0": "#04050E", + "color1": "#8B7543", + "color2": "#595136", + "color3": "#5E5F54", + "color4": "#344564", + "color5": "#24324D", + "color6": "#7C837F", + "color7": "#c8c2a4", + "color8": "#0d1136", + "color9": "#c29d49", + "color10": "#7c6e3c", + "color11": "#838761", + "color12": "#39568b", + "color13": "#273e6b", + "color14": "#90baa2", + "color15": "#ffffda" + } +} diff --git a/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_dcaa6ao-7cff8fa3-29d5-4fbf-aaa0-dc7bb7a27a81_jpg_dark_wal__1.1.0.json b/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_dcaa6ao-7cff8fa3-29d5-4fbf-aaa0-dc7bb7a27a81_jpg_dark_wal__1.1.0.json new file mode 100644 index 0000000..2ada810 --- /dev/null +++ b/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_dcaa6ao-7cff8fa3-29d5-4fbf-aaa0-dc7bb7a27a81_jpg_dark_wal__1.1.0.json @@ -0,0 +1,28 @@ +{ + "wallpaper": "/home/atc/.config/wpg/wallpapers/dcaa6ao-7cff8fa3-29d5-4fbf-aaa0-dc7bb7a27a81.jpg", + "alpha": "90", + + "special": { + "background": "#121213", + "foreground": "#e6ffff", + "cursor": "#e6ffff" + }, + "colors": { + "color0": "#121213", + "color1": "#45596F", + "color2": "#52616F", + "color3": "#938668", + "color4": "#516E8B", + "color5": "#637990", + "color6": "#698DA5", + "color7": "#b0d1d2", + "color8": "#2a2a2c", + "color9": "#4e739b", + "color10": "#5e7e9c", + "color11": "#cfb476", + "color12": "#5b8ec2", + "color13": "#709cca", + "color14": "#76bae8", + "color15": "#e6ffff" + } +} diff --git a/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_matte_painting_3_cc_jpg_dark_wal__1.1.0.json b/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_matte_painting_3_cc_jpg_dark_wal__1.1.0.json new file mode 100644 index 0000000..823f018 --- /dev/null +++ b/.config/wpg/schemes/_home_atc__config_wpg_wallpapers_matte_painting_3_cc_jpg_dark_wal__1.1.0.json @@ -0,0 +1,28 @@ +{ + "wallpaper": "/home/atc/.config/wpg/wallpapers/matte_painting_3_cc.jpg", + "alpha": "90", + + "special": { + "background": "#03030B", + "foreground": "#f4f6fb", + "cursor": "#f4f6fb" + }, + "colors": { + "color0": "#03030B", + "color1": "#565665", + "color2": "#3C4262", + "color3": "#1F316B", + "color4": "#1B3C85", + "color5": "#314D8B", + "color6": "#566694", + "color7": "#b9bbbf", + "color8": "#0b0b34", + "color9": "#63638f", + "color10": "#434e89", + "color11": "#1f3a94", + "color12": "#184ab7", + "color13": "#335fc0", + "color14": "#607dcf", + "color15": "#f4f6fb" + } +} diff --git a/.config/wpg/sequences b/.config/wpg/sequences index 9a8995d..8f773ed 100644 --- a/.config/wpg/sequences +++ b/.config/wpg/sequences @@ -1 +1 @@ -]4;0;#0f2030\]4;1;#C4BCB0\]4;2;#B5C6CB\]4;3;#D8CBB7\]4;4;#ACB9C4\]4;5;#AEB1B2\]4;6;#96A8B0\]4;7;#e0e1dd\]4;8;#1a3956\]4;9;#fff9cc\]4;10;#d2ffff\]4;11;#ffffd0\]4;12;#c7f2ff\]4;13;#cbf1fe\]4;14;#ade2f9\]4;15;#fffffc\]10;#fffffc\]11;[90]#0f2030\]12;#fffffc\]13;#fffffc\]17;#fffffc\]19;#0f2030\]4;232;#0f2030\]4;256;#fffffc\]708;[90]#0f2030\
\ 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 72e27f2..825f7d2 100644 --- a/.config/wpg/templates/i3.base +++ b/.config/wpg/templates/i3.base @@ -49,17 +49,16 @@ bindsym $mod+shift+0 move container to workspace $ws10 ## GAPS/BORDERS default_border pixel 5 -default_floating_border normal +default_floating_border pixel 5 gaps inner 10 smart_borders no_gaps title_align center workspace_auto_back_and_forth yes # If there's only one container, give it a 4:3-ish aspect ratio -gaps horizontal 250 +gaps horizontal 450 smart_gaps inverse_outer - ## COLORS # base colors -- set by WPG set $coloract "{active}" @@ -105,8 +104,8 @@ bindsym $mod+u resize shrink height bindsym $mod+y resize shrink width bindsym $mod+minus gaps inner current plus 10 bindsym $mod+plus gaps inner current minus 10 -bindsym $mod+shift+minus gaps horizontal all set 250 -bindsym $mod+shift+plus gaps horizontal all set 0 +bindsym $mod+shift+minus gaps horizontal current set 250 +bindsym $mod+shift+plus gaps horizontal current set 0 ## LAYOUT # split direction @@ -130,6 +129,7 @@ bindsym $mod+space focus mode_toggle ## SHORTCUTS bindsym $mod+shift+F1 exec --no-startup-id firefox /usr/local/share/doc/freebsd/handbook/book.html bindsym $mod+F2 exec --no-startup-id firefox +bindsym $mod+shift+F2 exec --no-startup-id firefox --private-window bindsym $mod+F3 exec i3-filescmd.sh bindsym $mod+F4 exec i3-mailcmd.sh bindsym $mod+F5 exec i3-newsboatcmd.sh @@ -164,16 +164,6 @@ bindsym $mod+shift+c reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+shift+r restart -## MODES AND BARS -set $mode_display -mode "$mode_display" {{ - bindsym $left move workspace to output left - bindsym $right move workspace to output right - bindsym Return mode "default" - bindsym q mode "default" - bindsym Escape mode "default" -}} - set $mode_system l e s r shift+s mode "$mode_system" {{ bindsym e exec --no-startup-id i3-msg exit, mode "default" @@ -193,14 +183,12 @@ mode "$mode_help" {{ bindsym Escape mode "default" }} -bindsym $mod+d mode "$mode_display" bindsym $mod+Insert mode "$mode_system" bindsym $mod+F1 mode "$mode_help" ## BARS bar {{ height 30 - output $display_primary strip_workspace_numbers yes position bottom status_command i3blocks 2>/var/log/xinit/i3blocks.log @@ -4,7 +4,6 @@ audio/abcde audio/cdparanoia audio/mixertui audio/virtual_oss -benchmarks/unixbench databases/sqlite3 devel/git devel/libnotify @@ -25,10 +24,8 @@ games/residualvm games/scummvm games/vvvvvv graphics/ImageMagick7 -graphics/blender graphics/feh graphics/gimp -graphics/inkscape graphics/mupdf graphics/scrot graphics/sxiv @@ -40,7 +37,6 @@ multimedia/ffmpeg multimedia/handbrake multimedia/makemkv multimedia/mpv -net-im/6cord net/rsync ports-mgmt/poudriere security/doas @@ -60,7 +56,6 @@ sysutils/fusefs-webdavfs sysutils/grub2-bhyve sysutils/htop sysutils/pidof -sysutils/powerdxx sysutils/rename sysutils/testdisk sysutils/tmux @@ -72,7 +67,7 @@ textproc/p5-docx2txt www/firefox www/newsboat www/node -www/npm +www/yarn www/youtube_dl x11-fonts/fontconfig x11-fonts/iosevka @@ -16,7 +16,6 @@ # Regular expression to use to match URLs. #REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] -REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] # Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh # shell script. Alternatively, you can leave COMMAND unset and set the BROWSER @@ -24,8 +23,7 @@ REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t> #COMMAND lynx %s #COMMAND netscape -remote 'openURL(%s)' -#COMMAND url_handler.sh -COMMAND qutebrowser %s +COMMAND url_handler.sh # Quit urlview after launch @@ -16,8 +16,12 @@ syntax on " switch syntax highlighting on " Matching and key mappings :match ErrorMsg '\%>80v.\+' " right-hand drift warning -"" automatically finish closing tags -:inoremap <lt>/ </<C-x><C-o><Esc>==gi + +" Automatically finish closing tags +augroup html_vue_hbs + au! + autocmd BufNewFile,BufRead *.html|*.vue|*.hbs :inoremap <lt>/ </<C-x><C-o><Esc>==gi +augroup END " only do this if autocommands enabled if has("autocmd") @@ -44,35 +48,9 @@ if empty(glob('~/.vim/autoload/plug.vim')) endif call plug#begin('~/.vim/plugged') -"Plug 'dense-analysis/ale' Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'} call plug#end() -"" ALE -"let g:ale_linter_aliases = { -"\ 'vue': ['vue', 'javascript'], -"\ 'liquid': ['liquid', 'html'], -"\} -"let g:ale_linters = { -"\ 'vue': ['eslint', 'vls'], -"\ 'javascript': ['eslint'], -"\ 'html': ['htmlhint'], -"\ 'rust': [] -"\} -"let g:ale_fixers = { -"\ 'css': ['prettier'], -"\ 'html': ['prettier'], -"\ 'javascript': ['eslint'], -"\ 'json': ['prettier'], -"\ 'liquid': ['prettier'], -"\ 'markdown': ['prettier'], -"\ 'vue': ['eslint'], -"\ 'scss': ['prettier'], -"\ '*': ['remove_trailing_lines', 'trim_whitespace'], -"\ 'rust': [] -"\} -"let g:ale_fix_on_save = 1 - " COC.VIM inoremap <silent><expr> <TAB> \ pumvisible() ? "\<C-n>" : @@ -61,10 +61,10 @@ setopt prompt_subst GIT_PROMPT_SYMBOL="%{$fg[blue]%} " # plus/minus - clean repo GIT_PROMPT_AHEAD="%{$fg[red]%} NUM%{$reset_color%}" # A"NUM" - ahead by "NUM" commits GIT_PROMPT_BEHIND="%{$fg[cyan]%} NUM%{$reset_color%}" # B"NUM" - behind by "NUM" commits -GIT_PROMPT_MERGING="%{$fg_bold[magenta]%} %{$reset_color%}" # lightning bolt - merge conflict -GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%} %{$reset_color%}" # red circle - untracked files -GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%} %{$reset_color%}" # yellow circle - tracked files modified -GIT_PROMPT_STAGED="%{$fg_bold[green]%} %{$reset_color%}" # green circle - staged changes present = ready for "git push" +GIT_PROMPT_MERGING="%{$fg_bold[magenta]%} %{$reset_color%}" # lightning bolt - merge conflict +GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%} %{$reset_color%}" # red circle - untracked files +GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%} %{$reset_color%}" # yellow circle - tracked files modified +GIT_PROMPT_STAGED="%{$fg_bold[green]%} %{$reset_color%}" # green circle - staged changes present = ready for "git push" parse_git_branch() { # Show Git branch/tag, or name-rev if on detached head |