diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | install.sh | 25 | ||||
| -rw-r--r-- | user_configuration.json | 71 |
3 files changed, 21 insertions, 77 deletions
@@ -1,3 +1,3 @@ # ARCHISOFILES -Репозиторий с моими актуальными файлами `pkglist.txt`, `user_configuration.json`. +Репозиторий с моими актуальным файлам `pkglist.txt` и установочником `install.sh`. @@ -2,7 +2,6 @@ dirArchIsoFiles=~/archisofiles dotfiles=~/.dotfiles counterAbortedPkg=0 - setStatusE () { if [ "$1" = true ]; then set +e @@ -23,8 +22,17 @@ yaySetupPkg () { yay -S --needed - < "$dirArchIsoFiles"/pkglist.txt } +openKeepass () { + entryKey=$(keepassxc-cli show "$dirArchIsoFiles"/Passwords.kdbx github) +} + cloneDotfiles () { - keepassxc-cli show "$dirArchIsoFiles"/Passwords.kdbx github | grep "Notes:" | awk '{ print $2 }' | wl-copy + # Сделать повторный ввод пароля + if [] + notesKey=$(echo "$entryKey" | grep "Notes:") + + echo "$notesKey" | awk '{ print $2 }' | wl-copy + echo "Пароль скопирован и находится в буфере обмена" git clone https://github.com/blueingreen68/.dotfiles } @@ -93,16 +101,23 @@ stowUpdateNoFoldingPkg () { done } +swaySetup () { + mkdir -p ~/.config/sway + cp /etc/sway/config ~/.config/sway/ + + echo "[ "$(tty)" = "/dev/tty1" ] && exec sway" >> .bash_profile +} + startSetup () { select event in Pacman Stow StowUpdate; do case $event in - Pacman) + Yay) yaySetupPkg + swaySetup break ;; Stow) - yaySetupPkg cloneDotfiles readArrays stowPkgExtract @@ -130,4 +145,4 @@ startSetup () { } # Установка -startSetup +cloneDotfiles diff --git a/user_configuration.json b/user_configuration.json deleted file mode 100644 index 2ec0529..0000000 --- a/user_configuration.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "additional-repositories": [ - "multilib" - ], - "archinstall-language": "English", - "audio_config": { - "audio": "pipewire" - }, - "bootloader": "Grub", - "config_version": "2.7.1", - "debug": false, - "disk_config": { - "config_type": "default_layout", - }, - "hostname": "blueingreen", - "kernels": [ - "linux" - ], - "locale_config": { - "kb_layout": "us", - "sys_enc": "UTF-8", - "sys_lang": "en_US" - }, - "mirror_config": { - "custom_mirrors": [], - "mirror_regions": { - "Russia": [ - "https://mirror.yandex.ru/archlinux/$repo/os/$arch", - "https://mirror.yal.sl-chat.ru/archlinux/$repo/os/$arch", - "https://mirror.truenetwork.ru/archlinux/$repo/os/$arch", - "https://mirror.surf/archlinux/$repo/os/$arch", - "https://mirror.kpfu.ru/archlinux/$repo/os/$arch", - "https://mirror.kamtv.ru/archlinux/$repo/os/$arch", - "http://mirrors.powernet.com.ru/archlinux/$repo/os/$arch", - "http://mirror.yandex.ru/archlinux/$repo/os/$arch", - "http://mirror.truenetwork.ru/archlinux/$repo/os/$arch", - "http://mirror.surf/archlinux/$repo/os/$arch", - "http://mirror.kpfu.ru/archlinux/$repo/os/$arch", - "http://mirror.kamtv.ru/archlinux/$repo/os/$arch" - ] - } - }, - "network_config": { - "type": "nm" - }, - "no_pkg_lookups": false, - "ntp": true, - "offline": false, - "packages": [ - "git", - "stow" - ], - "parallel downloads": 0, - "profile_config": { - "gfx_driver": null, - "greeter": null, - "profile": { - "custom_settings": {}, - "details": [], - "main": "Minimal" - } - }, - "script": "guided", - "silent": false, - "skip_ntp": false, - "skip_version_check": false, - "swap": true, - "timezone": "Asia/Yekaterinburg", - "uki": false, - "version": "2.7.1" -} |