diff --git a/README.md b/README.md index fa3ac55..9269455 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,12 @@ sudo pacman-key --lsign-key DDF7DB817396A49B2A2723F7403BD972F75D9D76 ``` sudo ./build ``` +Если требуется собрать только 1 образ, то используйте команду `sudo mkarchiso -v kde` для сборки образа с графикой или команду `sudo mkarchiso -v nox` для сборки образа без графики. + В случае успешного завершения, в каталоге `out` должны быть созданы ISO образы. Если у вас установлен qemu, можете протестировать образ: ``` -run_archiso -u -i out/archlinux-zfs-lxde-*.iso +run_archiso -u -i out/archlinux-zfs-kde-*.iso ``` Для очистки каталога проекта от результатов сборки используйте команду: ``` diff --git a/airootfs/root/.config/kscreenlockerrc b/airootfs/root/.config/kscreenlockerrc new file mode 100644 index 0000000..c578cbc --- /dev/null +++ b/airootfs/root/.config/kscreenlockerrc @@ -0,0 +1,6 @@ +[$Version] +update_info=kscreenlocker.upd:0.1-autolock + +[Daemon] +Autolock=false +LockOnResume=false diff --git a/airootfs/root/.config/kxkbrc b/airootfs/root/.config/kxkbrc new file mode 100644 index 0000000..008e605 --- /dev/null +++ b/airootfs/root/.config/kxkbrc @@ -0,0 +1,11 @@ +[$Version] +update_info=kxkb.upd:remove-empty-lists,kxkb.upd:add-back-resetoptions,kxkb_variants.upd:split-variants + +[Layout] +DisplayNames=, +LayoutList=us,ru +Options=grp:ctrl_shift_toggle,grp_led:scroll +ResetOldOptions=true +SwitchMode=WinClass +Use=true +VariantList=, diff --git a/airootfs/root/.config/lxpanel/LXDE/config b/airootfs/root/.config/lxpanel/LXDE/config deleted file mode 100644 index 76228e2..0000000 --- a/airootfs/root/.config/lxpanel/LXDE/config +++ /dev/null @@ -1,2 +0,0 @@ -[Command] -Logout=lxde-logout diff --git a/airootfs/root/.config/lxpanel/LXDE/panels/panel b/airootfs/root/.config/lxpanel/LXDE/panels/panel deleted file mode 100644 index e09cf7c..0000000 --- a/airootfs/root/.config/lxpanel/LXDE/panels/panel +++ /dev/null @@ -1,160 +0,0 @@ -# lxpanel config file. Manually editing is not recommended. -# Use preference dialog in lxpanel to adjust config when you can. - -Global { - edge=bottom - align=left - margin=0 - widthtype=percent - width=100 - height=26 - transparent=0 - tintcolor=#000000 - alpha=0 - setdocktype=1 - setpartialstrut=1 - autohide=0 - heightwhenhidden=0 - usefontcolor=1 - fontcolor=#ffffff - background=1 - backgroundfile=/usr/share/lxpanel/images/background.png -} -Plugin { - type=space - Config { - Size=2 - } -} -Plugin { - type=menu - Config { - image=/usr/share/lxde/images/lxde-icon.png - system { - } - separator { - } - item { - command=run - } - separator { - } - item { - image=gnome-logout - command=logout - } - } -} -Plugin { - type=launchbar - Config { - Button { - id=pcmanfm.desktop - } - Button { - id=firefox.desktop - } - } -} -Plugin { - type=space - Config { - Size=4 - } -} -Plugin { - type=wincmd - Config { - Button1=iconify - Button2=shade - } -} -Plugin { - type=space - Config { - Size=4 - } -} -Plugin { - type=pager - Config { - } -} -Plugin { - type=space - Config { - Size=4 - } -} -Plugin { - type=taskbar - expand=1 - Config { - tooltips=1 - IconsOnly=0 - AcceptSkipPager=1 - ShowIconified=1 - ShowMapped=1 - ShowAllDesks=0 - UseMouseWheel=1 - UseUrgencyHint=1 - FlatButton=0 - MaxTaskWidth=150 - spacing=1 - } -} -Plugin { - type=cpu - Config { - } -} -Plugin { - type=volume - Config { - VolumeMuteKey=XF86AudioMute - VolumeDownKey=XF86AudioLowerVolume - VolumeUpKey=XF86AudioRaiseVolume - } -} -Plugin { - type=tray - Config { - } -} -Plugin { - type=dclock - Config { - ClockFmt=%R - TooltipFmt=%A %x - BoldFont=0 - IconOnly=0 - CenterText=0 - } -} -Plugin { - type=launchbar - Config { - Button { - id=lxde-screenlock.desktop - } - Button { - id=lxde-logout.desktop - } - } -} -Plugin { - type=xkb - Config { - Model=pc105 - LayoutsList=us,ru - VariantsList=, - ToggleOpt=grp:ctrl_shift_toggle - KeepSysLayouts=0 - PerWinLayout=1 - } -} -Plugin { - type=netstatus - Config { - } -} diff --git a/airootfs/root/.config/lxpanel/launchtaskbar.cfg b/airootfs/root/.config/lxpanel/launchtaskbar.cfg deleted file mode 100644 index a3d0e52..0000000 --- a/airootfs/root/.config/lxpanel/launchtaskbar.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[special_cases] -synaptic=synaptic-pkexec -soffice.bin=libreoffice -x-terminal-emulator=lxterminal diff --git a/airootfs/root/.config/plasma-org.kde.plasma.desktop-appletsrc b/airootfs/root/.config/plasma-org.kde.plasma.desktop-appletsrc new file mode 100644 index 0000000..344aa97 --- /dev/null +++ b/airootfs/root/.config/plasma-org.kde.plasma.desktop-appletsrc @@ -0,0 +1,119 @@ +[ActionPlugins][0] +RightButton;NoModifier=org.kde.contextmenu +wheel:Vertical;NoModifier=org.kde.switchdesktop + +[ActionPlugins][1] +RightButton;NoModifier=org.kde.contextmenu + +[Containments][1] +ItemGeometries-1024x768= +ItemGeometriesHorizontal= +activityId=e22b904d-6156-441d-8265-e49aa36765d8 +formfactor=0 +immutability=1 +lastScreen=0 +location=0 +plugin=org.kde.plasma.folder +wallpaperplugin=org.kde.image + +[Containments][1][Wallpaper][org.kde.image][General] +Image=file:///usr/share/wallpapers/Next/contents/images/1024x768.jpg + +[Containments][2] +activityId= +formfactor=2 +immutability=1 +lastScreen=0 +location=4 +plugin=org.kde.panel +wallpaperplugin=org.kde.image + +[Containments][2][Applets][14] +immutability=1 +plugin=org.kde.plasma.digitalclock + +[Containments][2][Applets][15] +immutability=1 +plugin=org.kde.plasma.showdesktop + +[Containments][2][Applets][3] +immutability=1 +plugin=org.kde.plasma.kickoff + +[Containments][2][Applets][3][Configuration] +PreloadWeight=100 + +[Containments][2][Applets][3][Configuration][General] +favoritesPortedToKAstats=true + +[Containments][2][Applets][3][Configuration][Shortcuts] +global=Alt+F1 + +[Containments][2][Applets][3][Shortcuts] +global=Alt+F1 + +[Containments][2][Applets][4] +immutability=1 +plugin=org.kde.plasma.pager + +[Containments][2][Applets][5] +immutability=1 +plugin=org.kde.plasma.icontasks + +[Containments][2][Applets][5][Configuration][General] +launchers=applications:systemsettings.desktop,preferred://filemanager,preferred://browser + +[Containments][2][Applets][6] +immutability=1 +plugin=org.kde.plasma.marginsseparator + +[Containments][2][Applets][7] +immutability=1 +plugin=org.kde.plasma.systemtray + +[Containments][2][Applets][7][Configuration] +PreloadWeight=55 +SystrayContainmentId=8 + +[Containments][2][General] +AppletOrder=3;4;5;6;7;14;15 + +[Containments][8] +activityId= +formfactor=2 +immutability=1 +lastScreen=0 +location=4 +plugin=org.kde.plasma.private.systemtray +wallpaperplugin=org.kde.image + +[Containments][8][Applets][10] +immutability=1 +plugin=org.kde.plasma.devicenotifier + +[Containments][8][Applets][11] +immutability=1 +plugin=org.kde.plasma.keyboardlayout + +[Containments][8][Applets][12] +immutability=1 +plugin=org.kde.plasma.manage-inputmethod + +[Containments][8][Applets][13] +immutability=1 +plugin=org.kde.plasma.notifications + +[Containments][8][Applets][16] +immutability=1 +plugin=org.kde.plasma.networkmanagement + +[Containments][8][Applets][9] +immutability=1 +plugin=org.kde.plasma.clipboard + +[Containments][8][General] +extraItems=org.kde.plasma.battery,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.keyboardlayout,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.networkmanagement,org.kde.plasma.notifications +knownItems=org.kde.plasma.battery,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.keyboardlayout,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.networkmanagement,org.kde.plasma.notifications + +[ScreenMapping] +itemsOnDisabledScreens= diff --git a/airootfs/root/.xinitrc b/airootfs/root/.xinitrc index e0d1745..01248df 100644 --- a/airootfs/root/.xinitrc +++ b/airootfs/root/.xinitrc @@ -1 +1 @@ -exec startlxde \ No newline at end of file +exec startplasma-x11 \ No newline at end of file diff --git a/build b/build index 9d87568..3cb3c4b 100755 --- a/build +++ b/build @@ -1,5 +1,5 @@ #!/bin/bash mkarchiso -v ./nox rm -rf work -mkarchiso -v ./lxde +mkarchiso -v ./kde rm -rf work diff --git a/lxde/airootfs b/kde/airootfs similarity index 100% rename from lxde/airootfs rename to kde/airootfs diff --git a/lxde/bootstrap_packages.x86_64 b/kde/bootstrap_packages.x86_64 similarity index 100% rename from lxde/bootstrap_packages.x86_64 rename to kde/bootstrap_packages.x86_64 diff --git a/lxde/efiboot b/kde/efiboot similarity index 100% rename from lxde/efiboot rename to kde/efiboot diff --git a/lxde/packages.x86_64 b/kde/packages.x86_64 similarity index 94% rename from lxde/packages.x86_64 rename to kde/packages.x86_64 index f50df18..74c4e0d 100644 --- a/lxde/packages.x86_64 +++ b/kde/packages.x86_64 @@ -123,9 +123,13 @@ zfs-dkms ncdu xorg xorg-xinit -lxde +plasma-desktop +dolphin +konsole +kwrite +partitionmanager networkmanager -nm-connection-editor +plasma-nm firefox firefox-i18n-en-us firefox-i18n-ru diff --git a/lxde/pacman.conf b/kde/pacman.conf similarity index 100% rename from lxde/pacman.conf rename to kde/pacman.conf diff --git a/lxde/profiledef.sh b/kde/profiledef.sh similarity index 96% rename from lxde/profiledef.sh rename to kde/profiledef.sh index 126863c..93373ed 100644 --- a/lxde/profiledef.sh +++ b/kde/profiledef.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 -iso_name="archlinux-zfs-lxde" +iso_name="archlinux-zfs-kde" iso_label="ARCH_$(date +%Y%m)" iso_publisher="Arch Linux " iso_application="Arch Linux Live/Rescue CD" diff --git a/lxde/syslinux b/kde/syslinux similarity index 100% rename from lxde/syslinux rename to kde/syslinux