Merge because stupid
This commit is contained in:
commit
14702f2d00
36
PKGBUILD
36
PKGBUILD
|
@ -3,8 +3,9 @@ pkgver=0.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Thurstylark's auto configuration and package depends"
|
pkgdesc="Thurstylark's auto configuration and package depends"
|
||||||
arch=(any)
|
arch=(any)
|
||||||
url="git.archlinux.org/tl-config"
|
url="http://git.thurstylark.org/tl-config"
|
||||||
license=('none')
|
license=('none')
|
||||||
|
<<<<<<< HEAD
|
||||||
groups=()
|
groups=()
|
||||||
depends=(
|
depends=(
|
||||||
# System setup
|
# System setup
|
||||||
|
@ -18,8 +19,27 @@ depends=(
|
||||||
'alsa-utils'
|
'alsa-utils'
|
||||||
# Non-graphical environment
|
# Non-graphical environment
|
||||||
'vifm' 'vcsh'
|
'vifm' 'vcsh'
|
||||||
|
=======
|
||||||
|
depends=('pacaur'
|
||||||
|
'git'
|
||||||
|
'openssh'
|
||||||
|
'mosh'
|
||||||
|
'chromium'
|
||||||
|
'chromium-widevine'
|
||||||
|
'i3'
|
||||||
|
'3lock'
|
||||||
|
'dmenu'
|
||||||
|
'germinal'
|
||||||
|
'tmux'
|
||||||
|
'vifm'
|
||||||
|
'vcsh'
|
||||||
|
'htop'
|
||||||
|
'nmap'
|
||||||
|
'pkgfile'
|
||||||
|
>>>>>>> b4d547670e10ac1585f21a914cc5e6f9887f0aa1
|
||||||
'pass'
|
'pass'
|
||||||
'vim-systemd'
|
'vim-systemd'
|
||||||
|
<<<<<<< HEAD
|
||||||
# Non-graphical Apps
|
# Non-graphical Apps
|
||||||
'nmap' 'openvpn'
|
'nmap' 'openvpn'
|
||||||
'pbpst' 'fb-client' 'shellcheck'
|
'pbpst' 'fb-client' 'shellcheck'
|
||||||
|
@ -54,8 +74,20 @@ source=("10-dpms.conf"
|
||||||
"50-synaptics.conf"
|
"50-synaptics.conf"
|
||||||
"mirrorupgrade.hook"
|
"mirrorupgrade.hook"
|
||||||
)
|
)
|
||||||
|
=======
|
||||||
|
'vte3-ng'
|
||||||
|
'xautolock'
|
||||||
|
'xclip'
|
||||||
|
'xdotool')
|
||||||
|
install=
|
||||||
|
source=("20-inteltearfree.conf"
|
||||||
|
"50-synaptics.conf"
|
||||||
|
"pacman.conf")
|
||||||
|
>>>>>>> b4d547670e10ac1585f21a914cc5e6f9887f0aa1
|
||||||
noextract=()
|
noextract=()
|
||||||
md5sums=()
|
md5sums=('760c4d3a7fa06a68a981e9785f235218'
|
||||||
|
'5584c5db17558cc6ccafc48e4e2d6f6b'
|
||||||
|
'1dfed5a9bb5ffc5fe43b361f7ece50b4')
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
make DESTDIR="$pkgdir/" install
|
make DESTDIR="$pkgdir/" install
|
||||||
|
|
Loading…
Reference in New Issue