From ceda24609a37dafb36d115d535538113a40bda44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?SALVI=20J=C3=A9r=C3=A9mie?= <jeremie.salvi@grandbesancon.fr>
Date: Fri, 16 Aug 2024 18:24:01 +0200
Subject: [PATCH] debug bash overlap because custom prompt errors\nadd nvidia
 kernel config

---
 TODO                          | 1 -
 configure.sh                  | 7 +++++++
 links/modprobe/blacklist.conf | 1 +
 links/modprobe/nvidia.conf    | 1 +
 links/tty/bash.bashrc         | 6 +++---
 scripts/git.sh                | 2 +-
 scripts/i3lock.sh             | 1 +
 7 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 links/modprobe/blacklist.conf
 create mode 100644 links/modprobe/nvidia.conf

diff --git a/TODO b/TODO
index 0864e75..9bc9cf9 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
 install steam, wine and lib32 multilib
 pipwire-pulseaudio as root to X11
-add nvidia to modprobe ant mkinitcpio (hyperland doc)
 configure ranger
diff --git a/configure.sh b/configure.sh
index 38ae44b..4643076 100755
--- a/configure.sh
+++ b/configure.sh
@@ -15,6 +15,13 @@ sed -i "s|^#ParallelDownloads.*|ParallelDownloads = 10|" /etc/pacman.conf
 #pacman -Syu --noconfirm
 #pacman -S --noconfirm - < packages
 
+### Configure modprobe
+ln -sf "${_DIRNAME}/links/modprobe/nvidia.conf" /etc/modprobe.d/nvidia.conf
+ln -sf "${_DIRNAME}/links/modprobe/blacklist.conf" /etc/modprobe.d/blacklist.conf
+
+### Configure mkinitcpio
+sed -i "s|^MODULES.*|MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)|" /etc/mkinitcpio.conf
+
 ### Configure tty
 mkdir -p /etc/systemd/system/getty@tty1.service.d
 ln -sf "${_DIRNAME}/links/tty/autologin.conf" /etc/systemd/system/getty@tty1.service.d/override.conf
diff --git a/links/modprobe/blacklist.conf b/links/modprobe/blacklist.conf
new file mode 100644
index 0000000..b46792e
--- /dev/null
+++ b/links/modprobe/blacklist.conf
@@ -0,0 +1 @@
+blacklist pcspkr
diff --git a/links/modprobe/nvidia.conf b/links/modprobe/nvidia.conf
new file mode 100644
index 0000000..4ad3f5a
--- /dev/null
+++ b/links/modprobe/nvidia.conf
@@ -0,0 +1 @@
+options nvidia_drm modeset=1 fbdev=1
diff --git a/links/tty/bash.bashrc b/links/tty/bash.bashrc
index b587a3a..c9be19f 100644
--- a/links/tty/bash.bashrc
+++ b/links/tty/bash.bashrc
@@ -30,9 +30,9 @@ fi
 . /usr/local/share/dotfiles/scripts/git.sh
 
 PS1="\n\[\e[48;5;027m\]  \u \[\e[00m\]\[\e[48;5;033;38;5;027m\]\[\e[00m\]"
-PS1+="\[\e[48;5;033m\] \h \[\e[00m\]\[\e[48;5;063;38;5;033m\]\e[00m\]"
-PS1+="\[\e[48;5;063m\] \w \[\e[00m\]\[\e[48;5;069;38;5;063m\]\e[00m\]"
-PS1+="\[\e[48;5;069m\]\$(_git) \[\e[00m\]\[\e[38;5;069m\]\e[00m\] "
+PS1+="\[\e[48;5;033m\] \h \[\e[00m\]\[\e[48;5;063;38;5;033m\]\[\e[00m\]"
+PS1+="\[\e[48;5;063m\] \w \[\e[00m\]\[\e[48;5;069;38;5;063m\]\[\e[00m\]"
+PS1+="\[\e[48;5;069m\] \$(_git)\[\e[00m\]\[\e[38;5;069m\]\[\e[00m\] "
 
 # You may comment the following lines if you won't `ls' to be colorized:
 eval "$(dircolors)"
diff --git a/scripts/git.sh b/scripts/git.sh
index 3e60904..d475a50 100755
--- a/scripts/git.sh
+++ b/scripts/git.sh
@@ -9,7 +9,7 @@ _git () {
     _ORIGIN="$(git remote show)"
     _AHEAD=$(git rev-list --left-right --count "$_BRANCH"..."$_ORIGIN"/"$_BRANCH" | cut -f 1)
     _BEHIND=$(git rev-list --left-right --count "$_BRANCH"..."$_ORIGIN"/"$_BRANCH" | cut -f 2)
-    printf "  %s " "$(git branch --show-current)"
+    printf " %s " "$(git branch --show-current)"
     if (( _MODIFIED == 0 )) && (( _UNTRACKED == 0 )) && (( _AHEAD == 0 )) && (( _BEHIND == 0 ))
     then
       printf ""
diff --git a/scripts/i3lock.sh b/scripts/i3lock.sh
index adf13bc..d24946a 100755
--- a/scripts/i3lock.sh
+++ b/scripts/i3lock.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+sleep 1
 import -window root /tmp/screenshot.png
 convert  /tmp/screenshot.png  -blur 15x15 /tmp/screenshot_blur.png 
 i3lock -i /tmp/screenshot_blur.png