From aef116579ad50d766e9cfaf1839b254f74af5678 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Fri, 30 Dec 2022 19:46:00 +0100 Subject: [PATCH] Remove Debian|Ubuntu support --- README.md | 2 +- install.sh | 5 +---- scripts/.local/bin/update.sh | 8 -------- zsh/.config/zsh/aliases.zsh | 13 ++++--------- zsh/.config/zsh/gpg.zsh | 10 ++++------ 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 0b4ae6d..0620798 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # My dotfiles This is a collection of some of my dotfiles for my Linux systems. They -work on Artix, Debian, Fedora and Ubuntu. +work on Artix and Fedora. To install: diff --git a/install.sh b/install.sh index ee710ea..e91791d 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh cd -P -- "$(readlink -e "$(dirname "$0")")" || exit 255 echo "=> Checking dependencies..." @@ -11,9 +11,6 @@ echo "=> Determining OS..." if [ "$(lsb_release -si)" = "Fedora" ]; then set -- "alacritty" "nvim" "scripts" "zsh" INSTALL="pkg install" -elif [ "$(lsb_release -si)" = "Debian" ] || [ "$(lsb_release -si)" = "Ubuntu" ]; then - set -- "scripts" "zsh" - INSTALL="sudo apt install" elif [ "$(lsb_release -si)" = "Artix" ]; then set -- "alacritty" "mako" "nvim" "scripts" "sway" "swaylock" "swaynag" "waybar" "zsh" INSTALL="doas pacman -S" diff --git a/scripts/.local/bin/update.sh b/scripts/.local/bin/update.sh index 54418e8..c2f9a70 100755 --- a/scripts/.local/bin/update.sh +++ b/scripts/.local/bin/update.sh @@ -3,14 +3,6 @@ [ "$(lsb_release -si)" = "Artix" ] && paru [ "$(lsb_release -si)" = "Fedora" ] && sudo dnf upgrade -if [ "$(lsb_release -si)" = "Debian" ] || [ "$(lsb_release -si)" = "Ubuntu" ]; then - sudo apt update - echo - sudo apt upgrade --purge - echo - sudo apt autoremove --purge --yes -fi - command -v flatpak >/dev/null 2>&1 && { echo; flatpak update; } command -v npm >/dev/null 2>&1 && diff --git a/zsh/.config/zsh/aliases.zsh b/zsh/.config/zsh/aliases.zsh index 0c37fde..65711d8 100644 --- a/zsh/.config/zsh/aliases.zsh +++ b/zsh/.config/zsh/aliases.zsh @@ -39,6 +39,10 @@ alias mount="udisksctl mount -b" alias unlock="udisksctl unlock -b" alias unmount="udisksctl unmount -b" +# Searching +alias grep="grep --color=always" +alias zgrep="zgrep --color=always" + # Misc. (( ${+commands[tmux]} )) && alias tmux="tmux -2u" @@ -46,10 +50,8 @@ alias unmount="udisksctl unmount -b" alias dnup="dotnet tool list --global | tail -n +3 | awk '{print \$1}' | xargs -l dotnet tool update --global" alias cl="clear" alias -g e="\$EDITOR" -alias grep="grep --color=always" alias ls="ls --color=always" alias q="exit 0" -alias zgrep="zgrep --color=always" # Platform specific if [[ $(lsb_release -si) == "Artix" ]]; then @@ -72,11 +74,4 @@ elif [[ $(lsb_release -si) == "Fedora" ]]; then alias dnfrm="sudo dnf remove" alias dnfsi="sudo dnf info" alias dnfss="sudo dnf search" -elif [[ $(lsb_release -si) =~ "^Debian|Ubuntu$" ]]; then - alias aptin="sudo apt install" - alias aptqi="dpkg -s" - alias aptqs="dpkg -l" - alias aptrm="sudo apt purge" - alias aptsi="apt info" - alias aptss="apt search" fi diff --git a/zsh/.config/zsh/gpg.zsh b/zsh/.config/zsh/gpg.zsh index bbf85eb..f291f3e 100644 --- a/zsh/.config/zsh/gpg.zsh +++ b/zsh/.config/zsh/gpg.zsh @@ -1,6 +1,4 @@ -if [[ ! $(lsb_release -si) =~ "^Debian|Ubuntu$" ]]; then - export GPG_TTY="$TTY" - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" - gpgconf --launch gpg-agent - gpg-connect-agent updatestartuptty /bye &> /dev/null -fi +export GPG_TTY="$TTY" +export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +gpgconf --launch gpg-agent +gpg-connect-agent updatestartuptty /bye &> /dev/null