Further trimmed .linux_items
* oh-my-zsh is now downloaded during update_archiso * (Including the lean theme) * packages.both removed * It's now built during update_archiso
This commit is contained in:
2Shirt
parent
708ffe1157
commit
faffd66d09
6 changed files with 25 additions and 261 deletions
Binary file not shown.
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xbel version="1.0"
|
||||
xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
|
||||
xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
|
||||
>
|
||||
<bookmark href="file:///usr/share/wallpaper" added="2016-05-01T18:50:20Z" modified="2016-05-01T18:50:20Z" visited="2016-05-01T18:50:21Z">
|
||||
<info>
|
||||
<metadata owner="http://freedesktop.org">
|
||||
<mime:mime-type type="inode/directory"/>
|
||||
<bookmark:applications>
|
||||
<bookmark:application name="xfdesktop-settings" exec="'xfdesktop-settings %u'" modified="2016-05-01T18:50:20Z" count="1"/>
|
||||
</bookmark:applications>
|
||||
</metadata>
|
||||
</info>
|
||||
</bookmark>
|
||||
</xbel>
|
||||
|
|
@ -1,90 +1,11 @@
|
|||
# If you come from bash you might have to change your $PATH.
|
||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH=$HOME/.oh-my-zsh
|
||||
|
||||
# Set name of the theme to load. Optionally, if you set this to "random"
|
||||
# it'll load a random theme each time that oh-my-zsh is loaded.
|
||||
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
|
||||
# Oh My ZSH
|
||||
export ZSH=$HOME/.oh-my-zsh
|
||||
ZSH_THEME="lean"
|
||||
|
||||
# Uncomment the following line to use case-sensitive completion.
|
||||
# CASE_SENSITIVE="true"
|
||||
|
||||
# Uncomment the following line to use hyphen-insensitive completion. Case
|
||||
# sensitive completion must be off. _ and - will be interchangeable.
|
||||
# HYPHEN_INSENSITIVE="true"
|
||||
|
||||
# Uncomment the following line to disable bi-weekly auto-update checks.
|
||||
DISABLE_AUTO_UPDATE="true"
|
||||
|
||||
# Uncomment the following line to change how often to auto-update (in days).
|
||||
# export UPDATE_ZSH_DAYS=13
|
||||
|
||||
# Uncomment the following line to disable colors in ls.
|
||||
# DISABLE_LS_COLORS="true"
|
||||
|
||||
# Uncomment the following line to disable auto-setting terminal title.
|
||||
# DISABLE_AUTO_TITLE="true"
|
||||
|
||||
# Uncomment the following line to enable command auto-correction.
|
||||
# ENABLE_CORRECTION="true"
|
||||
|
||||
# Uncomment the following line to display red dots whilst waiting for completion.
|
||||
# COMPLETION_WAITING_DOTS="true"
|
||||
|
||||
# Uncomment the following line if you want to disable marking untracked files
|
||||
# under VCS as dirty. This makes repository status check for large repositories
|
||||
# much, much faster.
|
||||
# DISABLE_UNTRACKED_FILES_DIRTY="true"
|
||||
|
||||
# Uncomment the following line if you want to change the command execution time
|
||||
# stamp shown in the history command output.
|
||||
# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
|
||||
HIST_STAMPS="yyyy-mm-dd"
|
||||
|
||||
# Would you like to use another custom folder than $ZSH/custom?
|
||||
# ZSH_CUSTOM=/path/to/new-custom-folder
|
||||
|
||||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||
# Add wisely, as too many plugins slow down shell startup.
|
||||
plugins=(archlinux git sudo systemd tmux)
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# User configuration
|
||||
|
||||
# export MANPATH="/usr/local/man:$MANPATH"
|
||||
|
||||
# You may need to manually set your language environment
|
||||
# export LANG=en_US.UTF-8
|
||||
|
||||
# Preferred editor for local and remote sessions
|
||||
# if [[ -n $SSH_CONNECTION ]]; then
|
||||
# export EDITOR='vim'
|
||||
# else
|
||||
# export EDITOR='mvim'
|
||||
# fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch x86_64"
|
||||
|
||||
# ssh
|
||||
# export SSH_KEY_PATH="~/.ssh/rsa_id"
|
||||
|
||||
# Set personal aliases, overriding those provided by oh-my-zsh libs,
|
||||
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
|
||||
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
|
||||
# For a full list of active aliases, run `alias`.
|
||||
#
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
|
||||
## Load aliases
|
||||
# Wizard Kit
|
||||
. $HOME/.aliases
|
||||
|
||||
## Update LS_COLORS
|
||||
eval $(dircolors ~/.dircolors)
|
||||
|
|
|
|||
|
|
@ -1,153 +0,0 @@
|
|||
aic94xx-firmware
|
||||
alsa-utils
|
||||
antiword
|
||||
arch-install-scripts
|
||||
bash-pipes
|
||||
bc
|
||||
bluez
|
||||
bluez-utils
|
||||
btrfs-progs
|
||||
cbatticon
|
||||
chntpw
|
||||
cmatrix
|
||||
colordiff
|
||||
compton
|
||||
conky
|
||||
crda
|
||||
curl
|
||||
darkhttpd
|
||||
ddrescue
|
||||
dhclient
|
||||
dialog
|
||||
dmidecode
|
||||
dmraid
|
||||
dnsmasq
|
||||
dnsutils
|
||||
dos2unix
|
||||
dosfstools
|
||||
dunst
|
||||
e2fsprogs
|
||||
elinks
|
||||
ethtool
|
||||
exfat-utils
|
||||
f2fs-tools
|
||||
feh
|
||||
ffmpeg
|
||||
firefox
|
||||
fsarchiver
|
||||
gnome-keyring
|
||||
gnu-netcat
|
||||
gparted
|
||||
gptfdisk
|
||||
grub
|
||||
gsmartcontrol
|
||||
gtk-theme-arc-git
|
||||
hardinfo
|
||||
hdparm
|
||||
hexedit
|
||||
hfsprogs
|
||||
htop
|
||||
i3-gaps
|
||||
i3lock-fancy-git
|
||||
i3status
|
||||
inxi
|
||||
ipw2100-fw
|
||||
ipw2200-fw
|
||||
irssi
|
||||
ldns
|
||||
lftp
|
||||
libewf
|
||||
libinput
|
||||
linux-atm
|
||||
linux-firmware
|
||||
lm_sensors
|
||||
lsscsi
|
||||
mc
|
||||
mdadm
|
||||
mediainfo
|
||||
mesa-demos
|
||||
mkvtoolnix-cli
|
||||
mprime-bin
|
||||
mpv
|
||||
mtools
|
||||
mupdf
|
||||
ncdu
|
||||
ndisc6
|
||||
network-manager-applet
|
||||
networkmanager
|
||||
nfs-utils
|
||||
nilfs-utils
|
||||
nmap
|
||||
ntfs-3g
|
||||
ntp
|
||||
oblogout
|
||||
openbox-patched
|
||||
openconnect
|
||||
openssh
|
||||
openvpn
|
||||
p7zip
|
||||
papirus-icon-theme
|
||||
partclone
|
||||
parted
|
||||
partimage
|
||||
pasystray
|
||||
pavucontrol
|
||||
ppp
|
||||
pptpclient
|
||||
progsreiserfs
|
||||
pulseaudio
|
||||
qemu-guest-agent
|
||||
reiserfsprogs
|
||||
rfkill
|
||||
rng-tools
|
||||
rofi
|
||||
rp-pppoe
|
||||
rsync
|
||||
rxvt-unicode
|
||||
sdparm
|
||||
sg3_utils
|
||||
smartmontools
|
||||
speedtest-cli
|
||||
speedtouch
|
||||
spice-vdagent
|
||||
sudo
|
||||
tcpdump
|
||||
terminus-font
|
||||
testdisk-wip
|
||||
thunar
|
||||
tint2
|
||||
tk
|
||||
tmux
|
||||
tree
|
||||
ttf-font-awesome
|
||||
ttf-inconsolata
|
||||
udevil
|
||||
udisks2
|
||||
ufw
|
||||
unzip
|
||||
usb_modeswitch
|
||||
veracrypt
|
||||
vim
|
||||
virtualbox-guest-modules-arch
|
||||
virtualbox-guest-utils
|
||||
vpnc
|
||||
wd719x-firmware
|
||||
wget
|
||||
wimlib
|
||||
wireless_tools
|
||||
wpa_actiond
|
||||
wvdial
|
||||
xf86-input-libinput
|
||||
xf86-video-amdgpu
|
||||
xf86-video-fbdev
|
||||
xf86-video-intel
|
||||
xf86-video-nouveau
|
||||
xf86-video-vesa
|
||||
xl2tpd
|
||||
xorg-server
|
||||
xorg-xdpyinfo
|
||||
xorg-xev
|
||||
xorg-xinit
|
||||
xorg-xinput
|
||||
zd1211-firmware
|
||||
zsh
|
||||
32
Build Linux
32
Build Linux
|
|
@ -7,6 +7,7 @@ ROOT_DIR="$(realpath $(dirname "$0"))"
|
|||
BUILD_DIR="$ROOT_DIR/BUILD_LINUX"
|
||||
ARCHLIVE_DIR="$BUILD_DIR/Archlive"
|
||||
CUSTOM_REPO_DIR="$BUILD_DIR/CustomRepo"
|
||||
SKEL="$ARCHLIVE_DIR/airootfs/etc/skel"
|
||||
DATE="$(date +%F)"
|
||||
DATETIME="$(date +%F_%H%M)"
|
||||
LOG_DIR="$BUILD_DIR/Logs"
|
||||
|
|
@ -55,28 +56,37 @@ function copy_archiso() {
|
|||
# Add items
|
||||
rsync -aI "$ROOT_DIR/.linux_items/include/live/" "$ARCHLIVE_DIR/"
|
||||
|
||||
# Update build.sh
|
||||
if ! grep -iq 'customize_iso' "$ARCHLIVE_DIR/build.sh"; then
|
||||
sed -ir "s!run_once make_iso\$!# customize_iso\ncp -a \"$ROOT_DIR/.linux_items/include/iso\"/* \"\${work_dir}/iso\"/\n\nrun_once make_iso!" "$ARCHLIVE_DIR/build.sh"
|
||||
fi
|
||||
|
||||
# Remove items
|
||||
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/scripts/choose-mirror"
|
||||
rmdir "$ARCHLIVE_DIR/airootfs/etc/systemd/scripts" --ignore-fail-on-non-empty
|
||||
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/system/choose-mirror.service"
|
||||
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount"
|
||||
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/system/pacman-init.service"
|
||||
rm "$ARCHLIVE_DIR/airootfs/etc/systemd/udev/rules.d/81-dhcpcd.rules"
|
||||
rmdir "$ARCHLIVE_DIR/airootfs/etc/systemd/udev/rules.d" --ignore-fail-on-non-empty
|
||||
rmdir "$ARCHLIVE_DIR/airootfs/etc/systemd/udev" --ignore-fail-on-non-empty
|
||||
rm "$ARCHLIVE_DIR/airootfs/etc/udev/rules.d/81-dhcpcd.rules"
|
||||
rmdir "$ARCHLIVE_DIR/airootfs/etc/udev/rules.d" --ignore-fail-on-non-empty
|
||||
rmdir "$ARCHLIVE_DIR/airootfs/etc/udev" --ignore-fail-on-non-empty
|
||||
}
|
||||
|
||||
# Update items
|
||||
function update_archlive() {
|
||||
# build.sh
|
||||
if ! grep -iq 'customize_iso' "$ARCHLIVE_DIR/build.sh"; then
|
||||
sed -ir "s!run_once make_iso\$!# customize_iso\ncp -a \"$ROOT_DIR/.linux_items/include/iso\"/* \"\${work_dir}/iso\"/\n\nrun_once make_iso!" "$ARCHLIVE_DIR/build.sh"
|
||||
fi
|
||||
|
||||
# MOTD
|
||||
sed -i "s/WK/$KIT_NAME_SHORT/" "$ARCHLIVE_DIR/airootfs/etc/motd"
|
||||
sed -ir 's/^(b43|clonezilla|gpm|grml|refind|testdisk|vim)/#\1/' "$ARCHLIVE_DIR/packages.both"
|
||||
|
||||
# Live packages
|
||||
sed -i -r 's/^(b43|clonezilla|gpm|grml|refind|testdisk|vim)/#\1/' "$ARCHLIVE_DIR/packages.both"
|
||||
cat "$ROOT_DIR/.linux_items/packages/live" >> "$ARCHLIVE_DIR/packages.both"
|
||||
echo "[CustomRepo]" >> "$ARCHLIVE_DIR/pacman.conf"
|
||||
echo "SigLevel = Optional TrustAll" >> "$ARCHLIVE_DIR/pacman.conf"
|
||||
echo "file://$CUSTOM_REPO_DIR" >> "$ARCHLIVE_DIR/pacman.conf"
|
||||
|
||||
# Oh My ZSH
|
||||
git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git "$SKEL/.oh-my-zsh"
|
||||
rm -Rf "$SKEL/.oh-my-zsh/.git"
|
||||
curl -o "$SKEL/.oh-my-zsh/themes/lean.zsh-theme" https://raw.githubusercontent.com/miekg/lean/master/prompt_lean_test.zsh
|
||||
}
|
||||
|
||||
function copy_settings() {
|
||||
|
|
@ -193,6 +203,7 @@ function build_full() {
|
|||
copy_settings
|
||||
update_repo
|
||||
copy_archiso
|
||||
update_archlive
|
||||
# Rerun script as root to start Archiso build process
|
||||
run_elevated "$(realpath "$0")" --build-arch
|
||||
}
|
||||
|
|
@ -205,6 +216,7 @@ case $1 in
|
|||
|
||||
--copy-archiso)
|
||||
copy_archiso
|
||||
update_archlive
|
||||
;;
|
||||
|
||||
--install-deps)
|
||||
|
|
|
|||
Loading…
Reference in a new issue