Some cleanup

8 files changed, 29 insertions, 141 deletions

diff --git a/dotfiles/.config/sway/fulcrum b/dotfiles/.config/sway/fulcrum
new file mode 100644
index 0000000..cf233c5
--- /dev/null
+++ b/dotfiles/.config/sway/fulcrum
@@ -0,0 +1,28 @@
+# vim: filetype=i3
+
+# Configuration specific to my laptop computer
+
+# Automatic display settings
+exec kanshi
+
+# Default wallpaper
+output "*" background ~/.config/wall1.png fill
+
+# Outputs
+output "eDP-1" pos 0 0 scale 1.25
+
+# On lid close
+bindswitch --reload --locked lid:on exec "swaysession suspend"
+
+# Workspaces
+workspace $ws1  output eDP-1 HDMI-A-2
+workspace $ws2  output eDP-1 HDMI-A-2
+workspace $ws3  output eDP-1 HDMI-A-2
+workspace $ws4  output eDP-1 HDMI-A-2
+workspace $ws5  output eDP-1 HDMI-A-2
+workspace $ws6  output eDP-1 HDMI-A-2
+workspace $ws7  output VGA-1
+workspace $ws8  output VGA-1
+workspace $ws9  output VGA-1
+workspace $ws10 output VGA-1
+
diff --git a/install.sh b/install.sh
deleted file mode 100755
index b792183..0000000
--- a/install.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# Helper script to install some programs and configs for an Arch+Sway system
-# Needs (quite some) work
-
-if [ -z "$1" ]; then
-  echo "Specify username for new user"
-  exit 1;
-fi
-
-CLONEDIR=$PWD
-
-# Install some basic programs
-pacman -Sy --noconfirm base-devel zsh zsh-syntax-highlighting man networkmanager openresolv wireguard-tools bind-tools neovim sway swaylock swayidle waybar egl-wayland imv swaybg xorg-server-xwayland termite kitty qt5-wayland wl-clipboard dbus tmux htop bemenu mupdf mpd ncmpcpp mpc mpv libnotify mako cronie rsync grim slop ffmpeg w3m youtube-dl youtube-viewer newsboat wget curl krita inkscape darktable gcc make fontconfig pkg-config fakeroot papirus-icon-theme alsa-utils pulseaudio pamixer pulseaudio-bluetooth imagemagick ntfs-3g unzip unrar gnome-themes-standard gtk-engine-murrine telegram-desktop qt5ct r bc udisks2 perl-term-readline-gnu transmission-cli transmission-remote-gtk 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 acpilight powertop accountsservice lightdm xdg-user-dirs abook ranger terminus-font qutebrowser jq stow wdiff texlive-most pandoc units isync notmuch gnome-keyring pacman-contrib
-
-# Copy system config files
-cp system/sudoers /etc/
-cp system/resolvconf.conf /etc/
-cp system/NetworkManager/NetworkManager.conf /etc/NetworkManager/NetworkManager.conf
-cp system/mkinitcpio.conf /etc/
-cp systemd/hotspot.service /etc/systemd/system/
-cp systemd/startupsound.service /etc/systemd/system/
-cp system/pam.d/* /etc/pam.d/
-cp system/systemd/journald.conf /etc/systemd/journald.conf
-
-systemctl enable lightdm
-systemctl enable NetworkManager
-systemctl start NetworkManager
-
-# Create non-root user with superuser privileges
-useradd -G wheel network video storage optical disk audio -s /bin/zsh "$1"
-passwd "$1"
-
-# Install AUR helper
-cd /tmp
-mkdir build
-chown -R "$1:$1" build
-cd build
-sudo -u "$1" "git clone https://aur.archlinux.org/yay.git && cd yay && makepkg -si"
-
-yay -S --noconfirm aerc-git ttf-symbola pam-gnupg pacmixer mimeo xdg-utils-mimeo cli-visualizer
-
-cd "$CLONEDIR"
-
-# System customization (graphical loader, DM)
-cp -r system/loader/ /boot/loader/
-cp -r system/lightdm/ /etc/lightdm/
-cp system/plymouth/bgrt.plymouth /usr/share/plymouth/themes/bgrt/bgrt.plymouth
-
-# Copy some fonts to make them available system-wide
-mkdir -p /usr/share/fonts/rice
-cp system/fonts/* /usr/share/fonts/rice/
-
-plymouth-set-default-theme -R bgrt
diff --git a/laptop/lid-button b/laptop/lid-button
deleted file mode 100644
index e2a381d..0000000
--- a/laptop/lid-button
+++ /dev/null
@@ -1,2 +0,0 @@
-event=button/lid
-action=/etc/acpi/actions/lid-button.sh %e
diff --git a/laptop/lid-button.sh b/laptop/lid-button.sh
deleted file mode 100755
index 71f67c6..0000000
--- a/laptop/lid-button.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export SWAYSOCK=/run/user/1000/sway-ipc.1000.$(pgrep -x sway).sock
-
-case "$3" in
-	close)
-        logger "LID close on custom";
-        if [ "$(ps cax | grep sway)" ]; then
-            su yaroslav -c "swaymsg exec 'swaysession suspend'"
-        else
-            systemctl suspend
-        fi
-		;;
-	open)
-		logger "LID open on custom" ;;
-	*)
-		logger "LID undefined action $1" ;;
-esac
diff --git a/system/loader/entries/arch.conf b/system/loader/entries/arch.conf
deleted file mode 100755
index 5d60a7a..0000000
--- a/system/loader/entries/arch.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title Arch Linux
-linux /vmlinuz-linux
-initrd /initramfs-linux.img
-options root=/dev/ArchVolGroup-root rw quiet splash loglevel=2 rd.udev.log_priority=3 rd.systemd.show_status=false vt.global_cursor_default=0 cryptdevice=/dev/nvme0n1p2:cryptlvm root=/dev/ArchVolGroup/root bluetooth.disable_ertm=1
diff --git a/system/loader/loader.conf b/system/loader/loader.conf
deleted file mode 100755
index a8c34e5..0000000
--- a/system/loader/loader.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#timeout 3
-#console-mode keep
-default arch
diff --git a/system/plymouth/bgrt.plymouth b/system/plymouth/bgrt.plymouth
deleted file mode 100644
index bf3e15e..0000000
--- a/system/plymouth/bgrt.plymouth
+++ /dev/null
@@ -1,60 +0,0 @@
-[Plymouth Theme]
-Name=BGRT
-Description=Jimmac's spinner theme using the ACPI BGRT graphics as background
-ModuleName=two-step
-
-[two-step]
-Font=Cantarell 12
-TitleFont=Cantarell Light 28
-ImageDir=/usr/share/plymouth/themes/spinner
-DialogHorizontalAlignment=.5
-DialogVerticalAlignment=.8
-TitleHorizontalAlignment=.5
-TitleVerticalAlignment=.4
-HorizontalAlignment=.5
-VerticalAlignment=.7
-WatermarkHorizontalAlignment=.5
-WatermarkVerticalAlignment=.96
-Transition=fade
-TransitionDuration=1.0
-BackgroundStartColor=0x1b1e25
-BackgroundEndColor=0x1b1e25
-ProgressBarBackgroundColor=0x606060
-ProgressBarForegroundColor=0xffffff
-DialogClearsFirmwareBackground=false
-MessageBelowAnimation=true
-
-[boot-up]
-DialogClearsFirmwareBackground=false
-UseFirmwareBackground=true
-UseProgressBar=true
-
-[shutdown]
-UseFirmwareBackground=false
-_Title=Powering off...
-
-[reboot]
-UseFirmwareBackground=false
-_Title=Rebooting...
-
-[updates]
-SuppressMessages=true
-ProgressBarShowPercentComplete=true
-UseProgressBar=true
-_Title=Installing Updates...
-_SubTitle=Do not turn off your computer
-
-[system-upgrade]
-SuppressMessages=true
-ProgressBarShowPercentComplete=true
-UseProgressBar=true
-_Title=Upgrading System...
-_SubTitle=Do not turn off your computer
-
-[firmware-upgrade]
-SuppressMessages=true
-ProgressBarShowPercentComplete=true
-UseProgressBar=true
-UseFirmwareBackground=true
-_Title=Upgrading Firmware...
-_SubTitle=Do not turn off your computer
diff --git a/system/sudoers b/system/sudoers
index bb24b9f..361226b 100644
--- a/system/sudoers
+++ b/system/sudoers
@@ -9,6 +9,7 @@
 
 Defaults passwd_timeout=0
 Defaults timestamp_timeout=15
+Defaults timestamp_type=global
 
 ##
 ## User privilege specification