Skip to content

Commit f8da07e

Browse files
demonkillerrdemonkillerr
authored
[MAJOR] Merge pull request #57 from tcet-opensource/xfce-de
[MAJOR] Welcome app and other improvements
2 parents 29a4331 + b98cd23 commit f8da07e

File tree

18 files changed

+306
-3678
lines changed

18 files changed

+306
-3678
lines changed

‎.github/workflows/iso-build.yml

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Build TCET Linux ISO
1+
name: Release TCET Linux ISO
22

33
on:
44
workflow_dispatch:
55

66
jobs:
7-
build:
7+
release:
88
runs-on: ubuntu-latest
99
timeout-minutes: 60
1010

@@ -17,30 +17,36 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v3
20-
20+
2121
- name: Set current date as environment variable
2222
run: echo "DATE=`date +'%Y.%m.%d'`" >>$GITHUB_ENV
23-
23+
2424
- name: Synchronise package repositories and install archiso
25-
run: pacman -Syu --noconfirm archiso mkinitcpio-archiso git squashfs-tools
26-
27-
- name: Build TCET Linux ISO
25+
run: pacman -Syu --noconfirm archiso git archlinux-keyring reflector wget
26+
27+
- name: Running Reflector
2828
run: |
29-
pacman -S --noconfirm --needed archlinux-keyring wget
30-
wget https://raw.githubusercontent.com/tcet-opensource/tcet-linux/main/pacman.conf -O /etc/pacman.conf
31-
#echo "Fetching chaotic keys"
32-
#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
33-
#pacman-key --populate archlinux chaotic
34-
mkarchiso -v -w ./work -o ./out ./
35-
echo "ISO Built in ./out folder!"
29+
reflector --country "France,Sweden" \
30+
--verbose \
31+
--sort rate \
32+
--protocol https \
33+
--latest 5 \
34+
--save /etc/pacman.d/mirrorlist
35+
pacman -Syu
3636
37+
- name: Building TCET Linux ISO
38+
run: |
39+
pacman -Syu
40+
wget https://raw.githubusercontent.com/tcet-opensource/tcet-linux/main/pacman.conf -O /etc/pacman.conf
41+
mkarchiso -v -w ./work -o ./out ./
42+
echo "ISO Built in ./out folder!"
43+
3744
- name: Release ISO File
38-
uses: "marvinpinto/action-automatic-releases@latest"
45+
uses: ncipollo/release-action@v1
3946
with:
40-
repo_token: "${{ secrets.GITHUB_TOKEN }}"
41-
automatic_release_tag: ${{ env.DATE }}
42-
prerelease: false
43-
title: "tcet-linux"
44-
files: |
45-
out/*
47+
artifacts: "out/*.iso"
48+
body: "v2.0.0"
49+
generateReleaseNotes: false
50+
name: "TCET-Linux"
51+
tag: ${{ env.DATE }}
4652

‎airootfs/etc/lightdm/lightdm-gtk-greeter.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
[greeter]
5151
background=/usr/share/backgrounds/xfce/wallpaper5.png
5252
#user-background=
53-
theme-name=Qogir-dark
53+
theme-name=Qogir-Dark
5454
icon-theme-name=tela-circle-icon
5555
#font-name=
5656
xft-antialias=true

‎airootfs/etc/pacman.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ Include = /etc/pacman.d/mirrorlist
8080
[extra]
8181
Include = /etc/pacman.d/mirrorlist
8282

83-
#[community-testing]
84-
#Include = /etc/pacman.d/mirrorlist
85-
86-
[community]
87-
Include = /etc/pacman.d/mirrorlist
88-
8983
# If you want to run 32 bit applications on your x86_64 system,
9084
# enable the multilib repositories as required here.
9185

‎airootfs/etc/skel/.config/autostart/set_once_xfce4.desktop

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[Desktop Entry]
2+
Encoding=UTF-8
3+
Version=0.9.4
4+
Type=Application
5+
Name=set_once
6+
Comment=set up xed once
7+
Exec=sh -c ~/set_once_xfce4.sh
8+
OnlyShowIn=XFCE;
9+
StartupNotify=false
10+
Terminal=false
11+
Hidden=false

‎airootfs/etc/skel/.p10k.zsh

Lines changed: 0 additions & 1764 deletions
This file was deleted.

‎airootfs/etc/skel/.zshrc

Lines changed: 5 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@
44
alias ls='ls --color=auto'
55
PS1='[\u@\h \W]\$ '
66

7-
8-
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
9-
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
10-
fi
11-
12-
source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
13-
14-
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
15-
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
16-
177
# Autosuggestions
188
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
199

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

2414

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

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

4938

50-
51-
52-
53-
5439
## Path section
5540
# Set $PATH if ~/.local/bin exist
5641
if [ -d "$HOME/.local/bin" ]; then
@@ -63,7 +48,6 @@ function set_win_title(){
6348
}
6449
precmd_functions+=(set_win_title)
6550

66-
6751
## Plugins section: Enable fish style features
6852
# Use syntax highlighting
6953
source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
@@ -130,6 +114,11 @@ SAVEHIST=10000
130114
# Use emacs key bindings
131115
bindkey -e
132116

117+
# Ctrl+ backspace delets the word
118+
119+
bindkey '^H' backward-kill-word
120+
bindkey '5~' kill-word
121+
133122
# [PageUp] - Up a line of history
134123
if [[ -n "${terminfo[kpp]}" ]]; then
135124
bindkey -M emacs "${terminfo[kpp]}" up-line-or-history
@@ -242,47 +231,6 @@ if [[ -n "${key[Alt-Right]}" ]]; then
242231
bindkey -M vicmd "${key[Alt-Right]}" forward-word
243232
fi
244233

245-
## Useful aliases
246-
alias grubup="sudo update-grub"
247-
alias fixpacman="sudo rm /var/lib/pacman/db.lck"
248-
alias tarnow='tar -acf '
249-
alias untar='tar -zxvf '
250-
alias wget='wget -c '
251-
alias rmpkg="sudo pacman -Rdd"
252-
alias psmem='ps auxf | sort -nr -k 4'
253-
alias psmem10='ps auxf | sort -nr -k 4 | head -10'
254-
alias ..='cd ..'
255-
alias ...='cd ../..'
256-
alias ....='cd ../../..'
257-
alias .....='cd ../../../..'
258-
alias ......='cd ../../../../..'
259-
alias dir='dir --color=auto'
260-
alias vdir='vdir --color=auto'
261-
alias grep='grep --color=auto'
262-
alias fgrep='grep -F --color=auto'
263-
alias egrep='grep -E --color=auto'
264-
alias hw='hwinfo --short' # Hardware Info
265-
alias big="expac -H M '%m\t%n' | sort -h | nl" # Sort installed packages according to size in MB (expac must be installed)
266-
alias gitpkg='pacman -Q | grep -i "\-git" | wc -l' # List amount of -git packages
267-
268-
# Get fastest mirrors
269-
alias mirror="sudo reflector -f 30 -l 30 --number 10 --verbose --save /etc/pacman.d/mirrorlist"
270-
alias mirrord="sudo reflector --latest 50 --number 20 --sort delay --save /etc/pacman.d/mirrorlist"
271-
alias mirrors="sudo reflector --latest 50 --number 20 --sort score --save /etc/pacman.d/mirrorlist"
272-
alias mirrora="sudo reflector --latest 50 --number 20 --sort age --save /etc/pacman.d/mirrorlist"
273-
274-
# Help people new to Arch
275-
alias apt-get='man pacman'
276-
alias apt='man pacman'
277-
alias helpme='cht.sh --shell'
278-
alias pacdiff='sudo -H DIFFPROG=meld pacdiff'
279-
alias please='sudo'
280-
alias tb='nc termbin.com 9999'
281-
alias upd="/usr/bin/update"
282-
283-
# Replace yay with paru if installed
284-
[ ! -x /usr/bin/yay ] && [ -x /usr/bin/paru ] && alias yay='paru'
285-
286234
# Load Mcfly
287235
export MCFLY_FUZZY=true
288236
export MCFLY_RESULTS=20

‎airootfs/etc/skel/set_once_xfce4.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
dbus-launch dconf load / < ~/xed.dconf
3+
rm ~/xed.dconf ~/.config/autostart/set_once_xfce4.desktop ~/set_once_xfce4.sh

‎airootfs/root/.config/Thunar/uca.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<actions>
3+
<action>
4+
<icon>terminal</icon>
5+
<name>Open Terminal Here</name>
6+
<unique-id>1624819824627808-1</unique-id>
7+
<command>exo-open --working-directory %f --launch TerminalEmulator</command>
8+
<description>Open Xfce4 Terminal In Current Directory</description>
9+
<patterns>*</patterns>
10+
<startup-notify/>
11+
<directories/>
12+
</action>
13+
<action>
14+
<icon>view-hidden</icon>
15+
<name>Show Hidden Files</name>
16+
<unique-id>1624823324668515-1</unique-id>
17+
<command>xdotool key &quot;ctrl+h&quot;</command>
18+
<description>Show Files Starting With A Dot</description>
19+
<patterns>*</patterns>
20+
<directories/>
21+
<audio-files/>
22+
<image-files/>
23+
<other-files/>
24+
<text-files/>
25+
<video-files/>
26+
</action>
27+
</actions>

‎airootfs/root/.config/mimeapps.list

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[Default Applications]
2+
text/plain=xed.desktop
3+
application/xml=xed.desktop
4+
application/x-zerosize=xed.desktop
5+
6+
[Added Associations]
7+
text/plain=xed.desktop;
8+
application/xml=xed.desktop;
9+
application/x-zerosize=xed.desktop;
10+
application/x-desktop=xed.desktop;
11+

‎airootfs/root/.config/starship.toml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
format = """
2+
[░▒▓](#a3aed2)\
3+
[  ](bg:#a3aed2 fg:#090c0c)\
4+
[](bg:#769ff0 fg:#a3aed2)\
5+
$directory\
6+
[](fg:#769ff0 bg:#394260)\
7+
$git_branch\
8+
$git_status\
9+
[](fg:#394260 bg:#212736)\
10+
$nodejs\
11+
$rust\
12+
$golang\
13+
$php\
14+
[](fg:#212736 bg:#1d2230)\
15+
$time\
16+
[ ](fg:#1d2230)\
17+
\n▶▶ """
18+
19+
[directory]
20+
style = "fg:#e3e5e5 bg:#769ff0"
21+
format = "[ $path ]($style)"
22+
truncation_length = 3
23+
truncation_symbol = "…/"
24+
25+
[directory.substitutions]
26+
"Documents" = ""
27+
"Downloads" = ""
28+
"Music" = ""
29+
"Pictures" = ""
30+
31+
[git_branch]
32+
symbol = ""
33+
style = "bg:#394260"
34+
format = '[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)'
35+
36+
[git_status]
37+
style = "bg:#394260"
38+
format = '[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)'
39+
40+
[nodejs]
41+
symbol = ""
42+
style = "bg:#212736"
43+
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
44+
45+
[rust]
46+
symbol = ""
47+
style = "bg:#212736"
48+
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
49+
50+
[golang]
51+
symbol = ""
52+
style = "bg:#212736"
53+
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
54+
55+
[php]
56+
symbol = ""
57+
style = "bg:#212736"
58+
format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
59+
60+
[time]
61+
disabled = false
62+
time_format = "%R" # Hour:Minute Format
63+
style = "bg:#1d2230"
64+
format = '[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)'

0 commit comments

Comments
 (0)