From 8194a0407bddb5d8df9fa34f2e63b53046bbbc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Clara=20M=C3=BCller?= Date: Mon, 15 Jul 2024 17:04:35 +0200 Subject: [PATCH] Fixing missing Memtest in Bootloader. Adding customized live user cepheus. --- .bashrc | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++ i3config | 0 makefile | 6 +- packages.list | 3 + 4 files changed, 204 insertions(+), 2 deletions(-) create mode 100755 .bashrc mode change 100755 => 100644 i3config mode change 100755 => 100644 makefile mode change 100755 => 100644 packages.list diff --git a/.bashrc b/.bashrc new file mode 100755 index 0000000..a14cc84 --- /dev/null +++ b/.bashrc @@ -0,0 +1,197 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1="\`if [[ \$? == 0 ]]; then echo '\[\e[1;32m\]✔'; else echo \"\[\e[1;31m\]✘:\$?\"; fi\` \[\033[0;37m\]\t \[\033[1;35m\]\u\[\033[0;35m\]@\h\[\033[0;35m\]:\[\e[0;34m\]\w\[\e[0;33m\]\`parse_git_branch\`\[\e[0;37m\]\\$ \[\e[m\]" +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + alias dir='dir --color=auto' + alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +alias ll='ls -l' +alias la='ls -A' +alias l='ls -CF' + +# Cs private Aliases +# workdirectory + +# change keyboard language +# set keyboard layout german +alias de='setxkbmap de' + +# set keyboard layout british +alias gb='setxkbmap gb' + +# get current branch in git repo +function parse_git_branch() { + BRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` + if [ ! "${BRANCH}" == "" ] + then + STAT=`parse_git_dirty` + echo "[${BRANCH}${STAT}]" + else + echo "" + exit 1 + fi +} + +# get current status of git repo +function parse_git_dirty { + status=`git status 2>&1 | tee` + dirty=`echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?"` + untracked=`echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?"` + ahead=`echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?"` + newfile=`echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?"` + renamed=`echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?"` + deleted=`echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?"` + bits='' + if [ "${renamed}" == "0" ]; then + bits=">${bits}" + fi + if [ "${ahead}" == "0" ]; then + bits="*${bits}" + fi + if [ "${newfile}" == "0" ]; then + bits="+${bits}" + fi + if [ "${untracked}" == "0" ]; then + bits="?${bits}" + fi + if [ "${deleted}" == "0" ]; then + bits="x${bits}" + fi + if [ "${dirty}" == "0" ]; then + bits="!${bits}" + fi + if [ ! "${bits}" == "" ]; then + echo " ${bits}" + else + echo "" + fi +} + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + +# notifications with longterm processes # add ; alert to call +#if [ -x /usr/bin/notify-send ]; then + # alias alert='notify-send -i gnome-terminal "[$?] $(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/;\s*alert$//'\'')"' +#fi + +# path for cargo +#export PATH="$HOME/.cargo/bin:$PATH" + +# path for PostgreSQL +#export PATH="/usr/local/pgsql:$PATH" + +# python +#export PATH="$PATH:$HOME/.local/lib/python3.8/site-packages" +#export PATH="$PATH:/usr/local/lib/python3.8" +export PATH="$PATH:~/.local/bin" +export PATH="$PATH:/usr/bin/" +export PATH="$PATH:/usr/share/vim/vim81/colors" + +# vim +export PATH=/opt/vim/src:$PATH + + +# autostart RVM +#source /etc/profile.d/rvm.sh +export PATH=/opt/vim/src:$PATH diff --git a/i3config b/i3config old mode 100755 new mode 100644 diff --git a/makefile b/makefile old mode 100755 new mode 100644 index 3fa8c66..14c2b75 --- a/makefile +++ b/makefile @@ -10,7 +10,7 @@ build: sudo lb clean --all #sudo lb config --image-name CEPHEUS-CALAMARES- --hdd-label CEPHEUS-CALAMARES- --archive-areas main non-free-firmware #sudo lb config --distribution bullseye --image-name CEPHEUS- --hdd-label CEPHEUS --archive-areas main non-free-firmware - sudo lb config --debug --distribution bookworm --debian-installer live --backports true --archive-areas "main contrib non-free non-free-firmware" --hdd-label CEPHEUS-bookworm --uefi-secure-boot disable --image-name CEPHEUS-bookworm --linux-packages "linux-image linux-headers" + sudo lb config --debug --distribution bookworm --memtest memtest86+ --bootappend-live "boot=live component username=cepheus" --debian-installer live --backports true --archive-areas "main contrib non-free non-free-firmware" --hdd-label CEPHEUS-bookworm --uefi-secure-boot disable --image-name CEPHEUS-bookworm --linux-packages "linux-image linux-headers" #lb config --debug --debian-installer live --distribution bookworm --backports true --archive-areas "main contrib non-free non-free-firmware" --uefi-secure-boot disable --hdd-label CEPHEUS --image-name CEPHEUS-bookworm --linux-packages "linux-image linux-headers" # configure installer echo "debian-installer-launcher" > config/package-lists/installer.list.chroot @@ -38,6 +38,8 @@ build: git clone https://github.com/ycm-core/YouCompleteMe.git config/includes.chroot/etc/skel/.vim/bundle/YouCompleteMe/ git clone https://tpope.io/vim/fugitive.git config/includes.chroot/etc/skel/.vim/pack/tpope/start/ git clone https://github.com/preservim/nerdtree config/includes.chroot/etc/skel/.vim/nerdtree/ + # add bashrc + cp .bashrc config/includes.chroot/etc/skel.bashrc # set list of packages to remove by calamares after installation #cp packages.conf config/includes.chroot/etc/calamares/modules/ # add script for modifying live build @@ -49,7 +51,7 @@ build: cp vimrc config/includes.chroot/etc/skel/.vimrc # add color scheme for vim cp forest_refuge.vim config/includes.chroot/etc/skel/.vim/colors/ - echo "exec --no-startup-id feh --bg-scale /home/user/.config/i3/kraut.png" >>config/includes.chroot/etc/skel/.config/i3/config + echo "exec --no-startup-id feh --bg-scale /home/cepheus/.config/i3/kraut.png" >>config/includes.chroot/etc/skel/.config/i3/config #echo "exec --no-startup-id feh --geometry 1920x1080+0+0 /home/user/.config/i3/kraut.png" >>config/includes.chroot/etc/skel/.config/i3/config # modify grub -> not in VM with QEMU?? cp -r /usr/share/live/build/bootloaders config/ diff --git a/packages.list b/packages.list old mode 100755 new mode 100644 index 5381646..5eeafae --- a/packages.list +++ b/packages.list @@ -86,3 +86,6 @@ vim-syntastic vim-fugitive git-crypt grub-efi +bash-completion +network-manager +task-laptop