aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Common/bashrc.m413
-rw-r--r--Makefile.m44
3 files changed, 5 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 789363c..38ec1c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,4 @@ linux/sway/autostart
linux/sway/hid
Makefile
config
+*.pyc
diff --git a/Common/bashrc.m4 b/Common/bashrc.m4
index b1d8c67..54e287b 100644
--- a/Common/bashrc.m4
+++ b/Common/bashrc.m4
@@ -49,17 +49,8 @@ shopt -s checkwinsize
# match all files and zero or more directories and subdirectories.
#shopt -s globstar
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
- xterm-color|*-256color) color_prompt=yes;;
-esac
-
-if [ "$color_prompt" = yes ]; then
- PS1='\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
- PS1='\w\$ '
-fi
-unset color_prompt
+# Prompt
+PS1='\w\$ '
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
diff --git a/Makefile.m4 b/Makefile.m4
index 4eea0c2..171cef5 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -196,7 +196,7 @@ update_packages:
m4_ifelse(DT_DISTRO, `fedora', m4_dnl
DPKG_DEPENDENCIES := m4_dnl
-m4_ifelse(DT_TOOLS, `yes', `highlight atool w3m mediainfo curl zsh vim git python3-pip zsh tmux nodejs catimg ripgrep the_silver_searcher',) m4_dnl
+m4_ifelse(DT_TOOLS, `yes', `highlight atool w3m mediainfo curl zsh vim-enhanced git python3-pip zsh tmux nodejs catimg ripgrep the_silver_searcher',) m4_dnl
m4_ifelse(DT_GREETD_TUIGREET', `yes', `greetd',) m4_dnl
m4_ifelse(DT_TLP, `yes', `tlp',) m4_dnl
m4_dnl
@@ -210,7 +210,7 @@ m4_ifelse(DT_QTILE, `yes', `wlroots python3-pywayland python3-xkbcommon',) m4_dn
install_packages:
@missing_packages=""; \
for pkg in $(DPKG_DEPENDENCIES); do \
- if ! dpkg -s "$$pkg" >/dev/null 2>&1; then \
+ if ! rpm -q "$$pkg" >/dev/null 2>&1; then \
missing_packages="$$missing_packages $$pkg"; \
fi; \
done; \