diff --git a/configuration_zsh/zsh_setup_configs.sh b/configuration_zsh/zsh_setup_configs.sh deleted file mode 100644 index 2acafd0..0000000 --- a/configuration_zsh/zsh_setup_configs.sh +++ /dev/null @@ -1,4 +0,0 @@ -setopt EXTENDED_GLOB -for rcfile in /mnt/etc/skel/.zprezto/runcoms/^README.md(.N); do - ln -s ".zprezto/runcoms/${rcfile:t}" "/mnt/etc/skel/.${rcfile:t}" -done \ No newline at end of file diff --git a/pyscripts/s04_packages.py b/pyscripts/s04_packages.py index 6303bf6..ab9b008 100644 --- a/pyscripts/s04_packages.py +++ b/pyscripts/s04_packages.py @@ -28,7 +28,8 @@ def install_packages(user_input, install_user_name): 'unrar', 'fortune-mod', 'reflector', - 'tree'] + 'tree', + 'prezto-git'] packages = { 'minimal': { 'desktop' : [], diff --git a/pyscripts/s13_shell.py b/pyscripts/s13_shell.py index e6eff8a..3edc43a 100644 --- a/pyscripts/s13_shell.py +++ b/pyscripts/s13_shell.py @@ -1,3 +1,4 @@ +import os import fileinput from shutil import copy2 from subprocess import CalledProcessError @@ -15,30 +16,19 @@ def configure_shell(): ### Install zsh and configure print(" >> Installing zsh with prezto") - ### Clone the Prezto files - run("git clone --recursive https://github.com/sorin-ionescu/prezto.git /mnt/etc/skel/.zprezto") - - ### Set correct theme - # sed -i "s|theme ''|theme '$USER_ZSH_THEME'|g" arch-installer/configuration_zsh/zpreztorc - - ### Copy them into the user's folder - run("zsh arch-installer/configuration_zsh/zsh_setup_configs.sh") - ### Copy prompt theme and .zpreztorc over copy2("arch-installer/configuration_zsh/zshrc", "/mnt/etc/skel/.zshrc") copy2("arch-installer/configuration_zsh/zpreztorc", "/mnt/etc/skel/.zpreztorc") - copy2("arch-installer/configuration_zsh/prompt_plasmon_setup", "/mnt/etc/skel/.zprezto/modules/prompt/functions/") - ### Add powerline fonts to display prezto symbols - print(" >> Installing powerline fonts") - run("git clone https://github.com/powerline/fonts") - run("export HOME='/mnt/etc/skel' && zsh ./fonts/install.sh") + directory = "/mnt/etc/skel/.zprezto/modules/prompt/functions/" + if not os.path.exists(directory): + os.makedirs(directory) + copy2("arch-installer/configuration_zsh/prompt_plasmon_setup", directory) ### Copy Vim-config copy2("arch-installer/configuration_zsh/.vimrc", "/mnt/etc/skel/") - ### Change the default shell print(" >> Changing default shell to zsh") sed_inplace("/mnt/etc/default/useradd", "SHELL=/bin/bash", "SHELL=/bin/zsh")