diff --git a/.config/keepassxc/keepassxc.ini b/.config/keepassxc/keepassxc.ini
deleted file mode 100644
index af4a794..0000000
--- a/.config/keepassxc/keepassxc.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[General]
-ConfigVersion=1
-GlobalAutoTypeKey=65
-GlobalAutoTypeModifiers=100663296
-MinimizeAfterUnlock=true
-
-[Browser]
-CustomProxyLocation=
-
-[GUI]
-MinimizeOnClose=true
-MinimizeOnStartup=true
-ShowTrayIcon=true
-TrayIconAppearance=monochrome-light
-
-[KeeShare]
-Active="\n\n \n\n"
-Foreign="\n\n \n\n"
-Own="\n\n \n \n\n"
-QuietSuccess=true
-
-[PasswordGenerator]
-AdditionalChars=
-ExcludedChars=
-Logograms=true
diff --git a/.config/qutebrowser/autoconfig.yml b/.config/qutebrowser/autoconfig.yml
index 54c4230..3b33998 100644
--- a/.config/qutebrowser/autoconfig.yml
+++ b/.config/qutebrowser/autoconfig.yml
@@ -16,7 +16,7 @@ settings:
auto_save.interval:
global: 15000
auto_save.session:
- global: true
+ global: false
backend:
global: webengine
bindings.commands:
@@ -24,8 +24,12 @@ settings:
insert: {}
colors.webpage.darkmode.enabled:
global: false
+ completion.web_history.max_items:
+ global: 0
content.autoplay:
global: false
+ content.cache.size:
+ global: 0
content.cookies.accept:
global: no-3rdparty
content.cookies.store:
@@ -80,7 +84,7 @@ settings:
global: http://search.m
url.searchengines:
global:
- DEFAULT: http://search.m/?q={}&categories=general,it
+ DEFAULT: http://search.m/?q={}
url.start_pages:
global: http://search.m
window.title_format:
diff --git a/.config/qutebrowser/bookmarks/urls b/.config/qutebrowser/bookmarks/urls
index 3014764..e69de29 100644
--- a/.config/qutebrowser/bookmarks/urls
+++ b/.config/qutebrowser/bookmarks/urls
@@ -1,2 +0,0 @@
-https://rotabull.octopus.app/app#/users/sign-in Octopus Deploy
-https://logentries.com/login/ Try Logentries Log Management Free – Logentries
diff --git a/.config/qutebrowser/qsettings/QtProject.conf b/.config/qutebrowser/qsettings/QtProject.conf
deleted file mode 100644
index 24d7d63..0000000
--- a/.config/qutebrowser/qsettings/QtProject.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[FileDialog]
-history=@Invalid()
-lastVisited=file:///home/m/Downloads
-qtVersion=5.14.2
-viewMode=Detail
diff --git a/.config/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks
index 21e8d41..4e643cf 100644
--- a/.config/qutebrowser/quickmarks
+++ b/.config/qutebrowser/quickmarks
@@ -1,7 +1,9 @@
-slack https://app.slack.com/client/T1FR44MU4/C1FR44RHS
hn https://news.ycombinator.com/
ch https://app.clubhouse.io/rotabull/stories/space/1285/platform-eng
gh https://github.com/
gcp https://console.cloud.google.com/projectselector2/home/dashboard?organizationId=817788800675&supportedpurview=project
aws https://console.aws.amazon.com/s3/home?region=us-east-1
rip https://app.rippling.com/dashboard
+slk https://rotabull.slack.com/
+octo https://rotabull.octopus.app/app#/users/sign-in
+log https://logentries.com/login/
diff --git a/.vimrc b/.vimrc
index 6f74ca4..ec8a27b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -26,7 +26,7 @@ Plug 'junegunn/fzf', { 'on': 'FZF' }
" Language specific plugins
Plug 'dart-lang/dart-vim-plugin'
Plug 'elixir-editors/vim-elixir'
-Plug 'dag/vim-fish'
+Plug 'georgewitteman/vim-fish'
Plug 'fatih/vim-go'
Plug 'jparise/vim-graphql'
Plug 'pangloss/vim-javascript'
@@ -73,6 +73,7 @@ nnoremap h :ALEHover
nnoremap a :Ack
nnoremap we :VimwikiAll2HTML
nnoremap wz :VimwikiIndex :Goyo
+nnoremap wg :VimwikiGoto
nnoremap z :Goyo 101x100%
" Allows you to use // in order to search for the visually selected text
@@ -139,15 +140,20 @@ let g:pencil#map#suspend_af = 'K'
let g:vimwiki_list = [{'path': expand('~/.wiki/')}]
-augroup js_ft
+augroup ft_jsx
au!
- autocmd BufNewFile,BufRead *.jsx set ft=javascript.jsx
- autocmd BufNewFile,BufRead *.tsx set ft=typescript.tsx
+ autocmd BufNewFile,BufRead *.jsx set filetype=javascript.jsx
+ autocmd BufNewFile,BufRead *.tsx set filetype=typescript.tsx
augroup END
-augroup wiki_ft
+augroup ft_wiki
au!
- autocmd BufNewFile,BufRead *.wiki set tw=70 cc=70
+ autocmd FileType vimwiki set textwidth=70 colorcolumn=70
+augroup END
+
+augroup ft_fish
+ au!
+ autocmd FileType fish set tabstop=4
augroup END
if exists('$TMUX')
diff --git a/provision_debian b/provision_debian
index 82a6259..739c114 100755
--- a/provision_debian
+++ b/provision_debian
@@ -1,5 +1,4 @@
#!/usr/bin/env fish
-# This run(.fish) script serves as a central place to store frequently run commands for this project.
# Source: https://github.com/mitchell/run.fish
### Config ###
@@ -8,12 +7,14 @@
set -g run_func_prefix 'provision'
set -g run_arg_delimeter ':'
+function define_aliases
+end
### Commands ###
# Add, edit, and remove commands freely below.
# To add a command simply create a function with this naming scheme: {run_func_prefix}_{name}.
#
-function provision_m_env
+function provision_m_env -d 'Provision m environment (fish, git, neovim, etc.)'
log "Provisioning m's environment." head
log 'Installing git, neovim, tmux, rsync, curl, and kitty-terminfo...'
@@ -55,7 +56,7 @@ function provision_m_env
log "Done provisioning m's environment." tail
end
-function provision_desktop_env
+function provision_desktop_env -d 'Provision bspwm based desktop environment'
log 'Provisioning desktop environment.' head
log 'Installing window manager and compositor.'
@@ -117,7 +118,7 @@ gtk-font-name = IBM Plex Sans 11" >~/.config/gtk-3.0/settings.ini
log 'Done provisioning desktop environment.' tail
end
-function provision_m_net
+function provision_m_net -d 'Provision applications to join m-net'
log 'Provisioning m-net.' head
sudo apt-get update >/dev/null 2>&1
@@ -132,7 +133,7 @@ function provision_m_net
log 'Done provisioning desktop environment.' tail
end
-function provision_libvirt
+function provision_libvirt -d 'Provision libvirt and virt-manager'
log 'Provisioning Libvirt and KVM.' head
sudo apt-get update >/dev/null 2>&1
@@ -147,7 +148,7 @@ function provision_libvirt
log 'Done provisioning Libvirt and KVM' tail
end
-function provision_vagrant
+function provision_vagrant -d 'Provision vagrant with libvirt plugin'
log 'Provisioning vagrant and the libvirt provider.' head
sudo apt-get update >/dev/null 2>&1
@@ -161,7 +162,7 @@ function provision_vagrant
log 'Done provisioning vagrant and libvirt provider.' tail
end
-function provision_docker
+function provision_docker -d 'Provision docker and docker-compose'
log 'Provisioning Docker CE and Docker Compose.' head
log 'Installing docker dependencies.'
@@ -200,7 +201,7 @@ function provision_docker
log 'Done provisioning Docker CE and Docker Compose.' tail
end
-function provision_wireguard
+function provision_wireguard -d 'Provision wireguard'
log 'Provisioning Wireguard.' head
log 'Installing wireguard and resolvconf.'
@@ -213,7 +214,7 @@ function provision_wireguard
log 'Done provisioning Wireguard.' tail
end
-function provision_caddy
+function provision_caddy -d 'Provision caddy and disable service'
log 'Provisioning Caddy.' head
log 'Adding Caddy repo and installing caddy.'
@@ -223,6 +224,10 @@ function provision_caddy
sudo apt-get update >/dev/null 2>&1
sudo apt-get install --yes caddy >/dev/null 2>&1
+ log 'Disabling and stopping service.'
+ sudo systemctl disable caddy.service
+ sudo systemctl stop caddy.service
+
log 'Done provisioning Caddy.' tail
end
@@ -243,57 +248,64 @@ function log -a message level
end
end
-### Default Commands ###
-# Below is a set of default commands, like help and commands. Give them a try by doing:
-# ./run help
-# ./run help:hello
-# ./run commands
-#
-function "$run_func_prefix"_commands -d 'List all available commands'
- functions --names | grep $run_func_prefix'_' | string replace $run_func_prefix'_' ''
-end
-
-function "$run_func_prefix"_help -a command -d 'Print command definition'
- if test -n "$command"
- functions $run_func_prefix'_'$command
- else
- echo 'Here are the available commands:'
- $run_func_prefix'_commands'
- echo \n"To see a command's definition and description do `./run help$run_arg_delimeter{command}`"
- end
-end
-
-### Command Execution ###
-# Do not edit, unless you want to alter how the script executes commands.
-#
-# This script can execute 1 or more commands like make. It can also receive 1 argument per
-# command or subcommand in the following format: {name}{run_arg_delimeter}{argument}.
-#
-# Examples:
-# ./run hello
-# ./run hey:mitchell
-# ./run lang:fr:mitchell
-# ./run hello hey:mitchell lang:fr
-#
function main
- for command in $argv
- set -l last_status $status
- test $last_status -gt 0; and exit $last_status
+ alias $run_func_prefix\_default=$run_func_prefix\_help
+ define_aliases
- execute_command $run_func_prefix $command
+ for command in $argv
+ and execute_command $run_func_prefix $command
+ end
+
+ and if test -z "$argv"
+ execute_command $run_func_prefix default
end
end
function execute_command -a prefix command
set -l args (string split --max 1 $run_arg_delimeter $command)
- set -l func $prefix'_'$args[1]
+ set -l func $prefix\_$args[1]
+
+ define_default_functions $prefix
if functions -q $func
$func $args[2]
+ else if test -z "$command"
+ execute_command $prefix default
else
echo "$prefix command '$command' does not exist"
exit 1
end
end
+function define_default_functions
+ set -g prefix $argv[1]
+
+ function _$prefix\_commands -d 'List all available commands'
+ set -l names (functions --names | grep $prefix\_)
+
+ for name in $names
+ set -l details (functions -D -v $name)
+ set -l description $details[5]
+ set -l short_name (string replace $prefix\_ '' $name)
+
+ if test (string length $short_name) -ge 8
+ echo $short_name\t$description
+ else
+ echo $short_name\t\t$description
+ end
+ end
+ end
+
+ function $prefix\_help -a command -d 'Print help menu or command definition'
+ if test -n "$command"
+ functions $prefix\_$command
+ else
+ echo 'Here are the available commands:'\n
+ _$prefix\_commands
+ echo \n"To see a command's definition do `run help$run_arg_delimeter{command}`"
+ echo "To see a subcommand group's help menu do `run {command}$run_arg_delimeter""help`"
+ end
+ end
+end
+
main $argv
diff --git a/sync b/sync
index 47bea2e..ee277c6 100755
--- a/sync
+++ b/sync
@@ -66,7 +66,6 @@ function sync_desktop_env
rsync -aP ./.config/picom ~/.config/
rsync -aP ./.config/xfce4 ~/.config/
rsync -aP ./.config/qutebrowser ~/.config/
- rsync -aP ./.config/keepassxc ~/.config/
rsync -aP ./.ideavimrc ~/
rsync -aP ./.yabairc ~/
rsync -aP ./.skhdrc ~/