diff --git a/playbooks/desktop.yml b/playbooks/desktop.yml index 2ad9e8c..b4e8b8c 100755 --- a/playbooks/desktop.yml +++ b/playbooks/desktop.yml @@ -32,8 +32,6 @@ tags: [ backup ] - role: motd tags: [ motd ] - - role: desktop - tags: [ desktop ] - role: udev vars: udev_rules: @@ -46,10 +44,44 @@ tags: [ desktop, zerotier ] - hosts: lap-s76-lemp9-0.desu.ltd roles: + - role: desktop + vars: + desktop_apt_keys_url_extra: + - "https://packagecloud.io/slacktechnologies/slack/gpgkey" # Slack + desktop_apt_repos_extra: + - "deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie main" # Slack + - "ppa:kubuntu-ppa/backports" # Kubuntu Backports + - "ppa:kgilmer/speed-ricer" # Ricing for fun and profit + desktop_apt_packages_extra: + # DE + - bspwm + - compton + - conky-all + - dunst + - ibus + - ibus-mozc + - kubuntu-desktop + - mozc-utils-gui + - nitrogen + - pavucontrol-qt + - polybar + - qt5ct + - rofi + - xbacklight + # Applications + - redshift + - slack-desktop + - xserver-xephyr + desktop_apt_debs_extra: + - "https://zoom.us/client/latest/zoom_amd64.deb" # Zoom, proprietary shitware + - "https://downloads.raspberrypi.org/imager/imager_amd64.deb" # Pi imager + tags: [ desktop ] - role: grub tags: [ desktop, grub ] - hosts: dsk-ryzen-0.desu.ltd roles: + - role: desktop + tags: [ desktop ] - role: grub vars: grub_disable_os_prober: "false" diff --git a/roles/desktop/defaults/main.yml b/roles/desktop/defaults/main.yml index 0e0ff11..d4cbab9 100644 --- a/roles/desktop/defaults/main.yml +++ b/roles/desktop/defaults/main.yml @@ -18,7 +18,6 @@ desktop_apt_keys_keyserver: desktop_apt_keys_keyserver_extra: [] desktop_apt_keys_url: - - "https://packagecloud.io/slacktechnologies/slack/gpgkey" # Slack - "https://syncthing.net/release-key.txt" # Syncthing - "https://packages.riot.im/debian/riot-im-archive-keyring.gpg" # Element - "https://download.spotify.com/debian/pubkey_0D811D58.gpg" # Spotify 2 @@ -28,26 +27,18 @@ desktop_apt_keys_url: desktop_apt_keys_url_extra: [] desktop_apt_repos: - - "deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie main" # Slack - "deb http://repository.spotify.com stable non-free" # Spotify - "deb https://apt.syncthing.net/ syncthing stable" # Syncthing - - "deb https://download.mono-project.com/repo/ubuntu vs-bionic main" # Monodevelop - "deb https://packages.riot.im/debian/ default main" # Element - "deb https://apt.kubernetes.io/ kubernetes-xenial main" # Kubernetes - "deb https://download.docker.com/linux/ubuntu focal stable" # Docker - "deb https://baltocdn.com/helm/stable/debian/ all main" # Helm - # Backports - - "ppa:kubuntu-ppa/backports" # Kubuntu Backports # First-party PPAs - "ppa:phoerious/keepassxc" # KeepassXC - "ppa:libretro/stable" # Libretro - "ppa:minetestdevs/stable" # Minetest - - "ppa:greymd/tmux-xpanes" # xpanes - - "ppa:hsheth2/ppa" # cava - - "ppa:bitcoin-unlimited/bucash" # bucash # Third-party PPAs - "ppa:drewwalton19216801/dolphin-master-cosmic" # Because Dolphin doesn't update their shit - - "ppa:kgilmer/speed-ricer" # Ricing is fun and kgilmer is cool - "ppa:lutris-team/lutris" # Lutris is useful for vidya desktop_apt_repos_extra: [] @@ -98,22 +89,7 @@ desktop_apt_packages: - fonts-noto # Important series of fonts to have - fonts-roboto # Used a lot on the web # DE - - bspwm # My main window manager - - compton # Compositor - - conky-all # Used for statistics displays on desktops - - dunst # Notification daemon -# - hsetroot # Used in absence of Nitrogen to set basic wallpaper stuff - - ibus - - ibus-mozc # For Japanese input - - kubuntu-desktop # Basic sanity check - - mozc-utils-gui # Configuration panel not explicitly pulled in - - nitrogen # Wallpaper setter - papirus-icon-theme # Fancy paper icon theme - - pavucontrol-qt # Nice audio interface - - polybar # MY BAR - - qt5ct # Useful for qt5 themeing - - rofi # Application launcher - - xbacklight # For the day I get around to fixing support for this on my machines # Games - minetest # Applications @@ -150,9 +126,7 @@ desktop_apt_packages: - pulseeffects # ECHO... Echo... echo... echo... - q4wine # Quick n dirty wine wrapper - qbittorrent # Bittorrent client of choice - - redshift # At the moment I work thirds, so this is kinda counterintuitive, but whatever - retroarch # Emulators are legitimate competition - - slack-desktop # Gotta get slack, slack to the past - spotify-client # Moosucc - steam-installer # Steam is an important part of one's life - syncthing-gtk # Also pulls in syncthing and is very neato burrito @@ -163,30 +137,16 @@ desktop_apt_packages: - vulkan-utils - winetricks # Protontricks wraps this, I think - xdotool # Used in one or two macro scripts - - xserver-xephyr # Neat but mostly useless utility that I want to get Firestarter happy with - zim # Desktop wiki # Other architectures, misc - "libgl1-mesa-dri:i386" - "mesa-vulkan-drivers:i386" desktop_apt_packages_extra: [] -desktop_apt_packages_remove: - - cava # Audio visualizer thing - - tmux-xpanes # Used for administration and work stuff - - tree # Useful basic utility - - vagrant # Very handy for development - - vagrant-libvirt - - barrier # FOSS variant of Synergy - - bitcoin-qt # Bitcoin stuffs - - g810-led # Controls lights on Logitech peripherals - - mono-complete # Initialization may take an eternity - - monodevelop # For Terraria modding, don't hate me - - monodoc-browser # Tries to get installed when Mono is removed +desktop_apt_packages_remove: [] desktop_apt_packages_remove_extra: [] desktop_apt_debs: - "https://dl.discordapp.net/apps/linux/0.0.15/discord-0.0.15.deb" # Discord - "https://github.com/MultiMC/MultiMC5/releases/download/0.6.8/multimc_1.4-1.deb" # MultiMC - - "https://zoom.us/client/latest/zoom_amd64.deb" # Zoom, proprietary shitware - - "https://downloads.raspberrypi.org/imager/imager_amd64.deb" # Pi imager desktop_apt_debs_extra: []