diff --git a/config/albert/albert.conf b/config/albert/albert.conf deleted file mode 100644 index f08dcfa..0000000 --- a/config/albert/albert.conf +++ /dev/null @@ -1,54 +0,0 @@ -[General] -hotkey=Meta+Space -showTray=true -standsalone_note_shown=true -terminal=terminator -x - -[org.albert.extension.applications] -enabled=true - -[org.albert.extension.calculator] -enabled=true - -[org.albert.extension.files] -enabled=false - -[org.albert.extension.firefoxbookmarks] -enabled=true -profile=Profile0 - -[org.albert.extension.kvstore] -enabled=true - -[org.albert.extension.system] -enabled=true - -[org.albert.extension.terminal] -enabled=true - -[org.albert.extension.websearch] -enabled=true - -[org.albert.frontend.boxmodel.widgets] -alwaysOnTop=true -clearOnHide=false -displayIcons=true -displayScrollbar=false -displayShadow=true -hideOnClose=false -hideOnFocusLoss=true -itemCount=5 -showCentered=true -theme=Bright - -[org.albert.frontend.widgetboxmodel] -alwaysOnTop=true -clearOnHide=false -displayIcons=true -displayScrollbar=false -displayShadow=true -hideOnClose=false -hideOnFocusLoss=true -itemCount=5 -showCentered=true -theme=Spotlight Dark diff --git a/config/openbox/rc.xml b/config/openbox/rc.xml index 0d05537..c28d36e 100644 --- a/config/openbox/rc.xml +++ b/config/openbox/rc.xml @@ -202,10 +202,19 @@ - terminator + terminator/execute> + + + + rofi -show + + + + + diff --git a/setup.bash b/setup.bash index 0592147..28ca554 100755 --- a/setup.bash +++ b/setup.bash @@ -17,7 +17,7 @@ install-apt-dependencies() { sudo apt-get install \ xcompmgr \ openbox \ - albert \ + rofi \ plank \ dunst \ numix-icon-theme-circle \ @@ -83,7 +83,6 @@ copy-files-in-dir-to() { copy-config() { echo "=> Copying config" - copy-files-in-dir-to "$(here)/config/albert" "$(config-dir albert)" copy-files-in-dir-to "$(here)/config/openbox" "$(config-dir openbox)" copy-files-in-dir-to "$(here)/config/dunst" "$(config-dir dunst)" copy-files-in-dir-to "$(here)/config/terminator" "$(config-dir terminator)" @@ -100,39 +99,10 @@ add-custom-startup() { printf '. "%s"\n' "$startup_file" >> "$(config-dir openbox)/autostart.sh" } -ppa-has-been-added() { - declare -r ppa="$1" - - if [[ $ppa == ppa:* ]]; then - ppa-has-been-added "${ppa#ppa:}" - return $? - fi - - grep -q "$ppa" /etc/apt/sources.list /etc/apt/sources.list.d/* -} - -add-ppa-if-not-added() { - declare ppa="$1" - if ! ppa-has-been-added "$ppa"; then - printf 'Adding ppa "%s"\n' "$ppa" - sudo add-apt-repository "$ppa" - fi -} - os-is-ubuntu-1804() { [[ $(cat /etc/os-release | grep VERSION_ID | grep -Po '(?<=").*(?=")') == '18.04' ]] } -add-ppas() { - if os-is-ubuntu-1804; then - add-ppa-if-not-added \ - 'deb http://download.opensuse.org/repositories/home:/manuelschneid3r/xUbuntu_18.04/ /' - else - add-ppa-if-not-added 'ppa:nilarimogard/webupd8' - fi - add-ppa-if-not-added 'ppa:numix/ppa' -} - cache-dir() { echo "$HOME/.cache/clopper-ob" } @@ -237,7 +207,6 @@ add-custom-background() { } setup-openbox-for-user() { - add-ppas install-dependencies copy-config create-cache-dir