From: xf0r3m Date: Sun, 31 Dec 2023 17:54:36 +0000 (+0100) Subject: Merge z gałęzią d13. Powód: unifikacja projektów immudex. Projekt xfcedebian jest... X-Git-Url: https://gitweb.morketsmerke.org/?a=commitdiff_plain;h=17b565b20722653675fcf0df6dbb90c2d1ac8354;p=xfcedebian.git Merge z gałęzią d13. Powód: unifikacja projektów immudex. Projekt xfcedebian jest częscią projektu immudex. --- 17b565b20722653675fcf0df6dbb90c2d1ac8354 diff --cc README.md index edd696f,287576f..41542bc --- a/README.md +++ b/README.md @@@ -1,14 -1,3 +1,18 @@@ # xfcedebian ++<<<<<<< HEAD +1. Wymagania: + - Instalacja Debiana z XFCE + +2. Instalacja: + - Logujemy się do środowiska jako root, następnie uruchamiamy terminal: + 1. git clone https://github.com/xf0r3m/xfcedebian.git + 2. cd xfcedebian + 2. chmod +x install.sh + 3. sudo ./install.sh + 4. useradd -m -s /bin/bash user + 5. passwd user + 6. reboot ++======= + Layout środowiska graficznego dla immudex. ++>>>>>>> origin/d13 diff --cc conkyrc index c309e4e,be783cf..ecdf070 --- a/conkyrc +++ b/conkyrc @@@ -51,23 -51,23 +51,43 @@@ conky.config = } conky.text = [[ ++<<<<<<< HEAD +${color blue}Info:$color ${scroll 32 $nodename - $sysname $nodename $kernel $machine} +$hr +${color blue}Uptime:$color $uptime +${color blue}Frequency (in MHz):$color $freq +${color blue}Frequency (in GHz):$color $freq_g +${color blue}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4} +${color blue}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4} +${color blue}CPU Usage:$color $cpu% ${cpubar 4} +${color blue}Processes:$color $processes ${color blue}Running:$color $running_processes +${color blue}Battery:$color ${battery} +$hr +${color blue}File systems: + / $color${fs_used /}/${fs_size /} ${fs_bar 6 /} +${color blue}Networking: +Up:$color ${upspeed} ${color blue} - Down:$color ${downspeed} +$hr +${color blue}Name PID CPU% MEM% ++======= + ${color green}Info:$color ${scroll 32 immudex${exec immudex-branch} ${exec immudex-version} - $sysname $nodename $kernel $machine} + $hr + ${color green}Uptime:$color $uptime + ${color green}Frequency (in MHz):$color $freq + ${color green}Frequency (in GHz):$color $freq_g + ${color green}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4} + ${color green}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4} + ${color green}CPU Usage:$color $cpu% ${cpubar 4} + ${color green}Processes:$color $processes ${color green}Running:$color $running_processes + ${color green}Battery:$color ${battery} + $hr + ${color green}File systems: + / $color${fs_used /}/${fs_size /} ${fs_bar 6 /} + ${color green}Networking: + Up:$color ${upspeed} ${color green} - Down:$color ${downspeed} + $hr + ${color green}Name PID CPU% MEM% ++>>>>>>> origin/d13 ${color red} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} ${color red} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} ${color red} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} diff --cc install.sh index 2578bea,a625f30..114516a --- a/install.sh +++ b/install.sh @@@ -2,26 -2,36 +2,56 @@@ set -e ++<<<<<<< HEAD +apt install -y ranger git qmmp vlc lynx tmux pass qemu-kvm libvirt-clients libvirt-daemon-system bridge-utils virtinst libvirt-daemon virt-manager conky picom; + +mkdir /etc/skel/.config; +cp -rvv xfce4 /etc/skel/.config; + +mkdir /etc/skel/.config/autostart; +cp conky.desktop /etc/skel/.config/autostart; + +cp vimrc /etc/skel/.vimrc; +cp conkyrc /etc/skel/.conkyrc; + +cp -rvv Pulpit /etc/skel; +tar -xzvf fonts.tgz -C /etc/skel; ++======= + # Pakiet conky jest pakietem wirtualnym zapewnianym przez: + # conky-std 1.19.5-1 + # conky-cli 1.19.5-1 + # conky-all 1.19.5-1 + #Należy jednoznacznie wybrać jeden z nich do instalacji. + + apt install -y ranger git qmmp vlc lynx tmux pass qemu-kvm libvirt-clients libvirt-daemon-system bridge-utils virtinst libvirt-daemon virt-manager conky-all vim-gtk3 mutt; + + mkdir /etc/skel/.config; + cp -rvv xfce4 /etc/skel/.config; + cp -vv mimeapps.list /etc/skel/.config; + cp -vv mimeinfo.cache /usr/share/applications; + + mkdir /etc/skel/.config/autostart; + cp conky.desktop /etc/skel/.config/autostart; + + cp vimrc /etc/skel/.vimrc; + cp conkyrc /etc/skel/.conkyrc; + + mkdir /usr/share/fonts/truetype/meslo; + tar -xzvf fonts.tgz -C /usr/share/fonts/truetype/meslo; ++>>>>>>> origin/d13 rm -rf /etc/lightdm; cp -rvv lightdm /etc; rm /usr/share/images/desktop-base/default; cp -rvv images/* /usr/share/images/desktop-base; ++<<<<<<< HEAD +ln -s /usr/share/images/desktop-base/altai_1920x1080.png /usr/share/images/desktop-base/default; ++======= + ln -s /usr/share/images/desktop-base/d13_wallpaper.png /usr/share/images/desktop-base/default; + if [ -f /etc/skel/.face ]; then rm /etc/skel/.face; fi + ln -s /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png /etc/skel/.face; ++>>>>>>> origin/d13 cp icons/* /usr/share/icons; ln -s /usr/share/icons/changes-prevent.png /usr/share/icons/padlock-icon.png; diff --cc lightdm/lightdm-gtk-greeter.conf index 65cad0f,b8b17c3..a45b629 --- a/lightdm/lightdm-gtk-greeter.conf +++ b/lightdm/lightdm-gtk-greeter.conf @@@ -1,5 -1,5 +1,9 @@@ [greeter] ++<<<<<<< HEAD +background = /usr/share/images/desktop-base/abandoned_hospital_bower.png ++======= + background = /usr/share/images/desktop-base/lightdm_wallpaper.jpg ++>>>>>>> origin/d13 theme-name = Adwaita-dark icon-theme-name = Adwaita default-user-image = /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png diff --cc xfce4/panel/whiskermenu-1.rc index 0f70fb6,feb5ad4..3014d81 --- a/xfce4/panel/whiskermenu-1.rc +++ b/xfce4/panel/whiskermenu-1.rc @@@ -1,5 -1,5 +1,10 @@@ ++<<<<<<< HEAD +favorites=xfce4-web-browser.desktop,xfce4-file-manager.desktop +recent=xfce4-terminal-emulator.desktop,xfce4-terminal.desktop,lightdm-gtk-greeter-settings.desktop ++======= + favorites=xfce4-web-browser.desktop,xfce4-file-manager.desktop,xfce4-terminal-emulator.desktop,qmmp-1.desktop,gvim.desktop,vlc.desktop,virt-manager.desktop + recent= ++>>>>>>> origin/d13 button-title=Start button-icon=debian-logo button-single-row=false @@@ -8,21 -8,19 +13,34 @@@ show-button-icon=tru launcher-show-name=true launcher-show-description=true launcher-show-tooltip=true ++<<<<<<< HEAD +launcher-icon-size=3 +hover-switch-category=false +category-show-name=true +category-icon-size=1 +sort-categories=true +view-mode=0 ++======= + item-icon-size=3 + hover-switch-category=false + category-show-name=true + category-icon-size=1 + load-hierarchy=false + view-as-icons=false ++>>>>>>> origin/d13 default-category=0 recent-items-max=10 favorites-in-recent=true position-search-alternate=true position-commands-alternate=false position-categories-alternate=true ++<<<<<<< HEAD +position-categories-horizontal=false +stay-on-focus-out=false +profile-shape=0 ++======= + stay-on-focus-out=false ++>>>>>>> origin/d13 confirm-session-command=true menu-width=450 menu-height=500 @@@ -40,7 -38,7 +58,11 @@@ show-command-restart=tru command-shutdown=xfce4-session-logout --halt --fast show-command-shutdown=true command-suspend=xfce4-session-logout --suspend ++<<<<<<< HEAD +show-command-suspend=false ++======= + show-command-suspend=true ++>>>>>>> origin/d13 command-hibernate=xfce4-session-logout --hibernate show-command-hibernate=false command-logout=xfce4-session-logout diff --cc xfce4/terminal/terminalrc index d194e06,b321ece..ed4a9f3 --- a/xfce4/terminal/terminalrc +++ b/xfce4/terminal/terminalrc @@@ -28,8 -27,5 +28,12 @@@ MiscNewTabAdjacent=FALS MiscSearchDialogOpacity=100 MiscShowUnsafePasteDialog=TRUE MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU ++<<<<<<< HEAD +BackgroundImageFile=/usr/share/images/desktop-base/lofi_girl.jpg +BackgroundImageStyle=TERMINAL_BACKGROUND_STYLE_FILLED +BackgroundImageShading=0,600000 +FontName=Source Code Pro 12 ++======= + FontName=MesloLGS Nerd Font 10 ++>>>>>>> origin/d13 diff --cc xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index ccb6fb6,1a1aecf..33aad95 --- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@@ -27,7 -27,7 +27,11 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> origin/d13 diff --cc xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml index c48417d,4158902..b40b3b5 --- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml @@@ -4,6 -4,7 +4,10 @@@ ++<<<<<<< HEAD ++======= + ++>>>>>>> origin/d13 diff --cc xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 9535fae,786221d..e82f941 --- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@@ -13,6 -13,10 +13,13 @@@ ++<<<<<<< HEAD ++======= + + + + ++>>>>>>> origin/d13 @@@ -24,7 -28,7 +31,11 @@@ ++<<<<<<< HEAD + ++======= + ++>>>>>>> origin/d13 @@@ -38,12 -42,18 +49,26 @@@ ++<<<<<<< HEAD + + ++======= + + + + + + + ++>>>>>>> origin/d13 ++<<<<<<< HEAD ++======= + ++>>>>>>> origin/d13 @@@ -58,7 -68,49 +83,54 @@@ ++<<<<<<< HEAD + + ++======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ++>>>>>>> origin/d13