From 3af095e2e40eabc77686724d932287c689788ca4 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 5 Jul 2023 08:18:25 -0700 Subject: [PATCH] Initial arch from debian --- provision/{debian => arch}/TODO.md | 0 .../{debian => arch}/additional-setup.md | 0 provision/{debian => arch}/ansible/hosts | 0 .../{debian => arch}/ansible/requirements.yml | 0 provision/{debian => arch}/ansible/setup.yml | 2 +- .../ansible/tasks/desktop/_main.yml | 0 .../ansible/tasks/desktop/configs.yml | 0 .../ansible/tasks/desktop/packages.yml | 2 +- .../ansible/tasks/desktop/sway.yml | 3 +- .../ansible/tasks/development}/_main.yml | 0 .../ansible/tasks/development/packages.yml | 10 +++--- .../ansible/tasks/engineering/.placeholder | 0 .../ansible/tasks/engineering}/_main.yml | 2 -- .../ansible/tasks/engineering/packages.yml | 2 +- .../ansible/tasks/engineering/superslicer.yml | 0 .../ansible/tasks/gaming/_main.yml | 0 .../ansible/tasks/gaming/packages.yml | 0 .../ansible/tasks/gaming/yuzu.yml | 0 .../tasks/include/download-github-archive.yml | 0 .../tasks/include/download-github-bin.yml | 0 .../ansible/tasks/include/hide-desktop.yml | 0 .../ansible/tasks/system/_main.yml | 0 .../ansible/tasks/system/configs.yml | 0 .../ansible/tasks/system/fonts.yml | 0 .../ansible/tasks/system/packages.yml | 20 ++++------- .../ansible/tasks/terminal/_main.yml | 0 .../ansible/tasks/terminal/configs.yml | 0 .../ansible/tasks/terminal/nnn.yml | 0 .../ansible/tasks/terminal/packages.yml | 6 ++-- provision/{debian => arch}/jumpstart.sh | 7 ++-- provision/{debian => arch}/readme.md | 4 +-- .../ansible/tasks/development/configs.yml | 5 --- .../debian/ansible/tasks/include/xbps-src.yml | 33 ------------------- 33 files changed, 22 insertions(+), 74 deletions(-) rename provision/{debian => arch}/TODO.md (100%) rename provision/{debian => arch}/additional-setup.md (100%) rename provision/{debian => arch}/ansible/hosts (100%) rename provision/{debian => arch}/ansible/requirements.yml (100%) rename provision/{debian => arch}/ansible/setup.yml (89%) rename provision/{debian => arch}/ansible/tasks/desktop/_main.yml (100%) rename provision/{debian => arch}/ansible/tasks/desktop/configs.yml (100%) rename provision/{debian => arch}/ansible/tasks/desktop/packages.yml (92%) rename provision/{debian => arch}/ansible/tasks/desktop/sway.yml (77%) rename provision/{debian/ansible/tasks/engineering => arch/ansible/tasks/development}/_main.yml (100%) rename provision/{debian => arch}/ansible/tasks/development/packages.yml (69%) rename provision/{debian => arch}/ansible/tasks/engineering/.placeholder (100%) rename provision/{debian/ansible/tasks/development => arch/ansible/tasks/engineering}/_main.yml (51%) rename provision/{debian => arch}/ansible/tasks/engineering/packages.yml (94%) rename provision/{debian => arch}/ansible/tasks/engineering/superslicer.yml (100%) rename provision/{debian => arch}/ansible/tasks/gaming/_main.yml (100%) rename provision/{debian => arch}/ansible/tasks/gaming/packages.yml (100%) rename provision/{debian => arch}/ansible/tasks/gaming/yuzu.yml (100%) rename provision/{debian => arch}/ansible/tasks/include/download-github-archive.yml (100%) rename provision/{debian => arch}/ansible/tasks/include/download-github-bin.yml (100%) rename provision/{debian => arch}/ansible/tasks/include/hide-desktop.yml (100%) rename provision/{debian => arch}/ansible/tasks/system/_main.yml (100%) rename provision/{debian => arch}/ansible/tasks/system/configs.yml (100%) rename provision/{debian => arch}/ansible/tasks/system/fonts.yml (100%) rename provision/{debian => arch}/ansible/tasks/system/packages.yml (67%) rename provision/{debian => arch}/ansible/tasks/terminal/_main.yml (100%) rename provision/{debian => arch}/ansible/tasks/terminal/configs.yml (100%) rename provision/{debian => arch}/ansible/tasks/terminal/nnn.yml (100%) rename provision/{debian => arch}/ansible/tasks/terminal/packages.yml (85%) rename provision/{debian => arch}/jumpstart.sh (86%) rename provision/{debian => arch}/readme.md (97%) delete mode 100644 provision/debian/ansible/tasks/development/configs.yml delete mode 100644 provision/debian/ansible/tasks/include/xbps-src.yml diff --git a/provision/debian/TODO.md b/provision/arch/TODO.md similarity index 100% rename from provision/debian/TODO.md rename to provision/arch/TODO.md diff --git a/provision/debian/additional-setup.md b/provision/arch/additional-setup.md similarity index 100% rename from provision/debian/additional-setup.md rename to provision/arch/additional-setup.md diff --git a/provision/debian/ansible/hosts b/provision/arch/ansible/hosts similarity index 100% rename from provision/debian/ansible/hosts rename to provision/arch/ansible/hosts diff --git a/provision/debian/ansible/requirements.yml b/provision/arch/ansible/requirements.yml similarity index 100% rename from provision/debian/ansible/requirements.yml rename to provision/arch/ansible/requirements.yml diff --git a/provision/debian/ansible/setup.yml b/provision/arch/ansible/setup.yml similarity index 89% rename from provision/debian/ansible/setup.yml rename to provision/arch/ansible/setup.yml index bb9099d9..9a82609f 100644 --- a/provision/debian/ansible/setup.yml +++ b/provision/arch/ansible/setup.yml @@ -1,4 +1,4 @@ -- name: Ansible playbook to setup Debian +- name: Ansible playbook to setup Arch hosts: all vars_files: diff --git a/provision/debian/ansible/tasks/desktop/_main.yml b/provision/arch/ansible/tasks/desktop/_main.yml similarity index 100% rename from provision/debian/ansible/tasks/desktop/_main.yml rename to provision/arch/ansible/tasks/desktop/_main.yml diff --git a/provision/debian/ansible/tasks/desktop/configs.yml b/provision/arch/ansible/tasks/desktop/configs.yml similarity index 100% rename from provision/debian/ansible/tasks/desktop/configs.yml rename to provision/arch/ansible/tasks/desktop/configs.yml diff --git a/provision/debian/ansible/tasks/desktop/packages.yml b/provision/arch/ansible/tasks/desktop/packages.yml similarity index 92% rename from provision/debian/ansible/tasks/desktop/packages.yml rename to provision/arch/ansible/tasks/desktop/packages.yml index a30538a1..72e638be 100644 --- a/provision/debian/ansible/tasks/desktop/packages.yml +++ b/provision/arch/ansible/tasks/desktop/packages.yml @@ -3,7 +3,7 @@ name: - mpv # Video player based on MPlayer/mplayer2 - ffmpeg # Decoding, encoding and streaming software - - firefox # Mozilla Firefox web browser + - firefox state: present become: true diff --git a/provision/debian/ansible/tasks/desktop/sway.yml b/provision/arch/ansible/tasks/desktop/sway.yml similarity index 77% rename from provision/debian/ansible/tasks/desktop/sway.yml rename to provision/arch/ansible/tasks/desktop/sway.yml index fe89c330..69637f93 100644 --- a/provision/debian/ansible/tasks/desktop/sway.yml +++ b/provision/arch/ansible/tasks/desktop/sway.yml @@ -6,8 +6,7 @@ - swayidle - grim # screenshot functionality - wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout - - mako-notifier # notification system developed by swaywm maintainer - - wdisplays # tool to configure displays + - mako # notification system developed by swaywm maintainer - feh - pcmanfm - blueman diff --git a/provision/debian/ansible/tasks/engineering/_main.yml b/provision/arch/ansible/tasks/development/_main.yml similarity index 100% rename from provision/debian/ansible/tasks/engineering/_main.yml rename to provision/arch/ansible/tasks/development/_main.yml diff --git a/provision/debian/ansible/tasks/development/packages.yml b/provision/arch/ansible/tasks/development/packages.yml similarity index 69% rename from provision/debian/ansible/tasks/development/packages.yml rename to provision/arch/ansible/tasks/development/packages.yml index b2d958b0..0933c2e1 100644 --- a/provision/debian/ansible/tasks/development/packages.yml +++ b/provision/arch/ansible/tasks/development/packages.yml @@ -2,12 +2,11 @@ apt: name: - python3 # Python programming language (3.11 series) - - python3-pip # A tool for installing and managing Python3 packages - - python3-ipython + - python-pip # A tool for installing and managing Python3 packages + - ipython - ripgrep # Fast search tool inspired by ag and grep - - fd-find # Simple, fast and user-friendly alternative to find - - pipenv # Python Development Workflow for Humans - - python3-dev # Python programming language (3.11 series) - development files + - fd # Simple, fast and user-friendly alternative to find + - python-pipenv # Python Development Workflow for Humans - cloc state: present become: true @@ -30,6 +29,5 @@ flatpak: name: - com.vscodium.codium # Free/Libre Open Source Software Binaries of VS Code - - com.github.GradienceTeam.Gradience state: present become: true diff --git a/provision/debian/ansible/tasks/engineering/.placeholder b/provision/arch/ansible/tasks/engineering/.placeholder similarity index 100% rename from provision/debian/ansible/tasks/engineering/.placeholder rename to provision/arch/ansible/tasks/engineering/.placeholder diff --git a/provision/debian/ansible/tasks/development/_main.yml b/provision/arch/ansible/tasks/engineering/_main.yml similarity index 51% rename from provision/debian/ansible/tasks/development/_main.yml rename to provision/arch/ansible/tasks/engineering/_main.yml index b527d4d1..68d12ab3 100644 --- a/provision/debian/ansible/tasks/development/_main.yml +++ b/provision/arch/ansible/tasks/engineering/_main.yml @@ -1,4 +1,2 @@ - import_tasks: packages.yml tags: ["packages"] -- import_tasks: configs.yml - tags: ["configs"] diff --git a/provision/debian/ansible/tasks/engineering/packages.yml b/provision/arch/ansible/tasks/engineering/packages.yml similarity index 94% rename from provision/debian/ansible/tasks/engineering/packages.yml rename to provision/arch/ansible/tasks/engineering/packages.yml index 84dd23e4..539c9539 100644 --- a/provision/debian/ansible/tasks/engineering/packages.yml +++ b/provision/arch/ansible/tasks/engineering/packages.yml @@ -2,7 +2,7 @@ apt: name: - freecad # General purpose 3D CAD modeler - #- gqrx + - gqrx state: present become: true diff --git a/provision/debian/ansible/tasks/engineering/superslicer.yml b/provision/arch/ansible/tasks/engineering/superslicer.yml similarity index 100% rename from provision/debian/ansible/tasks/engineering/superslicer.yml rename to provision/arch/ansible/tasks/engineering/superslicer.yml diff --git a/provision/debian/ansible/tasks/gaming/_main.yml b/provision/arch/ansible/tasks/gaming/_main.yml similarity index 100% rename from provision/debian/ansible/tasks/gaming/_main.yml rename to provision/arch/ansible/tasks/gaming/_main.yml diff --git a/provision/debian/ansible/tasks/gaming/packages.yml b/provision/arch/ansible/tasks/gaming/packages.yml similarity index 100% rename from provision/debian/ansible/tasks/gaming/packages.yml rename to provision/arch/ansible/tasks/gaming/packages.yml diff --git a/provision/debian/ansible/tasks/gaming/yuzu.yml b/provision/arch/ansible/tasks/gaming/yuzu.yml similarity index 100% rename from provision/debian/ansible/tasks/gaming/yuzu.yml rename to provision/arch/ansible/tasks/gaming/yuzu.yml diff --git a/provision/debian/ansible/tasks/include/download-github-archive.yml b/provision/arch/ansible/tasks/include/download-github-archive.yml similarity index 100% rename from provision/debian/ansible/tasks/include/download-github-archive.yml rename to provision/arch/ansible/tasks/include/download-github-archive.yml diff --git a/provision/debian/ansible/tasks/include/download-github-bin.yml b/provision/arch/ansible/tasks/include/download-github-bin.yml similarity index 100% rename from provision/debian/ansible/tasks/include/download-github-bin.yml rename to provision/arch/ansible/tasks/include/download-github-bin.yml diff --git a/provision/debian/ansible/tasks/include/hide-desktop.yml b/provision/arch/ansible/tasks/include/hide-desktop.yml similarity index 100% rename from provision/debian/ansible/tasks/include/hide-desktop.yml rename to provision/arch/ansible/tasks/include/hide-desktop.yml diff --git a/provision/debian/ansible/tasks/system/_main.yml b/provision/arch/ansible/tasks/system/_main.yml similarity index 100% rename from provision/debian/ansible/tasks/system/_main.yml rename to provision/arch/ansible/tasks/system/_main.yml diff --git a/provision/debian/ansible/tasks/system/configs.yml b/provision/arch/ansible/tasks/system/configs.yml similarity index 100% rename from provision/debian/ansible/tasks/system/configs.yml rename to provision/arch/ansible/tasks/system/configs.yml diff --git a/provision/debian/ansible/tasks/system/fonts.yml b/provision/arch/ansible/tasks/system/fonts.yml similarity index 100% rename from provision/debian/ansible/tasks/system/fonts.yml rename to provision/arch/ansible/tasks/system/fonts.yml diff --git a/provision/debian/ansible/tasks/system/packages.yml b/provision/arch/ansible/tasks/system/packages.yml similarity index 67% rename from provision/debian/ansible/tasks/system/packages.yml rename to provision/arch/ansible/tasks/system/packages.yml index 290fe0f0..e5b703a8 100644 --- a/provision/debian/ansible/tasks/system/packages.yml +++ b/provision/arch/ansible/tasks/system/packages.yml @@ -8,29 +8,21 @@ - wireguard-tools # Fast, modern, secure vpn tunnel #- pipewire-codec-aptx # PipeWire Bluetooth aptX codec plugin - ansible # Simple deployment, configuration management and execution framework - - build-essential - - pkg-config - - qemu-system - - libvirt-daemon-system + - base-devel + - qemu + - virt-manager + - dnsmasq + - iptables - trash-cli # Command line interface to the freedesktop.org trashcan - cargo - borgbackup - fzf - unzip + - chezmoi state: present become: true -- name: Install chezmoi - ansible.builtin.shell: | - sh -c "$(curl -fsLS get.chezmoi.io)" -- -b $HOME/.local/bin # Manage your dotfiles across multiple machines, securely - - name: Add flatpak remote ansible.builtin.shell: | flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo become: true - -- name: Enable Multi-Arch - ansible.builtin.shell: | - dpkg --add-architecture i386 - apt update - become: true diff --git a/provision/debian/ansible/tasks/terminal/_main.yml b/provision/arch/ansible/tasks/terminal/_main.yml similarity index 100% rename from provision/debian/ansible/tasks/terminal/_main.yml rename to provision/arch/ansible/tasks/terminal/_main.yml diff --git a/provision/debian/ansible/tasks/terminal/configs.yml b/provision/arch/ansible/tasks/terminal/configs.yml similarity index 100% rename from provision/debian/ansible/tasks/terminal/configs.yml rename to provision/arch/ansible/tasks/terminal/configs.yml diff --git a/provision/debian/ansible/tasks/terminal/nnn.yml b/provision/arch/ansible/tasks/terminal/nnn.yml similarity index 100% rename from provision/debian/ansible/tasks/terminal/nnn.yml rename to provision/arch/ansible/tasks/terminal/nnn.yml diff --git a/provision/debian/ansible/tasks/terminal/packages.yml b/provision/arch/ansible/tasks/terminal/packages.yml similarity index 85% rename from provision/debian/ansible/tasks/terminal/packages.yml rename to provision/arch/ansible/tasks/terminal/packages.yml index 3ce426bc..a2965657 100644 --- a/provision/debian/ansible/tasks/terminal/packages.yml +++ b/provision/arch/ansible/tasks/terminal/packages.yml @@ -2,9 +2,9 @@ apt: name: - neovim # Vim-fork focused on extensibility and agility - - taskwarrior # Command-line TODO list manager - - timewarrior # Timewarrior tracks and reports time - - python3-tasklib # Library for interacting with taskwarrior databases (Python3) + - task # Command-line TODO list manager + - timew # Timewarrior tracks and reports time + - python-tasklib # Library for interacting with taskwarrior databases (Python3) - vifm # Ncurses-based file manager with vi-like keybindings - zsh # Z SHell - tmux # Terminal Multiplexer diff --git a/provision/debian/jumpstart.sh b/provision/arch/jumpstart.sh similarity index 86% rename from provision/debian/jumpstart.sh rename to provision/arch/jumpstart.sh index eed123df..cdcf926f 100755 --- a/provision/debian/jumpstart.sh +++ b/provision/arch/jumpstart.sh @@ -1,15 +1,14 @@ #!/usr/bin/env bash -echo -e "Starting initial setup for Debian..." +echo -e "Starting initial setup for Arch..." CHEZDIR="$HOME/.local/share/chezmoi" echo "Input email for bitwarden:" read bitemail # Install ansible python dependencies -sudo apt update -y -sudo apt install python3 python3-pip ansible cargo -y -sudo find / -name "EXTERNALLY-MANAGED" -type f -delete +sudo pacman -Syu +sudo pacman python3 python3-pip ansible cargo -y pip install pexpect cargo install rbw diff --git a/provision/debian/readme.md b/provision/arch/readme.md similarity index 97% rename from provision/debian/readme.md rename to provision/arch/readme.md index e44b12b3..eb03a776 100644 --- a/provision/debian/readme.md +++ b/provision/arch/readme.md @@ -1,5 +1,5 @@ -# Provision Debian -> \*Installs Debian from behind paywall...\* +# Provision Arch +> \*Yes, I haven't showered in days.\* Jumpstart scripts to install Debian with packages and configs I use. diff --git a/provision/debian/ansible/tasks/development/configs.yml b/provision/debian/ansible/tasks/development/configs.yml deleted file mode 100644 index 50da50e7..00000000 --- a/provision/debian/ansible/tasks/development/configs.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: Setup nvm - tags: ["once"] - shell: > - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash - creates=/home/{{ user }}/.nvm/nvm.sh diff --git a/provision/debian/ansible/tasks/include/xbps-src.yml b/provision/debian/ansible/tasks/include/xbps-src.yml deleted file mode 100644 index 4892b389..00000000 --- a/provision/debian/ansible/tasks/include/xbps-src.yml +++ /dev/null @@ -1,33 +0,0 @@ -- name: Clone or pull void-packages - ansible.builtin.git: - repo: 'https://github.com/starr-dusT/void-packages.git' - dest: /home/{{ user }}/git/void-packages - update: yes - register: git_return - -- name: Bootstrap if newly cloned - ansible.builtin.command: ./xbps-src binary-bootstrap - args: - chdir: /home/{{ user }}/git/void-packages - when: not git_return.before - -- name: Enable restricted if newly cloned - copy: - dest: /home/{{ user }}/git/void-packages/etc/conf - content: | - XBPS_ALLOW_RESTRICTED=yes - when: not git_return.before - -- name: Package {{ item.package }} with xbps-src - ansible.builtin.command: ./xbps-src pkg {{ item.package }} - args: - chdir: /home/{{ user }}/git/void-packages - -- name: Install packaged {{ item.package }} - expect: - command: xbps-install --repository {{ item.repository }} {{ item.package }} - responses: - continue: y - args: - chdir: /home/{{ user }}/git/void-packages - become: true