diff --git a/home/.chezmoiremove b/home/.chezmoiremove index 0349494c..4d214f8f 100644 --- a/home/.chezmoiremove +++ b/home/.chezmoiremove @@ -14,6 +14,7 @@ Brewfile .gconf/ .gitconfig .gitignore +.gnome/ .gradle .inputrc .java/ @@ -37,6 +38,7 @@ Brewfile .vagrant.d/ .viminfo .volta/ +.vscode/ .vscode-oss/ .wgetrc .wget-hsts diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index 80a6520d..107700ba 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -498,7 +498,12 @@ async function OSTypeInstallerKey() { const yum = which.sync('yum', { nothrow: true }) const zypper = which.sync('zypper', { nothrow: true }) if (apt) { - return 'apt' + try { + await $`test -d /etc/ubuntu-advantage` + return 'ubuntu' + } catch (e) { + return 'apt' + } } else if (dnf || yum) { return 'dnf' } else if (pacman) { diff --git a/software.yml b/software.yml index 8ba81d67..b66ddd8b 100644 --- a/software.yml +++ b/software.yml @@ -147,6 +147,21 @@ installerPreference: - script - ansible - binary + ubuntu: + - snap + - flatpak + - whalebrew + - apt + - brew + - go + - cargo + - npm + - pipx + - gem + - appimage + - script + - ansible + - binary windows: - choco - scoop