Compare commits
2 commits
043b436ba7
...
499c113a21
Author | SHA1 | Date | |
---|---|---|---|
499c113a21 | |||
591f4cb1f0 |
4 changed files with 29 additions and 7 deletions
|
@ -7,6 +7,7 @@ import pathlib
|
||||||
import os
|
import os
|
||||||
import getpass
|
import getpass
|
||||||
import tempfile
|
import tempfile
|
||||||
|
import sys
|
||||||
|
|
||||||
|
|
||||||
# CLI Args Parsing
|
# CLI Args Parsing
|
||||||
|
@ -35,17 +36,34 @@ log.setLevel(min(
|
||||||
|
|
||||||
# Pacman
|
# Pacman
|
||||||
if config.getboolean('pacman', 'install_yay', fallback=False):
|
if config.getboolean('pacman', 'install_yay', fallback=False):
|
||||||
log.info('Installing yay')
|
log.info('Installing git and base-devel')
|
||||||
|
proc = subprocess.run(('sudo', 'pacman', '-Syu', '--needed',
|
||||||
|
'git', 'base-devel'))
|
||||||
|
if proc.returncode != 0:
|
||||||
|
log.error('Installation of git and base-devel failed')
|
||||||
|
sys.exit(proc.returncode)
|
||||||
|
|
||||||
with tempfile.TemporaryDirectory() as yay_folder:
|
with tempfile.TemporaryDirectory() as yay_folder:
|
||||||
log.info('Cloning yay')
|
log.info('Cloning yay')
|
||||||
subprocess.run(('git', 'clone', 'https://aur.archlinux.org/yay', yay_folder))
|
proc = subprocess.run(('git', 'clone',
|
||||||
subprocess.run(('makepkg', '-rcsi'), cwd=yay_folder)
|
'https://aur.archlinux.org/yay', yay_folder))
|
||||||
|
if proc.returncode != 0:
|
||||||
|
log.error('Cloning of yay failed')
|
||||||
|
sys.exit(proc.returncode)
|
||||||
|
log.info('Compiling and installing yay')
|
||||||
|
proc = subprocess.run(('makepkg', '-rcsi'), cwd=yay_folder)
|
||||||
|
if proc.returncode != 0:
|
||||||
|
log.error('Yay compile and install failed')
|
||||||
|
sys.exit(proc.returncode)
|
||||||
|
|
||||||
if config.getboolean('pacman', 'install_pkg', fallback=False):
|
if config.getboolean('pacman', 'install_pkg', fallback=False):
|
||||||
with open(config.get('pacman', 'pkg_list', fallback=''), 'r') as pkg_file:
|
with open(config.get('pacman', 'pkg_list', fallback=''), 'r') as pkg_file:
|
||||||
pkg_list = pkg_file.read().splitlines()
|
pkg_list = pkg_file.read().splitlines()
|
||||||
log.info('Installing packages')
|
log.info('Installing packages')
|
||||||
subprocess.run(('yay', '-Syu', *pkg_list))
|
proc = subprocess.run(('yay', '-Syu', '--needed', *pkg_list))
|
||||||
|
if proc.returncode != 0:
|
||||||
|
log.error('Package install failed')
|
||||||
|
sys.exit(proc.returncode)
|
||||||
|
|
||||||
# Config files
|
# Config files
|
||||||
if 'config' in config:
|
if 'config' in config:
|
||||||
|
@ -58,3 +76,5 @@ if 'config' in config:
|
||||||
log.debug(f'Copying {src} -> {dst}')
|
log.debug(f'Copying {src} -> {dst}')
|
||||||
dst.parent.mkdir(exist_ok=True)
|
dst.parent.mkdir(exist_ok=True)
|
||||||
shutil.copy2(src, dst)
|
shutil.copy2(src, dst)
|
||||||
|
|
||||||
|
log.info('Autoconfig ended successfully')
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
[pacman]
|
[pacman]
|
||||||
install_yay = True
|
install_yay = False
|
||||||
install_pkg = False
|
install_pkg = False
|
||||||
pkg_list = pacman.list
|
pkg_list = pacman.list
|
||||||
|
|
||||||
[config]
|
[config]
|
||||||
root = config
|
root = config
|
||||||
kitty = kitty.conf:~/.config/kitty/kitty.conf
|
kitty = kitty.conf:~/.config/kitty/kitty.conf
|
||||||
kitty-theme = kitty-theme.conf:~/.config/kitty/theme.conf
|
#kitty-theme = kitty-theme.conf:~/.config/kitty/theme.conf
|
||||||
neovim = init.vim:~/.config/nvim/init.vim
|
neovim = init.vim:~/.config/nvim/init.vim
|
||||||
git = gitconfig:~/.gitconfig
|
git = gitconfig:~/.gitconfig
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
font_family Fira Code
|
font_family Fira Code
|
||||||
font_size 12
|
font_size 12
|
||||||
include ./theme.conf
|
#include ./theme.conf
|
||||||
|
|
||||||
map ctrl+f2 detach_window
|
map ctrl+f2 detach_window
|
||||||
map ctrl+f3 detach_window new-tab
|
map ctrl+f3 detach_window new-tab
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
git
|
git
|
||||||
fish
|
fish
|
||||||
|
sudo
|
||||||
|
neovim
|
||||||
|
|
Reference in a new issue