aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav de la Peña Smirnov <yps@yaroslavps.com>2021-05-20 16:14:23 +0300
committerYaroslav de la Peña Smirnov <yps@yaroslavps.com>2021-05-20 16:14:23 +0300
commita5c47661ab4003e9b7221ac87a521ff361d37ec6 (patch)
tree15820de53dd08e742990c0e49664b8030aa34f36
parent518e002630d907c6d6c13e3ec3becd7d24382669 (diff)
downloadswayrice-a5c47661ab4003e9b7221ac87a521ff361d37ec6.tar.gz
swayrice-a5c47661ab4003e9b7221ac87a521ff361d37ec6.zip
Changes after having to reinstall Artix
Mainly to install script and sway config for my X200.
-rwxr-xr-xartix.sh37
-rw-r--r--dotfiles/.config/sway/basedpad24
2 files changed, 44 insertions, 17 deletions
diff --git a/artix.sh b/artix.sh
index 9352aa7..99918eb 100755
--- a/artix.sh
+++ b/artix.sh
@@ -4,12 +4,12 @@
# Artix+runit+Sway system
pacman -Sy zsh zsh-syntax-highlighting wireguard-tools mediainfo highlight \
- bind-tools sway swaylock swayidle waybar egl-wayland imv swaybg \
+ bind-tools sway swaylock swayidle waybar egl-wayland imv swaybg man-db \
xorg-server-xwayland alacritty qt5-wayland wl-clipboard dbus tmux htop \
bemenu bemenu-wlroots mupdf mpd ncmpcpp mpc mpv libnotify cronie \
- cronie-runit metalog metalog-runit dnsmasq networkmanager \
+ cronie-runit metalog metalog-runit dnsmasq networkmanager dhcpcd \
networkmanager-runit rsync grim wf-recorder slurp ffmpeg w3m youtube-dl \
- youtube-viewer newsboat wget curl inkscape gimp darktable gcc make \
+ newsboat wget curl inkscape gimp darktable gcc make wpa_supplicant \
fontconfig pkg-config fakeroot papirus-icon-theme alsa-utils pulseaudio \
pamixer pulseaudio-bluetooth imagemagick ntfs-3g unzip unrar \
gnome-themes-standard telegram-desktop qt5ct r bc udisks2 dash \
@@ -17,8 +17,8 @@ pacman -Sy zsh zsh-syntax-highlighting wireguard-tools mediainfo highlight \
python-pynvim python-pip python-pillow calcurse acpi acpid gnupg \
noto-fonts-cjk noto-fonts-emoji ttf-joypixels otf-latin-modern \
otf-latinmodern-math powerline-fonts python-pygit2 polkit polkit-gnome \
- zathura zathura-pdf-mupdf zathura-djvu gst-libav vifm blueman bluez \
- bluez-runit acpilight accountsservice xdg-user-dirs abook terminus-font \
+ zathura zathura-pdf-mupdf zathura-djvu gst-libav blueman bluez \
+ bluez-runit acpilight accountsservice xdg-user-dirs terminus-font \
qutebrowser jq stow wdiff texlive-most texlive-lang biber units isync \
notmuch pass translate-shell gnome-keyring pacman-contrib linux-headers \
openntpd openntpd-runit v4l2loopback-dkms || exit 1
@@ -31,14 +31,20 @@ cp -r system/NetworkManager/* /etc/NetworkManager/
cp -r system/pacman.d/hooks /etc/pacman.d/
cp -r runit/powertune /etc/runit/sv/
+# Copy some fonts to make them available system-wide
+mkdir -p /usr/share/fonts/rice
+cp system/fonts/* /usr/share/fonts/rice/
+
# Activate runit services
-ln -s /etc/runit/sv/dbus /run/runit/service/
-ln -s /etc/runit/sv/bluetoothd /run/runit/service/
-ln -s /etc/runit/sv/cronie /run/runit/service/
-ln -s /etc/runit/sv/metalog /run/runit/service/
-ln -s /etc/runit/sv/NetworkManager /run/runit/service/
-ln -s /etc/runit/sv/dhcpcd /run/runit/service/
-ln -s /etc/runit/sv/wpa_supplicant /run/runit/service/
+ln -s /etc/runit/sv/dbus /etc/runit/runsvdir/default/
+ln -s /etc/runit/sv/bluetoothd /etc/runit/runsvdir/default/
+ln -s /etc/runit/sv/cronie /etc/runit/runsvdir/default/
+ln -s /etc/runit/sv/metalog /etc/runit/runsvdir/default/
+ln -s /etc/runit/sv/NetworkManager /etc/runit/runsvdir/default/
+ln -s /etc/runit/sv/dhcpcd /etc/runit/runsvdir/default/
+ln -s /etc/runit/sv/wpa_supplicant /etc/runit/runsvdir/default/
+
+exit
# Install AUR helper
cd /tmp
@@ -48,9 +54,6 @@ cd build
sudo -u "$1" "git clone https://aur.archlinux.org/yay.git && cd yay && makepkg -si"
yay -S --noconfirm aerc-git ttf-symbola ttf-ms-fonts pam-gnupg ncpamixer mimeo \
- xdg-utils-mimeo cli-visualizer lf dragon-drag-and-drop swaylock-effects
-
-# Copy some fonts to make them available system-wide
-mkdir -p /usr/share/fonts/rice
-cp system/fonts/* /usr/share/fonts/rice/
+ xdg-utils-mimeo cli-visualizer lf dragon-drag-and-drop swaylock-effects \
+ youtube-viewer abook
diff --git a/dotfiles/.config/sway/basedpad b/dotfiles/.config/sway/basedpad
new file mode 100644
index 0000000..6d062b4
--- /dev/null
+++ b/dotfiles/.config/sway/basedpad
@@ -0,0 +1,24 @@
+# vim: filetype=i3
+
+# Configuration specific to my laptop computer
+
+# Default wallpaper
+output "*" background ~/.config/wall1.png fill
+
+# Outputs
+output "LVDS-1" pos 0 0
+
+# On lid close
+bindswitch --reload --locked lid:on exec "lock-color"
+
+# Workspaces
+workspace $ws1 output LVDS-1
+workspace $ws2 output LVDS-1
+workspace $ws3 output LVDS-1
+workspace $ws4 output LVDS-1
+workspace $ws5 output LVDS-1
+workspace $ws6 output LVDS-1
+workspace $ws7 output DP-1 VGA-1
+workspace $ws8 output DP-1 VGA-1
+workspace $ws9 output DP-1 VGA-1
+workspace $ws10 output DP-1 VGA-1