diff --git a/.config/gnupg/gpg.conf b/.config/gnupg/gpg.conf index e69de29..cdb3a72 100644 --- a/.config/gnupg/gpg.conf +++ b/.config/gnupg/gpg.conf @@ -0,0 +1 @@ +keyserver keyserver.ubuntu.com diff --git a/.config/nvim b/.config/nvim index ffb080c..f7d2632 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit ffb080ca7f2436fac53137af39408252d23f2891 +Subproject commit f7d2632d208c892a3f570674975a4477e0aeb7ab diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 3f956b6..3e60d2f 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,16 +1,15 @@ #!/bin/sh - # Use neovim for vim if present [ -x "$(command -v nvim)" ] && alias vim="nvim" vimdiff="nvim -d" # Use $XINITRC variable if file exists. [ -f "$XINITRC" ] && alias startx="startx $XINITRC" -# sudo not required for some system commands +# doas not required for some system commands for x in mount umount sv pacman updatedb su ; do - alias $x="sudo $x" + alias $x="doas $x" done # Verbosity and settings that you pretty much just always are going to want. @@ -35,18 +34,19 @@ alias \ alias \ ka="killall" \ YT="youtube-viewer" \ - sdn="sudo shutdown -h now" \ + sdn="doas shutdown -h now" \ e="$EDITOR" \ v="$EDITOR" \ cl="clear" \ - p="sudo pacman" \ + p="doas pacman" \ z="zathura" \ ll="ls -l" \ la="ls -al" \ ag="alias | grep" \ lc="clone_from_labs" \ gc="clone_from_github" \ - dgit="git --git-dir ~/.config/dotfiles/.git --work-tree=$HOME" + dgit="git --git-dir ~/.config/dotfiles/.git --work-tree=$HOME" \ + sudo=doas # Clone from labs function clone_from_labs() { diff --git a/.local/bin/setup/setupfirefox b/.local/bin/setup/setupfirefox index 833363b..9aac7ca 100755 --- a/.local/bin/setup/setupfirefox +++ b/.local/bin/setup/setupfirefox @@ -26,5 +26,5 @@ read -s -k $'?Press enter when you have synced Firefox...\n' echo "" | xclip -selection clipboard -i -firefox "https://www.enpass.io/downloads/" +firefox "https://www.enpass.io/downloads/" "about:preferences#search" diff --git a/.local/bin/setup/setupjoplin b/.local/bin/setup/setupjoplin index 95ac751..d8245fc 100755 --- a/.local/bin/setup/setupjoplin +++ b/.local/bin/setup/setupjoplin @@ -6,25 +6,25 @@ TOWERPW=$(echo "$TOWER" | grep -Po "(?<=pass : ).+(?=\")") path="https://tower.scarif.space/remote.php/dav/files/chris/Joplin" -joplin config sync.target 5 -joplin config sync.5.path "$path" -joplin config sync.5.username "$TOWERUN" -joplin config sync.5.password "$TOWERPW" -joplin sync +# joplin config sync.target 5 +# joplin config sync.5.path "$path" +# joplin config sync.5.username "$TOWERUN" +# joplin config sync.5.password "$TOWERPW" +# joplin sync -# echo "$path" | xclip -selection clipboard -i +echo "$path" | xclip -selection clipboard -i -# joplin-desktop & +joplin-desktop & -# clipnotify +clipnotify -# echo "$TOWERUN" | xclip -selection clipboard -i +echo "$TOWERUN" | xclip -selection clipboard -i -# clipnotify +clipnotify -# echo "$TOWERPW" | xclip -selection clipboard -i +echo "$TOWERPW" | xclip -selection clipboard -i -# read -n 1 -r -s -p $'Press enter when you have synced Joplin...\n' +read -n 1 -r -s -p $'Press enter when you have synced Joplin...\n' -# echo "" | xclip -selection clipboard -i +echo "" | xclip -selection clipboard -i diff --git a/.local/bin/setup/setupkeyring b/.local/bin/setup/setupkeyring index f8ca762..ed4f338 100755 --- a/.local/bin/setup/setupkeyring +++ b/.local/bin/setup/setupkeyring @@ -3,5 +3,5 @@ echo "Setting up keyring to start at login" # Start gnome keyring at login -sudo -A sed -i '/auth include system-local-login/a auth optional pam_gnome_keyring.so' /etc/pam.d/login -sudo -A sed -i '/session include system-local-login/a session optional pam_gnome_keyring.so auto_start' /etc/pam.d/login +doas -A sed -i '/auth include system-local-login/a auth optional pam_gnome_keyring.so' /etc/pam.d/login +doas -A sed -i '/session include system-local-login/a session optional pam_gnome_keyring.so auto_start' /etc/pam.d/login diff --git a/.local/bin/setup/setupmaptool b/.local/bin/setup/setupmaptool index ba9cc95..bcdce37 100755 --- a/.local/bin/setup/setupmaptool +++ b/.local/bin/setup/setupmaptool @@ -6,5 +6,5 @@ echo "Configuring MapTool" if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI" ]; then DPI="$(cat "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI")" SCALE="$(((DPI+48)/96))" - sudo -A sed -i "/\[JavaOptions\]/a -Dsun.java2d.uiScale=$SCALE" /opt/maptool/lib/app/MapTool.cfg + doas -A sed -i "/\[JavaOptions\]/a -Dsun.java2d.uiScale=$SCALE" /opt/maptool/lib/app/MapTool.cfg fi diff --git a/.local/bin/setup/setupvpn b/.local/bin/setup/setupvpn index f74ad16..33007a0 100755 --- a/.local/bin/setup/setupvpn +++ b/.local/bin/setup/setupvpn @@ -1,6 +1,6 @@ #! /bin/bash -sudo systemctl enable --now expressvpn.service +doas systemctl enable --now expressvpn.service VPN=$(enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort show "ExpressVPN Activation Code" 2>&1) VPNPW=$(echo "$LABS" | grep -Po "(?<=pass : ).+(?=\")") diff --git a/.local/bin/setup/setupwacom b/.local/bin/setup/setupwacom index 0dea5f2..4811727 100755 --- a/.local/bin/setup/setupwacom +++ b/.local/bin/setup/setupwacom @@ -2,7 +2,7 @@ echo "Initialising Wacom settings" -sudo tee /etc/udev/rules.d/99-wacom.rules <