support specific desktop sync (kde,gnome)
This commit is contained in:
parent
0b094010f3
commit
8aa07eacd6
GPG key ID:
A82D63DFF8D1317F
13 changed files with 83 additions and 231 deletions
|
|
@ -1,11 +1,7 @@
|
|||
abbr code codium
|
||||
abbr d "nautilus . -w &> /dev/null & disown"
|
||||
abbr vs "codium ."
|
||||
# abbr vencord-installer 'yes | sh -c "$(curl -sS https://raw.githubusercontent.com/Vendicated/VencordInstaller/main/install.sh)"'
|
||||
abbr xclip "xclip -selection clipboard"
|
||||
abbr spotx "curl -sSL https://spotx-official.github.io/run.sh | bash"
|
||||
abbr rm "trash -f"
|
||||
abbr catall "catall . '*.ext1' '*.ext2' | xclip -selection clipboard"
|
||||
abbr ls "eza --icons=auto"
|
||||
abbr lst "eza --icons=auto --tree --level=2"
|
||||
abbr ll "eza --git --icons=auto -gl"
|
||||
|
|
@ -14,7 +10,6 @@ abbr llt "eza --git --icons=auto --tree --level=2 -gl"
|
|||
abbr lat "eza --git --icons=auto --tree --level=2 -gla"
|
||||
abbr pdf "firefox *.pdf & disown"
|
||||
abbr beep "cvlc --play-and-exit /usr/share/sounds/freedesktop/stereo/bell.oga &> /dev/null"
|
||||
abbr p "xclip -o > file"
|
||||
abbr wifix "sudo systemctl restart NetworkManager.service"
|
||||
abbr zed "zeditor"
|
||||
abbr z "zeditor ."
|
||||
|
|
|
|||
4
.config/fish/conf.d/abbr_gnome.fish
Normal file
4
.config/fish/conf.d/abbr_gnome.fish
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
abbr d "nautilus . -w &> /dev/null & disown"
|
||||
abbr xclip "xclip -selection clipboard"
|
||||
abbr catall "catall . '*.ext1' '*.ext2' | xclip -selection clipboard"
|
||||
abbr p "xclip -o > file"
|
||||
3
.config/fish/conf.d/abbr_kde.fish
Normal file
3
.config/fish/conf.d/abbr_kde.fish
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
abbr d "dolphin . --new-window &> /dev/null & disown"
|
||||
abbr catall "catall . '*.ext1' '*.ext2' | wl-copy"
|
||||
abbr p "wl-copy > file"
|
||||
1
.config/fish/conf.d/alias_kde.fish
Normal file
1
.config/fish/conf.d/alias_kde.fish
Normal file
|
|
@ -0,0 +1 @@
|
|||
alias pwd "pwd | tee /dev/tty | wl-copy"
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
user_pref("gfx.webrender.all", true); // Composition => WebRender (hardware)
|
||||
user_pref("media.ffmpeg.vaapi.enabled", true); // VA-API (hardware acceleration)
|
||||
user_pref("apz.overscroll.enabled", true); // Animation quand on scroll trop vers le haut/bas
|
||||
|
|
|
|||
1
.mozilla/firefox/user-gnome.js
Normal file
1
.mozilla/firefox/user-gnome.js
Normal file
|
|
@ -0,0 +1 @@
|
|||
user_pref("apz.overscroll.enabled", true); // Animation quand on scroll trop vers le haut/bas
|
||||
64
Makefile
64
Makefile
|
|
@ -32,6 +32,7 @@ ARCH = $(shell grep -c "archlinux" /proc/version 2> /dev/null)
|
|||
WSL = $(shell grep -c "WSL2" /proc/version 2> /dev/null)
|
||||
TERMUX = $(firstword $(shell type termux-info &> /dev/null && echo 1))
|
||||
ADMIN_WIN = $(shell touch $(PF) 2> /dev/null; echo $$?)
|
||||
DESKTOP = $(shell echo $$DESKTOP_SESSION)
|
||||
|
||||
|
||||
# Check for latest version
|
||||
|
|
@ -139,15 +140,9 @@ sync-arch:
|
|||
|
||||
# Fish
|
||||
@$(CURL) $(REPO_SRC)/.config/fish/conf.d/abbr_arch.fish >> $(HOME)/.config/fish/conf.d/abbr.fish
|
||||
@$(CURL) $(REPO_SRC)/.config/fish/conf.d/alias_arch.fish >> $(HOME)/.config/fish/conf.d/alias.fish
|
||||
@echo "Fish specific settings synced!"
|
||||
@echo
|
||||
|
||||
# Emoji Picker
|
||||
-@$(WGET) $(REPO_SRC)/.config/gazatu.xyz/emoji-picker.ini -O $(HOME)/.config/gazatu.xyz/emoji-picker.ini
|
||||
@echo "Emoji picker settings synced!"
|
||||
@echo
|
||||
|
||||
# Firefox
|
||||
-@$(RM) $(HOME)/.mozilla/firefox/*.default-release/user.js
|
||||
@$(WGET) $(REPO_SRC)/.mozilla/firefox/user.js -P $(HOME)/.mozilla/firefox/*.default-release
|
||||
|
|
@ -167,17 +162,6 @@ sync-arch:
|
|||
@echo "s-tui settings synced!"
|
||||
@echo
|
||||
|
||||
# gpu-screen-recorder
|
||||
@$(WGET) $(REPO_SRC)/.config/gpu-screen-recorder.env -O $(HOME)/.config/gpu-screen-recorder.env
|
||||
@echo "ADDITIONAL_ARGS=-a $$(pactl get-default-source)" >> $(HOME)/.config/gpu-screen-recorder.env
|
||||
@echo "gpu-screen-recorder settings synced!"
|
||||
@echo
|
||||
|
||||
# Blackbox
|
||||
-@$(WGET) $(REPO_SRC)/.local/share/blackbox/user-keymap.json -O $(HOME)/.local/share/blackbox/user-keymap.json
|
||||
@echo "Blackbox keymap synced!"
|
||||
@echo
|
||||
|
||||
# Pacman hooks
|
||||
@sudo $(MKDIR) /etc/pacman.d/hooks
|
||||
@sudo $(WGET) $(REPO_SRC)/pacman.d/hooks/stop-wine-associations.hook -O /etc/pacman.d/hooks/stop-wine-associations.hook
|
||||
|
|
@ -190,6 +174,52 @@ sync-arch:
|
|||
@echo "Pacman hooks synced!"
|
||||
@echo
|
||||
|
||||
# Redirect to specific sync based on desktop
|
||||
ifeq ($(DESKTOP),plasma)
|
||||
@$(MAKE) sync-plasma
|
||||
else
|
||||
@$(MAKE) sync-gnome
|
||||
endif
|
||||
|
||||
|
||||
# Plasma desktop specific
|
||||
sync-plasma:
|
||||
# Fish
|
||||
@$(CURL) $(REPO_SRC)/.config/fish/conf.d/abbr_kde.fish >> $(HOME)/.config/fish/conf.d/abbr.fish
|
||||
@$(CURL) $(REPO_SRC)/.config/fish/conf.d/alias_kde.fish >> $(HOME)/.config/fish/conf.d/alias.fish
|
||||
@echo "Fish KDE settings synced!"
|
||||
@echo
|
||||
|
||||
|
||||
# Gnome desktop specific
|
||||
sync-gnome:
|
||||
# Fish
|
||||
@$(CURL) $(REPO_SRC)/.config/fish/conf.d/abbr_gnome.fish >> $(HOME)/.config/fish/conf.d/abbr.fish
|
||||
@$(CURL) $(REPO_SRC)/.config/fish/conf.d/alias_gnome.fish >> $(HOME)/.config/fish/conf.d/alias.fish
|
||||
@echo "Fish GNOME settings synced!"
|
||||
@echo
|
||||
|
||||
|
||||
# Emoji Picker
|
||||
-@$(WGET) $(REPO_SRC)/.config/gazatu.xyz/emoji-picker.ini -O $(HOME)/.config/gazatu.xyz/emoji-picker.ini
|
||||
@echo "Emoji picker settings synced!"
|
||||
@echo
|
||||
|
||||
# Firefox
|
||||
@$(CURL) $(REPO_SRC)/.mozilla/firefox/user-gnome.js >> $(wildcard $(HOME)/.mozilla/firefox/*.default-release)/user.js
|
||||
@echo "Firefox GNOME settings synced!"
|
||||
@echo
|
||||
|
||||
# gpu-screen-recorder
|
||||
@$(WGET) $(REPO_SRC)/.config/gpu-screen-recorder.env -O $(HOME)/.config/gpu-screen-recorder.env
|
||||
@echo "ADDITIONAL_ARGS=-a $$(pactl get-default-source)" >> $(HOME)/.config/gpu-screen-recorder.env
|
||||
@echo "gpu-screen-recorder settings synced!"
|
||||
@echo
|
||||
|
||||
# Blackbox
|
||||
-@$(WGET) $(REPO_SRC)/.local/share/blackbox/user-keymap.json -O $(HOME)/.local/share/blackbox/user-keymap.json
|
||||
@echo "Blackbox keymap synced!"
|
||||
@echo
|
||||
|
||||
# Windows Subsystem for Linux specific
|
||||
sync-wsl:
|
||||
|
|
|
|||
|
|
@ -45,6 +45,24 @@ function main {
|
|||
done
|
||||
|
||||
|
||||
# === Normal packages ==
|
||||
sudo pacman -S --noconfirm \
|
||||
bat xclip base-devel make python-pygments signal-desktop drawing micro git-lfs npm sdl2_image \
|
||||
flameshot firefox libva-intel-driver nodejs fish autoconf valgrind copyq automake \
|
||||
python-virtualenv noto-fonts-emoji gdb tk sdl2_mixer xdg-desktop-portal-gnome eza \
|
||||
texlive-latexextra texlive-langfrench texlive-luatex texlive-binextra syncthing ufw fzf glu \
|
||||
noto-fonts-cjk networkmanager-openvpn man-pages man-pages-fr s-tui uwufetch docker \
|
||||
docker-compose python-pip bluez-utils vlc opam pacman-contrib cpanminus gnome-text-editor \
|
||||
rebuild-detector difftastic sdl2_ttf rustup jq rsync otf-fira-sans ttf-fira-code otf-fira-mono \
|
||||
otf-font-awesome timidity++ soundfont-fluid fluidsynth libsamplerate cups \
|
||||
system-config-printer fwupd mdcat bitwarden gnome-shell-extension-appindicator \
|
||||
gnome-shell-extension-desktop-icons-ng gnome-shell-extension-caffeine libreoffice-fresh \
|
||||
trash-cli jdk-openjdk texlive-fontsrecommended texlive-fontsextra texlive-publishers \
|
||||
texlive-mathscience texlive-plaingeneric texlive-bibtexextra sfml perl-yaml-tiny \
|
||||
perl-file-homedir perl-file-which clamav spotify-launcher bottom mvn qpdf inkscape \
|
||||
hieroglyphic biber typst fprintd zip unzip sbctl
|
||||
|
||||
|
||||
# === AUR packages ==
|
||||
paru -S --noconfirm \
|
||||
obsidian parsec-bin evolution-etesync-git x11-emoji-picker ufw-docker zed \
|
||||
|
|
|
|||
|
|
@ -45,6 +45,15 @@ function main {
|
|||
done
|
||||
|
||||
|
||||
# === Normal packages ==
|
||||
sudo pacman -S --noconfirm \
|
||||
wl-clipboard bat base-devel make signal-desktop micro git-lfs firefox fish python-virtualenv \
|
||||
noto-fonts-emoji eza ufw fzf noto-fonts-cjk man-pages man-pages-fr s-tui uwufetch python-pip \
|
||||
vlc pacman-contrib rebuild-detector difftastic rustup jq cups fwupd mdcat bitwarden \
|
||||
libreoffice-fresh trash-cli jdk-openjdk clamav spotify-launcher bottom qpdf typst zip unzip \
|
||||
sbctl
|
||||
|
||||
|
||||
# === AUR packages ==
|
||||
paru -S --noconfirm \
|
||||
obsidian parsec-bin evolution-etesync-git zed vscodium-bin \
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
curl -O https://git.mylloon.fr/Anri/confOS/raw/branch/main/archinstall/user_configuration.json
|
||||
curl -O https://git.mylloon.fr/Anri/confOS/raw/branch/main/archinstall/user_disk_layout.json
|
||||
|
||||
archinstall --config user_configuration.json --disk-layout user_disk_layout.json
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
{
|
||||
"additional-repositories": [],
|
||||
"archinstall-language": "French",
|
||||
"audio": "pipewire",
|
||||
"bootloader": "systemd-bootctl",
|
||||
"config_version": "2.5.0",
|
||||
"debug": false,
|
||||
"desktop-environment": "gnome",
|
||||
"gfx_driver": "Intel (open-source)",
|
||||
"harddrives": ["/dev/nvme0n1"],
|
||||
"hostname": "laylow",
|
||||
"kernels": ["linux"],
|
||||
"keyboard-layout": "fr-latin1",
|
||||
"mirror-region": {
|
||||
"France": {
|
||||
"http://arch.yourlabs.org/$repo/os/$arch": true,
|
||||
"http://archlinux.datagr.am/$repo/os/$arch": true,
|
||||
"http://archlinux.mailtunnel.eu/$repo/os/$arch": true,
|
||||
"http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch": true,
|
||||
"http://archlinux.polymorf.fr/$repo/os/$arch": true,
|
||||
"http://archlinux.rezopole.net/$repo/os/$arch": true,
|
||||
"http://ftp.u-strasbg.fr/linux/distributions/archlinux/$repo/os/$arch": true,
|
||||
"http://mir.archlinux.fr/$repo/os/$arch": true,
|
||||
"http://mirroir.labhouse.fr/arch/$repo/os/$arch": true,
|
||||
"http://mirroir.wptheme.fr/archlinux/$repo/os/$arch": true,
|
||||
"http://mirror.archlinux.ikoula.com/archlinux/$repo/os/$arch": true,
|
||||
"http://mirror.cyberbits.eu/archlinux/$repo/os/$arch": true,
|
||||
"http://mirror.ibcp.fr/pub/archlinux/$repo/os/$arch": true,
|
||||
"http://mirror.lastmikoi.net/archlinux/$repo/os/$arch": true,
|
||||
"http://mirror.theo546.fr/archlinux/$repo/os/$arch": true,
|
||||
"http://mirrors.celianvdb.fr/archlinux/$repo/os/$arch": true,
|
||||
"http://mirrors.gandi.net/archlinux/$repo/os/$arch": true,
|
||||
"http://mirrors.standaloneinstaller.com/archlinux/$repo/os/$arch": true,
|
||||
"https://arch.juline.tech/$repo/os/$arch": true,
|
||||
"https://arch.yourlabs.org/$repo/os/$arch": true,
|
||||
"https://archlinux.mailtunnel.eu/$repo/os/$arch": true,
|
||||
"https://mirroir.labhouse.fr/arch/$repo/os/$arch": true,
|
||||
"https://mirroir.wptheme.fr/archlinux/$repo/os/$arch": true,
|
||||
"https://mirror.cyberbits.eu/archlinux/$repo/os/$arch": true,
|
||||
"https://mirror.ibakerserver.pt/Arch/$repo/os/$arch": true,
|
||||
"https://mirror.sysa.tech/archlinux/$repo/os/$arch": true,
|
||||
"https://mirror.thekinrar.fr/archlinux/$repo/os/$arch": true,
|
||||
"https://mirror.theo546.fr/archlinux/$repo/os/$arch": true,
|
||||
"https://mirror.wormhole.eu/archlinux/$repo/os/$arch": true,
|
||||
"https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch": true,
|
||||
"https://mirrors.eric.ovh/arch/$repo/os/$arch": true,
|
||||
"https://mirrors.gandi.net/archlinux/$repo/os/$arch": true,
|
||||
"https://mirrors.slaanesh.org/archlinux/$repo/os/$arch": true
|
||||
}
|
||||
},
|
||||
"mount_point": null,
|
||||
"nic": {
|
||||
"dhcp": true,
|
||||
"dns": null,
|
||||
"gateway": null,
|
||||
"iface": null,
|
||||
"ip": null,
|
||||
"type": "nm"
|
||||
},
|
||||
"ntp": true,
|
||||
"packages": [
|
||||
"bat",
|
||||
"xclip",
|
||||
"base-devel",
|
||||
"make",
|
||||
"python-pygments",
|
||||
"signal-desktop",
|
||||
"drawing",
|
||||
"micro",
|
||||
"git-lfs",
|
||||
"npm",
|
||||
"sdl2_image",
|
||||
"flameshot",
|
||||
"firefox",
|
||||
"libva-intel-driver",
|
||||
"nodejs",
|
||||
"fish",
|
||||
"autoconf",
|
||||
"valgrind",
|
||||
"copyq",
|
||||
"automake",
|
||||
"python-virtualenv",
|
||||
"noto-fonts-emoji",
|
||||
"gdb",
|
||||
"tk",
|
||||
"sdl2_mixer",
|
||||
"xdg-desktop-portal-gnome",
|
||||
"eza",
|
||||
"texlive-latexextra",
|
||||
"texlive-langfrench",
|
||||
"texlive-luatex",
|
||||
"texlive-binextra",
|
||||
"syncthing",
|
||||
"ufw",
|
||||
"fzf",
|
||||
"glu",
|
||||
"noto-fonts-cjk",
|
||||
"networkmanager-openvpn",
|
||||
"man-pages",
|
||||
"man-pages-fr",
|
||||
"s-tui",
|
||||
"uwufetch",
|
||||
"docker",
|
||||
"docker-compose",
|
||||
"python-pip",
|
||||
"bluez-utils",
|
||||
"vlc",
|
||||
"opam",
|
||||
"pacman-contrib",
|
||||
"cpanminus",
|
||||
"gnome-text-editor",
|
||||
"rebuild-detector",
|
||||
"difftastic",
|
||||
"sdl2_ttf",
|
||||
"rustup",
|
||||
"jq",
|
||||
"rsync",
|
||||
"otf-fira-sans",
|
||||
"ttf-fira-code",
|
||||
"otf-fira-mono",
|
||||
"otf-font-awesome",
|
||||
"timidity++",
|
||||
"soundfont-fluid",
|
||||
"fluidsynth",
|
||||
"libsamplerate",
|
||||
"cups",
|
||||
"system-config-printer",
|
||||
"fwupd",
|
||||
"mdcat",
|
||||
"bitwarden",
|
||||
"gnome-shell-extension-appindicator",
|
||||
"gnome-shell-extension-desktop-icons-ng",
|
||||
"gnome-shell-extension-caffeine",
|
||||
"libreoffice-fresh",
|
||||
"trash-cli",
|
||||
"jdk-openjdk",
|
||||
"texlive-fontsrecommended",
|
||||
"texlive-fontsextra",
|
||||
"texlive-publishers",
|
||||
"texlive-mathscience",
|
||||
"texlive-plaingeneric",
|
||||
"texlive-bibtexextra",
|
||||
"sfml",
|
||||
"perl-yaml-tiny",
|
||||
"perl-file-homedir",
|
||||
"perl-file-which",
|
||||
"clamav",
|
||||
"spotify-launcher",
|
||||
"bottom",
|
||||
"mvn",
|
||||
"qpdf",
|
||||
"inkscape",
|
||||
"hieroglyphic",
|
||||
"biber",
|
||||
"typst",
|
||||
"fprintd",
|
||||
"zip",
|
||||
"unzip",
|
||||
"sbctl"
|
||||
],
|
||||
"plugin": null,
|
||||
"profile": {
|
||||
"path": "/usr/lib/python3.10/site-packages/archinstall/profiles/desktop.py"
|
||||
},
|
||||
"script": "guided",
|
||||
"silent": false,
|
||||
"swap": false,
|
||||
"sys-encoding": "UTF-8",
|
||||
"sys-language": "fr_FR.UTF-8",
|
||||
"timezone": "Europe/Paris",
|
||||
"version": "2.5.0"
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
"/dev/nvme0n1": {
|
||||
"partitions": [
|
||||
{
|
||||
"boot": true,
|
||||
"encrypted": false,
|
||||
"filesystem": {
|
||||
"format": "fat32"
|
||||
},
|
||||
"mountpoint": "/boot",
|
||||
"size": "512MiB",
|
||||
"start": "1MiB",
|
||||
"type": "primary",
|
||||
"wipe": true
|
||||
},
|
||||
{
|
||||
"encrypted": false,
|
||||
"filesystem": {
|
||||
"format": "ext4"
|
||||
},
|
||||
"mountpoint": "/",
|
||||
"size": "100%",
|
||||
"start": "513MiB",
|
||||
"type": "primary",
|
||||
"wipe": true
|
||||
}
|
||||
],
|
||||
"wipe": true
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue