From: xf0r3m Date: Sun, 31 Dec 2023 17:58:17 +0000 (+0100) Subject: Przesłanie plików gałęzi d13 do gałęzi main. X-Git-Url: https://gitweb.morketsmerke.org/?a=commitdiff_plain;h=013cfb39cc941c333b772aca5be02b99f898686b;p=xfcedebian.git Przesłanie plików gałęzi d13 do gałęzi main. --- diff --git a/README.md b/README.md index 41542bc..75b3ea6 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,3 @@ # 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 +Layout środowiska graficznego dla immudex-testing. diff --git a/conkyrc b/conkyrc index ecdf070..be783cf 100644 --- a/conkyrc +++ b/conkyrc @@ -51,25 +51,6 @@ 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 @@ -87,7 +68,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 --git a/fonts.tgz b/fonts.tgz index 691c670..8e31d55 100644 Binary files a/fonts.tgz and b/fonts.tgz differ diff --git a/install.sh b/install.sh index 114516a..a625f30 100644 --- a/install.sh +++ b/install.sh @@ -2,21 +2,6 @@ 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 @@ -38,20 +23,15 @@ 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 --git a/lightdm/lightdm-gtk-greeter.conf b/lightdm/lightdm-gtk-greeter.conf index a45b629..b8b17c3 100644 --- a/lightdm/lightdm-gtk-greeter.conf +++ b/lightdm/lightdm-gtk-greeter.conf @@ -1,9 +1,5 @@ [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 --git a/xfce4/panel/whiskermenu-1.rc b/xfce4/panel/whiskermenu-1.rc index 3014d81..feb5ad4 100644 --- a/xfce4/panel/whiskermenu-1.rc +++ b/xfce4/panel/whiskermenu-1.rc @@ -1,10 +1,5 @@ -<<<<<<< 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 @@ -13,34 +8,19 @@ show-button-icon=true 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 @@ -58,11 +38,7 @@ show-command-restart=true 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 --git a/xfce4/terminal/terminalrc b/xfce4/terminal/terminalrc index ed4a9f3..b321ece 100644 --- a/xfce4/terminal/terminalrc +++ b/xfce4/terminal/terminalrc @@ -1,5 +1,4 @@ [Configuration] -BackgroundMode=TERMINAL_BACKGROUND_IMAGE MiscAlwaysShowTabs=FALSE MiscBell=FALSE MiscBellUrgent=FALSE @@ -28,12 +27,5 @@ MiscNewTabAdjacent=FALSE 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 --git a/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 33aad95..1a1aecf 100644 --- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -27,11 +27,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> origin/d13 diff --git a/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml index b40b3b5..4158902 100644 --- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml @@ -4,10 +4,7 @@ -<<<<<<< HEAD -======= ->>>>>>> origin/d13 diff --git a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index e82f941..786221d 100644 --- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -13,13 +13,10 @@ -<<<<<<< HEAD -======= ->>>>>>> origin/d13 @@ -31,11 +28,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> origin/d13 @@ -49,10 +42,6 @@ -<<<<<<< HEAD - - -======= @@ -60,15 +49,11 @@ ->>>>>>> origin/d13 -<<<<<<< HEAD -======= ->>>>>>> origin/d13 @@ -83,10 +68,6 @@ -<<<<<<< HEAD - - -======= @@ -131,6 +112,5 @@ ->>>>>>> origin/d13