Browse Source

added base files and custom repository

bmallred 10 years ago
parent
commit
2083a1078b
106 changed files with 3854 additions and 0 deletions
  1. 22 0
      build.sh
  2. 33 0
      customrepo/build.sh
  3. 1 0
      customrepo/i686/customrepo.db
  4. BIN
      customrepo/i686/customrepo.db.tar.gz
  5. 140 0
      customrepo/makepkg32.conf
  6. 140 0
      customrepo/makepkg64.conf
  7. 11 0
      customrepo/packages.list
  8. 1 0
      customrepo/x86_64/customrepo.db
  9. BIN
      customrepo/x86_64/customrepo.db.tar.gz
  10. 3 0
      releng/aitab
  11. 264 0
      releng/build.sh
  12. 4 0
      releng/efiboot/loader/entries/archiso-x86_64-cd.conf
  13. 4 0
      releng/efiboot/loader/entries/archiso-x86_64-usb.conf
  14. 2 0
      releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf
  15. 2 0
      releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf
  16. 2 0
      releng/efiboot/loader/loader.conf
  17. 6 0
      releng/isolinux/isolinux.cfg
  18. 2 0
      releng/mkinitcpio.conf
  19. 125 0
      releng/packages.both
  20. 0 0
      releng/packages.i686
  21. 9 0
      releng/packages.x86_64
  22. 97 0
      releng/pacman.conf
  23. 0 0
      releng/root-image/etc/fstab
  24. 1 0
      releng/root-image/etc/hostname
  25. 18 0
      releng/root-image/etc/lightdm/lightdm-webkit-greeter.conf
  26. 151 0
      releng/root-image/etc/lightdm/lightdm.conf
  27. 1 0
      releng/root-image/etc/locale.conf
  28. 3 0
      releng/root-image/etc/modules-load.d/virtualbox.conf
  29. 6 0
      releng/root-image/etc/pam.d/su
  30. 37 0
      releng/root-image/etc/skel/.Xdefaults
  31. 37 0
      releng/root-image/etc/skel/.Xresources
  32. 43 0
      releng/root-image/etc/skel/.config/dunst/dunstrc
  33. 20 0
      releng/root-image/etc/skel/.config/i3/autostart
  34. 230 0
      releng/root-image/etc/skel/.config/i3/config
  35. 35 0
      releng/root-image/etc/skel/.config/i3/i3exit
  36. 19 0
      releng/root-image/etc/skel/.config/i3/shutdown
  37. 83 0
      releng/root-image/etc/skel/.config/i3status/config
  38. 3 0
      releng/root-image/etc/skel/.config/zsh/aliases.zsh
  39. 7 0
      releng/root-image/etc/skel/.config/zsh/autoloads.zsh
  40. 3 0
      releng/root-image/etc/skel/.config/zsh/flags.zsh
  41. 40 0
      releng/root-image/etc/skel/.config/zsh/keys.zsh
  42. 25 0
      releng/root-image/etc/skel/.config/zsh/prompt.zsh
  43. 3 0
      releng/root-image/etc/skel/.config/zsh/zsh/aliases.zsh
  44. 7 0
      releng/root-image/etc/skel/.config/zsh/zsh/autoloads.zsh
  45. 3 0
      releng/root-image/etc/skel/.config/zsh/zsh/flags.zsh
  46. 40 0
      releng/root-image/etc/skel/.config/zsh/zsh/keys.zsh
  47. 25 0
      releng/root-image/etc/skel/.config/zsh/zsh/prompt.zsh
  48. 1 0
      releng/root-image/etc/skel/.fehbg
  49. 1 0
      releng/root-image/etc/skel/.vim/bundle/YouCompleteMe
  50. 1 0
      releng/root-image/etc/skel/.vim/bundle/ctrlp.vim
  51. 1 0
      releng/root-image/etc/skel/.vim/bundle/lightline.vim
  52. 1 0
      releng/root-image/etc/skel/.vim/bundle/syntastic
  53. 1 0
      releng/root-image/etc/skel/.vim/bundle/vim-makeshift
  54. 1 0
      releng/root-image/etc/skel/.vim/bundle/vim-umbrella
  55. 1 0
      releng/root-image/etc/skel/.vim/bundle/vundle
  56. 3 0
      releng/root-image/etc/skel/.vim/settings.vim
  57. 3 0
      releng/root-image/etc/skel/.vim/settings/256colors.vim
  58. 5 0
      releng/root-image/etc/skel/.vim/settings/lightline.vim
  59. 1 0
      releng/root-image/etc/skel/.vim/settings/printer.vim
  60. 4 0
      releng/root-image/etc/skel/.vim/settings/python.vim
  61. 11 0
      releng/root-image/etc/skel/.vim/settings/syntastic.vim
  62. 13 0
      releng/root-image/etc/skel/.vim/vundle.vim
  63. 1 0
      releng/root-image/etc/skel/.vim/vundles/appearance.vundle
  64. 5 0
      releng/root-image/etc/skel/.vim/vundles/ide.vundle
  65. 1571 0
      releng/root-image/etc/skel/.viminfo
  66. 76 0
      releng/root-image/etc/skel/.vimrc
  67. 21 0
      releng/root-image/etc/skel/.xinitrc
  68. 24 0
      releng/root-image/etc/skel/.xprofile
  69. 5 0
      releng/root-image/etc/skel/.zprofile
  70. 1 0
      releng/root-image/etc/skel/.zshenv
  71. 27 0
      releng/root-image/etc/skel/.zshrc
  72. 9 0
      releng/root-image/etc/skel/dmenu/kbd-brightness-down
  73. 10 0
      releng/root-image/etc/skel/dmenu/kbd-brightness-up
  74. 11 0
      releng/root-image/etc/skel/dmenu/kbd-wifi-toggle
  75. 7 0
      releng/root-image/etc/skel/dmenu/vm-stop-all
  76. 9 0
      releng/root-image/etc/skel/virtual/assign_ca.sh
  77. 11 0
      releng/root-image/etc/skel/virtual/gencert.sh
  78. 1 0
      releng/root-image/etc/sudoers.d/g_wheel
  79. 26 0
      releng/root-image/etc/systemd/scripts/choose-mirror
  80. 10 0
      releng/root-image/etc/systemd/system/choose-mirror.service
  81. 1 0
      releng/root-image/etc/systemd/system/default.target
  82. 1 0
      releng/root-image/etc/systemd/system/display-manager.service
  83. 8 0
      releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount
  84. 15 0
      releng/root-image/etc/systemd/system/pacman-init.service
  85. 1 0
      releng/root-image/etc/udev/rules.d/81-dhcpcd.rules
  86. 34 0
      releng/root-image/root/.automated_script.sh
  87. 1 0
      releng/root-image/root/.zlogin
  88. 23 0
      releng/root-image/root/customize_root_image.sh
  89. 3 0
      releng/root-image/root/install.txt
  90. BIN
      releng/root-image/usr/share/lightdm-webkit/themes/arch/archlogo.png
  91. BIN
      releng/root-image/usr/share/pixmaps/grit-p12.png
  92. 11 0
      releng/syslinux/archiso.cfg
  93. 25 0
      releng/syslinux/archiso_head.cfg
  94. 32 0
      releng/syslinux/archiso_pxe32.cfg
  95. 32 0
      releng/syslinux/archiso_pxe64.cfg
  96. 3 0
      releng/syslinux/archiso_pxe_32_inc.cfg
  97. 4 0
      releng/syslinux/archiso_pxe_both_inc.cfg
  98. 11 0
      releng/syslinux/archiso_pxe_choose.cfg
  99. 9 0
      releng/syslinux/archiso_sys32.cfg
  100. 9 0
      releng/syslinux/archiso_sys64.cfg
  101. 3 0
      releng/syslinux/archiso_sys_32_inc.cfg
  102. 4 0
      releng/syslinux/archiso_sys_both_inc.cfg
  103. 11 0
      releng/syslinux/archiso_sys_choose.cfg
  104. 27 0
      releng/syslinux/archiso_tail.cfg
  105. BIN
      releng/syslinux/splash.png
  106. 5 0
      releng/syslinux/syslinux.cfg

+ 22 - 0
build.sh

