Merge pull request #11 from zstg/main

Lots of fixes

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "airootfs/usr/share/backgrounds/StratOS"]
  path = airootfs/usr/share/backgrounds/StratOS
  url = https://github.com/lugvitc/StratOS-wallpapers
-[submodule "airootfs/usr/share/grub/themes/StratOS-grub"]
- path = airootfs/usr/share/grub/themes/StratOS-grub
- url = https://github.com/zstg/StratOS-grub
 [submodule "airootfs/opt/maneki-neko"]
  path = airootfs/opt/maneki-neko
  url = https://github.com/zstg/stratOS-maneki-neko
@@ -16,3 +13,6 @@
 [submodule "airootfs/etc/skel/.config/emacs"]
  path = airootfs/etc/skel/.config/emacs
  url = https://github.com/StratOS-Linux/Stratmacs
+[submodule "airootfs/usr/share/grub/themes/StratOS-grub"]
+ path = airootfs/usr/share/grub/themes/StratOS-grub
+ url = https://github.com/StratOS-Linux/StratOS-grub

airootfs/etc/passwd

@@ -1,2 +1,2 @@
 root:x:0:0:root:/root:/usr/bin/bash
-stratos:x:1000:1000::/home/stratos:/usr/bin/bash
+stratos:x:1000:1000::/home/stratos:/usr/bin/zsh

airootfs/etc/skel/.aliases

@@ -0,0 +1,10 @@
+alias ls='eza --color=always'
+alias rg='rg -i --sort-path'
+alias grep='grep --color=auto'
+alias neofetch='neofetch --ascii_distro janus'
+alias fetch-arch="sudo brl fetch arch"
+alias fetch-ubuntu=" sudo brl fetch ubuntu -m http://repo.huaweicloud.com/ubuntu -r mantic"
+alias apt="nala"
+alias sudo="sudo -E"
+alias cat="bat --plain --number --color=always"
+alias bat="bat --plain --number --color=always"

airootfs/etc/skel/.bashrc

@@ -4,15 +4,9 @@
 
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
-# [[ -f ~/.bashrc-personal && source ~/.bashrc-personal ]]
+[[ -f ~/.bashrc-personal ]] && source ~/.bashrc-personal
 export PATH=~/.local/bin:$PATH
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-alias neofetch='neofetch --ascii_distro janus'
-alias fetch-arch="sudo brl fetch arch"
-alias fetch-ubuntu=" sudo brl fetch ubuntu -m http://repo.huaweicloud.com/ubuntu -r mantic"
-alias apt="nala"
-alias sudo="sudo -E"
+[[ -f ~/.aliases ]] && source ~/.aliases
 source <(starship init bash --print-full-init)
 [[ $(command -v grab) ]] && grab
 PS1='[\u@\h \W]\$ ' # this works ONLY on bash, use Starship instead.

airootfs/etc/skel/.zshrc

@@ -0,0 +1,14 @@
+#
+# ~/.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+[[ -f ~/.zshrc-personal ]] && source ~/.zshrc-personal
+export PATH=~/.local/bin:$PATH
+[[ -f ~/.aliases ]] && source ~/.aliases
+source <(starship init zsh --print-full-init)
+[[ $(command -v grab) ]] && grab
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+bindkey "^[[H" beginning-of-line
+bindkey "^[[F" end-of-line

airootfs/usr/local/bin/StratOS-configure-distro

@@ -16,19 +16,18 @@ while true; do
  1)
  echo "Bootstrapping Ubuntu..."
  until $(which apt); do
- pkexec brl remove -d ubuntu >/dev/null
- pkexec brl fetch ubuntu
+ pkexec brl remove -d ubuntu 2>/dev/null
+ pkexec brl fetch ubuntu 
+ sudo apt install -y nala
  done
  echo "\n==> Ubuntu configured successfully."
- pkexec sed 's/timeout = 30/timeout = 0/g' -i /bedrock/etc/bedrock.conf
  ;;
  2)
  echo "Bootstrapping Fedora..."
  until $(which dnf); do
- pkexec brl remove -d fedora >/dev/null
+ pkexec brl remove -d fedora 2>/dev/null
  pkexec brl fetch fedora
  done
- pkexec sed 's/timeout = 30/timeout = 0/g' -i /bedrock/etc/bedrock.conf
  echo "\n==> Fedora configured successfully."
  ;;
  *)

airootfs/usr/local/bin/StratOS-configure-theme

@@ -17,8 +17,8 @@ while true; do
  gsettings set org.gnome.desktop.interface gtk-theme "'Tokyonight-Dark-B'"
  gsettings set org.gnome.desktop.interface icon-theme "'Tokyonight-Dark'" 
  ln -sf $HOME/.themes/Tokyonight-Dark-B/gtk-4.0/ ~/.config/
