diff options
Diffstat (limited to '')
22 files changed, 172 insertions, 35 deletions
diff --git a/dot_config/environment.d/01_PATH.conf b/dot_config/environment.d/01_PATH.conf index 2d43e7a..1913958 100644 --- a/dot_config/environment.d/01_PATH.conf +++ b/dot_config/environment.d/01_PATH.conf @@ -6,4 +6,5 @@ PATH="${HOME}/.opam/default/bin:${PATH}" PATH="${HOME}/.opam/beluga/bin:${PATH}" PATH="${HOME}/.cabal/bin:${PATH}" PATH="${HOME}/.cargo/bin:${PATH}" -PATH="${HOME}/bin:${PATH}" +PATH="${HOME}/.go/bin:${PATH}" +PATH="${HOME}/.local/bin:${PATH}" diff --git a/dot_config/isyncrc.tmpl b/dot_config/isyncrc.tmpl index 0d4db33..761ac1a 100644 --- a/dot_config/isyncrc.tmpl +++ b/dot_config/isyncrc.tmpl @@ -8,15 +8,15 @@ TLSType IMAPS IMAPAccount queensu Host outlook.office365.com User 9rak@queensu.ca -PassCmd "~/bin/mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" $XDG_STATE_HOME/xoauth2-tokens/9rak.queensu.ca" +PassCmd "mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" $XDG_STATE_HOME/xoauth2-tokens/9rak.queensu.ca" AuthMechs XOAUTH2 TLSType IMAPS IMAPAccount CMU Host imap.gmail.com User rkavanag@alumni.cmu.edu -Pass {{ .password.cmu }} -AuthMechs PLAIN +PassCmd "mutt_oauth2.py --encryption-pipe=cat --decryption-pipe=cat $XDG_STATE_HOME/xoauth2-tokens/rkavanag.alumni.cmu.edu" +AuthMechs XOAUTH2 TLSType IMAPS IMAPAccount gmail @@ -29,7 +29,7 @@ TLSType IMAPS IMAPAccount ryan.a.kavanagh.gmail.com Host imap.gmail.com User ryan.a.kavanagh@gmail.com -PassCmd "~/bin/mutt_oauth2.py --encryption-pipe=cat --decryption-pipe=cat $XDG_STATE_HOME/xoauth2-tokens/ryan.a.kavanagh.gmail.com" +PassCmd "mutt_oauth2.py --encryption-pipe=cat --decryption-pipe=cat $XDG_STATE_HOME/xoauth2-tokens/ryan.a.kavanagh.gmail.com" AuthMechs XOAUTH2 TLSType IMAPS @@ -100,7 +100,7 @@ Channel uqam-others Far :uqam-remote: Near :uqam-maildir: Create Both -Patterns * !Calendar !Calendar/* !Contacts !"Conversation History" !"Deleted Items" !"Flux RSS" !Journal !Notes !Outbox !Probl* +Patterns * !Calendar !Calendar/* !Contacts !"Conversation History" !"Flux RSS" !Journal !Notes !Outbox !Probl* Expunge Near Sync All @@ -108,7 +108,7 @@ Channel queensu Far :queensu-remote: Near :queensu-maildir: Create Both -Patterns * !Calendar !Calendar/* !Contacts !"Conversation History" !"Deleted Items" !"Flux RSS" !Journal !Notes !Outbox +Patterns * !Calendar !Calendar/* !Contacts !"Conversation History" !"Flux RSS" !Journal !Notes !Outbox Expunge Both Remove Both Sync All @@ -118,7 +118,7 @@ Far :cmu-remote: Near :cmu-maildir: Create Both Expunge Near -Patterns * !"[Gmail]/All Mail" !"[Gmail]/Important" !"[Gmail]/Starred" !"[Gmail]/Bin" +Patterns * !"[Gmail]/All Mail" !"[Gmail]/Important" !"[Gmail]/Starred" Sync All Channel rak-inbox @@ -172,7 +172,7 @@ Far :gmail-remote: Near :gmail-maildir: Create Near Expunge Near -Pattern INBOX "[Google Mail]/Sent Mail" "[Google Mail]/Drafts" "[Google Mail]/Bin" +Pattern INBOX "[Google Mail]/Sent Mail" "[Google Mail]/Drafts" "[Google Mail]/Bin" Sync Pull Channel gmail-others diff --git a/dot_config/mpd/mpd.conf b/dot_config/mpd/mpd.conf new file mode 100644 index 0000000..7321d5b --- /dev/null +++ b/dot_config/mpd/mpd.conf @@ -0,0 +1,23 @@ +music_directory "/var/lib/mpd/music" +playlist_directory "~/.config/mpd/playlists" +db_file "~/.local/state/mpd/db" +state_file "~/.local/state/mpd/state" +filesystem_charset "UTF-8" + +auto_update "yes" + +input { + plugin "curl" +} + +audio_output { + type "fifo" + name "my_fifo" + path "$XDG_RUNTIME_DIR/mpd/mpd.fifo" + format "44100:16:2" +} + +audio_output { + type "pipewire" + name "PipeWire Sound Server" +} diff --git a/dot_config/msmtp/config b/dot_config/msmtp/config index cae5650..ffd7db5 100644 --- a/dot_config/msmtp/config +++ b/dot_config/msmtp/config @@ -9,6 +9,6 @@ user kavanagh.ryan@uqam.ca from kavanagh.ryan@uqam.ca tls_certcheck on auth xoauth2 -passwordeval /home/rak/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' -t $XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca +passwordeval mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' $XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca port 587 tls_trust_file /etc/ssl/certs/ca-certificates.crt diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc index fd74dfa..3d9924a 100644 --- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc +++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc @@ -1,7 +1,8 @@ # vim: syntax=neomuttrc +set imap_keepalive = 60 set imap_authenticators = 'xoauth2' -set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token" +set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca\"" set imap_passive = 'no' set imap_user = 'kavanagh.ryan@uqam.ca' diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc index ac1f134..db9492c 100644 --- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc +++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc @@ -5,7 +5,7 @@ set copy = no set from = 'Ryan Kavanagh <kavanagh.ryan@uqam.ca>' set smtp_authenticators = 'xoauth2' -set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token" +set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca\"" set smtp_url = 'smtp://kavanagh.ryan@uqam.ca@smtp.office365.com:587/' set signature = "`pwd`/signature" diff --git a/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl index 16febff..874fabf 100644 --- a/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl +++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl @@ -1,8 +1,7 @@ # vim: syntax=muttrc set imap_keepalive = 60 -{{- if .password.cmu }} -set imap_pass = '{{ .password.cmu }}' -{{- end }} +set imap_authenticators = 'xoauth2' +set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/rkavanag.alumni.cmu.edu\"" set imap_passive = 'no' set imap_user = 'rkavanag@alumni.cmu.edu' diff --git a/dot_config/neomutt/neomuttrc.tmpl b/dot_config/neomutt/neomuttrc.tmpl index d2b8811..1c93305 100644 --- a/dot_config/neomutt/neomuttrc.tmpl +++ b/dot_config/neomutt/neomuttrc.tmpl @@ -135,7 +135,7 @@ source "$XDG_CONFIG_HOME/neomutt/score.rc" source "$XDG_CONFIG_HOME/neomutt/color.rc" source "$XDG_CONFIG_HOME/neomutt/gpg.rc" -{{- if hasPrefix .chezmoi.homeDir "/sdf" }} +{{- if hasPrefix .chezmoi.homedir "/sdf" }} set from = 'Ryan Kavanagh <rak@sdf.org>' {{- end }} diff --git a/dot_config/private_mpv/input.conf b/dot_config/private_mpv/input.conf new file mode 100644 index 0000000..b674700 --- /dev/null +++ b/dot_config/private_mpv/input.conf @@ -0,0 +1 @@ +r cycle_values video-rotate 90 180 270 0 diff --git a/dot_config/sh/10_aliases b/dot_config/sh/10_aliases index 1b8f65d..b749d13 100644 --- a/dot_config/sh/10_aliases +++ b/dot_config/sh/10_aliases @@ -1,10 +1,25 @@ #!/bin/sh -alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade' +apt-upgrade() { + sudo apt-get update && sudo apt-get dist-upgrade +} -alias 1920s='mplayer -playlist http://kara.fast-serv.com:8398/listen.pls' -alias dismuke='mplayer -playlist https://early1900s.org/radiodismuke/radiodismuke.pls' -alias wzum='mplayer http://pubmusic.streamguys1.com/wzum-aac' +1920s() { + mpv -playlist 'http://kara.fast-serv.com:8398/listen.pls' +} +dismuke() { + mpv -playlist 'https://early1900s.org/radiodismuke/radiodismuke.pls' +} +wzum() { + mpv 'http://pubmusic.streamguys1.com/wzum-aac' +} +wesa() { + # WESA JazzWorks + mpv 'https://ais-sa3.cdnstream1.com/2558_128.aac' +} +wyep() { + mpv 'https://ais-sa3.cdnstream1.com/2557_128.aac' +} alias mplayer-fb='mplayer -vo fbdev' alias links2-fb='links2 -driver fb' diff --git a/dot_config/swayidle/.keep b/dot_config/swayidle/.keep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/dot_config/swayidle/.keep diff --git a/dot_config/swayidle/config b/dot_config/swayidle/config new file mode 100644 index 0000000..d774c2c --- /dev/null +++ b/dot_config/swayidle/config @@ -0,0 +1,4 @@ +timeout 180 swaylock +timeout 240 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' +before-sleep swaylock +after-resume 'swaymsg "output * dpms on"' diff --git a/dot_config/systemd/user/plocate-updatedb.service b/dot_config/systemd/user/plocate-updatedb.service new file mode 100644 index 0000000..55620c5 --- /dev/null +++ b/dot_config/systemd/user/plocate-updatedb.service @@ -0,0 +1,28 @@ +[Unit] +Description=Update the plocate database +ConditionACPower=true + +[Service] +Type=oneshot +ExecStart=/usr/sbin/updatedb.plocate -l 0 -o "${XDG_STATE_HOME}/plocate/home.db" -U "${HOME}" +LimitNOFILE=131072 +IOSchedulingClass=idle +Nice=19 + +CapabilityBoundingSet=CAP_DAC_READ_SEARCH CAP_CHOWN +IPAddressDeny=any +LockPersonality=true +MemoryDenyWriteExecute=true +NoNewPrivileges=true +PrivateTmp=true +PrivateDevices=true +PrivateNetwork=true +ProtectClock=true +ProtectControlGroups=true +ProtectHostname=true +RestrictAddressFamilies=AF_UNIX +RestrictNamespaces=true +RestrictRealtime=true +RestrictSUIDSGID=true +SystemCallArchitectures=native +SystemCallFilter=@system-service @chown diff --git a/dot_config/systemd/user/plocate-updatedb.timer b/dot_config/systemd/user/plocate-updatedb.timer new file mode 100644 index 0000000..1d25abb --- /dev/null +++ b/dot_config/systemd/user/plocate-updatedb.timer @@ -0,0 +1,11 @@ +[Unit] +Description=Update the plocate database daily + +[Timer] +OnCalendar=daily +RandomizedDelaySec=1h +AccuracySec=6h +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/dot_config/systemd/user/sbuild-update.service b/dot_config/systemd/user/sbuild-update.service new file mode 100644 index 0000000..82c6bb3 --- /dev/null +++ b/dot_config/systemd/user/sbuild-update.service @@ -0,0 +1,29 @@ +[Unit] +Description=Update sbuild unshare chroot tarballs +ConditionACPower=true +Wants=network-online.target + +[Service] +Type=oneshot +ExecStart=%h/.local/lib/sbuild/update-chroots.sh +LimitNOFILE=131072 +IOSchedulingClass=idle +Nice=19 + +CapabilityBoundingSet=CAP_DAC_READ_SEARCH CAP_CHOWN +IPAddressDeny=any +LockPersonality=true +MemoryDenyWriteExecute=true +NoNewPrivileges=true +PrivateTmp=true +PrivateDevices=true +PrivateNetwork=true +ProtectClock=true +ProtectControlGroups=true +ProtectHostname=true +RestrictAddressFamilies=AF_UNIX +RestrictNamespaces=true +RestrictRealtime=true +RestrictSUIDSGID=true +SystemCallArchitectures=native +SystemCallFilter=@system-service @chown diff --git a/dot_config/systemd/user/sbuild-update.timer b/dot_config/systemd/user/sbuild-update.timer new file mode 100644 index 0000000..2576e16 --- /dev/null +++ b/dot_config/systemd/user/sbuild-update.timer @@ -0,0 +1,11 @@ +[Unit] +Description=Update sbuild unshare chroot tarballs + +[Timer] +OnCalendar=daily +RandomizedDelaySec=1h +AccuracySec=6h +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/dot_config/systemd/user/ssh-agent.service.d/override.conf b/dot_config/systemd/user/ssh-agent.service.d/override.conf deleted file mode 100644 index a3b6435..0000000 --- a/dot_config/systemd/user/ssh-agent.service.d/override.conf +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenSSH Agent -Documentation=man:ssh-agent(1) -Before=basic.target -ConditionPathExists=/etc/X11/Xsession.options -Wants=dbus.socket -After=dbus.socket - -[Service] -ExecStart= -ExecStart=/home/rak/.local/lib/openssh/agent-launch start diff --git a/dot_config/systemd/user/swaybg-random.service b/dot_config/systemd/user/swaybg-random.service index 06d7c29..f35fd77 100644 --- a/dot_config/systemd/user/swaybg-random.service +++ b/dot_config/systemd/user/swaybg-random.service @@ -5,7 +5,7 @@ Description=Randomize Wayland background Type=exec Restart=always RuntimeMaxSec=1h -ExecStart=/home/rak/bin/swaybg-random +ExecStart=%h/.local/bin/swaybg-random [Install] WantedBy=wayland-session.target diff --git a/dot_config/systemd/user/timers.target.wants/symlink_plocate-updatedb.timer b/dot_config/systemd/user/timers.target.wants/symlink_plocate-updatedb.timer new file mode 100644 index 0000000..28d405c --- /dev/null +++ b/dot_config/systemd/user/timers.target.wants/symlink_plocate-updatedb.timer @@ -0,0 +1 @@ +/home/rak/.config/systemd/user/plocate-updatedb.timer diff --git a/dot_config/systemd/user/timers.target.wants/symlink_sbuild-update.timer b/dot_config/systemd/user/timers.target.wants/symlink_sbuild-update.timer new file mode 100644 index 0000000..24c026e --- /dev/null +++ b/dot_config/systemd/user/timers.target.wants/symlink_sbuild-update.timer @@ -0,0 +1 @@ +/home/rak/.config/systemd/user/sbuild-update.timer
\ No newline at end of file diff --git a/dot_config/waybar/config b/dot_config/waybar/config index 234ba92..f1ded1a 100644 --- a/dot_config/waybar/config +++ b/dot_config/waybar/config @@ -7,7 +7,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"], "modules-center": ["sway/window"], - "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "battery", "battery#bat2", "clock", "tray"], + "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "battery", "battery#bat2", "clock", "tray", "custom/notification"], // "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"], // Modules configuration // "sway/workspaces": { @@ -161,8 +161,27 @@ "default": "🎜" }, "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder + "exec": "/usr/share/waybar/custom_modules/mediaplayer.py 2> /dev/null" // Script in resources folder // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + }, + "custom/notification": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "notification": "<span foreground='red'><sup></sup></span>", + "none": "", + "dnd-notification": "<span foreground='red'><sup></sup></span>", + "dnd-none": "", + "inhibited-notification": "<span foreground='red'><sup></sup></span>", + "inhibited-none": "", + "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>", + "dnd-inhibited-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true } } - diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css index ebddece..645bf9e 100644 --- a/dot_config/waybar/style.css +++ b/dot_config/waybar/style.css @@ -279,3 +279,7 @@ label:focus { #scratchpad.empty { background-color: transparent; } +#custom-notification { + font-family: "NotoSansMono Nerd Font"; + margin: 0 5px; +} |