diff --git a/awesome/user_configuration.json b/awesome/user_configuration.json index 64aadcc..5c39279 100644 --- a/awesome/user_configuration.json +++ b/awesome/user_configuration.json @@ -6,10 +6,94 @@ ], "archinstall-language": "English", "audio": "pulseaudio", - "bootloader": "grub-install", + "audio_config": { + "audio": "pulseaudio" + }, + "bootloader": "Grub", "config_version": "2.5.1", + "custom-commands": [ + "sudo -u augusto sh -c 'mkdir $HOME/repos; cd $HOME/repos; git clone https://git.augustogunsch.com/augusto/dotfiles; cd dotfiles; ./install.sh; ./configure-tmux.sh'", + "sudo -u root sh -c 'mkdir $HOME/repos; cd $HOME/repos; git clone https://git.augustogunsch.com/augusto/dotfiles; cd dotfiles; ./install.sh; ./configure-tmux.sh'", + "sed -i 's/export PROMPT=.*$/export PROMPT='\"'\"'%B%F{63}[%F{68}%n@%m %F{white}%~%F{63}]$%b%f '\"'\"'/' /root/.zshrc", + "chsh -s /usr/bin/zsh root; chsh -s /usr/bin/zsh augusto", + "systemctl enable lightdm", + "sudo -u augusto sh -c 'mkdir $HOME/aur; cd $HOME/aur; git clone https://aur.archlinux.org/yay.git; cd yay; makepkg -s'", + "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/gtk-theme-material-black.git material-black-theme; cd material-black-theme; makepkg -s'", + "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/arc-icon-theme.git; cd arc-icon-theme; makepkg -s'", + "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/alarm-clock-applet.git; cd alarm-clock-applet; makepkg -s'", + "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/nerd-fonts-hack.git; cd nerd-fonts-hack; makepkg -s'", + "pacman -U --noconfirm --noprogressbar /home/augusto/aur/**/*.pkg.tar.zst && rm -rf /home/augusto/aur" + ], "debug": false, "desktop-environment": "awesome", + "disk-layout": "user_disk_layout.json", + "disk_config": { + "config_type": "manual_partitioning", + "device_modifications": [ + { + "device": "/dev/vda", + "partitions": [ + { + "btrfs": [], + "dev_path": null, + "flags": [ + "Boot" + ], + "fs_type": "fat32", + "mount_options": [], + "mountpoint": "/boot", + "obj_id": "9bb5282d-0143-4fa6-9a68-9282a43b13f6", + "size": { + "sector_size": { + "unit": "B", + "value": 512 + }, + "unit": "B", + "value": 212843520 + }, + "start": { + "sector_size": { + "unit": "B", + "value": 512 + }, + "unit": "sectors", + "value": 34 + }, + "status": "create", + "type": "primary" + }, + { + "btrfs": [], + "dev_path": null, + "flags": [], + "fs_type": "ext4", + "mount_options": [], + "mountpoint": "/", + "obj_id": "9d638210-731c-4aff-9cff-e410c683c0bc", + "size": { + "sector_size": { + "unit": "B", + "value": 512 + }, + "unit": "B", + "value": 42725277696 + }, + "start": { + "sector_size": { + "unit": "B", + "value": 512 + }, + "unit": "MiB", + "value": 214 + }, + "status": "create", + "type": "primary" + } + ], + "wipe": false + } + ] + }, "gfx_driver": "All open-source (default)", "harddrives": [ "/dev/sda" @@ -19,6 +103,11 @@ "linux" ], "keyboard-layout": "us", + "locale_config": { + "kb_layout": "us", + "sys_enc": "UTF-8", + "sys_lang": "en_US" + }, "mirror-region": { "Poland": { "http://arch.midov.pl/arch/$repo/os/$arch": true, @@ -36,6 +125,9 @@ "https://repo.skni.umcs.pl/archlinux/$repo/os/$arch": true } }, + "network_config": { + "type": "nm" + }, "nic": { "dhcp": true, "dns": null, @@ -110,6 +202,7 @@ "profile": { "path": "/usr/lib/python3.10/site-packages/archinstall/profiles/desktop.py" }, + "profile_config": null, "save_config": null, "script": "guided", "silent": false, @@ -117,18 +210,5 @@ "sys-encoding": "UTF-8", "sys-language": "en_US", "timezone": "Europe/Warsaw", - "version": "2.5.1", - "custom-commands": [ - "sudo -u augusto sh -c 'mkdir $HOME/repos; cd $HOME/repos; git clone https://git.augustogunsch.com/augusto/dotfiles; cd dotfiles; ./install.sh; ./configure-tmux.sh'", - "sudo -u root sh -c 'mkdir $HOME/repos; cd $HOME/repos; git clone https://git.augustogunsch.com/augusto/dotfiles; cd dotfiles; ./install.sh; ./configure-tmux.sh'", - "sed -i 's/export PROMPT=.*$/export PROMPT='\"'\"'%B%F{63}[%F{68}%n@%m %F{white}%~%F{63}]$%b%f '\"'\"'/' /root/.zshrc", - "chsh -s /usr/bin/zsh root; chsh -s /usr/bin/zsh augusto", - "systemctl enable lightdm", - "sudo -u augusto sh -c 'mkdir $HOME/aur; cd $HOME/aur; git clone https://aur.archlinux.org/yay.git; cd yay; makepkg -s'", - "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/gtk-theme-material-black.git material-black-theme; cd material-black-theme; makepkg -s'", - "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/arc-icon-theme.git; cd arc-icon-theme; makepkg -s'", - "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/alarm-clock-applet.git; cd alarm-clock-applet; makepkg -s'", - "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/nerd-fonts-hack.git; cd nerd-fonts-hack; makepkg -s'", - "pacman -U --noconfirm --noprogressbar /home/augusto/aur/**/*.pkg.tar.zst && rm -rf /home/augusto/aur" - ] -} + "version": "2.6.3" +} \ No newline at end of file diff --git a/awesome/user_disk_layout.json b/awesome/user_disk_layout.json deleted file mode 100644 index 6741f43..0000000 --- a/awesome/user_disk_layout.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "/dev/sda": { - "partitions": [ - { - "boot": true, - "encrypted": false, - "filesystem": { - "format": "fat32" - }, - "mountpoint": "/boot", - "size": "203MiB", - "start": "3MiB", - "type": "primary", - "wipe": true - }, - { - "encrypted": false, - "filesystem": { - "format": "ext4", - "mount_options": [] - }, - "mountpoint": "/", - "size": "100%", - "start": "206MiB", - "type": "primary", - "wipe": true - } - ], - "wipe": true - } -}