- sudo cp -f /usr/share/grub/themes/StratOS-grub/tokyonight-dark/theme.txt /usr/share/grub/themes/StratOS-grub/theme.txt
- sudo cp -f /usr/share/grub/themes/StratOS-grub/tokyonight-dark/background.png /usr/share/grub/themes/StratOS-grub/background.png
+ sudo cp -f /usr/share/grub/themes/StratOS-grub/tokyo-night/theme.txt /usr/share/grub/themes/StratOS-grub/theme.txt
+ sudo cp -f /usr/share/grub/themes/StratOS-grub/tokyo-night/background.png /usr/share/grub/themes/StratOS-grub/background.png
  sudo ln -sf /etc/calamares/branding/tokyonight-dark/stylesheet.qss /etc/calamares/branding/default/stylesheet.qss 
  sudo ln -sf $HOME/.config/starship/tokyonight-dark/starship.toml $HOME/.config/starship.toml 
  sudo cp /opt/maneki-neko/src/ui/TokyoNight-Dark/** /opt/maneki-neko/src/ui/

airootfs/usr/local/bin/StratOS-configure-ubuntu

@@ -11,6 +11,7 @@ if [[ -d /bedrock ]]; then
  # notify-send "Bootstrapping Ubuntu..."
  # pkexec /bedrock/bin/brl fetch ubuntu
  # notify-send "Cleaning up..."
+ pkexec sed 's/timeout = 30/timeout = 0/g' -i /bedrock/etc/bedrock.conf # make this change regardless of whether a distro is installed or not
  rm -f $HOME/.config/autostart/ubuntu.desktop
  # sudo apt update
  # sudo apt -y upgrade

packages.x86_64

@@ -6,6 +6,7 @@ archlinux-keyring
 # b43-fwcutter
 base
 base-devel
+bat
 bind
 bibata-cursor-theme
 broadcom-wl
@@ -18,7 +19,7 @@ chromium
 # cryptsetup
 # darkhttpd
 dbus
-ddrescue
+# ddrescue
 dhclient
 dhcpcd
 dialog
@@ -33,17 +34,20 @@ efibootmgr
 emacs
 ethtool
 exfatprogs
+eza
 f2fs-tools
 fatresize
-fsarchiver
+fd
+# fsarchiver
+fzf
 git
 
 # GNOME-related packages
 # gnome
 gdm
 gnome-backgrounds
 gnome-characters
-gnome-color-manager
+# gnome-color-manager
 gnome-control-center
 gnome-font-viewer
 gnome-keyring
@@ -66,9 +70,9 @@ xdg-user-dirs-gtk
 
 
 
-gnu-netcat
+# gnu-netcat
 gpart
-gpm
+# gpm
 gptfdisk
 grab
 grub
@@ -80,16 +84,15 @@ kpmcore
 kvantum
 lazygit
 less
-libfido2
+# libfido2
 libusb-compat
 licenses
 linux
 linux-atm
 linux-firmware
 linux-firmware-marvell
-livecd-sounds
-lsscsi
-# StratOS-repo/calamares
+# livecd-sounds
+# lsscsi
 lvm2
 # lynx
 man-db
@@ -99,35 +102,36 @@ memtest86+
 memtest86+-efi
 mkinitcpio
 mkinitcpio-archiso
-mkinitcpio-nfs-utils
+# mkinitcpio-nfs-utils
 mkinitcpio-openswap
 modemmanager
 mtools
 nano
-nbd
-ndisc6
+# nbd
+# ndisc6
 neovim
 networkmanager
-nfs-utils
-nilfs-utils
+# nfs-utils
+# nilfs-utils
 npm
 ntfs-3g
 # nvme-cli
 open-iscsi
 open-vm-tools
 openssh
 os-prober
-partclone
+# partclone
 # parted
-partimage
-pcsclite
-pv
+# partimage
+# pcsclite
+# pv
 python-pyqt5
 qt5-wayland
 qt6-wayland
 refind
 # reflector
 rock
+ripgrep
 rsync
 sg3_utils
 smartmontools
@@ -137,13 +141,13 @@ starship
 sudo
 syslinux
 systemd-resolvconf
-tcpdump
+# tcpdump
 terminus-font
 testdisk
 # tpm2-tools
 # tpm2-tss
 ttf-jetbrains-mono-nerd
-udftools
+# udftools
 usb_modeswitch
 usbmuxd
 usbutils
@@ -155,4 +159,5 @@ wpa_supplicant
 xorg
 xorg-server
 yay-bin
-# zsh
+zsh
+zsh-syntax-highlighting

syslinux/archiso_head.cfg

@@ -14,8 +14,8 @@ MENU HELPMSGENDROW 29
 
 # Refer to https://wiki.syslinux.org/wiki/index.php/Comboot/menu.c32
 
-MENU COLOR title 1;33;40 #80ff8080 #00000000 std
-MENU COLOR border 33;40 #40ff8080 #00000000 std
+MENU COLOR title 1;33;40 #40769ff0 #00000000 std
+MENU COLOR border 33;40 #40769ff0 #00000000 std
 MENU COLOR sel 7;33;40 #e0ffffff #20ffffff all
 MENU COLOR unsel 33;44 #50ffffff #a0000000 std
 MENU COLOR help 37;40 #c0ffffff #a0000000 std