Zmiana środowiska z ratpoison na fluxbox

diff --git a/mikrod-nord.sh b/mikrod-nord.sh
index 39dd5d4e1a316fdba906867417f1e81ecf7e4413..7e10c3c9b10d7e2a75354661beb9be6da3a5e470 100644 (file)
--- a/mikrod-nord.sh
+++ b/mikrod-nord.sh
@@ -7,16 +7,18 @@ sudo dpkg-reconfigure locales;
 sudo dpkg-reconfigure keyboard-configuration;
 sudo dpkg-reconfigure console-setup;
 
-sudo apt install --no-install-recommends -y xserver-xorg-core xserver-xorg xinit xterm feh ratpoison wget;
+sudo apt install --no-install-recommends -y xserver-xorg-core xserver-xorg xinit xterm feh fluxbox wget x11-xserver-utils;
 
 sudo usermod -aG video,audio,input $USER;
-mkdir $HOME/wallpapers;
-(cd $HOME/wallpapers && wget https://ftp.morketsmerke.org/~xf0r3m/ign-0011.png)
+sudo mkdir /usr/share/images/nord
+wget https://ftp.morketsmerke.org/~xf0r3m/ign-0011.png -O /usr/share/images/nord/ign-0011.png;
+
+sed -i 's,/usr/share/images/fluxbox/debian-squared.jpg,/usr/share/images/nord/ign-0011.png,' /usr/share/fluxbox/styles/Squared_for_Debian/theme.cfg
 
 cat >> $HOME/.xsession <<EOF
 setxkbmap pl &
-feh --no-fehbg --bg-fill ~/wallpapers/ign-0011.png &
-exec ratpoison
+xrdb ~/.Xresources;
+exec fluxbox
 EOF
 
 sudo mkdir -p /usr/share/fonts/truetype/meslo;
@@ -27,40 +29,21 @@ sudo tar -xzvf fonts.tgz -C /usr/share/fonts/truetype/meslo
 cat >> $HOME/XTerm << EOF
 xterm*faceName: Meslo LGS Nerd Font
 xterm*faceSize: 8 
-
-xterm*.foreground: #D8DEE9
-xterm*.background: #2E3440
-xterm*.cursorColor: #D8DEE9
-xterm*.fadeing: 35
-xterm*.fadeColor: #4C566A
-
-xterm*.color0: #3B4253
-xterm*.color1: #BF616A
-xterm*.color2: #A3BE8C
-xterm*.color3: #EBCB8B
-xterm*.color4: #81A1C1
-xterm*.color5: #E5E9F0
-xterm*.color6: #88C0D0
-xterm*.color7: #E5E9F0
-xterm*.color8: #4C566A
-xterm*.color9: #BF616A
-xterm*.color10: #A3BE8C
-xterm*.color11: #EBCB8B
-xterm*.color12: #81A1C1
-xterm*.color13: #B48EAD
-xterm*.color14: #8FBCBB
-xterm*.color15: #ECEFF4
 EOF
 
 sudo apt install --no-install-recommends -y git procps;
 git clone https://github.com/jschx/ufetch;
-uiLine=$(grep =n 'unknown' ufetch/ufetch-debian | cut -d ":" -f 1)
-sed -i "${uiLine}s/unknown/ratpoison/" ufetch/ufetch-debian;
+uiLine=$(grep -n 'unknown' ufetch/ufetch-debian | cut -d ":" -f 1)
+sed -i "${uiLine}s/unknown/fluxbox/" ufetch/ufetch-debian;
 sudo cp ufetch/ufetch-debian /usr/local/bin/ufetch;
 ufetch
 rm -rf ufetch;
 
-sudo apt install -y --no-install-recommends w3m newsboat alsa-utils mpv nmap ranger curl
+git clone https://github.com/nordtheme/xresources;
+cp xresources/src/nord $HOME/.Xresources;
+rm -rf xresources;
+
+sudo apt install -y --no-install-recommends w3m vim newsboat alsa-utils mpv nmap ranger curl
 
 ytdlpVer=$(curl https://github.com/yt-dlp/yt-dlp/releases.atom 2>/dev/null | grep '<title>.*</title>$' | sed -n '2p' | sed 's/\ /\n/g' | tail -1 | sed 's,</title>,,');
 sudo wget https://github.com/yt-dlp/yt-dlp/releases/download/${ytdlpVer}/yt-dlp -O /usr/bin/yt-dlp
@@ -74,3 +57,18 @@ sudo apt install --no-install-recommends jq fzf ueberzug bsdextrautils make
 git clone https://github.com/pystardust/ytfzf
 (cd ytfzf && sudo make install doc)
 rm -rf ytfzf;
+
+if [ ! -d $HOME/.fluxbox ]; then
+  mkdir $HOME/.fluxbox;
+fi
+
+cat >> $HOME/.fluxbox/menu <<EOF
+[begin] (mikrod/nord)
+  [submenu] (Aplikacje) {}
+    [exec] (Terminal) { xterm -T "Bash" -e /bin/bash --login} <>
+    [exec] (Vim) { xterm -T "Vim" -e /usr/bin/vim } <>
+  [end]
+  [config] (Konfiguracja)
+  [restart] (Restart)
+  [exit] (Zakończ X11)
+EOF