Skip to content

Commit

Permalink
[MAJOR] Merge pull request tcet-opensource#57 from tcet-opensource/xf…
Browse files Browse the repository at this point in the history
…ce-de

[MAJOR] Welcome app and other improvements
  • Loading branch information
demonkillerr authored Jul 6, 2023
2 parents 29a4331 + b98cd23 commit f8da07e
Show file tree
Hide file tree
Showing 18 changed files with 306 additions and 3,678 deletions.
48 changes: 27 additions & 21 deletions .github/workflows/iso-build.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build TCET Linux ISO
name: Release TCET Linux ISO

on:
workflow_dispatch:

jobs:
build:
release:
runs-on: ubuntu-latest
timeout-minutes: 60

Expand All @@ -17,30 +17,36 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Set current date as environment variable
run: echo "DATE=`date +'%Y.%m.%d'`" >>$GITHUB_ENV

- name: Synchronise package repositories and install archiso
run: pacman -Syu --noconfirm archiso mkinitcpio-archiso git squashfs-tools

- name: Build TCET Linux ISO
run: pacman -Syu --noconfirm archiso git archlinux-keyring reflector wget
- name: Running Reflector
run: |
pacman -S --noconfirm --needed archlinux-keyring wget
wget https://raw.githubusercontent.com/tcet-opensource/tcet-linux/main/pacman.conf -O /etc/pacman.conf
#echo "Fetching chaotic keys"
#pacman-key --init && pacman-key --recv-key 0706B90D37D9B881 FBA220DFC880C036 --keyserver keyserver.ubuntu.com && pacman-key --lsign-key 0706B90D37D9B881 FBA220DFC880C036 && pacman --noconfirm -U 'https://geo-mirror.chaotic.cx/chaotic-aur/chaotic-'{keyring,mirrorlist}'.pkg.tar.zst' && echo "[chaotic-aur]" >> /etc/pacman.conf && echo "Include = /etc/pacman.d/chaotic-mirrorlist" >> /etc/pacman.conf
#pacman-key --populate archlinux chaotic
mkarchiso -v -w ./work -o ./out ./
echo "ISO Built in ./out folder!"
reflector --country "France,Sweden" \
--verbose \
--sort rate \
--protocol https \
--latest 5 \
--save /etc/pacman.d/mirrorlist
pacman -Syu
- name: Building TCET Linux ISO
run: |
pacman -Syu
wget https://raw.githubusercontent.com/tcet-opensource/tcet-linux/main/pacman.conf -O /etc/pacman.conf
mkarchiso -v -w ./work -o ./out ./
echo "ISO Built in ./out folder!"
- name: Release ISO File
uses: "marvinpinto/action-automatic-releases@latest"
uses: ncipollo/release-action@v1
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: ${{ env.DATE }}
prerelease: false
title: "tcet-linux"
files: |
out/*
artifacts: "out/*.iso"
body: "v2.0.0"
generateReleaseNotes: false
name: "TCET-Linux"
tag: ${{ env.DATE }}

2 changes: 1 addition & 1 deletion airootfs/etc/lightdm/lightdm-gtk-greeter.conf
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
[greeter]
background=/usr/share/backgrounds/xfce/wallpaper5.png
#user-background=
theme-name=Qogir-dark
theme-name=Qogir-Dark
icon-theme-name=tela-circle-icon
#font-name=
xft-antialias=true
Expand Down
6 changes: 0 additions & 6 deletions airootfs/etc/pacman.conf
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist

#[community-testing]
#Include = /etc/pacman.d/mirrorlist

[community]
Include = /etc/pacman.d/mirrorlist

# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.

Expand Down
11 changes: 11 additions & 0 deletions airootfs/etc/skel/.config/autostart/set_once_xfce4.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Version=0.9.4
Type=Application
Name=set_once
Comment=set up xed once
Exec=sh -c ~/set_once_xfce4.sh
OnlyShowIn=XFCE;
StartupNotify=false
Terminal=false
Hidden=false
1,764 changes: 0 additions & 1,764 deletions airootfs/etc/skel/.p10k.zsh

This file was deleted.

62 changes: 5 additions & 57 deletions airootfs/etc/skel/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@
alias ls='ls --color=auto'
PS1='[\u@\h \W]\$ '


if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi

source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme

# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

# Autosuggestions
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh

Expand All @@ -22,7 +12,6 @@ source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.
#source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh



#Display ISO version and distribution information in short
alias version="sed -n 1p /etc/os-release && sed -n 7p /etc/os-release && sed -n 8p /etc/os-release"

Expand All @@ -47,10 +36,6 @@ alias fix-keys="sudo rm -rvf /etc/pacman.d/gnupg && sudo pacman-key --init && su
#bindkey '^[[1;5D' backward-word # Ctrl+Left arrow






## Path section
# Set $PATH if ~/.local/bin exist
if [ -d "$HOME/.local/bin" ]; then
Expand All @@ -63,7 +48,6 @@ function set_win_title(){
}
precmd_functions+=(set_win_title)


## Plugins section: Enable fish style features
# Use syntax highlighting
source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
Expand Down Expand Up @@ -130,6 +114,11 @@ SAVEHIST=10000
# Use emacs key bindings
bindkey -e

# Ctrl+ backspace delets the word

bindkey '^H' backward-kill-word
bindkey '5~' kill-word

# [PageUp] - Up a line of history
if [[ -n "${terminfo[kpp]}" ]]; then
bindkey -M emacs "${terminfo[kpp]}" up-line-or-history
Expand Down Expand Up @@ -242,47 +231,6 @@ if [[ -n "${key[Alt-Right]}" ]]; then
bindkey -M vicmd "${key[Alt-Right]}" forward-word
fi

## Useful aliases
alias grubup="sudo update-grub"
alias fixpacman="sudo rm /var/lib/pacman/db.lck"
alias tarnow='tar -acf '
alias untar='tar -zxvf '
alias wget='wget -c '
alias rmpkg="sudo pacman -Rdd"
alias psmem='ps auxf | sort -nr -k 4'
alias psmem10='ps auxf | sort -nr -k 4 | head -10'
alias ..='cd ..'
alias ...='cd ../..'
alias ....='cd ../../..'
alias .....='cd ../../../..'
alias ......='cd ../../../../..'
alias dir='dir --color=auto'
alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='grep -F --color=auto'
alias egrep='grep -E --color=auto'
alias hw='hwinfo --short' # Hardware Info
alias big="expac -H M '%m\t%n' | sort -h | nl" # Sort installed packages according to size in MB (expac must be installed)
alias gitpkg='pacman -Q | grep -i "\-git" | wc -l' # List amount of -git packages

# Get fastest mirrors
alias mirror="sudo reflector -f 30 -l 30 --number 10 --verbose --save /etc/pacman.d/mirrorlist"
alias mirrord="sudo reflector --latest 50 --number 20 --sort delay --save /etc/pacman.d/mirrorlist"
alias mirrors="sudo reflector --latest 50 --number 20 --sort score --save /etc/pacman.d/mirrorlist"
alias mirrora="sudo reflector --latest 50 --number 20 --sort age --save /etc/pacman.d/mirrorlist"

# Help people new to Arch
alias apt-get='man pacman'
alias apt='man pacman'
alias helpme='cht.sh --shell'
alias pacdiff='sudo -H DIFFPROG=meld pacdiff'
alias please='sudo'
alias tb='nc termbin.com 9999'
alias upd="/usr/bin/update"

# Replace yay with paru if installed
[ ! -x /usr/bin/yay ] && [ -x /usr/bin/paru ] && alias yay='paru'

# Load Mcfly
export MCFLY_FUZZY=true
export MCFLY_RESULTS=20
Expand Down
3 changes: 3 additions & 0 deletions airootfs/etc/skel/set_once_xfce4.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
dbus-launch dconf load / < ~/xed.dconf
rm ~/xed.dconf ~/.config/autostart/set_once_xfce4.desktop ~/set_once_xfce4.sh
27 changes: 27 additions & 0 deletions airootfs/root/.config/Thunar/uca.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<actions>
<action>
<icon>terminal</icon>
<name>Open Terminal Here</name>
<unique-id>1624819824627808-1</unique-id>
<command>exo-open --working-directory %f --launch TerminalEmulator</command>
<description>Open Xfce4 Terminal In Current Directory</description>
<patterns>*</patterns>
<startup-notify/>
<directories/>
</action>
<action>
<icon>view-hidden</icon>
<name>Show Hidden Files</name>
<unique-id>1624823324668515-1</unique-id>
<command>xdotool key &quot;ctrl+h&quot;</command>
<description>Show Files Starting With A Dot</description>
<patterns>*</patterns>
<directories/>
<audio-files/>
<image-files/>
<other-files/>
<text-files/>
<video-files/>
</action>
</actions>
11 changes: 11 additions & 0 deletions airootfs/root/.config/mimeapps.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Default Applications]
text/plain=xed.desktop
application/xml=xed.desktop
application/x-zerosize=xed.desktop

[Added Associations]
text/plain=xed.desktop;
application/xml=xed.desktop;
application/x-zerosize=xed.desktop;
application/x-desktop=xed.desktop;

64 changes: 64 additions & 0 deletions airootfs/root/.config/starship.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
format = """
[░▒▓](#a3aed2)\
[  ](bg:#a3aed2 fg:#090c0c)\
[](bg:#769ff0 fg:#a3aed2)\
$directory\
[](fg:#769ff0 bg:#394260)\
$git_branch\
$git_status\
[](fg:#394260 bg:#212736)\
$nodejs\
$rust\
$golang\
$php\
[](fg:#212736 bg:#1d2230)\
$time\
[ ](fg:#1d2230)\
\n▶▶ """

[directory]
style = "fg:#e3e5e5 bg:#769ff0"
format = "[ $path ]($style)"
truncation_length = 3
truncation_symbol = "…/"

[directory.substitutions]
"Documents" = ""
"Downloads" = ""
"Music" = ""
"Pictures" = ""

[git_branch]
symbol = ""
style = "bg:#394260"
format = '[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)'

[git_status]
style = "bg:#394260"
format = '[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)'

[nodejs]
symbol = ""
style = "bg:#212736"
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'

[rust]
symbol = ""
style = "bg:#212736"
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'

[golang]
symbol = ""
style = "bg:#212736"
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'

[php]
symbol = ""
style = "bg:#212736"
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'

[time]
disabled = false
time_format = "%R" # Hour:Minute Format
style = "bg:#1d2230"
format = '[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)'
58 changes: 58 additions & 0 deletions airootfs/root/.config/xfce4/terminal/accels.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
; xfce4-terminal GtkAccelMap rc-file -*- scheme -*-
; this file is an automated accelerator map dump
;
(gtk_accel_path "<Actions>/terminal-window/goto-tab-2" "<Alt>2")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-6" "<Alt>6")
; (gtk_accel_path "<Actions>/terminal-window/copy-input" "")
; (gtk_accel_path "<Actions>/terminal-window/close-other-tabs" "")
; (gtk_accel_path "<Actions>/terminal-window/move-tab-right" "<Primary><Shift>Page_Down")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-7" "<Alt>7")
; (gtk_accel_path "<Actions>/terminal-window/set-title-color" "")
; (gtk_accel_path "<Actions>/terminal-window/edit-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/zoom-menu" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-1" "<Alt>1")
; (gtk_accel_path "<Actions>/terminal-window/fullscreen" "F11")
; (gtk_accel_path "<Actions>/terminal-window/read-only" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-5" "<Alt>5")
; (gtk_accel_path "<Actions>/terminal-window/preferences" "")
; (gtk_accel_path "<Actions>/terminal-window/reset-and-clear" "")
; (gtk_accel_path "<Actions>/terminal-window/about" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-4" "<Alt>4")
; (gtk_accel_path "<Actions>/terminal-window/close-window" "<Primary><Shift>q")
; (gtk_accel_path "<Actions>/terminal-window/reset" "")
; (gtk_accel_path "<Actions>/terminal-window/save-contents" "")
(gtk_accel_path "<Actions>/terminal-window/toggle-menubar" "F10")
; (gtk_accel_path "<Actions>/terminal-window/copy" "<Primary><Shift>c")
; (gtk_accel_path "<Actions>/terminal-window/copy-html" "")
; (gtk_accel_path "<Actions>/terminal-window/last-active-tab" "")
; (gtk_accel_path "<Actions>/terminal-window/show-borders" "")
; (gtk_accel_path "<Actions>/terminal-window/view-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/detach-tab" "<Primary><Shift>d")
; (gtk_accel_path "<Actions>/terminal-window/scroll-on-output" "")
; (gtk_accel_path "<Actions>/terminal-window/show-toolbar" "")
; (gtk_accel_path "<Actions>/terminal-window/next-tab" "<Primary>Page_Down")
; (gtk_accel_path "<Actions>/terminal-window/tabs-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/search-next" "")
; (gtk_accel_path "<Actions>/terminal-window/search-prev" "")
; (gtk_accel_path "<Actions>/terminal-window/undo-close-tab" "")
; (gtk_accel_path "<Actions>/terminal-window/set-title" "<Primary><Shift>s")
; (gtk_accel_path "<Actions>/terminal-window/contents" "F1")
; (gtk_accel_path "<Actions>/terminal-window/zoom-reset" "<Primary>0")
; (gtk_accel_path "<Actions>/terminal-window/close-tab" "<Primary><Shift>w")
; (gtk_accel_path "<Actions>/terminal-window/new-tab" "<Primary><Shift>t")
; (gtk_accel_path "<Actions>/terminal-window/new-window" "<Primary><Shift>n")
; (gtk_accel_path "<Actions>/terminal-window/terminal-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/show-menubar" "")
; (gtk_accel_path "<Actions>/terminal-window/select-all" "<Primary><Shift>a")
; (gtk_accel_path "<Actions>/terminal-window/paste" "<Primary><Shift>v")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-9" "<Alt>9")
; (gtk_accel_path "<Actions>/terminal-window/move-tab-left" "<Primary><Shift>Page_Up")
; (gtk_accel_path "<Actions>/terminal-window/search" "<Primary><Shift>f")
; (gtk_accel_path "<Actions>/terminal-window/file-menu" "")
; (gtk_accel_path "<Actions>/terminal-window/prev-tab" "<Primary>Page_Up")
; (gtk_accel_path "<Actions>/terminal-window/paste-selection" "")
; (gtk_accel_path "<Actions>/terminal-window/zoom-in" "<Primary>plus")
; (gtk_accel_path "<Actions>/terminal-window/zoom-out" "<Primary>minus")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-8" "<Alt>8")
; (gtk_accel_path "<Actions>/terminal-window/help-menu" "")
(gtk_accel_path "<Actions>/terminal-window/goto-tab-3" "<Alt>3")
Loading

0 comments on commit f8da07e

Please sign in to comment.