@ -0,0 +1,22 @@
1
# ---------------------------
2
# Build Custom Repository
3
# ---------------------------
4
5
./customrepo/build.sh
6
7
# ---------------------------
8
# Build ISO
9
# ---------------------------
10
11
# Clean up
12
rm -rf ./releng/work/*
13
rm -rf ./releng/out
14
15
# Change root ownership
16
chown -R root:root ./releng/root-image
17
18
# Call the original build script
19
./releng/build.sh -v
20
21
# Change ownership back
22
chown -R bryan:users releng/root-image

+ 33 - 0
customrepo/build.sh

@ -0,0 +1,33 @@
1
#!/bin/zsh
2
3
# Pull the packages in from a more human readable file
4
packages=("${(@f)$(cat packages.list)}")
5
6
# Clean everything up
7
rm -rf ./packages/* 
8
rm -rf ./x86_64/* 
9
rm -rf ./i686/*
10
11
# Move to our working directory
12
cd packages
13
14
for p in $packages;
15
do
16
    # Grab the most recent packages
17
    wget https://aur.archlinux.org/packages/$p[0,2]/$p/$p.tar.gz
18
    
19
    # Unpackage the compressed packages
20
    tar -xvf $p.tar.gz
21
    
22
    # Make the Arch packages
23
    cd $p
24
    makepkg --config ../../makepkg64.conf && mv *.pkg.tar.xz ../../x86_64
25
    linux32 makepkg --config ../../makepkg32.conf && mv *.pkg.tar.xz ../../i686
26
    cd ..
27
done
28
29
30
# Add the Arch packages to the repositories
31
cd ..
32
repo-add -n ./x86_64/customrepo.db.tar.gz ./x86_64/*.tar.xz
33
repo-add -n ./i686/customrepo.db.tar.gz ./i686/*.tar.xz

+ 1 - 0
customrepo/i686/customrepo.db

@ -0,0 +1 @@
1
customrepo.db.tar.gz

BIN
customrepo/i686/customrepo.db.tar.gz


+ 140 - 0
customrepo/makepkg32.conf

@ -0,0 +1,140 @@
1
#
2
# /etc/makepkg.conf
3
#
4
5
#########################################################################
6
# SOURCE ACQUISITION
7
#########################################################################
8
#
9
#-- The download utilities that makepkg should use to acquire sources
10
#  Format: 'protocol::agent'
11
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
12
          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
13
          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
14
          'rsync::/usr/bin/rsync --no-motd -z %u %o'
15
          'scp::/usr/bin/scp -C %u %o')
16
17
# Other common tools:
18
# /usr/bin/snarf
19
# /usr/bin/lftpget -c
20
# /usr/bin/wget
21
22
#########################################################################
23
# ARCHITECTURE, COMPILE FLAGS
24
#########################################################################
25
#
26
CARCH="i686"
27
CHOST="i686-unknown-linux-gnu"
28
29
#-- Compiler and Linker Flags
30
# -march (or -mcpu) builds exclusively for an architecture
31
# -mtune optimizes for an architecture, but builds for whole processor family
32
CPPFLAGS="-D_FORTIFY_SOURCE=2"
33
CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
34
CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
35
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
36
#-- Make Flags: change this for DistCC/SMP systems
37
#MAKEFLAGS="-j2"
38
#-- Debugging flags
39
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
40
DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
41
42
#########################################################################
43
# BUILD ENVIRONMENT
44
#########################################################################
45
#
46
# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
47
#  A negated environment option will do the opposite of the comments below.
48
#
49
#-- fakeroot: Allow building packages as a non-root user
50
#-- distcc:   Use the Distributed C/C++/ObjC compiler
51
#-- color:    Colorize output messages
52
#-- ccache:   Use ccache to cache compilation
53
#-- check:    Run the check() function if present in the PKGBUILD
54
#-- sign:     Generate PGP signature file
55
#
56
BUILDENV=(fakeroot !distcc color !ccache check !sign)
57
#
58
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
59
#-- specify a space-delimited list of hosts running in the DistCC cluster.
60
#DISTCC_HOSTS=""
61
#
62
#-- Specify a directory for package building.
63
#BUILDDIR=/tmp/makepkg
64
65
#########################################################################
66
# GLOBAL PACKAGE OPTIONS
67
#   These are default values for the options=() settings
68
#########################################################################
69
#
70
# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
71
#  A negated option will do the opposite of the comments below.
72
#
73
#-- strip:      Strip symbols from binaries/libraries
74
#-- docs:       Save doc directories specified by DOC_DIRS
75
#-- libtool:    Leave libtool (.la) files in packages
76
#-- staticlibs: Leave static library (.a) files in packages
77
#-- emptydirs:  Leave empty directories in packages
78
#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
79
#-- purge:      Remove files specified by PURGE_TARGETS
80
#-- upx:        Compress binary executable files using UPX
81
#-- debug:      Add debugging flags as specified in DEBUG_* variables
82
#
83
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
84
85
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
86
INTEGRITY_CHECK=(md5)
87
#-- Options to be used when stripping binaries. See `man strip' for details.
88
STRIP_BINARIES="--strip-all"
89
#-- Options to be used when stripping shared libraries. See `man strip' for details.
90
STRIP_SHARED="--strip-unneeded"
91
#-- Options to be used when stripping static libraries. See `man strip' for details.
92
STRIP_STATIC="--strip-debug"
93
#-- Manual (man and info) directories to compress (if zipman is specified)
94
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
95
#-- Doc directories to remove (if !docs is specified)
96
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
97
#-- Files to be removed from all packages (if purge is specified)
98
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
99
100
#########################################################################
101
# PACKAGE OUTPUT
102
#########################################################################
103
#
104
# Default: put built package and cached source in build directory
105
#
106
#-- Destination: specify a fixed directory where all packages will be placed
107
#PKGDEST=/home/bryan/customrepo/i686
108
#-- Source cache: specify a fixed directory where source files will be cached
109
#SRCDEST=/home/sources
110
#-- Source packages: specify a fixed directory where all src packages will be placed
111
#SRCPKGDEST=/home/srcpackages
112
#-- Log files: specify a fixed directory where all log files will be placed
113
#LOGDEST=/home/makepkglogs
114
#-- Packager: name/email of the person or organization building packages
115
#PACKAGER="John Doe <john@doe.com>"
116
#-- Specify a key to use for package signing
117
#GPGKEY=""
118
119
#########################################################################
120
# COMPRESSION DEFAULTS
121
#########################################################################
122
#
123
COMPRESSGZ=(gzip -c -f -n)
124
COMPRESSBZ2=(bzip2 -c -f)
125
COMPRESSXZ=(xz -c -z -)
126
COMPRESSLRZ=(lrzip -q)
127
COMPRESSLZO=(lzop -q)
128
COMPRESSZ=(compress -c -f)
129
130
#########################################################################
131
# EXTENSION DEFAULTS
132
#########################################################################
133
#
134
# WARNING: Do NOT modify these variables unless you know what you are
135
#          doing.
136
#
137
PKGEXT='.pkg.tar.xz'
138
SRCEXT='.src.tar.gz'
139
140
# vim: set ft=sh ts=2 sw=2 et:

+ 140 - 0
customrepo/makepkg64.conf

@ -0,0 +1,140 @@
1
#
2
# /etc/makepkg.conf
3
#
4
5
#########################################################################
6
# SOURCE ACQUISITION
7
#########################################################################
8
#
9
#-- The download utilities that makepkg should use to acquire sources
10
#  Format: 'protocol::agent'
11
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
12
          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
13
          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
14
          'rsync::/usr/bin/rsync --no-motd -z %u %o'
15
          'scp::/usr/bin/scp -C %u %o')
16
17
# Other common tools:
18
# /usr/bin/snarf
19
# /usr/bin/lftpget -c
20
# /usr/bin/wget
21
22
#########################################################################
23
# ARCHITECTURE, COMPILE FLAGS
24
#########################################################################
25
#
26
CARCH="x86_64"
27
CHOST="x86_64-unknown-linux-gnu"
28
29
#-- Compiler and Linker Flags
30
# -march (or -mcpu) builds exclusively for an architecture
31
# -mtune optimizes for an architecture, but builds for whole processor family
32
CPPFLAGS="-D_FORTIFY_SOURCE=2"
33
CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
34
CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
35
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
36
#-- Make Flags: change this for DistCC/SMP systems
37
#MAKEFLAGS="-j2"
38
#-- Debugging flags
39
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
40
DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
41
42
#########################################################################
43
# BUILD ENVIRONMENT
44
#########################################################################
45
#
46
# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
47
#  A negated environment option will do the opposite of the comments below.
48
#
49
#-- fakeroot: Allow building packages as a non-root user
50
#-- distcc:   Use the Distributed C/C++/ObjC compiler
51
#-- color:    Colorize output messages
52
#-- ccache:   Use ccache to cache compilation
53
#-- check:    Run the check() function if present in the PKGBUILD
54
#-- sign:     Generate PGP signature file
55
#
56
BUILDENV=(fakeroot !distcc color !ccache check !sign)
57
#
58
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
59
#-- specify a space-delimited list of hosts running in the DistCC cluster.
60
#DISTCC_HOSTS=""
61
#
62
#-- Specify a directory for package building.
63
#BUILDDIR=/tmp/makepkg
64
65
#########################################################################
66
# GLOBAL PACKAGE OPTIONS
67
#   These are default values for the options=() settings
68
#########################################################################
69
#
70
# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
71
#  A negated option will do the opposite of the comments below.
72
#
73
#-- strip:      Strip symbols from binaries/libraries
74
#-- docs:       Save doc directories specified by DOC_DIRS
75
#-- libtool:    Leave libtool (.la) files in packages
76
#-- staticlibs: Leave static library (.a) files in packages
77
#-- emptydirs:  Leave empty directories in packages
78
#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
79
#-- purge:      Remove files specified by PURGE_TARGETS
80
#-- upx:        Compress binary executable files using UPX
81
#-- debug:      Add debugging flags as specified in DEBUG_* variables
82
#
83
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
84
85
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
86
INTEGRITY_CHECK=(md5)
87
#-- Options to be used when stripping binaries. See `man strip' for details.
88
STRIP_BINARIES="--strip-all"
89
#-- Options to be used when stripping shared libraries. See `man strip' for details.
90
STRIP_SHARED="--strip-unneeded"
91
#-- Options to be used when stripping static libraries. See `man strip' for details.
92
STRIP_STATIC="--strip-debug"
93
#-- Manual (man and info) directories to compress (if zipman is specified)
94
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
95
#-- Doc directories to remove (if !docs is specified)
96
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
97
#-- Files to be removed from all packages (if purge is specified)
98
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
99
100
#########################################################################
101
# PACKAGE OUTPUT
102
#########################################################################
103
#
104
# Default: put built package and cached source in build directory
105
#
106
#-- Destination: specify a fixed directory where all packages will be placed
107
#PKGDEST=/home/bryan/customrepo/x86_64
108
#-- Source cache: specify a fixed directory where source files will be cached
109
#SRCDEST=/home/sources
110
#-- Source packages: specify a fixed directory where all src packages will be placed
111
#SRCPKGDEST=/home/srcpackages
112
#-- Log files: specify a fixed directory where all log files will be placed
113
#LOGDEST=/home/makepkglogs
114
#-- Packager: name/email of the person or organization building packages
115
#PACKAGER="John Doe <john@doe.com>"
116
#-- Specify a key to use for package signing
117
#GPGKEY=""
118
119
#########################################################################
120
# COMPRESSION DEFAULTS
121
#########################################################################
122
#
123
COMPRESSGZ=(gzip -c -f -n)
124
COMPRESSBZ2=(bzip2 -c -f)
125
COMPRESSXZ=(xz -c -z -)
126
COMPRESSLRZ=(lrzip -q)
127
COMPRESSLZO=(lzop -q)
128
COMPRESSZ=(compress -c -f)
129
130
#########################################################################
131
# EXTENSION DEFAULTS
132
#########################################################################
133
#
134
# WARNING: Do NOT modify these variables unless you know what you are
135
#          doing.
136
#
137
PKGEXT='.pkg.tar.xz'
138
SRCEXT='.src.tar.gz'
139
140
# vim: set ft=sh ts=2 sw=2 et:

+ 11 - 0
customrepo/packages.list

@ -0,0 +1,11 @@
1
chromium-libpdf
2
chromium-pepper-flash
3
google-talkplugin
4
lightdm-webkit-greeter
5
lightdm-webkit-archlinux-theme-git
6
packer
7
ttf-ms-fonts
8
ttf-inconsolata-g
9
ttf-monaco
10
i3status-update-network-git
11
code-git

+ 1 - 0
customrepo/x86_64/customrepo.db

@ -0,0 +1 @@
1
customrepo.db.tar.gz

BIN
customrepo/x86_64/customrepo.db.tar.gz


+ 3 - 0
releng/aitab

@ -0,0 +1,3 @@
1
# <img>         <mnt>                 <arch>   <sfs_comp>  <fs_type>  <fs_size>
2
root-image      /                     i686     xz          ext4       50%
3
root-image      /                     x86_64   xz          ext4       50%

+ 264 - 0
releng/build.sh

@ -0,0 +1,264 @@
1
#!/bin/bash
2
3
set -e -u
4
5
iso_name=grit
6
iso_label="GRIT_$(date +%Y%m)"
7
iso_version=$(date +%Y.%m.%d)
8
install_dir=arch
9
work_dir=work
10
out_dir=out
11
12
arch=$(uname -m)
13
verbose=""
14
pacman_conf=${work_dir}/pacman.conf
15
script_path=$(readlink -f ${0%/*})
16
17
_usage ()
18
{
19
    echo "usage ${0} [options]"
20
    echo
21
    echo " General options:"
22
    echo "    -N <iso_name>      Set an iso filename (prefix)"
23
    echo "                        Default: ${iso_name}"
24
    echo "    -V <iso_version>   Set an iso version (in filename)"
25
    echo "                        Default: ${iso_version}"
26
    echo "    -L <iso_label>     Set an iso label (disk label)"
27
    echo "                        Default: ${iso_label}"
28
    echo "    -D <install_dir>   Set an install_dir (directory inside iso)"
29
    echo "                        Default: ${install_dir}"
30
    echo "    -w <work_dir>      Set the working directory"
31
    echo "                        Default: ${work_dir}"
32
    echo "    -o <out_dir>       Set the output directory"
33
    echo "                        Default: ${out_dir}"
34
    echo "    -v                 Enable verbose output"
35
    echo "    -h                 This help message"
36
    exit ${1}
37
}
38
39
# Helper function to run make_*() only one time per architecture.
40
run_once() {
41
    if [[ ! -e ${work_dir}/build.${1}_${arch} ]]; then
42
        $1
43
        touch ${work_dir}/build.${1}_${arch}
44
    fi
45
}
46
47
# Setup custom pacman.conf with current cache directories.
48
make_pacman_conf() {
49
    local _cache_dirs
50
    _cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
51
    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g" ${script_path}/pacman.conf > ${pacman_conf}
52
}
53
54
# Base installation, plus needed packages (root-image)
55
make_basefs() {
56
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init
57
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install
58
}
59
60
# Additional packages (root-image)
61
make_packages() {
62
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install
63
}
64
65
# Copy mkinitcpio archiso hooks and build initramfs (root-image)
66
make_setup_mkinitcpio() {
67
    local _hook
68
    for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
69
        cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/hooks
70
        cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/install
71
    done
72
    cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install
73
    cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio
74
    cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-archiso.conf
75
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run
76
}
77
78
# Customize installation (root-image)
79
make_customize_root_image() {
80
    cp -af ${script_path}/root-image ${work_dir}/${arch}
81
82
    curl -o ${work_dir}/${arch}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
83
84
    lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt
85
86
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run
87
    rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh
88
}
89
90
# Prepare kernel/initramfs ${install_dir}/boot/
91
make_boot() {
92
    mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch}
93
    cp ${work_dir}/${arch}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
94
    cp ${work_dir}/${arch}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
95
}
96
97
# Add other aditional/extra files to ${install_dir}/boot/
98
make_boot_extra() {
99
    cp ${work_dir}/${arch}/root-image/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest
100
    cp ${work_dir}/${arch}/root-image/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING
101
}
102
103
# Prepare /${install_dir}/boot/syslinux
104
make_syslinux() {
105
    mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
106
    for _cfg in ${script_path}/syslinux/*.cfg; do
107
        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
108
             s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}
109
    done
110
    cp ${script_path}/syslinux/splash.png ${work_dir}/iso/${install_dir}/boot/syslinux
111
    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux
112
    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
113
    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
114
    mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
115
    gzip -c -9 ${work_dir}/${arch}/root-image/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
116
    gzip -c -9 ${work_dir}/${arch}/root-image/usr/lib/modules/*-ARCH/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
117
}
118
119
# Prepare /isolinux
120
make_isolinux() {
121
    mkdir -p ${work_dir}/iso/isolinux
122
    sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
123
    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
124
    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
125
    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
126
}
127
128
# Prepare /EFI
129
make_efi() {
130
    mkdir -p ${work_dir}/iso/EFI/boot
131
    cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi
132
    cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/
133
134
    cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/loader.efi
135
136
    mkdir -p ${work_dir}/iso/loader/entries
137
    cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/
138
    cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/
139
    cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/
140
141
    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
142
         s|%INSTALL_DIR%|${install_dir}|g" \
143
        ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf
144
145
    # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell )
146
    curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi
147
    # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell )
148
    curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
149
}
150
151
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
152
make_efiboot() {
153
    mkdir -p ${work_dir}/iso/EFI/archiso
154
    truncate -s 31M ${work_dir}/iso/EFI/archiso/efiboot.img
155
    mkfs.vfat -n ARCHISO_EFI ${work_dir}/iso/EFI/archiso/efiboot.img
156
157
    mkdir -p ${work_dir}/efiboot
158
    mount ${work_dir}/iso/EFI/archiso/efiboot.img ${work_dir}/efiboot
159
160
    mkdir -p ${work_dir}/efiboot/EFI/archiso
161
    cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi
162
    cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img
163
164
    mkdir -p ${work_dir}/efiboot/EFI/boot
165
    cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
166
    cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/
167
168
    cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi
169
170
    mkdir -p ${work_dir}/efiboot/loader/entries
171
    cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/
172
    cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/
173
    cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/
174
175
    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
176
         s|%INSTALL_DIR%|${install_dir}|g" \
177
        ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf
178
179
    cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/
180
    cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/
181
182
    umount ${work_dir}/efiboot
183
}
184
185
# Copy aitab
186
make_aitab() {
187
    mkdir -p ${work_dir}/iso/${install_dir}
188
    cp ${script_path}/aitab ${work_dir}/iso/${install_dir}/aitab
189
}
190
191
# Build all filesystem images specified in aitab (.fs.sfs .sfs)
192
make_prepare() {
193
    cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir}
194
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
195
    setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
196
    rm -rf ${work_dir}/root-image
197
    # rm -rf ${work_dir}/${arch}/root-image (if low space, this helps)
198
}
199
200
# Build ISO
201
make_iso() {
202
    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
203
    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
204
}
205
206
if [[ ${EUID} -ne 0 ]]; then
207
    echo "This script must be run as root."
208
    _usage 1
209
fi
210
211
if [[ ${arch} != x86_64 ]]; then
212
    echo "This script needs to be run on x86_64"
213
    _usage 1
214
fi
215
216
while getopts 'N:V:L:D:w:o:vh' arg; do
217
    case "${arg}" in
218
        N) iso_name="${OPTARG}" ;;
219
        V) iso_version="${OPTARG}" ;;
220
        L) iso_label="${OPTARG}" ;;
221
        D) install_dir="${OPTARG}" ;;
222
        w) work_dir="${OPTARG}" ;;
223
        o) out_dir="${OPTARG}" ;;
224
        v) verbose="-v" ;;
225
        h) _usage 0 ;;
226
        *)
227
           echo "Invalid argument '${arg}'"
228
           _usage 1
229
           ;;
230
    esac
231
done
232
233
mkdir -p ${work_dir}
234
235
run_once make_pacman_conf
236
237
# Do all stuff for each root-image
238
for arch in i686 x86_64; do
239
    run_once make_basefs
240
    run_once make_packages
241
    run_once make_setup_mkinitcpio
242
    run_once make_customize_root_image
243
done
244
245
for arch in i686 x86_64; do
246
    run_once make_boot
247
done
248
249
# Do all stuff for "iso"
250
run_once make_boot_extra
251
run_once make_syslinux
252
run_once make_isolinux
253
run_once make_efi
254
run_once make_efiboot
255
256
run_once make_aitab
257
258
for arch in i686 x86_64; do
259
    #run_once make_prepare
260
	make_prepare
261
done
262
263
#run_once make_iso
264
make_iso

+ 4 - 0
releng/efiboot/loader/entries/archiso-x86_64-cd.conf

@ -0,0 +1,4 @@
1
title   Arch Linux archiso x86_64 UEFI CD
2
linux   /EFI/archiso/vmlinuz.efi
3
initrd  /EFI/archiso/archiso.img
4
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

+ 4 - 0
releng/efiboot/loader/entries/archiso-x86_64-usb.conf

@ -0,0 +1,4 @@
1
title   Arch Linux archiso x86_64 UEFI USB
2
linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz
3
initrd  /%INSTALL_DIR%/boot/x86_64/archiso.img
4
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

+ 2 - 0
releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf

@ -0,0 +1,2 @@
1
title  UEFI Shell x86_64 v1
2
efi    /EFI/shellx64_v1.efi

+ 2 - 0
releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf

@ -0,0 +1,2 @@
1
title  UEFI Shell x86_64 v2
2
efi    /EFI/shellx64_v2.efi

+ 2 - 0
releng/efiboot/loader/loader.conf

@ -0,0 +1,2 @@
1
timeout 3
2
default archiso-x86_64

+ 6 - 0
releng/isolinux/isolinux.cfg

@ -0,0 +1,6 @@
1
PATH /%INSTALL_DIR%/boot/syslinux/
2
DEFAULT loadconfig
3
4
LABEL loadconfig
5
  CONFIG /%INSTALL_DIR%/boot/syslinux/archiso.cfg
6
  APPEND /%INSTALL_DIR%/

+ 2 - 0
releng/mkinitcpio.conf

@ -0,0 +1,2 @@
1
HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard"
2
COMPRESSION="xz"

+ 125 - 0
releng/packages.both

@ -0,0 +1,125 @@
1
arch-install-scripts
2
b43-fwcutter
3
btrfs-progs
4
clonezilla
5
crda
6
darkhttpd
7
ddrescue
8
dhclient
9
dialog
10
dmraid
11
dnsmasq
12
dnsutils
13
dosfstools
14
elinks
15
ethtool
16
f2fs-tools
17
fsarchiver
18
gnu-netcat
19
gpm
20
gptfdisk
21
grml-zsh-config
22
grub
23
haveged
24
hdparm
25
intel-ucode
26
ipw2100-fw
27
ipw2200-fw
28
irssi
29
lftp
30
linux-atm
31
mc
32
mtools
33
nfs-utils
34
nilfs-utils
35
nmap
36
ntfs-3g
37
ntp
38
openconnect
39
openssh
40
openvpn
41
partclone
42
parted
43
partimage
44
ppp
45
pptpclient
46
rfkill
47
rp-pppoe
48
rsync
49
smartmontools
50
speedtouch
51
sudo
52
tcpdump
53
testdisk
54
usb_modeswitch
55
vpnc
56
wget
57
wireless_tools
58
wpa_actiond
59
wvdial
60
xl2tpd
61
zd1211-firmware
62
zsh
63
xf86-video-ati
64
xf86-video-intel
65
xf86-video-nouveau
66
xf86-video-openchrome
67
xf86-video-vesa
68
fontconfig
69
xorg-server
70
xorg-xinit
71
xorg-utils
72
xorg-server-utils
73
xorg-font-utils
74
virtualbox-guest-modules
75
virtualbox-guest-dkms
76
alsa-lib
77
alsa-oss
78
alsa-plugins
79
alsa-utils
80
libcanberra-pulse
81
pulseaudio-alsa
82
lightdm
83
lightdm-gtk3-greeter
84
accountsservice
85
pacman
86
i3-wm
87
i3lock
88
i3status
89
perl
90
perl-anyevent
91
perl-anyevent-i3
92
perl-json-xs
93
dmenu
94
dunst
95
feh
96
vim-runtime
97
gvim
98
libreoffice-base
99
libreoffice-en-US
100
libreoffice-common
101
libreoffice-calc
102
libreoffice-draw
103
libreoffice-impress
104
libreoffice-math
105
libreoffice-writer
106
chromium
107
chromium-libpdf
108
chromium-pepper-flash
109
thunderbird
110
pidgin
111
pidgin-libnotify
112
pidgin-otr
113
pidgin-encryption
114
pidgin-hotkeys
115
hexchat
116
rxvt-unicode
117
rxvt-unicode-terminfo
118
git
119
mercurial
120
svn
121
bzr
122
ttf-bitstream-vera
123
ttf-dejavu
124
ttf-droid
125
ttf-inconsolata

+ 0 - 0
releng/packages.i686


+ 9 - 0
releng/packages.x86_64

@ -0,0 +1,9 @@
1
gummiboot
2
prebootloader
3
refind-efi
4
lightdm-webkit-greeter
5
lightdm-webkit-archlinux-theme-git
6
ttf-inconsolata-g
7
ttf-ms-fonts
8
ttf-monaco
9

+ 97 - 0
releng/pacman.conf

@ -0,0 +1,97 @@
1
#
2
# /etc/pacman.conf
3
#
4
# See the pacman.conf(5) manpage for option and repository directives
5
6
#
7
# GENERAL OPTIONS
8
#
9
[options]
10
# The following paths are commented out with their default values listed.
11
# If you wish to use different paths, uncomment and update the paths.
12
#RootDir     = /
13
#DBPath      = /var/lib/pacman/
14
#CacheDir    = /var/cache/pacman/pkg/
15
#LogFile     = /var/log/pacman.log
16
#GPGDir      = /etc/pacman.d/gnupg/
17
HoldPkg     = pacman glibc
18
#XferCommand = /usr/bin/curl -C - -f %u > %o
19
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
20
#CleanMethod = KeepInstalled
21
#UseDelta    = 0.7
22
Architecture = auto
23
24
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
25
#IgnorePkg   =
26
#IgnoreGroup =
27
28
#NoUpgrade   =
29
#NoExtract   =
30
31
# Misc options
32
#UseSyslog
33
#Color
34
#TotalDownload
35
# We cannot check disk space from within a chroot environment
36
#CheckSpace
37
#VerbosePkgLists
38
39
# By default, pacman accepts packages signed by keys that its local keyring
40
# trusts (see pacman-key and its man page), as well as unsigned packages.
41
SigLevel    = Required DatabaseOptional
42
LocalFileSigLevel = Optional
43
#RemoteFileSigLevel = Required
44
45
# NOTE: You must run `pacman-key --init` before first using pacman; the local
46
# keyring can then be populated with the keys of all official Arch Linux
47
# packagers with `pacman-key --populate archlinux`.
48
49
#
50
# REPOSITORIES
51
#   - can be defined here or included from another file
52
#   - pacman will search repositories in the order defined here
53
#   - local/custom mirrors can be added here or in separate files
54
#   - repositories listed first will take precedence when packages
55
#     have identical names, regardless of version number
56
#   - URLs will have $repo replaced by the name of the current repo
57
#   - URLs will have $arch replaced by the name of the architecture
58
#
59
# Repository entries are of the format:
60
#       [repo-name]
61
#       Server = ServerName
62
#       Include = IncludePath
63
#
64
# The header [repo-name] is crucial - it must be present and
65
# uncommented to enable the repo.
66
#
67
68
# The testing repositories are disabled by default. To enable, uncomment the
69
# repo name header and Include lines. You can add preferred servers immediately
70
# after the header, and they will be used before the default mirrors.
71
72
# custom repository
73
[customrepo]
74
SigLevel = Optional TrustAll
75
Server = file:///home/bryan/projects/grit-iso/customrepo/$arch
76
77
#[testing]
78
#Include = /etc/pacman.d/mirrorlist
79
80
[core]
81
Include = /etc/pacman.d/mirrorlist
82
83
[extra]
84
Include = /etc/pacman.d/mirrorlist
85
86
#[community-testing]
87
#Include = /etc/pacman.d/mirrorlist
88
89
[community]
90
Include = /etc/pacman.d/mirrorlist
91
92
# An example of a custom package repository.  See the pacman manpage for
93
# tips on creating your own repositories.
94
#[custom]
95
#SigLevel = Optional TrustAll
96
#Server = file:///home/custompkgs
97

+ 0 - 0
releng/root-image/etc/fstab


+ 1 - 0
releng/root-image/etc/hostname

@ -0,0 +1 @@
1
grit-p12

+ 18 - 0
releng/root-image/etc/lightdm/lightdm-webkit-greeter.conf

@ -0,0 +1,18 @@
1
#
2
# background = Background file to use, either an image path or a color (e.g. #772953)
3
# theme-name = GTK+ theme to use
4
# font-name = Font to use
5
# xft-antialias = Whether to antialias Xft fonts (true or false)
6
# xft-dpi = Resolution for Xft in dots per inch (e.g. 96)
7
# xft-hintstyle = What degree of hinting to use (hintnone, hintslight, hintmedium, or hintfull)
8
# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
9
#
10
[greeter]
11
background=
12
theme-name=Clearlooks
13
webkit-theme=arch
14
font-name=DejaVuSans 11
15
xft-antialias=true
16
xft-dpi=96
17
xft-hintstyle=slight
18
xft-rgba=rgb

+ 151 - 0
releng/root-image/etc/lightdm/lightdm.conf

@ -0,0 +1,151 @@
1
#
2
# General configuration
3
#
4
# start-default-seat = True to always start one seat if none are defined in the configuration
5
# greeter-user = User to run greeter as
6
# minimum-display-number = Minimum display number to use for X servers
7
# minimum-vt = First VT to run displays on
8
# lock-memory = True to prevent memory from being paged to disk
9
# user-authority-in-system-dir = True if session authority should be in the system location
10
# guest-account-script = Script to be run to setup guest account
11
# log-directory = Directory to log information to
12
# run-directory = Directory to put running state in
13
# cache-directory = Directory to cache to
14
# sessions-directory = Directory to find sessions
15
# remote-sessions-directory = Directory to find remote sessions
16
# greeters-directory = Directory to find greeters
17
#
18
[LightDM]
19
#start-default-seat=true
20
#greeter-user=lightdm
21
#minimum-display-number=0
22
minimum-vt=1
23
#lock-memory=true
24
#user-authority-in-system-dir=false
25
#guest-account-script=guest-account
26
#log-directory=/var/log/lightdm
27
run-directory=/run/lightdm
28
#cache-directory=/var/cache/lightdm
29
#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
30
#remote-sessions-directory=/usr/share/lightdm/remote-sessions
31
#greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters
32
33
#
34
# Seat defaults
35
#
36
# type = Seat type (xlocal, xremote)
37
# xdg-seat = Seat name to set pam_systemd XDG_SEAT variable and name to pass to X server
38
# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
39
# xserver-layout = Layout to pass to X server
40
# xserver-config = Config file to pass to X server
41
# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
42
# xserver-share = True if the X server is shared for both greeter and session
43
# xserver-hostname = Hostname of X server (only for type=xremote)
44
# xserver-display-number = Display number of X server (only for type=xremote)
45
# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
46
# xdmcp-port = XDMCP UDP/IP port to communicate on
47
# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
48
# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
49
# unity-compositor-timeout = Number of seconds to wait for compositor to start
50
# greeter-session = Session to load for greeter
51
# greeter-hide-users = True to hide the user list
52
# greeter-allow-guest = True if the greeter should show a guest login option
53
# greeter-show-manual-login = True if the greeter should offer a manual login option
54
# greeter-show-remote-login = True if the greeter should offer a remote login option
55
# user-session = Session to load for users
56
# allow-guest = True if guest login is allowed
57
# guest-session = Session to load for guests (overrides user-session)
58
# session-wrapper = Wrapper script to run session with
59
# greeter-wrapper = Wrapper script to run greeter with
60
# guest-wrapper = Wrapper script to run guest sessions with
61
# display-setup-script = Script to run when starting a greeter session (runs as root)
62
# display-stopped-script = Script to run after stopping the display server (runs as root)
63
# greeter-setup-script = Script to run when starting a greeter (runs as root)
64
# session-setup-script = Script to run when starting a user session (runs as root)
65
# session-cleanup-script = Script to run when quitting a user session (runs as root)
66
# autologin-guest = True to log in as guest by default
67
# autologin-user = User to log in with by default (overrides autologin-guest)
68
# autologin-user-timeout = Number of seconds to wait before loading default user
69
# autologin-session = Session to load for automatic login (overrides user-session)
70
# autologin-in-background = True if autologin session should not be immediately activated
71
# exit-on-failure = True if the daemon should exit if this seat fails
72
#
73
[SeatDefaults]
74
#type=xlocal
75
#xdg-seat=seat0
76
#xserver-command=X
77
#xserver-layout=
78
#xserver-config=
79
#xserver-allow-tcp=false
80
#xserver-share=true
81
#xserver-hostname=
82
#xserver-display-number=
83
#xdmcp-manager=
84
#xdmcp-port=177
85
#xdmcp-key=
86
#unity-compositor-command=unity-system-compositor
87
#unity-compositor-timeout=60
88
greeter-session=lightdm-webkit-greeter
89
#greeter-hide-users=false
90
#greeter-allow-guest=true
91
#greeter-show-manual-login=false
92
#greeter-show-remote-login=true
93
user-session=i3
94
#allow-guest=true
95
#guest-session=
96
session-wrapper=/etc/lightdm/Xsession
97
#greeter-wrapper=
98
#guest-wrapper=
99
#display-setup-script=
100
#display-stopped-script=
101
#greeter-setup-script=
102
#session-setup-script=
103
#session-cleanup-script=
104
#autologin-guest=false
105
#autologin-user=
106
#autologin-user-timeout=0
107
#autologin-in-background=false
108
#autologin-session=UNIMPLEMENTED
109
#exit-on-failure=false
110
pam-service=lightdm-autologin
111
112
#
113
# Seat configuration
114
#
115
# Each seat must start with "Seat:".
116
# Uses settings from [SeatDefaults], any of these can be overriden by setting them in this section.
117
#
118
#[Seat:0]
119
120
#
121
# XDMCP Server configuration
122
#
123
# enabled = True if XDMCP connections should be allowed
124
# port = UDP/IP port to listen for connections on
125
# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
126
#
127
# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
128
# it can be a word and the first 7 characters are used as the key.
129
#
130
[XDMCPServer]
131
#enabled=false
132
#port=177
133
#key=
134
135
#
136
# VNC Server configuration
137
#
138
# enabled = True if VNC connections should be allowed
139
# command = Command to run Xvnc server with
140
# port = TCP/IP port to listen for connections on
141
# width = Width of display to use
142
# height = Height of display to use
143
# depth = Color depth of display to use
144
#
145
[VNCServer]
146
#enabled=false
147
#command=Xvnc
148
#port=5900
149
#width=1024
150
#height=768
151
#depth=8

+ 1 - 0
releng/root-image/etc/locale.conf

@ -0,0 +1 @@
1
LANG=en_US.UTF-8

+ 3 - 0
releng/root-image/etc/modules-load.d/virtualbox.conf

@ -0,0 +1,3 @@
1
vboxguest
2
vboxsf
3
vboxvideo

+ 6 - 0
releng/root-image/etc/pam.d/su

@ -0,0 +1,6 @@
1
#%PAM-1.0
2
auth		sufficient	pam_rootok.so
3
auth		sufficient	pam_wheel.so trust use_uid
4
auth		required	pam_unix.so
5
account		required	pam_unix.so
6
session		required	pam_unix.so

+ 37 - 0
releng/root-image/etc/skel/.Xdefaults

@ -0,0 +1,37 @@
1
URxvt*font: xft:Inconsolata:pixelsize=10:antialias=true:hinting=true, \
2
            xft:Inconsolata for Powerline:pixelsize=10:antialias=true:hinting=true,\
3
            xft:PowerlineSymbols:pixelsize=10:antialias=true:hinting=true
4
URxvt*termName: rxvt-256color
5
URxvt*background: #000000
6
URxvt*foreground: #cccccc
7
URxvt*scrollBar: false
8
URxvt*perl-lib: /usr/lib/urxvt/perl
9
URxvt*perl-ext-common: default,matcher
10
URxvt*urlLauncher: /usr/bin/chromium
11
URxvt*matcher.button: 1
12
13
Xft*dpi: 96
14
Xft*antialias: true
15
Xft*hinting: full
16
17
URxvt.perl-ext-common: matcher
18
URxvt.urlLauncher: chromium
19
URxvt.matcher.button: 1
20
URxvt.transparent: true
21
URxvt.tintColor: white
22
URxvt.shading: 40
23
URxvt*color0: #000000
24
URxvt*color1: #9e1828
25
URxvt*color3: #aece92
26
URxvt*color4: #968a38
27
URxvt*color5: #414171
28
URxvt*color6: #963c59
29
URxvt*color7: #bebebe
30
URxvt*color8: #666666
31
URxvt*color9: #cf6171
32
URxvt*color10: #c5f779
33
URxvt*color11: #fff796
34
URxvt*color12: #4186be
35
URxvt*color13: #cf9ebe
36
URxvt*color14: #71bebe
37
URxvt*color15: #ffffff

+ 37 - 0
releng/root-image/etc/skel/.Xresources

@ -0,0 +1,37 @@
1
URxvt*font: xft:Inconsolata:size=10, \
2
            xft:Inconsolata for Powerline:pixelsize=10:antialias=true:hinting=true,\
3
            xft:PowerlineSymbols:pixelsize=10:antialias=true:hinting=true
4
URxvt*termName: rxvt
5
URxvt*background: #000000
6
URxvt*foreground: #cccccc
7
URxvt*scrollBar: false
8
URxvt*perl-lib: /usr/lib/urxvt/perl
9
URxvt*perl-ext-common: default,matcher
10
URxvt*urlLauncher: /usr/bin/chromium
11
URxvt*matcher.button: 1
12
13
Xft*dpi: 96
14
Xft*antialias: true
15
Xft*hinting: full
16
17
URxvt.perl-ext-common: matcher
18
URxvt.urlLauncher: chromium
19
URxvt.matcher.button: 1
20
URxvt.transparent: true
21
URxvt.tintColor: white
22
URxvt.shading: 40
23
URxvt*color0: #000000
24
URxvt*color1: #9e1828
25
URxvt*color3: #aece92
26
URxvt*color4: #968a38
27
URxvt*color5: #414171
28
URxvt*color6: #963c59
29
URxvt*color7: #bebebe
30
URxvt*color8: #666666
31
URxvt*color9: #cf6171
32
URxvt*color10: #c5f779
33
URxvt*color11: #fff796
34
URxvt*color12: #4186be
35
URxvt*color13: #cf9ebe
36
URxvt*color14: #71bebe
37
URxvt*color15: #ffffff

+ 43 - 0
releng/root-image/etc/skel/.config/dunst/dunstrc

@ -0,0 +1,43 @@
1
[global]
2
font = "Monospace 8"
3
allow_markup = yes
4
format = "<b>%s %p</b>\n%b"
5
sort = yes
6
indicate_hidden = true
7
idle_threshold = 0
8
geometry = "300x5-20+20"
9
alignment = left 
10
show_age_threshold = 60
11
sticky_history = yes
12
follow = mouse
13
word_wrap = yes
14
separator_height = 2
15
padding = 10
16
horizontal_padding = 10
17
separator_color = frame
18
startup_notification = false
19
20
[frame]
21
width = 3
22
color = "#000000"
23
24
[shortcuts]
25
close = ctrl+space
26
close_all = ctrl+shift+grave
27
history = ctrl+grave
28
context = ctrl+shift+period
29
30
[urgency_low]
31
background = "#ffffff"
32
foreground = "#000000"
33
timeout = 30
34
35
[urgency_normal]
36
background = "#94DBFF"
37
foreground = "#000000"
38
timeout = 30
39
40
[urgency_critical]
41
background = "#ff9999"
42
foreground = "#000000"
43
timeout = 0

+ 20 - 0
releng/root-image/etc/skel/.config/i3/autostart

@ -0,0 +1,20 @@
1
#!/bin/sh
2
3
# XCompMgr
4
xcompmgr
5
6
# Set startup volume
7
amixer -D pulse set Master unmute
8
amixer -D pulse set Master 80% 
9
10
# Disable beeps
11
#xset -b &
12
13
# Set brightness
14
xbacklight -set 80 &
15
16
# Clipboard manager
17
#LC_ALL=C parcellite &
18
19
# On Screen Display
20
dunst &

+ 230 - 0
releng/root-image/etc/skel/.config/i3/config

@ -0,0 +1,230 @@
1
# This file has been auto-generated by i3-config-wizard(1).
2
# It will not be overwritten, so edit it as you like.
3
#
4
# Should you change your keyboard layout somewhen, delete
5
# this file and re-run i3-config-wizard(1).
6
#
7
8
# i3 config file (v4)
9
#
10
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
11
12
# the modifier
13
set $mod Mod4
14
15
# tags for our workspaces
16
set $tag1 "1: www"
17
set $tag2 "2: mail"
18
set $tag3 "3: comm"
19
set $tag4 "4"
20
set $tag5 "5"
21
set $tag6 "6"
22
set $tag7 "7"
23
set $tag8 "8"
24
set $tag9 "9"
25
set $tag10 "10: dev"
26
27
# colors
28
set $black #000000
29
set $white #ffffff
30
set $blue #00b1d7
31
set $gray #7e7371
32
set $red #c92601
33
34
# Font for window titles. Will also be used by the bar unless a different font
35
# is used in the bar {} block below. ISO 10646 = Unicode
36
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
37
# The font above is very space-efficient, that is, it looks good, sharp and
38
# clear in small sizes. However, if you need a lot of unicode glyphs or
39
# right-to-left text rendering, you should instead use pango for rendering and
40
# chose a FreeType font, such as:
41
# font pango:DejaVu Sans Mono 10
42
43
# configure window colors
44
client.focused              $black $black $blue $red
45
client.focused_inactive     $black $black $gray $red
46
client.unfocused            $black $black $gray $red
47
client.urgent               $black $black $red $red
48
49
# borders
50
hide_edge_borders both
51
52
# use Mouse+$mod to drag floating windows to their wanted position
53
floating_modifier $mod
54
55
# enable/disable following the mouse
56
focus_follows_mouse no
57
58
# start a terminal
59
bindsym $mod+Return exec i3-sensible-terminal
60
61
# kill focused window
62
bindsym $mod+Shift+q kill
63
64
# start dmenu (a program launcher)
65
bindsym $mod+d exec dmenu_run -i -b -nb "$black" -nf "$gray" -sb "$black" -sf "$blue" -fn "xft:Inconsolata:size=13" -p "run: "
66
# There also is the (new) i3-dmenu-desktop which only displays applications
67
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
68
# installed.
69
# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
70
71
# change focus
72
bindsym $mod+h focus left
73
bindsym $mod+j focus down
74
bindsym $mod+k focus up
75
bindsym $mod+l focus right
76
77
# move focused window
78
bindsym $mod+Shift+h move left
79
bindsym $mod+Shift+j move down
80
bindsym $mod+Shift+k move up
81
bindsym $mod+Shift+l move right
82
83
# split in horizontal orientation
84
bindsym $mod+c split h
85
86
# split in vertical orientation
87
bindsym $mod+v split v
88
89
# enter fullscreen mode for the focused container
90
bindsym $mod+f fullscreen
91
92
# change container layout (stacked, tabbed, toggle split)
93
bindsym $mod+s layout stacking
94
bindsym $mod+w layout tabbed
95
bindsym $mod+e layout toggle split
96
97
# toggle tiling / floating
98
bindsym $mod+Shift+space floating toggle
99
100
# change focus between tiling / floating windows
101
bindsym $mod+space focus mode_toggle
102
103
# focus the parent container
104
bindsym $mod+a focus parent
105
106
# focus the child container
107
#bindsym $mod+d focus child
108
109
# scratchpad
110
bindsym $mod+grave scratchpad show
111
bindsym $mod+Shift+grave move scratchpad
112
113
# workspace names
114
workspace $tag1 output LVDS1 
115
workspace $tag2 output LVDS1 
116
workspace $tag3 output LVDS1
117
workspace $tag10 output LVDS1
118
119
# switch to workspace
120
bindsym $mod+1 workspace $tag1
121
bindsym $mod+2 workspace $tag2 
122
bindsym $mod+3 workspace $tag3
123
bindsym $mod+4 workspace $tag4
124
bindsym $mod+5 workspace $tag5
125
bindsym $mod+6 workspace $tag6
126
bindsym $mod+7 workspace $tag7
127
bindsym $mod+8 workspace $tag8
128
bindsym $mod+9 workspace $tag9
129
bindsym $mod+0 workspace $tag10
130
131
# move focused container to workspace
132
bindsym $mod+Shift+1 move container to workspace $tag1
133
bindsym $mod+Shift+2 move container to workspace $tag2
134
bindsym $mod+Shift+3 move container to workspace $tag3
135
bindsym $mod+Shift+4 move container to workspace $tag4
136
bindsym $mod+Shift+5 move container to workspace $tag5
137
bindsym $mod+Shift+6 move container to workspace $tag6
138
bindsym $mod+Shift+7 move container to workspace $tag7
139
bindsym $mod+Shift+8 move container to workspace $tag8
140
bindsym $mod+Shift+9 move container to workspace $tag9
141
bindsym $mod+Shift+0 move container to workspace $tag10
142
143
# reload the configuration file
144
bindsym $mod+Shift+c reload
145
146
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
147
bindsym $mod+Shift+r restart
148
149
# toggle distraction free mode
150
bindsym $mod+Escape bar mode toggle
151
152
# volume and brightness controls
153
bindsym $mod+plus exec /usr/bin/amixer -D pulse set Master 5%+
154
bindsym $mod+minus exec /usr/bin/amixer -D pulse set Master 5%-
155
bindsym $mod+m exec /usr/bin/amixer -D pulse set Master 1+ toggle
156
bindsym $mod+bracketright exec /usr/bin/xbacklight -inc 10
157
bindsym $mod+bracketleft exec /usr/bin/xbacklight -dec 5
158
bindsym $mod+F8 exec /usr/bin/amixer -D pulse set Master 5%+
159
bindsym $mod+F7 exec /usr/bin/amixer -D pulse set Master 5%-
160
bindsym $mod+F6 exec /usr/bin/amixer -D pulse set Master 1+ toggle
161
bindsym $mod+F3 exec /usr/bin/xbacklight -inc 10
162
bindsym $mod+F2 exec /usr/bin/xbacklight -dec 5
163
bindsym $mod+F9 exec ~/dmenu/kbd-brightness-down
164
bindsym $mod+F10 exec ~/dmenu/kbd-brightness-up
165
bindsym $mod+F12 exec ~/dmenu/kbd-wifi-toggle
166
167
# resize window (you can also use the mouse for that)
168
mode "resize" {
169
        # These bindings trigger as soon as you enter the resize mode
170
        bindsym h resize shrink width 10 px or 10 ppt
171
        bindsym j resize grow height 10 px or 10 ppt
172
        bindsym k resize shrink height 10 px or 10 ppt
173
        bindsym l resize grow width 10 px or 10 ppt
174
175
        # back to normal: Enter or Escape
176
        bindsym Return mode "default"
177
        bindsym Escape mode "default"
178
}
179
bindsym $mod+r mode "resize"
180
181
# how to exit the system
182
set $mode_system system
183
mode "$mode_system" {
184
    bindsym l exec --no-startup-id ~/.config/i3/i3exit lock, mode "default"
185
    bindsym e exec --no-startup-id ~/.config/i3/i3exit logout, mode "default"
186
    bindsym s exec --no-startup-id ~/.config/i3/i3exit suspend, mode "default"
187
    bindsym h exec --no-startup-id ~/.config/i3/i3exit hibernate, mode "default"
188
    bindsym r exec --no-startup-id ~/.config/i3/i3exit reboot, mode "default"
189
    bindsym Shift+s exec --no-startup-id ~/.config/i3/i3exit shutdown, mode "default"
190
191
    # back to normal: Enter or Escape
192
    bindsym Return mode "default"
193
    bindsym Escape mode "default"
194
}
195
bindsym $mod+Shift+BackSpace mode "$mode_system"
196
197
# status bar 
198
bar {
199
    colors {
200
        background $black
201
        statusline $gray
202
        separator $white
203
        
204
        focused_workspace   $black $black $blue
205
        active_workspace    $black $black $blue
206
        inactive_workspace  $black $black $gray
207
        urgent_workspace    $black $black $red
208
    }
209
210
	position top
211
    status_command i3status
212
    workspace_buttons yes 
213
}
214
215
# enable floating for some windows
216
for_window [class="(?i)skype"] floating enable
217
for_window [class="(?i)chromium" instance="^crx_" window_role="pop-up"] floating enable
218
for_window [class="(?i)gource"] floating enable
219
220
# some things belong in particular areas
221
assign [class="(?i)chromium" instance="chromium"] $tag1
222
assign [class="(?i)thunderbird"] $tag2
223
assign [class="(?i).+xchat"] $tag3
224
225
# before autostart
226
exec ~/.config/i3/autostart
227
228
# autostart
229
exec --no-startup-id xcompmgr
230
exec --no-startup-id i3-msg 'workspace "1: www";'

+ 35 - 0
releng/root-image/etc/skel/.config/i3/i3exit

@ -0,0 +1,35 @@
1
#!/bin/sh
2
3
lock() {
4
    i3-msg 'workspace number 1: www;'
5
    i3lock -c 111111
6
}
7
8
case "$1" in
9
    lock)
10
        lock
11
        ;;
12
    logout)
13
        ~/.i3/shutdown
14
        i3-msg exit
15
        ;;
16
    suspend)
17
        lock && systemctl suspend
18
        ;;
19
    hibernate)
20
        lock && systemctl hibernate
21
        ;;
22
    reboot)
23
        ~/.i3/shutdown
24
        systemctl reboot
25
        ;;
26
    shutdown)
27
        ~/.i3/shutdown
28
        systemctl poweroff
29
        ;;
30
    *)
31
        echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}"
32
        exit 2
33
esac
34
35
exit 0

+ 19 - 0
releng/root-image/etc/skel/.config/i3/shutdown

@ -0,0 +1,19 @@
1
#!/bin/sh
2
3
# Check for any virtual machines running and save them.
4
if ! type "vboxmanage" > /dev/null; then
5
    for uuid in $( vboxmanage list runningvms | awk 'BEGIN{FS="\" "}{print $2}' )
6
    do
7
    	vboxmanage controlvm $uuid savestate
8
    done
9
fi
10
11
# Kill all open applications
12
i3-msg [class="."] kill
13
14
# Pause to allow applications to save any necessary information
15
# If they can't do it in 10 seconds their screwed.
16
sleep 1
17
18
## Now exit i3wm
19
#i3-msg exit

+ 83 - 0
releng/root-image/etc/skel/.config/i3status/config

@ -0,0 +1,83 @@
1
general {
2
	colors = true
3
    color_good = "#00b1d7"
4
    color_bad = "#c92601"
5
    color_degraded = "#7e7371"
6
	interval = 5
7
}
8
9
#order += "ipv6"
10
order += "disk /"
11
order += "disk /home"
12
#order += "run_watch DHCP"
13
#order += "run_watch VPN"
14
order += "wireless wlp2s0"
15
order += "ethernet eno1"
16
order += "volume master"
17
#order += "battery 1"
18
order += "cpu_temperature 0"
19
order += "load"
20
order += "tztime local"
21
22
wireless wlp1s0 {
23
	format_up = " W: (%quality at %essid, %bitrate) %ip "
24
	format_down = " W: down "
25
}
26
27
wireless wlp2s0 {
28
	format_up = " W: (%quality at %essid, %bitrate) %ip "
29
	format_down = " W: down "
30
}
31
32
ethernet eth0 {
33
	format_up = " E: %ip (%speed) "
34
	format_down = " E: down "
35
}
36
37
ethernet eno1 {
38
    format_up = " E: %ip (%speed) "
39
    format_down = " E: down "
40
}
41
42
battery 1 {
43
	format = " %status %percentage %remaining "
44
	path = "/sys/class/power_supply/BAT%d/uevent"
45
	low_threshold = 10
46
}
47
48
run_watch DHCP {
49
	pidfile = "/var/run/dhclient*.pid"
50
}
51
52
run_watch VPN {
53
	#pidfile = "/var/run/vpnc/pid"
54
    pidfile = "/var/run/openvpn/*.pid"
55
}
56
57
tztime local {
58
	format = " %Y-%m-%d %H:%M:%S "
59
}
60
61
load {
62
	format = " %5min "
63
}
64
65
cpu_temperature 0 {
66
	format = " T: %degrees C "
67
	path = "/sys/devices/platform/coretemp.0/temp1_input"
68
}
69
70
disk "/" {
71
	format = " %free "
72
}
73
74
disk "/home" {
75
	format = " %free "
76
}
77
78
volume master {
79
	format = " V: %volume "
80
	device = "default"
81
	mixer = "Master"
82
	mixer_idx = 0
83
}

+ 3 - 0
releng/root-image/etc/skel/.config/zsh/aliases.zsh

@ -0,0 +1,3 @@
1
alias ls='ls -h --color=auto'
2
alias wanip='dig +short myip.opendns.com @resolver1.opendns.com'
3
alias packer='sudo ~/projects/packer/packer'

+ 7 - 0
releng/root-image/etc/skel/.config/zsh/autoloads.zsh

@ -0,0 +1,7 @@
1
autoload -U compinit
2
autoload -U promptinit
3
autoload -Uz vcs_info
4
5
compinit
6
promptinit
7
prompt off

+ 3 - 0
releng/root-image/etc/skel/.config/zsh/flags.zsh

@ -0,0 +1,3 @@
1
setopt HIST_IGNORE_DUPS
2
setopt prompt_subst
3
setopt completealiases

+ 40 - 0
releng/root-image/etc/skel/.config/zsh/keys.zsh

@ -0,0 +1,40 @@
1
# create a zkbd compatible hash;
2
# to add other keys to this hash, see: man 5 terminfo
3
typeset -A key
4
5
key[Home]=${terminfo[khome]}
6
7
key[End]=${terminfo[kend]}
8
key[Insert]=${terminfo[kich1]}
9
key[Delete]=${terminfo[kdch1]}
10
key[Up]=${terminfo[kcuu1]}
11
key[Down]=${terminfo[kcud1]}
12
key[Left]=${terminfo[kcub1]}
13
key[Right]=${terminfo[kcuf1]}
14
key[PageUp]=${terminfo[kpp]}
15
key[PageDown]=${terminfo[knp]}
16
17
# setup key accordingly
18
[[ -n "${key[Home]}"     ]]  && bindkey  "${key[Home]}"     beginning-of-line
19
[[ -n "${key[End]}"      ]]  && bindkey  "${key[End]}"      end-of-line
20
[[ -n "${key[Insert]}"   ]]  && bindkey  "${key[Insert]}"   overwrite-mode
21
[[ -n "${key[Delete]}"   ]]  && bindkey  "${key[Delete]}"   delete-char
22
[[ -n "${key[Up]}"       ]]  && bindkey  "${key[Up]}"       up-line-or-history
23
[[ -n "${key[Down]}"     ]]  && bindkey  "${key[Down]}"     down-line-or-history
24
[[ -n "${key[Left]}"     ]]  && bindkey  "${key[Left]}"     backward-char
25
[[ -n "${key[Right]}"    ]]  && bindkey  "${key[Right]}"    forward-char
26
[[ -n "${key[PageUp]}"   ]]  && bindkey  "${key[PageUp]}"   beginning-of-buffer-or-history
27
[[ -n "${key[PageDown]}" ]]  && bindkey  "${key[PageDown]}" end-of-buffer-or-history
28
29
# Finally, make sure the terminal is in application mode, when zle is
30
# active. Only then are the values from $terminfo valid.
31
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
32
    function zle-line-init () {
33
        printf '%s' "${terminfo[smkx]}"
34
    }
35
    function zle-line-finish () {
36
        printf '%s' "${terminfo[rmkx]}"
37
    }
38
    zle -N zle-line-init
39
    zle -N zle-line-finish
40
fi

+ 25 - 0
releng/root-image/etc/skel/.config/zsh/prompt.zsh

@ -0,0 +1,25 @@
1
# Colors
2
white="%{%}"
3
bwhite="%{%}"
4
grey="%{%}"
5
green="%{%}" 
6
normal="%{%}"
7
8
# Z-Styles
9
zstyle ':completion:*' menu select
10
zstyle ':vcs_info:*' stagedstr '+'
11
zstyle ':vcs_info:*' unstagedstr '-'
12
zstyle ':vcs_info:*' check-for-changes true
13
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b'
14
zstyle ':vcs_info:*' enable git hg bzr svn
15
zstyle ':vcs_info:*' formats "${green}[${white}%s${green}::${white}%b%m%u%c${green}]${normal}"
16
17
# Any pre-commands
18
precmd ()
19
{
20
    vcs_info
21
}
22
23
# Prompts
24
PROMPT="${green}[${white}%D{%H:%M:%S}${green}] (${bwhite}%n${green}@${bwhite}%m${green}) (${bwhite}%~${green})${normal} "
25
RPROMPT='${vcs_info_msg_0_}'

+ 3 - 0
releng/root-image/etc/skel/.config/zsh/zsh/aliases.zsh

@ -0,0 +1,3 @@
1
alias ls='ls -h --color=auto'
2
alias wanip='dig +short myip.opendns.com @resolver1.opendns.com'
3
alias packer='sudo ~/projects/packer/packer'

+ 7 - 0
releng/root-image/etc/skel/.config/zsh/zsh/autoloads.zsh

@ -0,0 +1,7 @@
1
autoload -U compinit
2
autoload -U promptinit
3
autoload -Uz vcs_info
4
5
compinit
6
promptinit
7
prompt off

+ 3 - 0
releng/root-image/etc/skel/.config/zsh/zsh/flags.zsh

@ -0,0 +1,3 @@
1
setopt HIST_IGNORE_DUPS
2
setopt prompt_subst
3
setopt completealiases

+ 40 - 0
releng/root-image/etc/skel/.config/zsh/zsh/keys.zsh

@ -0,0 +1,40 @@
1
# create a zkbd compatible hash;
2
# to add other keys to this hash, see: man 5 terminfo
3
typeset -A key
4
5
key[Home]=${terminfo[khome]}
6
7
key[End]=${terminfo[kend]}
8
key[Insert]=${terminfo[kich1]}
9
key[Delete]=${terminfo[kdch1]}
10
key[Up]=${terminfo[kcuu1]}
11
key[Down]=${terminfo[kcud1]}
12
key[Left]=${terminfo[kcub1]}
13
key[Right]=${terminfo[kcuf1]}
14
key[PageUp]=${terminfo[kpp]}
15
key[PageDown]=${terminfo[knp]}
16
17
# setup key accordingly
18
[[ -n "${key[Home]}"     ]]  && bindkey  "${key[Home]}"     beginning-of-line
19
[[ -n "${key[End]}"      ]]  && bindkey  "${key[End]}"      end-of-line
20
[[ -n "${key[Insert]}"   ]]  && bindkey  "${key[Insert]}"   overwrite-mode
21
[[ -n "${key[Delete]}"   ]]  && bindkey  "${key[Delete]}"   delete-char
22
[[ -n "${key[Up]}"       ]]  && bindkey  "${key[Up]}"       up-line-or-history
23
[[ -n "${key[Down]}"     ]]  && bindkey  "${key[Down]}"     down-line-or-history
24
[[ -n "${key[Left]}"     ]]  && bindkey  "${key[Left]}"     backward-char
25
[[ -n "${key[Right]}"    ]]  && bindkey  "${key[Right]}"    forward-char
26
[[ -n "${key[PageUp]}"   ]]  && bindkey  "${key[PageUp]}"   beginning-of-buffer-or-history
27
[[ -n "${key[PageDown]}" ]]  && bindkey  "${key[PageDown]}" end-of-buffer-or-history
28
29
# Finally, make sure the terminal is in application mode, when zle is
30
# active. Only then are the values from $terminfo valid.
31
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
32
    function zle-line-init () {
33
        printf '%s' "${terminfo[smkx]}"
34
    }
35
    function zle-line-finish () {
36
        printf '%s' "${terminfo[rmkx]}"
37
    }
38
    zle -N zle-line-init
39
    zle -N zle-line-finish
40
fi

+ 25 - 0
releng/root-image/etc/skel/.config/zsh/zsh/prompt.zsh

@ -0,0 +1,25 @@
1
# Colors
2
white="%{%}"
3
bwhite="%{%}"
4
grey="%{%}"
5
green="%{%}" 
6
normal="%{%}"
7
8
# Z-Styles
9
zstyle ':completion:*' menu select
10
zstyle ':vcs_info:*' stagedstr '+'
11
zstyle ':vcs_info:*' unstagedstr '-'
12
zstyle ':vcs_info:*' check-for-changes true
13
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b'
14
zstyle ':vcs_info:*' enable git hg bzr svn
15
zstyle ':vcs_info:*' formats "${green}[${white}%s${green}::${white}%b%m%u%c${green}]${normal}"
16
17
# Any pre-commands
18
precmd ()
19
{
20
    vcs_info
21
}
22
23
# Prompts
24
PROMPT="${green}[${white}%D{%H:%M:%S}${green}] (${bwhite}%n${green}@${bwhite}%m${green}) (${bwhite}%~${green})${normal} "
25
RPROMPT='${vcs_info_msg_0_}'

+ 1 - 0
releng/root-image/etc/skel/.fehbg

@ -0,0 +1 @@
1
feh  --bg-scale '/usr/share/pixmap/grit-p12.png' 

+ 1 - 0
releng/root-image/etc/skel/.vim/bundle/YouCompleteMe

@ -0,0 +1 @@
1
Subproject commit 3da402fdf94f3122316bd395fcac95b384d6ca1b

+ 1 - 0
releng/root-image/etc/skel/.vim/bundle/ctrlp.vim

@ -0,0 +1 @@
1
Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f

+ 1 - 0
releng/root-image/etc/skel/.vim/bundle/lightline.vim

@ -0,0 +1 @@
1
Subproject commit 147cfbc4eb4326a7648d4bbdc24bee9d6dfb6d14

+ 1 - 0
releng/root-image/etc/skel/.vim/bundle/syntastic

@ -0,0 +1 @@
1
Subproject commit d12bc4f1d122a5e60d08d765acde58272cb84cbb

+ 1 - 0
releng/root-image/etc/skel/.vim/bundle/vim-makeshift

@ -0,0 +1 @@
1
Subproject commit fb0a0deabcdc0ead53a373087b58dc8d1b652484

+ 1 - 0
releng/root-image/etc/skel/.vim/bundle/vim-umbrella

@ -0,0 +1 @@
1
Subproject commit ebaf961263451dc26f42936e7b075be92b15d8af

+ 1 - 0
releng/root-image/etc/skel/.vim/bundle/vundle

@ -0,0 +1 @@
1
Subproject commit d2d22374638340f6e0a36e466281215f6b1cc35a

+ 3 - 0
releng/root-image/etc/skel/.vim/settings.vim

@ -0,0 +1,3 @@
1
for fpath in split(globpath("~/.vim/settings", "*.vim"), "\n")
2
    exe "source" fpath
3
endfor

+ 3 - 0
releng/root-image/etc/skel/.vim/settings/256colors.vim

@ -0,0 +1,3 @@
1
if !has('gui_running')
2
    set t_Co=256
3
endif

+ 5 - 0
releng/root-image/etc/skel/.vim/settings/lightline.vim

@ -0,0 +1,5 @@
1
let g:lightline = {
2
    \ "colorscheme": "wombat",
3
    \ }
4
5
set laststatus=2

+ 1 - 0
releng/root-image/etc/skel/.vim/settings/printer.vim

@ -0,0 +1 @@
1
set pdev=HP_WiFi

+ 4 - 0
releng/root-image/etc/skel/.vim/settings/python.vim

@ -0,0 +1,4 @@
1
call matchadd("ColorColumn", "\%81v", 100)
2
3
"set runtimepath^=~/.vim/bundle/ctrlp.vim
4
"au BufLeave,FocusLost * silent! update

+ 11 - 0
releng/root-image/etc/skel/.vim/settings/syntastic.vim

@ -0,0 +1,11 @@
1
" Mark syntax errors with :signs
2
let g:syntastic_enable_signs=1
3
4
" Automatically jump to the error when saving the file.
5
let g:syntastic_auto_jump=0
6
7
" Show the error list automatically.
8
let g:syntastic_auto_loc_list=1
9
10
" Don't care about warnings.
11
let g:syntastic_quiet_messages = { "level": "warnings" }

+ 13 - 0
releng/root-image/etc/skel/.vim/vundle.vim

@ -0,0 +1,13 @@
1
filetype off
2
3
set rtp+=~/.vim/bundle/vundle/
4
set rtp+=~/.vim/vundles/
5
call vundle#rc()
6
7
" Self management.
8
Bundle "gmarik/vundle"
9
10
runtime appearance.vundle
11
runtime ide.vundle
12
13
filetype plugin indent on

+ 1 - 0
releng/root-image/etc/skel/.vim/vundles/appearance.vundle

@ -0,0 +1 @@
1
Bundle "itchyny/lightline.vim"

+ 5 - 0
releng/root-image/etc/skel/.vim/vundles/ide.vundle

@ -0,0 +1,5 @@
1
Bundle "kien/ctrlp.vim"
2
Bundle "Valloric/YouCompleteMe"
3
Bundle "scrooloose/syntastic"
4
Bundle "johnsyweb/vim-makeshift"
5
Bundle "revolvingcow/vim-umbrella"

+ 1571 - 0
releng/root-image/etc/skel/.viminfo

@ -0,0 +1,1571 @@
1
# This viminfo file was generated by Vim 7.4.
2
# You may edit it if you're careful!
3
4
# Value of 'encoding' when this file was written
5
*encoding=latin1
6
7
8
# hlsearch on (H) or off (h):
9
~h
10
# Last Search Pattern:
11
~MSle0/%s
12
13
# Last Substitute Search Pattern:
14
~MSle0~&SignError
15
16
# Last Substitute String:
17
$UmbrellaError
18
19
# Command Line History (newest to oldest):
20
:q
21
:BundleInstall
22
:wq
23
:w
24
:e README.md
25
:pwd
26
:UmbrellaClear
27
:sign unplace 3 file=/home/bryan/projects/vim-umbrella/plugin/umbrella.vim
28
:sign unplace * file=/home/bryan/projects/vim-umbrella/plugin/umbrella.vim
29
:sign unplace 1 file=/home/bryan/projects/vim-umbrella/plugin/umbrella.vim
30
:sign unplace 1 file=umbrella.vim
31
:buffers-!
32
:help buffer
33
:sign unplace *
34
:sign unplace 1 buffer=umbrella.vim
35
:sign unplace 1 buffer=/home/bryan/projects/vim-umbrella/plugin/umbrella.vim
36
:sign unplace 1 buffer=expand('%:'")
37
:sign unplace 1 buffer=expand("%:p")
38
:sign unplace 1 file=expand("%:p")
39
:sign unplace 1
40
:UmbrellaRefresh
41
:Umbrella
42
:q!
43
:e umbrella
44
:digraphs
45
:diagraphs
46
:highlight
47
:ClearCoverage
48
:%s/SignError/UmbrellaError/g
49
:%s/SignWarning/UmbrellaWarning/g
50
:%s/SignCovered/UmbrellaCovered/g
51
:sign list
52
:w!
53
:%s/set_makeprg/SetMakeProgram/g
54
:%s/determine_build_system/FindProgram/g
55
:%s/build_defaults/Initialize/g
56
:%s/run_coverage/RunCoverage/g
57
:%s/show_coverage/ShowCoverage
58
:cd! -
59
:cd! 
60
:cd!
61
:o ../umbrella
62
:sp
63
:UmbrellaBuild
64
:e
65
:%s/build_systems/coverage_systems/g
66
:%s/makeshift/umbrella/g
67
:Helptags
68
:helptags
69
:e ~/.vim/vundles/ide.vundle
70
:e ~/.vim/settings/lightline.vim
71
:e ~/.vimrc
72
:vsp
73
:Q
74
:set t_Co=256
75
:e ~/.vim/vundle.vim
76
:o ~/.vimrc
77
:o ~/.vim/settings.vim
78
:undolist
79
:help buffers
80
:CtrlP ~/projects/
81
:CtrlP
82
:helptags ~/.vim/bundle/ctrlp.vim/doc
83
:.!vboxmanage
84
:e ./prompt.zsh
85
:%s/Edit/Create/g
86
:%s/Account/Company/g
87
:%s/Accounts/Candidates/g
88
:W
89
:%s/Account/Candidate/g
90
:%s/Account/Address/g
91
:%s/account/company/g
92
:%s/account/candidate/g
93
:%s/account/address/g
94
:%s/Candidate/Company/g
95
:e ~/.zsh/prompt.zsh
96
:e /home/bryan/.zsh/lib/bzr.zsh
97
:e /home/bryan/.zsh/lib/hg.zsh
98
:e hg.zsh
99
:e ~/.zsh/lib/git.zsh
100
:w! ~/.zsh/keys.zsh
101
:w ~/.zsh/keys.zsh
102
:e /home/bryan/projects/oh-my-zsh/themes/informer.zsh-theme
103
:%s/$mod+semicolon/$mod+l/g
104
:%s/$mod+l/$mod+k/g
105
:%s/$mod+k/$mod+j/g
106
:%s/$mod+j/$mod+h/g
107
:set nocp
108
:nohlsearch
109
:set noic
110
:set hls is
111
:set ic
112
:.,.+4!
113
:r !ls
114
:r TEST
115
:!ls -l; cat TEST
116
:'<,'>w TEST
117
:.!
118
:!ls -l
119
:!rm TEST
120
121
# Search String History (newest to oldest):
122
?/makeshift
123
? SignError
124
? SignWarning
125
? SignCovered
126
? umbrella_coverage = ''
127
? set_makeprg
128
? determine_build_system
129
? build_defaults
130
? run_coverage
131
? show_coverage
132
? build_systems
133
?/%s/build_systems/coverage_systems/g
134
?/umbrellag
135
? makeshift
136
? Edit
137
? Account
138
? Accounts
139
? account
140
? Candidate
141
?/$mod+b
142
?/$mod+c
143
?/$mod+g
144
? $mod+semicolon
145
? $mod+l
146
? $mod+k
147
? $mod+j
148
?/search
149
?/ignore
150
? thee
151
?/errroor
152
? \<some\>
153
154
# Expression History (newest to oldest):
155
156
# Input Line History (newest to oldest):
157
158
# Input Line History (newest to oldest):
159
160
# Registers:
161
"0	CHAR	0
162
	s
163
""1	LINE	0
164
	
165
"2	LINE	0
166
	source ~/projects/vim-umbrella/plugin/umbrella.vim
167
"3	LINE	0
168
	    endif
169
"4	LINE	0
170
	    if bufexists(l:currentBuffer)
171
"5	LINE	0
172
	    let l:currentBuffer = expand("%:p")
173
"6	LINE	0
174
	sign define UmbrellaPartial text==| texthl=UmbrellaPartial
175
"7	LINE	0
176
	sign define UmbrellaCovered text==] texthl=UmbrellaCovered
177
"8	LINE	0
178
	sign define UmbrellaPartial text==| texthl=UmbrellaPartial
179
"9	LINE	0
180
	sign define UmbrellaCovered text==) texthl=UmbrellaCovered
181
"j	CHAR	0
182
	jjjjjjjjjjjjjjjjjjj
183
"k	CHAR	0
184
	jjj
185
"q	CHAR	0
186
	jjjjjjj
187
"-	CHAR	0
188
	l
189
190
# File marks:
191
'0  1  0  ~/.vim/vundles/ide.vundle
192
'1  5  33  ~/.vim/vundles/ide.vundle
193
'2  76  0  ~/.vimrc
194
'3  4  28  ~/projects/dotfiles/.Xdefaults
195
'4  1  14  ~/projects/dotfiles/.zsh/aliases.zsh
196
'5  1  14  ~/.zsh/aliases.zsh
197
'6  1  0  ~/projects/vim-umbrella/plugin/umbrella.vim
198
'7  71  17  ~/projects/vim-umbrella/plugin/umbrella.vim
199
'8  66  12  ~/projects/vim-umbrella/plugin/umbrella.vim
200
'9  72  8  ~/projects/vim-umbrella/plugin/umbrella.vim
201
202
# Jumplist (newest first):
203
-'  1  0  ~/.vim/vundles/ide.vundle
204
-'  5  33  ~/.vim/vundles/ide.vundle
205
-'  76  0  ~/.vimrc
206
-'  2  0  ~/.vimrc
207
-'  1  0  ~/.vimrc
208
-'  4  28  ~/projects/dotfiles/.Xdefaults
209
-'  1  0  ~/projects/dotfiles/.Xdefaults
210
-'  1  14  ~/projects/dotfiles/.zsh/aliases.zsh
211
-'  1  14  ~/.zsh/aliases.zsh
212
-'  1  0  ~/projects/vim-umbrella/plugin/umbrella.vim
213
-'  71  17  ~/projects/vim-umbrella/plugin/umbrella.vim
214
-'  66  12  ~/projects/vim-umbrella/plugin/umbrella.vim
215
-'  72  8  ~/projects/vim-umbrella/plugin/umbrella.vim
216
-'  4  0  ~/projects/vim-umbrella/plugin/umbrella.vim
217
-'  111  7  ~/projects/vim-umbrella/plugin/umbrella.vim
218
-'  18  34  ~/projects/vim-umbrella/plugin/umbrella.vim
219
-'  97  0  ~/projects/vim-umbrella/plugin/umbrella.vim
220
-'  88  25  ~/projects/vim-umbrella/plugin/umbrella.vim
221
-'  96  21  ~/projects/vim-umbrella/plugin/umbrella.vim
222
-'  91  0  ~/projects/vim-umbrella/plugin/umbrella.vim
223
-'  92  33  ~/projects/vim-umbrella/plugin/umbrella.vim
224
-'  17  30  ~/projects/vim-umbrella/plugin/umbrella.vim
225
-'  145  1  ~/projects/vim-umbrella/plugin/umbrella.vim
226
-'  11  24  ~/projects/vim-umbrella/plugin/umbrella.vim
227
-'  33  32  ~/projects/vim-umbrella/plugin/umbrella.vim
228
-'  81  38  ~/projects/vim-umbrella/plugin/umbrella.vim
229
-'  47  0  ~/projects/vim-umbrella/plugin/umbrella.vim
230
-'  76  0  ~/projects/vim-umbrella/plugin/umbrella.vim
231
-'  70  11  ~/projects/vim-umbrella/plugin/umbrella.vim
232
-'  105  0  ~/projects/vim-umbrella/plugin/umbrella.vim
233
-'  93  115  ~/projects/vim-umbrella/plugin/umbrella.vim
234
-'  89  12  ~/projects/vim-umbrella/plugin/umbrella.vim
235
-'  86  29  ~/projects/vim-umbrella/plugin/umbrella.vim
236
-'  100  72  ~/projects/vim-umbrella/plugin/umbrella.vim
237
-'  85  34  ~/projects/vim-umbrella/plugin/umbrella.vim
238
-'  28  0  ~/projects/vim-umbrella/plugin/umbrella.vim
239
-'  82  4  ~/projects/vim-umbrella/plugin/umbrella.vim
240
-'  84  8  ~/projects/vim-umbrella/plugin/umbrella.vim
241
-'  36  4  ~/projects/vim-umbrella/plugin/umbrella.vim
242
-'  37  0  ~/projects/vim-umbrella/plugin/umbrella.vim
243
-'  24  7  ~/projects/vim-umbrella/plugin/umbrella.vim
244
-'  62  0  ~/projects/vim-umbrella/plugin/umbrella.vim
245
-'  61  24  ~/projects/vim-umbrella/plugin/umbrella.vim
246
-'  29  8  ~/projects/vim-umbrella/plugin/umbrella.vim
247
-'  25  8  ~/projects/vim-umbrella/plugin/umbrella.vim
248
-'  83  4  ~/projects/vim-umbrella/plugin/umbrella.vim
249
-'  106  16  ~/projects/vim-umbrella/plugin/umbrella.vim
250
-'  55  4  ~/projects/vim-umbrella/plugin/umbrella.vim
251
-'  19  1  ~/projects/vim-umbrella/plugin/umbrella.vim
252
-'  119  41  ~/projects/vim-umbrella/plugin/umbrella.vim
253
-'  112  27  ~/projects/vim-umbrella/plugin/umbrella.vim
254
-'  120  10  ~/projects/vim-umbrella/plugin/umbrella.vim
255
-'  116  2  ~/projects/vim-umbrella/plugin/umbrella.vim
256
-'  65  10  ~/projects/vim-umbrella/plugin/umbrella.vim
257
-'  21  31  ~/projects/vim-umbrella/plugin/umbrella.vim
258
-'  68  34  ~/projects/vim-umbrella/plugin/umbrella.vim
259
-'  64  32  ~/projects/vim-umbrella/plugin/umbrella.vim
260
-'  113  0  ~/projects/vim-umbrella/plugin/umbrella.vim
261
-'  1  25  ~/projects/vim-umbrella/umbrella
262
-'  103  23  ~/projects/vim-umbrella/plugin/umbrella.vim
263
-'  117  31  ~/projects/vim-umbrella/plugin/umbrella.vim
264
-'  118  4  ~/projects/vim-umbrella/plugin/umbrella.vim
265
-'  6  0  ~/.vimrc
266
-'  31  0  ~/.vimrc
267
-'  77  49  ~/.vimrc
268
-'  15  0  ~/.vimrc
269
-'  2  7  ~/projects/vim-umbrella/README.md
270
-'  1  0  ~/projects/vim-umbrella/README.md
271
-'  2  9  ~/projects/vim-makeshift/plugin/makeshift.vim
272
-'  10  26  ~/projects/vim-makeshift/plugin/makeshift.vim
273
-'  97  4  ~/projects/vim-makeshift/plugin/makeshift.vim
274
-'  15  29  ~/projects/vim-makeshift/plugin/makeshift.vim
275
-'  19  0  ~/projects/vim-makeshift/plugin/makeshift.vim
276
-'  20  0  ~/projects/vim-makeshift/plugin/makeshift.vim
277
-'  21  0  ~/projects/vim-makeshift/plugin/makeshift.vim
278
-'  31  4  ~/projects/vim-makeshift/plugin/makeshift.vim
279
-'  32  0  ~/projects/vim-makeshift/plugin/makeshift.vim
280
-'  33  0  ~/projects/vim-makeshift/plugin/makeshift.vim
281
-'  5  26  ~/projects/vim-makeshift/plugin/makeshift.vim
282
-'  12  17  ~/projects/vim-makeshift/plugin/makeshift.vim
283
-'  1  20  ~/projects/vim-makeshift/plugin/makeshift.vim
284
-'  4  31  ~/.vim/vundles/ide.vundle
285
-'  1  0  ~/.vim/vundle.vim
286
-'  5  10  ~/projects/pac-ls/pac-ls
287
-'  1  0  ~/projects/pac-ls/pac-ls
288
-'  1  0  ~/.vim/settings/syntastic.vim
289
-'  11  55  ~/.vim/settings/syntastic.vim
290
-'  3  28  ~/.vim/vundles/ide.vundle
291
-'  1  0  ~/.vim/settings/lightline.vim
292
-'  2  11  ~/.vim/vundles/ide.vundle
293
-'  5  0  ~/.vim/settings/lightline.vim
294
-'  2  27  ~/.vim/settings/lightline.vim
295
-'  4  28  ~/.Xdefaults
296
-'  1  0  ~/.Xdefaults
297
-'  1  0  ~/.xinitrc
298
-'  1  0  ~/.Xauthority
299
-'  1  0  ~/.zshrc
300
301
# History of marks within files (newest to oldest):
302
303
> ~/.vim/vundles/ide.vundle
304
	"	1	0
305
	^	5	34
306
	.	5	33
307
	+	1	23
308
	+	2	31
309
	+	3	29
310
	+	4	32
311
	+	5	33
312
313
> ~/[Vundle] Installer
314
	"	10	0
315
	.	1	0
316
	+	1	0
317
318
> ~/.vimrc
319
	"	76	0
320
	.	77	0
321
	+	1	40
322
	+	1	38
323
	+	76	5
324
	+	1	0
325
	+	72	0
326
	+	1	32
327
	+	13	9
328
	+	13	10
329
	+	70	18
330
	+	71	21
331
	+	6	23
332
	+	24	4
333
	+	22	37
334
	+	23	24
335
	+	77	49
336
	+	77	0
337
	+	77	0
338
339
> ~/projects/dotfiles/.Xdefaults
340
	"	4	28
341
	^	4	29
342
	.	4	28
343
	+	4	28
344
345
> ~/projects/dotfiles/.zsh/aliases.zsh
346
	"	1	14
347
	.	1	14
348
	+	4	0
349
	+	1	14
350
351
> ~/.zsh/aliases.zsh
352
	"	1	14
353
	^	4	61
354
	.	1	14
355
	+	1	15
356
	+	3	44
357
	+	4	60
358
	+	1	14
359
360
> ~/projects/vim-umbrella/plugin/umbrella.vim
361
	"	1	0
362
	^	71	4
363
	.	71	17
364
	+	81	40
365
	+	81	36
366
	+	81	0
367
	+	8	0
368
	+	10	0
369
	+	11	0
370
	+	12	0
371
	+	17	0
372
	+	17	0
373
	+	17	0
374
	+	10	0
375
	+	11	0
376
	+	12	0
377
	+	17	35
378
	+	17	35
379
	+	17	31
380
	+	17	35
381
	+	17	34
382
	+	17	32
383
	+	29	31
384
	+	25	28
385
	+	33	32
386
	+	17	34
387
	+	17	35
388
	+	17	34
389
	+	17	26
390
	+	17	51
391
	+	17	34
392
	+	17	31
393
	+	12	21
394
	+	11	24
395
	+	92	68
396
	+	93	174
397
	+	92	74
398
	+	17	34
399
	+	17	34
400
	+	17	33
401
	+	17	31
402
	+	17	34
403
	+	17	0
404
	+	17	31
405
	+	17	33
406
	+	17	30
407
	+	17	33
408
	+	17	33
409
	+	17	30
410
	+	17	34
411
	+	17	33
412
	+	17	33
413
	+	17	30
414
	+	87	32
415
	+	89	15
416
	+	92	15
417
	+	93	118
418
	+	88	33
419
	+	89	3
420
	+	93	0
421
	+	97	0
422
	+	93	136
423
	+	92	33
424
	+	99	16
425
	+	99	0
426
	+	96	16
427
	+	95	0
428
	+	91	0
429
	+	87	32
430
	+	88	0
431
	+	92	32
432
	+	96	32
433
	+	88	21
434
	+	92	21
435
	+	96	21
436
	+	88	29
437
	+	9	20
438
	+	14	15
439
	+	17	0
440
	+	18	0
441
	+	17	0
442
	+	18	0
443
	+	17	31
444
	+	18	0
445
	+	15	0
446
	+	18	0
447
	+	16	0
448
	+	106	7
449
	+	109	7
450
	+	111	7
451
	+	71	24
452
	+	71	30
453
	+	71	43
454
	+	71	43
455
	+	72	8
456
	+	71	29
457
	+	71	35
458
	+	71	18
459
	+	71	9
460
	+	71	47
461
	+	71	4
462
	+	72	0
463
	+	71	17
464
465
> ~/projects/vim-umbrella/doc/umbrella.txt
466
	"	119	0
467
468
> ~/projects/vim-umbrella/umbrella
469
	"	1	0
470
	^	1	48
471
	.	1	47
472
	+	1	26
473
	+	2	0
474
	+	1	89
475
	+	2	0
476
	+	1	47
477
478
> ~/projects/vim-umbrella/README.md
479
	"	80	1
480
	^	38	0
481
	.	37	1
482
	+	1	7
483
	+	2	7
484
	+	4	52
485
	+	44	34
486
	+	66	36
487
	+	67	0
488
	+	70	0
489
	+	54	12
490
	+	34	17
491
	+	22	55
492
	+	15	0
493
	+	57	0
494
	+	65	0
495
	+	63	3
496
	+	70	0
497
	+	73	10
498
	+	82	0
499
	+	81	38
500
	+	53	0
501
	+	15	0
502
	+	18	4
503
	+	19	0
504
	+	18	58
505
	+	39	47
506
	+	43	4
507
	+	44	38
508
	+	45	3
509
	+	47	11
510
	+	79	50
511
	+	25	12
512
	+	70	0
513
	+	13	0
514
	+	12	63
515
	+	37	1
516
517
> /usr/share/vim/vim74/doc/windows.txt
518
	"	932	54
519
520
> ~/projects/vim-umbrella/zsh
521
	"	1	0
522
523
> ~/projects/vim-makeshift/plugin/makeshift.vim
524
	"	2	9
525
	^	63	27
526
	.	63	26
527
	+	1	0
528
	+	34	0
529
	+	1	0
530
	+	5	26
531
	+	11	37
532
	+	12	0
533
	+	73	19
534
	+	79	19
535
	+	80	28
536
	+	75	33
537
	+	10	0
538
	+	63	26
539
540
> ~/projects/[Vundle] Installer
541
	"	9	0
542
	.	1	0
543
	+	1	0
544
545
> ~/.vim/vundle.vim
546
	"	1	0
547
	^	11	18
548
	.	11	17
549
	+	8	21
550
	+	7	17
551
	+	13	24
552
	+	10	25
553
	+	11	17
554
555
> ~/projects/pac-ls/pac-ls
556
	"	5	10
557
	^	5	11
558
	.	5	10
559
	+	19	0
560
	+	5	10
561
562
> ~/.vim/settings/syntastic.vim
563
	"	1	0
564
	^	11	56
565
	.	11	55
566
	+	11	55
567
568
> ~/.vim/[Vundle] Installer
569
	"	8	0
570
	.	1	0
571
	+	21	0
572
	+	18	0
573
	+	13	0
574
	+	8	0
575
	+	1	0
576
577
> ~/.vim/settings/[Vundle] Installer
578
	"	7	0
579
	.	1	0
580
	+	18	0
581
	+	13	0
582
	+	7	0
583
	+	1	0
584
585
> ~/.vim/settings/lightline.vim
586
	"	1	0
587
	^	1	0
588
	.	5	15
589
	+	6	0
590
	+	2	29
591
	+	3	5
592
	+	2	27
593
	+	5	15
594
595
> ~/.Xdefaults
596
	"	4	28
597
	^	4	29
598
	.	4	28
599
	+	4	28
600
601
> ~/.xinitrc
602
	"	1	0
603
	^	15	47
604
	.	15	47
605
	+	14	6
606
	+	15	47
607
608
> ~/.Xauthority
609
	"	1	0
610
611
> ~/.zshrc
612
	"	1	0
613
	.	11	0
614
	+	2	17
615
	+	4	18
616
	+	4	0
617
	+	4	0
618
	+	24	0
619
	+	2	13
620
	+	26	53
621
	+	2	9
622
	+	4	0
623
	+	4	16
624
	+	8	0
625
	+	14	0
626
	+	15	26
627
	+	17	0
628
	+	19	20
629
	+	4	0
630
	+	13	0
631
	+	24	14
632
	+	25	22
633
	+	26	0
634
	+	22	21
635
	+	12	20
636
	+	12	21
637
	+	12	42
638
	+	12	28
639
	+	12	10
640
	+	12	0
641
	+	12	0
642
	+	12	0
643
	+	10	25
644
	+	11	0
645
646
> ~/.zsh/keys.zsh
647
	"	20	0
648
	.	41	0
649
	+	2	0
650
	+	1	0
651
	+	41	0
652
653
> ~/.zsh/autoloads.zsh
654
	"	1	0
655
	^	2	22
656
	.	2	21
657
	+	3	8
658
	+	1	20
659
	+	3	21
660
	+	6	9
661
	+	2	21
662
663
> ~/.zsh/flags.zsh
664
	"	1	0
665
	^	3	22
666
	.	3	21
667
	+	1	23
668
	+	2	19
669
	+	3	21
670
671
> ~/.vim/settings/256colors.vim
672
	"	1	0
673
	^	3	5
674
	.	3	4
675
	+	3	4
676
677
> ~/.vim/ControlP
678
	"	1	0
679
	.	1	0
680
	+	1	0
681
	+	1	0
682
	+	1	0
683
	+	1	0
684
685
> ~/.vim/vundles/appearance.vundle
686
	"	1	29
687
	^	1	30
688
	.	1	29
689
	+	1	29
690
691
> ~/.vim/bundle/appearance.vundle
692
	"	1	29
693
	^	1	30
694
	.	1	29
695
	+	1	29
696
697
> ~/.vim/settings/python.vim
698
	"	4	0
699
	^	4	1
700
	.	4	0
701
	+	5	0
702
	+	1	10
703
	+	4	37
704
	+	1	0
705
	+	3	0
706
	+	4	0
707
708
> ~/projects/janikai/www/tinymvc/myapp/models/account_model.php
709
	"	39	0
710
	^	25	53
711
	.	25	52
712
	+	27	0
713
	+	16	8
714
	+	16	29
715
	+	16	23
716
	+	21	4
717
	+	20	83
718
	+	16	0
719
	+	15	60
720
	+	27	0
721
	+	12	0
722
	+	10	43
723
	+	10	60
724
	+	7	0
725
	+	5	52
726
	+	26	4
727
	+	25	52
728
729
> ~/.vim/settings.vim
730
	"	1	0
731
	^	3	6
732
	.	3	5
733
	+	5	5
734
	+	3	5
735
736
> ~/projects/pac-ls/ControlP
737
	"	2	0
738
	.	2	0
739
	+	1	0
740
	+	1	0
741
	+	1	0
742
	+	1	0
743
	+	1	0
744
	+	1	0
745
	+	1	0
746
	+	1	0
747
	+	1	0
748
	+	1	0
749
	+	1	0
750
	+	1	0
751
	+	1	0
752
	+	1	0
753
	+	1	0
754
	+	1	0
755
	+	1	0
756
	+	1	0
757
	+	1	0
758
	+	1	0
759
	+	1	0
760
	+	1	0
761
	+	1	0
762
	+	1	0
763
	+	1	0
764
	+	1	0
765
	+	1	0
766
	+	1	0
767
	+	1	0
768
	+	1	0
769
	+	1	0
770
	+	1	0
771
	+	1	0
772
	+	1	0
773
	+	1	0
774
	+	1	0
775
	+	1	0
776
	+	1	0
777
	+	1	0
778
	+	1	0
779
	+	1	0
780
	+	1	0
781
	+	1	0
782
	+	1	0
783
	+	1	0
784
	+	1	0
785
	+	1	0
786
	+	1	0
787
	+	1	0
788
	+	1	0
789
	+	1	0
790
	+	1	0
791
	+	1	0
792
	+	1	0
793
	+	1	0
794
	+	1	0
795
	+	1	0
796
	+	1	0
797
	+	1	0
798
	+	1	0
799
	+	1	0
800
	+	1	0
801
	+	1	0
802
	+	1	0
803
	+	1	0
804
	+	1	0
805
	+	1	0
806
	+	1	0
807
	+	1	0
808
	+	1	0
809
	+	1	0
810
	+	1	0
811
	+	1	0
812
	+	1	0
813
	+	1	0
814
	+	1	0
815
	+	1	0
816
	+	1	0
817
	+	1	0
818
	+	1	0
819
	+	1	0
820
	+	1	0
821
	+	1	0
822
	+	1	0
823
	+	1	0
824
	+	1	0
825
	+	1	0
826
	+	1	0
827
	+	2	0
828
829
> ~/projects/pac-ls/README.md
830
	"	1	0
831
832
> ~/projects/pac-ls/LICENSE
833
	"	5	0
834
	.	6	0
835
	+	6	0
836
837
> /usr/share/vim/vim74/doc/diff.txt
838
	"	25	0
839
840
> ~/projects/oh-my-zsh/lib/bzr.zsh
841
	"	1	0
842
	^	8	6
843
	.	8	5
844
	+	9	1
845
	+	19	0
846
	+	18	5
847
	+	3	28
848
	+	8	5
849
850
> ~/.i3/config
851
	"	259	0
852
	^	256	1
853
	.	260	0
854
	+	42	30
855
	+	238	0
856
	+	239	0
857
	+	247	74
858
	+	257	65
859
	+	161	48
860
	+	162	46
861
	+	161	0
862
	+	151	0
863
	+	156	14
864
	+	157	14
865
	+	158	14
866
	+	159	14
867
	+	160	14
868
	+	163	44
869
	+	109	17
870
	+	110	18
871
	+	111	18
872
	+	112	17
873
	+	113	18
874
	+	114	17
875
	+	109	28
876
	+	110	29
877
	+	111	29
878
	+	112	28
879
	+	113	29
880
	+	114	28
881
	+	233	16
882
	+	109	32
883
	+	110	33
884
	+	111	33
885
	+	112	32
886
	+	113	33
887
	+	114	32
888
	+	109	30
889
	+	110	31
890
	+	111	31
891
	+	112	30
892
	+	113	31
893
	+	114	31
894
	+	114	31
895
	+	117	38
896
	+	233	0
897
	+	232	23
898
	+	256	0
899
	+	255	0
900
	+	61	0
901
	+	63	0
902
	+	64	0
903
	+	65	0
904
	+	66	0
905
	+	62	31
906
	+	75	46
907
	+	76	31
908
	+	77	0
909
	+	78	0
910
	+	79	0
911
	+	80	0
912
	+	56	0
913
	+	57	0
914
	+	58	0
915
	+	59	0
916
	+	71	0
917
	+	70	19
918
	+	71	19
919
	+	72	19
920
	+	73	20
921
	+	83	13
922
	+	69	43
923
	+	55	43
924
	+	38	0
925
	+	258	0
926
	+	1	0
927
	+	260	0
928
	+	257	0
929
	+	256	0
930
	+	260	0
931
932
> ~/Downloads/openVPN_ljisc_client3.tblk/client.conf.txt
933
	"	1	0
934
935
> ~/.i3/status.conf
936
	"	43	35
937
	^	43	36
938
	.	43	35
939
	+	20	12
940
	+	12	22
941
	+	15	0
942
	+	31	8
943
	+	15	18
944
	+	32	41
945
	+	33	4
946
	+	7	0
947
	+	16	0
948
	+	8	0
949
	+	9	0
950
	+	11	0
951
	+	13	0
952
	+	17	0
953
	+	15	0
954
	+	13	0
955
	+	11	0
956
	+	42	31
957
	+	43	35
958
959
> ~/dmenu/rdp-chess
960
	"	2	149
961
	.	2	149
962
	+	2	149
963
964
> ~/dmenu/rdp-sharepoint
965
	"	1	0
966
	^	2	110
967
	.	2	109
968
	+	2	138
969
	+	1	7
970
	+	2	109
971
972
> ~/dmenu/rdp-janikai
973
	"	2	115
974
	^	2	116
975
	.	2	115
976
	+	2	131
977
	+	1	7
978
	+	2	32
979
	+	2	115
980
981
> ~/dmenu/rdp-ljisc
982
	"	2	115
983
	^	2	116
984
	.	2	115
985
	+	2	131
986
	+	1	7
987
	+	2	0
988
	+	2	115
989
990
> ~/dmenu/rdp-oreilly
991
	"	1	0
992
	^	2	33
993
	.	2	33
994
	+	1	8
995
	+	2	33
996
997
> ~/dmenu/kbd-brightness-down
998
	"	1	0
999
	.	4	0
1000
	+	6	24
1001
	+	5	17
1002
	+	4	0
1003
1004
> ~/dmenu/kbd-toggle-layout
1005
	"	5	26
1006
	^	5	27
1007
	.	5	27
1008
	+	1	9
1009
	+	1	9
1010
	+	5	27
1011
1012
> ~/dmenu/kdb-toggle-layout
1013
	"	4	23
1014
	^	4	24
1015
	.	4	23
1016
	+	5	5
1017
	+	2	0
1018
	+	3	6
1019
	+	9	1
1020
	+	5	30
1021
	+	4	23
1022
1023
> ~/dmenu/vm-stop-all
1024
	"	1	0
1025
1026
> ~/doc/SIR.md
1027
	"	15	19
1028
	^	15	43
1029
	.	15	19
1030
	+	9	58
1031
	+	22	83
1032
	+	23	17
1033
	+	10	52
1034
	+	11	28
1035
	+	12	53
1036
	+	24	30
1037
	+	25	36
1038
	+	26	51
1039
	+	13	29
1040
	+	5	1
1041
	+	16	1
1042
	+	4	41
1043
	+	1	14
1044
	+	2	13
1045
	+	15	19
1046
1047
> ~/doc/SIR.txt
1048
	"	16	10
1049
	^	2	11
1050
	.	2	10
1051
	+	14	27
1052
	+	6	42
1053
	+	7	48
1054
	+	16	40
1055
	+	8	62
1056
	+	5	36
1057
	+	1	36
1058
	+	10	37
1059
	+	11	36
1060
	+	3	0
1061
	+	2	10
1062
1063
> ~/.i3/autostart
1064
	"	14	16
1065
	.	14	16
1066
	+	14	16
1067
1068
> ~/projects/dotfiles/.i3/autostart
1069
	"	1	0
1070
1071
> ~/.i3/shutdown
1072
	"	16	6
1073
	^	16	7
1074
	.	16	6
1075
	+	5	0
1076
	+	6	0
1077
	+	7	0
1078
	+	8	0
1079
	+	6	0
1080
	+	1	7
1081
	+	16	6
1082
	+	16	0
1083
	+	4	39
1084
	+	5	3
1085
	+	6	3
1086
	+	7	3
1087
	+	8	9
1088
	+	9	1
1089
	+	8	4
1090
	+	7	4
1091
	+	6	4
1092
	+	5	28
1093
	+	7	14
1094
	+	16	6
1095
1096
> ~/projects/dotfiles/.i3/config
1097
	"	126	0
1098
	.	256	0
1099
	+	255	0
1100
	+	256	0
1101
1102
> ~/projects/dotfiles/.zsh/prompt.zsh
1103
	"	1	0
1104
1105
> ~/projects/dotfiles/.zshrc
1106
	"	1	0
1107
1108
> ~/.zsh/prompt.zsh
1109
	"	24	27
1110
	^	24	45
1111
	.	24	27
1112
	+	1	8
1113
	+	25	51
1114
	+	25	34
1115
	+	25	29
1116
	+	25	0
1117
	+	25	2
1118
	+	25	2
1119
	+	25	2
1120
	+	25	0
1121
	+	1	0
1122
	+	24	0
1123
	+	25	0
1124
	+	25	0
1125
	+	21	0
1126
	+	1	53
1127
	+	24	0
1128
	+	1	29
1129
	+	24	27
1130
	+	25	0
1131
	+	23	0
1132
	+	20	0
1133
	+	19	11
1134
	+	1	45
1135
	+	1	7
1136
	+	23	19
1137
	+	1	33
1138
	+	13	126
1139
	+	23	15
1140
	+	13	128
1141
	+	13	20
1142
	+	23	0
1143
	+	22	8
1144
	+	24	0
1145
	+	22	20
1146
	+	22	20
1147
	+	22	17
1148
	+	1	0
1149
	+	6	0
1150
	+	22	0
1151
	+	13	77
1152
	+	2	9
1153
	+	4	8
1154
	+	5	10
1155
	+	13	89
1156
	+	3	20
1157
	+	23	111
1158
	+	13	0
1159
	+	14	0
1160
	+	15	0
1161
	+	14	0
1162
	+	14	42
1163
	+	7	9
1164
	+	16	17
1165
	+	14	0
1166
	+	23	67
1167
	+	12	50
1168
	+	9	32
1169
	+	10	34
1170
	+	24	27
1171
1172
> ~/.hgrc
1173
	"	2	47
1174
	^	2	48
1175
	.	2	47
1176
	+	2	47
1177
1178
> ~/.zsh/autoload.zsh
1179
	"	2	20
1180
	^	2	21
1181
	.	2	20
1182
	+	2	20
1183
1184
> ~/projects/oh-my-zsh/oh-my-zsh.sh
1185
	"	58	0
1186
1187
> ~/projects/janikai/www/tinymvc/myapp/controllers/account.php
1188
	"	1	0
1189
	^	35	35
1190
	.	35	34
1191
	+	4	9
1192
	+	6	10
1193
	+	12	12
1194
	+	16	34
1195
	+	28	34
1196
	+	35	34
1197
1198
> ~/projects/janikai/www/tinymvc/myapp/views/company/index_view.php
1199
	"	46	6
1200
	^	36	47
1201
	.	36	46
1202
	+	4	35
1203
	+	11	20
1204
	+	21	0
1205
	+	22	31
1206
	+	36	46
1207
1208
> ~/projects/janikai/www/tinymvc/myapp/views/company/create_view.php
1209
	"	26	42
1210
	^	26	43
1211
	.	26	42
1212
	+	4	0
1213
	+	15	0
1214
	+	17	50
1215
	+	21	54
1216
	+	23	0
1217
	+	26	42
1218
1219
> ~/projects/janikai/www/tinymvc/myapp/views/company/edit_view.php
1220
	"	1	14
1221
	^	25	73
1222
	.	25	72
1223
	+	4	0
1224
	+	35	0
1225
	+	23	0
1226
	+	24	31
1227
	+	25	72
1228
1229
> ~/projects/janikai/www/tinymvc/myapp/views/account/index_view.php
1230
	"	11	14
1231
	^	11	15
1232
	.	11	15
1233
	+	50	6
1234
	+	4	23
1235
	+	8	23
1236
	+	10	10
1237
	+	11	24
1238
	+	47	0
1239
	+	44	22
1240
	+	43	20
1241
	+	37	21
1242
	+	36	19
1243
	+	43	19
1244
	+	42	53
1245
	+	4	34
1246
	+	11	15
1247
1248
> ~/projects/janikai/www/tinymvc/myapp/views/address/index_view.php
1249
	"	1	0
1250
	^	48	53
1251
	.	48	52
1252
	+	4	35
1253
	+	11	20
1254
	+	19	29
1255
	+	22	32
1256
	+	25	24
1257
	+	19	29
1258
	+	25	27
1259
	+	29	21
1260
	+	32	20
1261
	+	44	77
1262
	+	45	47
1263
	+	46	50
1264
	+	48	52
1265
1266
> ~/projects/janikai/www/tinymvc/myapp/views/candidate/index_view.php
1267
	"	24	16
1268
	^	39	55
1269
	.	24	0
1270
	+	4	0
1271
	+	11	21
1272
	+	24	19
1273
	+	24	23
1274
	+	25	31
1275
	+	40	45
1276
	+	40	57
1277
	+	38	38
1278
	+	19	28
1279
	+	23	20
1280
	+	22	38
1281
	+	38	54
1282
	+	39	54
1283
	+	40	0
1284
	+	24	0
1285
1286
> ~/projects/janikai/www/tinymvc/myapp/views/candidate/create_view.php
1287
	"	42	42
1288
	^	42	43
1289
	.	42	42
1290
	+	4	0
1291
	+	15	0
1292
	+	17	50
1293
	+	21	50
1294
	+	25	50
1295
	+	29	51
1296
	+	33	50
1297
	+	37	54
1298
	+	39	0
1299
	+	42	42
1300
1301
> ~/projects/janikai/www/tinymvc/myapp/views/candidate/edit_view.php
1302
	"	1	14
1303
	^	41	72
1304
	.	41	71
1305
	+	4	0
1306
	+	20	29
1307
	+	21	64
1308
	+	30	20
1309
	+	31	19
1310
	+	34	24
1311
	+	38	20
1312
	+	38	0
1313
	+	40	31
1314
	+	41	71
1315
1316
> ~/projects/janikai/www/tinymvc/myapp/views/address/delete_view.php
1317
	"	1	0
1318
1319
> ~/projects/janikai/www/tinymvc/myapp/views/address/edit_view.php
1320
	"	54	20
1321
	^	54	21
1322
	.	54	20
1323
	+	7	0
1324
	+	4	31
1325
	+	11	16
1326
	+	18	20
1327
	+	58	40
1328
	+	45	69
1329
	+	41	67
1330
	+	37	66
1331
	+	33	71
1332
	+	29	69
1333
	+	25	69
1334
	+	54	20
1335
1336
> ~/projects/janikai/www/tinymvc/myapp/views/address/create_view.php
1337
	"	13	7
1338
	^	24	32
1339
	.	24	31
1340
	+	4	0
1341
	+	16	29
1342
	+	17	50
1343
	+	43	0
1344
	+	18	21
1345
	+	19	0
1346
	+	40	0
1347
	+	19	15
1348
	+	23	16
1349
	+	26	21
1350
	+	30	21
1351
	+	34	21
1352
	+	38	21
1353
	+	40	30
1354
	+	36	28
1355
	+	32	27
1356
	+	28	32
1357
	+	24	31
1358
1359
> ~/projects/janikai/www/tinymvc/myapp/views/account/create_view.php
1360
	"	30	42
1361
	^	30	43
1362
	.	30	42
1363
	+	4	32
1364
	+	11	18
1365
	+	15	0
1366
	+	27	0
1367
	+	30	42
1368
1369
> ~/projects/janikai/www/tinymvc/myapp/views/account/edit_view.php
1370
	"	47	6
1371
	^	39	12
1372
	.	39	12
1373
	+	4	38
1374
	+	45	0
1375
	+	44	0
1376
	+	35	19
1377
	+	35	0
1378
	+	31	0
1379
	+	35	1
1380
	+	31	16
1381
	+	35	15
1382
	+	32	31
1383
	+	33	40
1384
	+	36	31
1385
	+	37	41
1386
	+	39	12
1387
1388
> ~/projects/janikai/www/tinymvc/myapp/views/index_view.php
1389
	"	1	0
1390
1391
> ~/projects/janikai/www/tinymvc/myapp/controllers/acou
1392
	"	1	0
1393
1394
> ~/projects/janikai/www/tinymvc/myapp/models/company_model.php
1395
	"	25	8
1396
	.	5	0
1397
	+	1	0
1398
	+	5	0
1399
1400
> ~/projects/janikai/www/tinymvc/myapp/models/candidate_model.php
1401
	"	25	8
1402
	.	5	0
1403
	+	1	0
1404
	+	5	0
1405
1406
> ~/projects/janikai/www/tinymvc/myapp/models/address_model.php
1407
	"	25	8
1408
	.	5	0
1409
	+	1	0
1410
	+	5	0
1411
1412
> ~/projects/janikai/www/tinymvc/myapp/controllers/company.php
1413
	"	41	1
1414
	^	12	13
1415
	.	16	0
1416
	+	4	3
1417
	+	6	10
1418
	+	12	12
1419
	+	16	0
1420
1421
> ~/projects/janikai/www/tinymvc/myapp/controllers/address.php
1422
	"	41	1
1423
	^	35	35
1424
	.	35	34
1425
	+	4	9
1426
	+	7	0
1427
	+	7	0
1428
	+	7	10
1429
	+	12	12
1430
	+	6	9
1431
	+	4	9
1432
	+	16	34
1433
	+	28	34
1434
	+	35	34
1435
1436
> ~/projects/janikai/www/tinymvc/myapp/controllers/candidate.php
1437
	"	41	1
1438
	^	6	13
1439
	.	6	13
1440
	+	4	11
1441
	+	6	12
1442
	+	8	24
1443
	+	9	26
1444
	+	12	14
1445
	+	31	2
1446
	+	28	39
1447
	+	38	2
1448
	+	25	0
1449
	+	26	0
1450
	+	27	0
1451
	+	28	0
1452
	+	31	0
1453
	+	33	0
1454
	+	34	0
1455
	+	35	0
1456
	+	38	0
1457
	+	14	0
1458
	+	15	0
1459
	+	18	0
1460
	+	19	0
1461
	+	14	3
1462
	+	15	3
1463
	+	18	7
1464
	+	19	3
1465
	+	26	3
1466
	+	27	3
1467
	+	28	7
1468
	+	31	3
1469
	+	33	3
1470
	+	34	3
1471
	+	38	3
1472
	+	35	7
1473
	+	23	43
1474
	+	35	20
1475
	+	16	55
1476
	+	17	63
1477
	+	22	5
1478
	+	31	0
1479
	+	28	8
1480
	+	35	8
1481
	+	36	7
1482
	+	30	7
1483
	+	23	0
1484
	+	36	33
1485
	+	29	61
1486
	+	23	0
1487
	+	6	13
1488
1489
> ~/projects/janikai/www/tinymvc/myapp/controllers/default.php
1490
	"	8	0
1491
1492
> ~/projects/janikai/www/tinymvc/myapp/configs/config_application.php
1493
	"	31	0
1494
1495
> ~/projects/janikai/www/htdocs/.htaccess
1496
	"	4	34
1497
	^	4	35
1498
	.	4	34
1499
	+	4	34
1500
1501
> ~/projects/janikai/www/tinymvc/myapp/configs/config_database.php
1502
	"	18	40
1503
	^	17	40
1504
	.	18	40
1505
	+	15	40
1506
	+	16	36
1507
	+	17	39
1508
	+	12	44
1509
	+	13	36
1510
	+	14	40
1511
	+	15	42
1512
	+	16	38
1513
	+	17	41
1514
	+	18	40
1515
1516
> ~/projects/janikai/www/htdocs/index.php
1517
	"	1	0
1518
1519
> ~/projects/janikai/www/TinyMVC-1.2.3/README
1520
	"	76	0
1521
1522
> ~/projects/janikai/.gitignore
1523
	"	12	4
1524
	^	12	5
1525
	.	12	4
1526
	+	12	4
1527
1528
> ~/projects/janikai/db/resumefixdb.sql
1529
	"	225	0
1530
1531
> ~/.zsh/lib/git.zsh
1532
	"	1	13
1533
	^	31	14
1534
	.	31	13
1535
	+	6	42
1536
	+	26	15
1537
	+	28	15
1538
	+	31	13
1539
1540
> ~/hg.zsh
1541
	"	1	0
1542
1543
> ~/.zsh/lib/hg.zsh
1544
	"	16	16
1545
	^	16	17
1546
	.	16	16
1547
	+	6	76
1548
	+	14	16
1549
	+	16	16
1550
1551
> ~/.zsh/lib/bzr.zsh
1552
	"	16	16
1553
	^	16	17
1554
	.	16	16
1555
	+	2	0
1556
	+	7	5
1557
	+	6	79
1558
	+	14	16
1559
	+	16	16
1560
1561
> ~/.zsh/alias.zsh
1562
	"	2	53
1563
	^	2	54
1564
	.	2	53
1565
	+	2	53
1566
1567
> ~/projects/oh-my-zsh/README.textile
1568
	"	1	0
1569
1570
> ~/projects/oh-my-zsh/themes/intheloop.zsh-theme
1571
	"	24	0

+ 76 - 0
releng/root-image/etc/skel/.vimrc

@ -0,0 +1,76 @@
1
" Use Vim settings instead of Vi.
2
set nocompatible
3
4
" General configuration.
5
set number
6
set backspace=indent,eol,start
7
set history=100
8
set showcmd
9
set showmode
10
set gcr=a:blinkon0
11
set visualbell
12
set autoread
13
set hidden
14
15
" Turn on syntax highlighting.
16
syntax on
17
18
" Change the leader
19
let mapleader=","
20
21
" Vundle initialization.
22
if filereadable(expand("~/.vim/vundle.vim"))
23
    source ~/.vim/vundle.vim
24
endif
25
26
" Turn off swap files
27
set noswapfile
28
set nobackup
29
set nowb
30
31
" Indentation
32
set autoindent
33
set smartindent
34
set smarttab
35
set shiftwidth=4
36
set softtabstop=4
37
set tabstop=4
38
set expandtab
39
40
filetype plugin on
41
filetype indent on
42
43
set nowrap
44
set linebreak
45
46
" Folds
47
set foldmethod=indent
48
set foldnestmax=3
49
set nofoldenable
50
51
" Completion
52
set wildmode=list:longest
53
set wildmenu
54
set wildignore=*.o,*.obj,*~
55
set wildignore+=*vim/backups*
56
set wildignore+=*sass-cache*
57
set wildignore+=*DS_Store*
58
set wildignore+=vendor/rails/**
59
set wildignore+=vendor/cache/**
60
set wildignore+=*.gem
61
set wildignore+=log/**
62
set wildignore+=tmp/**
63
set wildignore+=*.png,*.jpg,*.gif
64
65
" Scrolling
66
set scrolloff=8
67
set sidescrolloff=15
68
set sidescroll=1
69
70
" Custom settings.
71
so ~/.vim/settings.vim
72
73
" Setting files (for a clean configuration file)
74
for f in split(glob("~/.vim/settings/*.vim"), '\n')
75
    exe "source" f
76
endfor

+ 21 - 0
releng/root-image/etc/skel/.xinitrc

@ -0,0 +1,21 @@
1
#!/bin/sh
2
#
3
# ~/.xinitrc
4
#
5
# Executed by startx (run your window manager from here)
6
7
#if [ -d /etc/X11/xinit/xinitrc.d ]; then
8
#  for f in /etc/X11/xinit/xinitrc.d/*; do
9
#    [ -x "$f" ] && . "$f"
10
#  done
11
#  unset f
12
#fi
13
14
# Create a background
15
feh --bg-scale '/usr/share/pixmaps/grit-p12.png'
16
17
# exec gnome-session
18
# exec startkde
19
# exec startxfce4
20
# ...or the Window Manager of your choice
21
#exec i3

+ 24 - 0
releng/root-image/etc/skel/.xprofile

@ -0,0 +1,24 @@
1
#!/bin/sh
2
#
3
# ~/.xprofile
4
#
5
# Exected by startx (run your window manager from here)
6
7
if [ -d /etc/X11/xinit/xinitrc.d ]; then
8
    for f in /etc/X11/xinit/xinitrc.d/*; do
9
        [ -x "$f" ] && . "$f"
10
    done
11
    unset f
12
fi
13
14
# Create a background
15
feh --bg-scale '/home/bryan/pictures/background'
16
17
# Update i3status network devices
18
i3status-update-network
19
20
# exec gnome-session
21
# exec startkde
22
# exec startxfce4
23
# ...or the Window Manager of your choice
24
# exec i3

+ 5 - 0
releng/root-image/etc/skel/.zprofile

@ -0,0 +1,5 @@
1
#
2
# ~/.zprofile
3
#
4
5
[[ -f ~/.zshrc ]] && . ~/.zshrc

+ 1 - 0
releng/root-image/etc/skel/.zshenv

@ -0,0 +1 @@
1
export PATH=$PATH:$HOME/dmenu

+ 27 - 0
releng/root-image/etc/skel/.zshrc

@ -0,0 +1,27 @@
1
# Path to your oh-my-zsh configuration.
2
ZSH=$HOME/.config/zsh
3
4
# Load libraries
5
if [[ -e $ZSH/lib/*.zsh ]]; then
6
    for config_file ($ZSH/lib/*.zsh); do
7
        source $config_file
8
    done
9
    unset config_file
10
fi
11
12
# Load autoloads
13
source $ZSH/autoloads.zsh
14
15
# Load configuration flags
16
source $ZSH/flags.zsh
17
18
# Load key bindings
19
source $ZSH/keys.zsh
20
21
# Load custom prompt
22
source $ZSH/prompt.zsh
23
24
# Load aliases
25
source $ZSH/aliases.zsh
26
27
unset ZSH

+ 9 - 0
releng/root-image/etc/skel/dmenu/kbd-brightness-down

@ -0,0 +1,9 @@
1
#!/bin/sh
2
brightness="/sys/devices/platform/samsung/leds/samsung::kbd_backlight/brightness"
3
level=$(cat $brightness)
4
5
if [[ $level -gt 0 ]]; then
6
    level=`expr $level - 1`
7
fi
8
9
echo $level > $brightness

+ 10 - 0
releng/root-image/etc/skel/dmenu/kbd-brightness-up

@ -0,0 +1,10 @@
1
#!/bin/sh
2
brightness="/sys/devices/platform/samsung/leds/samsung::kbd_backlight/brightness"
3
level=$(cat $brightness)
4
max=$(cat /sys/devices/platform/samsung/leds/samsung::kbd_backlight/max_brightness)
5
6
if [[ $level -lt $max ]]; then
7
    level=`expr $level + 1`
8
fi
9
10
echo $level > $brightness

+ 11 - 0
releng/root-image/etc/skel/dmenu/kbd-wifi-toggle

@ -0,0 +1,11 @@
1
#!/bin/sh
2
wifi="/sys/devices/platform/samsung/rfkill/rfkill1/state"
3
state=$(cat $wifi)
4
5
if [[ $state -eq 1 ]]; then
6
    state=0
7
else
8
    state=1
9
fi
10
11
echo $state > $wifi

+ 7 - 0
releng/root-image/etc/skel/dmenu/vm-stop-all

@ -0,0 +1,7 @@
1
#!/bin/bash
2
3
# Check for any virtual machines running and save them.
4
for uuid in $( VBoxManage list runningvms | awk 'BEGIN{FS="\" "}{print $2}' )
5
do
6
	VBoxManage controlvm $uuid savestate
7
done

+ 9 - 0
releng/root-image/etc/skel/virtual/assign_ca.sh

@ -0,0 +1,9 @@
1
#!/bin/bash
2
3
for uuid in $( VBoxManage list vms | awk 'BEGIN{FS="\" "}{print $2}' )
4
do
5
	VBoxManage modifyvm $uuid --vrdeproperty "Security/Method=negotiate"
6
    VBoxManage modifyvm $uuid --vrdeproperty "Security/CACertificate=/home/bryan/virtual/ca_cert.pem"
7
	VBoxManage modifyvm $uuid --vrdeproperty "Security/ServerCertificate=/home/bryan/virtual/server_cert.pem"
8
	VBoxManage modifyvm $uuid --vrdeproperty "Security/ServerPrivateKey=/home/bryan/virtual/server_key_private.pem"
9
done

+ 11 - 0
releng/root-image/etc/skel/virtual/gencert.sh

@ -0,0 +1,11 @@
1
#!/bin/bash
2
3
# Create a CA self signed certificate
4
openssl req -new -x509 -days 365 -extensions v3_ca -keyout ca_key_private.pem -out ca_cert.pem
5
6
# Generate a server private key and a request for signing
7
openssl genrsa -out server_key_private.pem
8
openssl req -new -key server_key_private.pem -out server_req.pem
9
10
# Generate the server certificate
11
openssl x509 -req -days 365 -in server_req.pem -CA ca_cert.pem -CAkey ca_key_private.pem -set_serial 01 -out server_cert.pm

+ 1 - 0
releng/root-image/etc/sudoers.d/g_wheel

@ -0,0 +1 @@
1
%wheel  ALL=(ALL) NOPASSWD: ALL

+ 26 - 0
releng/root-image/etc/systemd/scripts/choose-mirror

@ -0,0 +1,26 @@
1
#!/bin/bash
2
3
get_cmdline() {
4
    local param
5
    for param in $(< /proc/cmdline); do
6
        case "${param}" in
7
            $1=*) echo "${param##*=}";
8
            return 0
9
            ;;
10
        esac
11
    done
12
}
13
14
mirror=$(get_cmdline mirror)
15
[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv)
16
[[ $mirror ]] || exit 0
17
18
mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
19
cat >/etc/pacman.d/mirrorlist << EOF
20
#
21
# Arch Linux repository mirrorlist
22
# Generated by archiso
23
#
24
25
Server = ${mirror%%/}/\$repo/os/\$arch
26
EOF

+ 10 - 0
releng/root-image/etc/systemd/system/choose-mirror.service

@ -0,0 +1,10 @@
1
[Unit]
2
Description=Choose mirror from the kernel command line
3
ConditionKernelCommandLine=mirror
4
5
[Service]
6
Type=oneshot
7
ExecStart=/etc/systemd/scripts/choose-mirror
8
9
[Install]
10
WantedBy=multi-user.target

+ 1 - 0
releng/root-image/etc/systemd/system/default.target

@ -0,0 +1 @@
1
/usr/lib/systemd/system/graphical.target

+ 1 - 0
releng/root-image/etc/systemd/system/display-manager.service

@ -0,0 +1 @@
1
/usr/lib/systemd/system/lightdm.service

+ 8 - 0
releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount

@ -0,0 +1,8 @@
1
[Unit]
2
Description=Temporary /etc/pacman.d/gnupg directory
3
4
[Mount]
5
What=tmpfs
6
Where=/etc/pacman.d/gnupg
7
Type=tmpfs
8
Options=mode=0755

+ 15 - 0
releng/root-image/etc/systemd/system/pacman-init.service

@ -0,0 +1,15 @@
1
[Unit]
2
Description=Initializes Pacman keyring
3
Wants=haveged.service
4
After=haveged.service
5
Requires=etc-pacman.d-gnupg.mount
6
After=etc-pacman.d-gnupg.mount
7
8
[Service]
9
Type=oneshot
10
RemainAfterExit=yes
11
ExecStart=/usr/bin/pacman-key --init
12
ExecStart=/usr/bin/pacman-key --populate archlinux
13
14
[Install]
15
WantedBy=multi-user.target

+ 1 - 0
releng/root-image/etc/udev/rules.d/81-dhcpcd.rules

@ -0,0 +1 @@
1
ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service"

+ 34 - 0
releng/root-image/root/.automated_script.sh

@ -0,0 +1,34 @@
1
#!/bin/bash
2
3
script_cmdline ()
4
{
5
    local param
6
    for param in $(< /proc/cmdline); do
7
        case "${param}" in
8
            script=*) echo "${param#*=}" ; return 0 ;;
9
        esac
10
    done
11
}
12
13
automated_script ()
14
{
15
    local script rt
16
    script="$(script_cmdline)"
17
    if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
18
        if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
19
            wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null
20
            rt=$?
21
        else
22
            cp "${script}" /tmp/startup_script
23
            rt=$?
24
        fi
25
        if [[ ${rt} -eq 0 ]]; then
26
            chmod +x /tmp/startup_script
27
            /tmp/startup_script
28
        fi
29
    fi
30
}
31
32
if [[ $(tty) == "/dev/tty1" ]]; then
33
    automated_script
34
fi

+ 1 - 0
releng/root-image/root/.zlogin

@ -0,0 +1 @@
1
~/.automated_script.sh

+ 23 - 0
releng/root-image/root/customize_root_image.sh

@ -0,0 +1,23 @@
1
#!/bin/bash
2
3
set -e -u
4
5
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
6
locale-gen
7
8
ln -sf /usr/share/zoneinfo/UTC /etc/localtime
9
10
usermod -s /usr/bin/zsh root
11
cp -aT /etc/skel/ /root/
12
13
useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /usr/bin/zsh arch
14
15
chmod 750 /etc/sudoers.d
16
chmod 440 /etc/sudoers.d/g_wheel
17
18
sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
19
sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf
20
21
systemctl enable pacman-init.service choose-mirror.service lightdm
22
#systemctl set-default multi-user.target
23
systemctl set-default graphical.target

+ 3 - 0
releng/root-image/root/install.txt

@ -0,0 +1,3 @@
1
View this installation guide online at
2
https://wiki.archlinux.org/index.php/Installation_Guide
3

BIN
releng/root-image/usr/share/lightdm-webkit/themes/arch/archlogo.png


BIN
releng/root-image/usr/share/pixmaps/grit-p12.png


+ 11 - 0
releng/syslinux/archiso.cfg

@ -0,0 +1,11 @@
1
DEFAULT select
2
3
LABEL select
4
COM32 boot/syslinux/whichsys.c32
5
APPEND -pxe- pxe -sys- sys -iso- sys
6
7
LABEL pxe
8
CONFIG boot/syslinux/archiso_pxe_choose.cfg
9
10
LABEL sys
11
CONFIG boot/syslinux/archiso_sys_choose.cfg

+ 25 - 0
releng/syslinux/archiso_head.cfg

@ -0,0 +1,25 @@
1
SERIAL 0 38400
2
UI boot/syslinux/vesamenu.c32
3
MENU TITLE Grit OS
4
MENU BACKGROUND boot/syslinux/splash.png
5
6
MENU WIDTH 78
7
MENU MARGIN 4
8
MENU ROWS 7
9
MENU VSHIFT 10
10
MENU TABMSGROW 14
11
MENU CMDLINEROW 14
12
MENU HELPMSGROW 16
13
MENU HELPMSGENDROW 29
14
15
# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
16
17
MENU COLOR border       30;44   #40ffffff #a0000000 std
18
MENU COLOR title        1;36;44 #9033ccff #a0000000 std
19
MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all
20
MENU COLOR unsel        37;44   #50ffffff #a0000000 std
21
MENU COLOR help         37;40   #c0ffffff #a0000000 std
22
MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std
23
MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std
24
MENU COLOR msg07        37;40   #90ffffff #a0000000 std
25
MENU COLOR tabmsg       31;40   #30ffffff #00000000 std

+ 32 - 0
releng/syslinux/archiso_pxe32.cfg

@ -0,0 +1,32 @@
1
LABEL arch32_nbd
2
TEXT HELP
3
Boot the Grit OS (i686) live medium (Using NBD).
4
It allows you to install Grit OS or perform system maintenance.
5
ENDTEXT
6
MENU LABEL Boot Grit OS (i686) (NBD)
7
LINUX boot/i686/vmlinuz
8
INITRD boot/i686/archiso.img
9
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
10
SYSAPPEND 3
11
12
LABEL arch32_nfs
13
TEXT HELP
14
Boot the Grit OS (i686) live medium (Using NFS).
15
It allows you to install Grit OS or perform system maintenance.
16
ENDTEXT
17
MENU LABEL Boot Grit OS (i686) (NFS)
18
LINUX boot/i686/vmlinuz
19
INITRD boot/i686/archiso.img
20
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
21
SYSAPPEND 3
22
23
LABEL arch32_http
24
TEXT HELP
25
Boot the Grit OS (i686) live medium (Using HTTP).
26
It allows you to install Grit OS or perform system maintenance.
27
ENDTEXT
28
MENU LABEL Boot Grit OS (i686) (HTTP)
29
LINUX boot/i686/vmlinuz
30
INITRD boot/i686/archiso.img
31
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
32
SYSAPPEND 3

+ 32 - 0
releng/syslinux/archiso_pxe64.cfg

@ -0,0 +1,32 @@
1
LABEL arch64_nbd
2
TEXT HELP
3
Boot the Grit OS (x86_64) live medium (Using NBD).
4
It allows you to install Grit OS or perform system maintenance.
5
ENDTEXT
6
MENU LABEL Boot Grit OS (x86_64) (NBD)
7
LINUX boot/x86_64/vmlinuz
8
INITRD boot/x86_64/archiso.img
9
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
10
SYSAPPEND 3
11
12
LABEL arch64_nfs
13
TEXT HELP
14
Boot the Grit OS (x86_64) live medium (Using NFS).
15
It allows you to install Grit OS or perform system maintenance.
16
ENDTEXT
17
MENU LABEL Boot Grit OS (x86_64) (NFS)
18
LINUX boot/x86_64/vmlinuz
19
INITRD boot/x86_64/archiso.img
20
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
21
SYSAPPEND 3
22
23
LABEL arch64_http
24
TEXT HELP
25
Boot the Grit OS (x86_64) live medium (Using HTTP).
26
It allows you to install Grit OS or perform system maintenance.
27
ENDTEXT
28
MENU LABEL Boot Grit OS (x86_64) (HTTP)
29
LINUX boot/x86_64/vmlinuz
30
INITRD boot/x86_64/archiso.img
31
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
32
SYSAPPEND 3

+ 3 - 0
releng/syslinux/archiso_pxe_32_inc.cfg

@ -0,0 +1,3 @@
1
INCLUDE boot/syslinux/archiso_head.cfg
2
INCLUDE boot/syslinux/archiso_pxe32.cfg
3
INCLUDE boot/syslinux/archiso_tail.cfg

+ 4 - 0
releng/syslinux/archiso_pxe_both_inc.cfg

@ -0,0 +1,4 @@
1
INCLUDE boot/syslinux/archiso_head.cfg
2
INCLUDE boot/syslinux/archiso_pxe64.cfg
3
INCLUDE boot/syslinux/archiso_pxe32.cfg
4
INCLUDE boot/syslinux/archiso_tail.cfg

+ 11 - 0
releng/syslinux/archiso_pxe_choose.cfg

@ -0,0 +1,11 @@
1
DEFAULT choose
2
3
LABEL choose
4
COM32 boot/syslinux/ifcpu64.c32
5
APPEND have64 -- nohave64
6
7
LABEL have64
8
CONFIG boot/syslinux/archiso_pxe_both_inc.cfg
9
10
LABEL nohave64
11
CONFIG boot/syslinux/archiso_pxe_32_inc.cfg

+ 9 - 0
releng/syslinux/archiso_sys32.cfg

@ -0,0 +1,9 @@
1
LABEL arch32
2
TEXT HELP
3
Boot the Grit OS (i686) live medium.
4
It allows you to install Grit OS or perform system maintenance.
5
ENDTEXT
6
MENU LABEL Boot Grit OS (i686)
7
LINUX boot/i686/vmlinuz
8
INITRD boot/i686/archiso.img
9
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

+ 9 - 0
releng/syslinux/archiso_sys64.cfg

@ -0,0 +1,9 @@
1
LABEL arch64
2
TEXT HELP
3
Boot the Grit OS (x86_64) live medium.
4
It allows you to install Grit OS or perform system maintenance.
5
ENDTEXT
6
MENU LABEL Boot Grit OS (x86_64)
7
LINUX boot/x86_64/vmlinuz
8
INITRD boot/x86_64/archiso.img
9
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

+ 3 - 0
releng/syslinux/archiso_sys_32_inc.cfg

@ -0,0 +1,3 @@
1
INCLUDE boot/syslinux/archiso_head.cfg
2
INCLUDE boot/syslinux/archiso_sys32.cfg
3
INCLUDE boot/syslinux/archiso_tail.cfg

+ 4 - 0
releng/syslinux/archiso_sys_both_inc.cfg

@ -0,0 +1,4 @@
1
INCLUDE boot/syslinux/archiso_head.cfg
2
INCLUDE boot/syslinux/archiso_sys64.cfg
3
INCLUDE boot/syslinux/archiso_sys32.cfg
4
INCLUDE boot/syslinux/archiso_tail.cfg

+ 11 - 0
releng/syslinux/archiso_sys_choose.cfg

@ -0,0 +1,11 @@
1
DEFAULT choose
2
3
LABEL choose
4
COM32 boot/syslinux/ifcpu64.c32
5
APPEND have64 -- nohave64
6
7
LABEL have64
8
CONFIG boot/syslinux/archiso_sys_both_inc.cfg
9
10
LABEL nohave64
11
CONFIG boot/syslinux/archiso_sys_32_inc.cfg

+ 27 - 0
releng/syslinux/archiso_tail.cfg

@ -0,0 +1,27 @@
1
LABEL existing
2
TEXT HELP
3
Boot an existing operating system.
4
Press TAB to edit the disk and partition number to boot.
5
ENDTEXT
6
MENU LABEL Boot existing OS
7
COM32 boot/syslinux/chain.c32
8
APPEND hd0 0
9
10
# http://www.memtest.org/
11
LABEL memtest
12
MENU LABEL Run Memtest86+ (RAM test)
13
LINUX boot/memtest
14
15
# http://hdt-project.org/
16
LABEL hdt
17
MENU LABEL Hardware Information (HDT)
18
COM32 boot/syslinux/hdt.c32
19
APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz
20
21
LABEL reboot
22
MENU LABEL Reboot
23
COM32 boot/syslinux/reboot.c32
24
25
LABEL poweroff
26
MENU LABEL Power Off
27
COM32 boot/syslinux/poweroff.c32

BIN
releng/syslinux/splash.png


+ 5 - 0
releng/syslinux/syslinux.cfg

@ -0,0 +1,5 @@
1
DEFAULT loadconfig
2
3
LABEL loadconfig
4
  CONFIG archiso.cfg
5
  APPEND ../../