update - dotfiles - These are my dotfiles. There are many like it, but these are mine.
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
---
(DIR) commit dda2927f6d2c7b85076e2de1b8caf7b552d0bdbc
(DIR) parent 484cfeac42c07d4d023f78d87d255ce4ca104d71
(HTM) Author: Jay Scott <me@jay.scot>
Date: Mon, 26 Sep 2022 14:03:08 +0100
update
Diffstat:
M .gitignore | 2 ++
M README | 6 +++---
D X11/Xresources | 53 ------------------------------
D X11/xinitrc | 10 ----------
A ashrc | 51 +++++++++++++++++++++++++++++++
D bashrc | 15 ---------------
R bin/old/dmenu_rss -> bin/dmenu_rss… | 0
R bin/old/download_useragents -> bin… | 0
R bin/old/mbsync_notify -> bin/mbsyn… | 0
M bootstrap.sh | 4 +---
M fdm/config | 11 +++++++++++
D install.sh | 90 -------------------------------
M mpd/mpd.conf | 5 +++--
M mutt/muttrc | 3 +++
D pkg/archlinux | 146 -------------------------------
D pkg/freebsd.txt | 47 -------------------------------
M profile | 69 +------------------------------
M sway/config | 2 +-
18 files changed, 77 insertions(+), 437 deletions(-)
---
(DIR) diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,8 @@ sfeed/fdm.cache
# misc
*.swp
+bin/fdm
+bin/lf
# vim
vim/bundle
(DIR) diff --git a/README b/README
@@ -10,7 +10,7 @@ settings maybe too restrictive for some. I also don't use social media at
all, the closest I come is using IRC.
- operating sys : archlinux / freeBSD
+ operating sys : alpine linux
window manager : sway
terminal : foot
launcher : bemenu
@@ -18,7 +18,7 @@ all, the closest I come is using IRC.
browser : qutebrowser
video : mpv
music : mpd / ncmpcpp
- gaming : gog only
+ gaming : scummvm
password mgt : pass
vpn : mullvad
- news : sfeed -> fdm -> mutt
+ news : sfeed
(DIR) diff --git a/X11/Xresources b/X11/Xresources
@@ -1,53 +0,0 @@
-! vim:ft=xdefaults
-
-/* COLOURS */
-#define RED0 #cc0403
-#define RED1 #f2201f
-#define GREEN0 #19cb00
-#define GREEN1 #23fd00
-#define YELLOW0 #cecb00
-#define YELLOW1 #fffd00
-#define BLUE0 #0d73cc
-#define BLUE1 #1a8fff
-#define MAGENTA0 #cb1ed1
-#define MAGENTA1 #fd28ff
-#define CYAN0 #0dcdcd
-#define CYAN1 #14ffff
-#define BLACK #000000
-#define GREY1 #767676
-#define GREY2 #dddddd
-#define WHITE #ffffff
-
-#define FONT Hack:size=14
-
-/* XFT */
-Xft.dpi: 96
-Xft.hinting: true
-Xft.rgba: rgb
-Xft.antialias: true
-Xft.autohint: false
-Xft.hintstyle: hintslight
-Xft.lcdfilter: lcddefault
-
-*.foreground: WHITE
-*.background: BLACK
-
-/* NORMAL */
-*.color0: BLACK
-*.color1: RED0
-*.color2: GREEN0
-*.color3: YELLOW0
-*.color4: BLUE0
-*.color5: MAGENTA0
-*.color6: CYAN0
-*.color7: GREY2
-
-/* BRIGHT */
-*.color8: GREY1
-*.color9: RED1
-*.color10: GREEN1
-*.color11: YELLOW1
-*.color12: BLUE1
-*.color13: MAGENTA1
-*.color14: CYAN1
-*.color15: WHITE
(DIR) diff --git a/X11/xinitrc b/X11/xinitrc
@@ -1,10 +0,0 @@
-# x stuff
-setxkbmap gb
-xset s off -dpms
-xrdb -load ~/.config/X11/Xresources
-~/bin/dwmstatus.sh &
-
-# apps
-mpd &
-
-exec dwm
(DIR) diff --git a/ashrc b/ashrc
@@ -0,0 +1,51 @@
+# users bin
+if [ -d "$HOME/bin" ]; then
+ PATH="$HOME/bin:$PATH"
+fi
+
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DOWNLOAD_DIR="$HOME/tmp"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+export XDG_DESKTOP_DIR="$HOME/"
+
+# cleanup ~/
+export PASSWORD_STORE_DIR="$XDG_CONFIG_HOME"/pass
+export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
+export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+
+# ps1 setup
+BOLD="\[$(tput bold)\]"
+RESET="\[$(tput sgr0)\]"
+export PS1="${BOLD}\w \$ ${RESET}"
+
+# common exports
+GPG_TTY=$(tty)
+export GPG_TTY
+export EDITOR="vim"
+export BROWSER="qutebrowser"
+export GOPATH="$XDG_DATA_HOME"/go
+export GOPROXY=direct
+
+export BEMENU_OPTS="-p '> ' --tb '#013220' --tf '#ffffff' --hf '#444444'"
+
+# safety first kids!
+alias cp='cp -i'
+alias mv='mv -i'
+alias rm='rm -i'
+
+# random alias
+alias xclip='xclip -selection c'
+alias yt-mp3='youtube-dl --extract-audio --audio-format mp3'
+alias t='wtwitch'
+alias weather='curl wttr.in/?1QF'
+
+# git alias
+alias ga='git add -A'
+alias gs='git status -s'
+alias gl="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
+alias gd='git diff'
+alias gma='git commit -am'
(DIR) diff --git a/bashrc b/bashrc
@@ -1,15 +0,0 @@
-if [ -f "$HOME/.profile" ]; then
- . "$HOME/.profile"
-fi
-
-# correct minor errors in the spelling
-shopt -s cdspell
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# don't put duplicate lines in the history.
-export HISTCONTROL=ignoredups:erasedups
-
-# move bash history out of $HOME
-export HISTFILE="$XDG_STATE_HOME"/bash/history
(DIR) diff --git a/bin/old/dmenu_rss b/bin/dmenu_rss.sh
(DIR) diff --git a/bin/old/download_useragents b/bin/download_useragents.sh
(DIR) diff --git a/bin/old/mbsync_notify b/bin/mbsync_notify.sh
(DIR) diff --git a/bootstrap.sh b/bootstrap.sh
@@ -2,10 +2,9 @@
DOTFILES=$(pwd)
-FILES='bashrc profile vimrc castgetrc'
+FILES='ashrc castgetrc profile vimrc'
ROOT='bin'
CONFIG='fdm foot git mpd mutt ncmpcpp qutebrowser sfeed senpai sway'
-AUR='paru'
link() {
for f in $FILES; do ln -sfn "$DOTFILES/$f" "$HOME/.$f"; done
@@ -21,7 +20,6 @@ unlink() {
backup() {
crontab -l >"$DOTFILES"/crontab
- $AUR -Qqe >"$DOTFILES"/pkg/archlinux
}
restore() {
(DIR) diff --git a/fdm/config b/fdm/config
@@ -31,6 +31,9 @@ action "freebsd-current" maildir "${listdir}/freebsd.current"
action "freebsd-questions" maildir "${listdir}/freebsd.questions"
action "srht-discuss" maildir "${listdir}/srht.discuss"
action "srht-dev" maildir "${listdir}/srht.dev"
+action "alpine-users" maildir "${listdir}/alpine.users"
+action "alpine-announce" maildir "${listdir}/alpine.announce"
+action "alpine-devel" maildir "${listdir}/alpine.devel"
# feeds
action "feedtag" tag "msgid" value "%1"
@@ -47,6 +50,14 @@ match "^List-Id:.*sr\\.ht-.*\\.lists\\.sr\\.ht" in headers {
match "^List-Id:.*dev" in headers action "srht-dev"
}
+# alpine
+match "^List-Id:.*lists\\.alpinelinux\\.org" in headers {
+ match "^List-Id:.*announce" in headers action "alpine-announce"
+ match "^List-Id:.*devel" in headers action "alpine-devel"
+ match "^List-Id:.*users" in headers action "alpine-users"
+}
+
+
# freebsd
match "^List-Id:.*freebsd-.*\\.freebsd\\.org" in headers {
match "^List-Id:.*announce" in headers action "freebsd-announce"
(DIR) diff --git a/install.sh b/install.sh
@@ -1,90 +0,0 @@
-#!/usr/bin/env sh
-# https://git.sr.ht/~proycon/alpine-desktop-dotfiles/blob/master/install.sh
-
-usage() {
- echo "Usage: install.sh [options] username" >&2
- echo "Options:" >&2
- echo " -u [user] Create and configure for user" >&2
-}
-
-die() {
- echo "$*" >&2
- exit 2
-}
-
-user=""
-
-while getopts ":hVu:x:Us:" arg; do
- case ${arg} in
- h)
- usage
- exit 0
- ;;
- u)
- user="$OPTARG"
- ;;
- ?)
- echo "Invalid option: -${OPTARG}."
- exit 2
- ;;
- esac
-done
-
-if [ -z "$user" ]; then
- echo "Error: Please specify the -u option, it is mandatory." >&2
- usage
- exit 2
-fi
-
-echo "=== Enable community repo ===" >&2
-sed -i '/v3\..*\/community/s/^#//g' /etc/apk/repositories
-
-echo "=== Updating base system ===" >&2
-apk update || die "update failed"
-apk upgrade -a || die "upgrade failed"
-
-#command-line essentials
-echo "=== installing command-line essentials ===" >&2
-apk add curl wget git vim tar zip gzip bzip2 rsync build-base less || die "failure installing command-line essentials"
-
-#basic wayland
-echo "=== Installing Wayland system ===" >&2
-apk add mesa-dri-gallium eudev font-hack seatd sway foot bemenu xwayland || die "failure installing basic X system"
-
-setup-udev || die "udev setup failed"
-
-#basic X tools
-echo "=== Installing tools ===" >&2
-apk add mpv zathura-pdf-mupdf firefox mutt mpd ncmpcpp lynx || die "failure installing tools"
-
-setup-udev || die "udev setup failed"
-
-echo "=== Installing audio ===" >&2
-apk add dbus dbus-openrc pipewire wireplumber rtkit pipewire-alsa || die "failure installing tools"
-
-echo "=== Bluetooth setup ===" >&2
-apk add bluez bluez-openrc pipewire-spa-bluez || die "failure installing tools"
-
-echo "=== installing documentation ===" >&2
-apk add mandoc mandoc-apropos man-pages docs || die "failure installing documentation"
-
-if [ ! -d "/home/$user" ]; then
- echo "=== Creating user ===" >&2
- #add user
- adduser "$user" || die "unable to add user"
- usermod -G audio,wheel,input,video,seat,rtkit -a -s /bin/ash "$user" || die "unable to add groups"
- mkdir "/home/$user/.config"
-
-fi
-
-echo "=== Starting services ===" >&2
-rc-update add seatd
-rc-service seatd start
-
-rc-update add dbus default
-rc-service dbus start
-
-rc-update add bluetooth
-rc-service bluetooth start
-
-echo "Not included by default: printer (do apk add cups && rc-update add cupsd)" >&2
(DIR) diff --git a/mpd/mpd.conf b/mpd/mpd.conf
@@ -6,9 +6,10 @@ pid_file "/home/jay/.config/mpd/mpd.pid"
state_file "/home/jay/.config/mpd/mpdstate"
audio_output {
- type "pulse"
- name "pulse audio"
+ type "pipewire"
+ name "PipeWire Sound Server"
}
+
audio_output {
type "fifo"
name "my_fifo"
(DIR) diff --git a/mutt/muttrc b/mutt/muttrc
@@ -76,6 +76,9 @@ mailboxes +feeds/uninformativ
# mailing lists
mailboxes +mailinglists
+mailboxes -label "alpine.users" +ml/alpine.users
+mailboxes -label "alpine.devel" +ml/alpine.devel
+mailboxes -label "alpine.announce" +ml/alpine.announce
mailboxes -label "srht.discuss" +ml/srht.discuss
mailboxes -label "srht.dev" +ml/srht.dev
mailboxes -label "freebsd.questions" +ml/freebsd.questions
(DIR) diff --git a/pkg/archlinux b/pkg/archlinux
@@ -1,146 +0,0 @@
-alsa-utils
-amfora
-aspell
-aspell-en
-autoconf
-automake
-base
-bash-completion
-bc
-beets
-bemenu
-binutils
-bison
-bluez-utils
-borg
-calibre
-campdown
-castget
-checkbashisms
-chrony
-clipman
-cronie
-dhcpcd
-efibootmgr
-fakeroot
-fdm
-feh
-firefox
-flex
-foot
-fzf
-gcc
-gdb
-gemget
-git
-glu
-gnu-free-fonts
-gnu-netcat
-go
-go-mtpfs-git
-groff
-grub
-imagemagick
-inetutils
-iw
-iwd
-jq
-jre-openjdk-headless
-keepass
-lf-bin
-lib32-alsa-lib
-lib32-alsa-plugins
-lib32-giflib
-lib32-gnutls
-lib32-gst-plugins-base-libs
-lib32-gtk3
-lib32-libpulse
-lib32-libva
-lib32-libxcomposite
-lib32-libxinerama
-lib32-libxslt
-lib32-mesa
-lib32-mpg123
-lib32-ocl-icd
-lib32-openal
-lib32-openssl-1.0
-lib32-pipewire
-lib32-sqlite
-lib32-v4l-utils
-lib32-vulkan-icd-loader
-lib32-vulkan-radeon
-libcurl-gnutls
-libtool
-libva-mesa-driver
-libxft
-libxinerama
-linux
-linux-firmware
-linux-headers
-lynx
-m4
-make
-man-db
-mpd
-mpv
-mutt
-ncmpcpp
-ntfs-3g
-ntp
-ocl-icd
-openssh
-openssl-1.0
-openttd
-openttd-opengfx
-openttd-opensfx
-pacman-contrib
-pamixer
-paru
-pass
-pass-audit-git
-patch
-perl-authen-sasl
-perl-io-socket-ssl
-pipewire-alsa
-pipewire-jack
-pipewire-pulse
-pkgconf
-poppler
-pulsemixer
-python-adblock
-qt5-wayland
-qutebrowser
-rsync
-senpai-irc-git
-shellcheck-bin
-shfmt
-sudo
-sway
-terminus-font
-texinfo
-ttf-hack
-ttf-liberation
-unrar
-unzip
-urlview
-usbutils
-vim
-vulkan-radeon
-w3m
-waybar
-webkit2gtk
-wget
-which
-wlsunset
-wtwitch
-xcb-util-errors
-xdg-ninja-git
-xf86-video-amdgpu
-xorg-server-common
-xorg-xset
-xorg-xwayland
-yt-dlp
-yt-dlp-drop-in
-ytfzf
-zathura
-zip
(DIR) diff --git a/pkg/freebsd.txt b/pkg/freebsd.txt
@@ -1,47 +0,0 @@
-amfora
-castget
-checkbashisms
-dialog4ports
-doas
-drm-kmod
-fdm
-firefox
-flock
-fusefs-ntfs
-fzf
-gcc
-git-lite
-gmake
-groff
-grub2-bhyve
-hack-font
-hs-ShellCheck
-jq
-lf
-libXft
-libXinerama
-lynx
-mksh
-mpv
-mupdf
-musicpd
-mutt
-ncmpcpp
-password-store
-pkg
-pkgconf
-py37-pip
-qutebrowser
-rsync
-rtorrent
-scummvm
-sxiv
-vim-console
-vm-bhyve
-wireguard
-xauth
-xinit
-xorg
-xorg-fonts
-xorg-server
-xrandr
(DIR) diff --git a/profile b/profile
@@ -1,67 +1,2 @@
-# users bin
-if [ -d "$HOME/bin" ]; then
- PATH="$HOME/bin:$PATH"
-fi
-
-# xdg related exports
-if test -z "${XDG_RUNTIME_DIR}"; then
- export XDG_RUNTIME_DIR=/tmp/$(id -u)-runtime-dir
- if ! test -d "${XDG_RUNTIME_DIR}"; then
- mkdir "${XDG_RUNTIME_DIR}"
- chmod 0700 "${XDG_RUNTIME_DIR}"
- fi
-fi
-
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DOWNLOAD_DIR="$HOME/tmp"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_DESKTOP_DIR="$HOME/"
-
-# cleanup ~/
-export PASSWORD_STORE_DIR="$XDG_CONFIG_HOME"/pass
-export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
-export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
-export HISTFILE="${XDG_STATE_HOME}"/bash/history
-export CARGO_HOME="$XDG_DATA_HOME"/cargo
-alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
-
-# ps1 setup
-BOLD="\[$(tput bold)\]"
-RESET="\[$(tput sgr0)\]"
-export PS1="${BOLD}\w \$ ${RESET}"
-
-# common exports
-GPG_TTY=$(tty)
-export GPG_TTY
-export EDITOR="vim"
-export BROWSER="qutebrowser"
-export GOPATH="$XDG_DATA_HOME"/go
-export GOPROXY=direct
-
-export BEMENU_OPTS="-p '> ' --tb '#013220' --tf '#ffffff' --hf '#444444'"
-
-# enable color support of common commands
-if [ -x /usr/bin/dircolors ]; then
- alias ls='ls --color=auto'
- alias grep='grep --color=auto'
-fi
-
-# safety first kids!
-alias cp='cp -i'
-alias mv='mv -i'
-alias rm='rm -i'
-
-# random alias
-alias xclip='xclip -selection c'
-alias yt-mp3='youtube-dl --extract-audio --audio-format mp3'
-alias t='wtwitch'
-alias weather='curl wttr.in/?1QF'
-
-# git alias
-alias ga='git add -A'
-alias gs='git status -s'
-alias gl="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
-alias gd='git diff'
-alias gma='git commit -am'
+ENV=$HOME/.ashrc; export ENV
+. $ENV
(DIR) diff --git a/sway/config b/sway/config
@@ -18,7 +18,7 @@ set $vol pamixer
exec wlsunset -l 57.6495 -L 3.318
exec mpd
exec wl-paste -t text --watch clipman store --no-persist
-#exec /usr/libexec/pipewire-launcher
+exec /usr/libexec/pipewire-launcher
# apperance
default_border none