diff --git a/dconf-settings.ini b/dconf-settings.ini index 0c4ac70d..d9ebdf85 100644 --- a/dconf-settings.ini +++ b/dconf-settings.ini @@ -42,27 +42,6 @@ dynamic-workspaces=true [org/gnome/shell] disabled-extensions=['tiling-assistant@ubuntu.com', 'ubuntu-dock@ubuntu.com', 'ding@rastersoft.com'] enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'caffeine@patapon.info'] -app-picker-layout=[{'org.gnome.TextEditor.desktop': <{'position': <0>}>, 'org.gnome.Contacts.desktop': <{'position': <1>}>, 'org.gnome.Weather.desktop': <{'position': <2>}>, 'org.gnome.clocks.desktop': <{'position': <3>}>, 'org.gnome.Snapshot.desktop': <{'position': <4>}>, 'org.gnome.Maps.desktop': <{'position': <5>}>, 'org.gnome.Calculator.desktop': <{'position': <6>}>, 'simple-scan.desktop': <{'position': <7>}>, 'Utilities': <{'position': <8>}>, '8a0d2631-145a-4dec-932f-0aa6b6d90681': <{'position': <9>}>, 'b0328f3f-55f6-4751-b3cf-3327ed872359': <{'position': <10>}>, 'org.gnome.baobab.desktop': <{'position': <11>}>, 'org.gnome.Logs.desktop': <{'position': <12>}>, 'org.gnome.Connections.desktop': <{'position': <13>}>, 'org.gnome.Settings.desktop': <{'position': <14>}>}] -favorite-apps=['org.gnome.Nautilus.desktop', 'brave-browser.desktop', 'org.gnome.Epiphany.desktop', 'discord.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Console.desktop', 'code.desktop', 'obsidian.desktop'] - -[org/gnome/desktop/app-folders] -folder-children=['Utilities', '8a0d2631-145a-4dec-932f-0aa6b6d90681', 'b0328f3f-55f6-4751-b3cf-3327ed872359'] - -[org/gnome/desktop/app-folders/folders/b0328f3f-55f6-4751-b3cf-3327ed872359] -apps=['org.prismlauncher.PrismLauncher.desktop', 'steam.desktop'] -name='Games' - -[org/gnome/desktop/app-folders/folders/Utilities] -apps=['org.freedesktop.GnomeAbrt.desktop', 'nm-connection-editor.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.DiskUtility.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.font-viewer.desktop', 'org.gnome.Loupe.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.tweaks.desktop', 'org.gnome.Usage.desktop', 'org.gnome.SystemMonitor.desktop', 'yelp.desktop', 'org.gnome.Tour.desktop', 'xterm.desktop', 'cups.desktop', 'nixos-manual.desktop', 'org.gnome.Extensions.desktop', 'org.gnome.Totem.desktop', 'nvim.desktop', 'htop.desktop'] -categories=['X-GNOME-Utilities'] -excluded-apps=['org.gnome.Sysprof.desktop', 'org.gnome.baobab.desktop', 'org.gnome.Logs.desktop', 'org.gnome.Connections.desktop'] -name='X-GNOME-Utilities.directory' -translate=true - -[org/gnome/desktop/app-folders/folders/8a0d2631-145a-4dec-932f-0aa6b6d90681] -apps=['io.github.fizzyizzy05.binary.desktop', 'com.belmoussaoui.Authenticator.desktop', 'org.gnome.Boxes.desktop', 'org.gnome.Builder.desktop', 'dev.geopjr.Collision.desktop', 'com.rafaelmardojai.WebfontKitGenerator.desktop', 'org.gnome.World.PikaBackup.desktop', 'com.belmoussaoui.Obfuscate.desktop', 'io.gitlab.gregorni.Letterpress.desktop', 'app.drey.Warp.desktop', 'de.haeckerfelix.Fragments.desktop', 'se.sjoerd.Graphs.desktop', 'com.github.ADBeveridge.Raider.desktop', 'com.github.finefindus.eyedropper.desktop', 'app.drey.Dialect.desktop', 'org.gnome.Devhelp.desktop', 'io.gitlab.adhami3310.Impression.desktop', 'org.gnome.Podcasts.desktop', 'org.gnome.gitlab.YaLTeR.VideoTrimmer.desktop', 'io.gitlab.liferooter.TextPieces.desktop', 'io.gitlab.adhami3310.Converter.desktop', 'net.nokyan.Resources.desktop', 'com.github.huluti.Curtail.desktop', 're.sonny.Commit.desktop', 'org.gnome.Sysprof.desktop'] -name='GNOME Circle' -translate=false [org/gnome/shell/extensions/dash-to-dock] dash-max-icon-size=32 diff --git a/debian-sources.list b/debian-sources.list new file mode 100644 index 00000000..e3d0b6b2 --- /dev/null +++ b/debian-sources.list @@ -0,0 +1,4 @@ +# Debian Testing +deb http://deb.debian.org/debian/ testing main non-free contrib +deb-src http://deb.debian.org/debian/ testing main non-free contrib +deb http://security.debian.org/debian-security testing-security main diff --git a/debian.sh b/debian.sh new file mode 100755 index 00000000..745358fa --- /dev/null +++ b/debian.sh @@ -0,0 +1,15 @@ +#! /bin/bash + +source scripts/p.sh +p # Update system +sudo cp /etc/apt/sources.list /etc/apt/sources.list.bckp +sudo cp debian-sources.list /etc/apt/sources.list +p + +sudo apt install gnome-core flatpak gnome-software-plugin-flatpak +sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + +# Enable Network Manager +sudo mv /etc/network/interfaces /etc/network/interfaces.bckp +sudo systemctl restart networking +sudo service NetworkManager restart diff --git a/home/.bashrc b/home/.bashrc index 75e30135..4bcfd71a 100644 --- a/home/.bashrc +++ b/home/.bashrc @@ -80,7 +80,12 @@ alias t='tmux' alias v='nvim' alias t="tmux" alias ta="tmux attach" -alias cat="bat" + +if command -v batcat 2>&1 >/dev/null; then + alias cat=batcat +else + alias cat=bat +fi set completion-ignore-case On diff --git a/scripts/p.sh b/scripts/p.sh index 2408612c..8941734b 100755 --- a/scripts/p.sh +++ b/scripts/p.sh @@ -101,141 +101,71 @@ p() ( fi } - checkP() { - app_name=$(echo "$1" | tr '[:upper:]' '[:lower:]') - app_name=$(echo "$app_name" | tr " " -) - # Some package names are different from the command name - case "$app_name" in - neovim) - commandName="nvim" - ;; - python) - commandName="python3" - ;; - nodejs) - commandName="node" - ;; - docker-compose) - commandName="docker compose" - ;; - pip) - commandName="pip3" - ;; - *) - commandName="$app_name" - ;; - esac - - if [[ ${packageManagers[@]} =~ "flatpak" ]]; then - flatpak_apps=$(flatpak list --columns=application) - echo $flatpak_apps | grep -iq $app_name - flatpak_success=$? - if [[ $flatpak_success == 0 ]]; then - printf "%b\n" "${GREEN}${BOLD}Flatpak:${ENDCOLOR}${GREEN} $(echo "$flatpak_apps" | tr ' ' '\n' | grep -i "$app_name")${ENDCOLOR}" - fi - fi - - which "$commandName" &>/dev/null - distro_success=$? - if [[ $distro_success == 0 ]]; then - printf "%b\n" "${GREEN}${BOLD}Distro:${ENDCOLOR}${GREEN} $app_name is installed.${ENDCOLOR}" - fi - - if [[ $flatpak_success != 0 && $distro_success != 0 ]]; then - printf "%b\n" "${YELLOW}$app_name not installed.${ENDCOLOR}" - return 1 - fi - } - installP() { - checkP $1 - if [[ $? != 1 ]]; then - printf "%b\n" "${GREEN}$1 is already installed.${ENDCOLOR}" - return 0 - fi - if [[ ${packageManagers[@]} =~ "brew" ]]; then - printf "%b\n" "${YELLOW}Attempting brew install...${ENDCOLOR}" - brew install $1 + for pm in "${packageManagers[@]}"; do + printf "%b\n" "${YELLOW}Attempting ${pm} install...${ENDCOLOR}" + case "$pm" in + flatpak) + flatpak install "$1" + ;; + paru) + paru -Sy "$1" + ;; + apt) + sudo apt install "$1" + ;; + pacman) + sudo pacman -Sy "$1" + ;; + dnf) + sudo dnf install "$1" + ;; + brew) + brew install "$1" + ;; + *) + continue + ;; + esac if [[ $? == 0 ]]; then return 0 fi - fi - if [[ ${packageManagers[@]} =~ "apt" ]]; then - printf "%b\n" "${YELLOW}Attempting apt install...${ENDCOLOR}" - sudo apt install $1 - if [[ $? == 0 ]]; then - return 0 - fi - elif [[ ${packageManagers[@]} =~ "paru" ]]; then - printf "%b\n" "${YELLOW}Attempting paru install...${ENDCOLOR}" - paru -Sy $1 - if [[ $? == 0 ]]; then - return 0 - fi - elif [[ ${packageManagers[@]} =~ "pacman" ]]; then - printf "%b\n" "${YELLOW}Attempting pacman install...${ENDCOLOR}" - sudo pacman -Sy $1 - if [[ $? == 0 ]]; then - return 0 - fi - elif [[ ${packageManagers[@]} =~ "dnf" ]]; then - printf "%b\n" "${YELLOW}Attempting dnf install...${ENDCOLOR}" - sudo dnf install $1 - if [[ $? == 0 ]]; then - return 0 - fi - fi - if [[ ${packageManagers[@]} =~ "flatpak" ]]; then - printf "%b\n" "${YELLOW}Attempting flatpak install...${ENDCOLOR}" - flatpak install $1 - if [[ $? == 0 ]]; then - return 0 - fi - fi - printf "%b\n" "${RED}ERROR - $1 not found.${ENDCOLOR}" + done + printf "%b\n" "${RED}ERROR: $1 not found.${ENDCOLOR}" return 1 } removeP() { - checkP $1 - if [[ $? != 0 ]]; then - printf "%b\n" "${YELLOW}$1 is not installed.${ENDCOLOR}" - return 0 - fi - if [[ ${packageManagers[@]} =~ "flatpak" ]]; then - printf "%b\n" "${YELLOW}Attempting flatpak uninstall...${ENDCOLOR}" - flatpak uninstall $1 + for pm in "${packageManagers[@]}"; do + printf "%b\n" "${YELLOW}Attempting ${pm} uninstall...${ENDCOLOR}" + case "$pm" in + flatpak) + flatpak uninstall "$1" + ;; + brew) + brew uninstall "$1" + ;; + apt) + sudo apt remove "$1" + ;; + pacman) + sudo pacman -Rs "$1" + ;; + paru) + paru -Rns "$1" + ;; + dnf) + sudo dnf remove "$1" + ;; + *) + continue + ;; + esac if [[ $? == 0 ]]; then return 0 fi - fi - if [[ ${packageManagers[@]} =~ "brew" ]]; then - printf "%b\n" "${YELLOW}Attempting brew uninstall...${ENDCOLOR}" - brew uninstall $1 - if [[ $? == 0 ]]; then - return 0 - fi - fi - if [[ ${packageManagers[@]} =~ "apt" ]]; then - printf "%b\n" "${YELLOW}Attempting apt uninstall...${ENDCOLOR}" - sudo apt remove $1 - if [[ $? == 0 ]]; then - return 0 - fi - elif [[ ${packageManagers[@]} =~ "pacman" ]]; then - printf "%b\n" "${YELLOW}Attempting pacman uninstall...${ENDCOLOR}" - sudo pacman -Rs $1 - if [[ $? == 0 ]]; then - return 0 - fi - elif [[ ${packageManagers[@]} =~ "dnf" ]]; then - printf "%b\n" "${YELLOW}Attempting dnf uninstall...${ENDCOLOR}" - sudo dnf remove $1 - if [[ $? == 0 ]]; then - return 0 - fi - fi - printf "%b\n" "${RED}ERROR - Failed to uninstall $1.${ENDCOLOR}" + done + printf "%b\n" "${RED}ERROR: $1 not found.${ENDCOLOR}" return 1 } @@ -277,7 +207,6 @@ p() ( printf "%b\n" "p (u) ${FAINT}- update os${ENDCOLOR}" printf "%b\n" "p i package ${FAINT}- install package${ENDCOLOR}" printf "%b\n" "p r package ${FAINT}- remove package${ENDCOLOR}" - printf "%b\n" "p c package ${FAINT}- check if package is installed${ENDCOLOR}" printf "%b\n" "p s packages ${FAINT}- launch a nix shell with the specified packages${ENDCOLOR}" printf "%b\n" "${FAINT}Supported package managers: flatpak, nix, brew, apt, paru, pacman, dnf${ENDCOLOR}" return 1