From: xf0r3m Date: Sat, 13 Sep 2025 16:38:18 +0000 (+0200) Subject: Utworznie plików niezależnych lub specjalnych dla immudex. Dostosowanie projektu... X-Git-Url: https://gitweb.morketsmerke.org/?a=commitdiff_plain;h=6cc74cf5f78669e181ad5dbc29fa0f4250e989bf;p=xfcedebian.git Utworznie plików niezależnych lub specjalnych dla immudex. Dostosowanie projektu dla użytkowników Debiana. --- diff --git a/conkyrc b/conkyrc index dd5f43f..ed64055 100644 --- a/conkyrc +++ b/conkyrc @@ -51,7 +51,7 @@ conky.config = { } conky.text = [[ -${color green}Info:$color ${scroll 32 immudex${exec immudex-branch} ${exec immudex-version} - $sysname $nodename $kernel $machine} +${color green}Info:$color ${scroll 32 GNU/Linux Debian ${exec cat /etc/debian_version} - $sysname $nodename $kernel $machine} $hr ${color green}Uptime:$color $uptime ${color green}Frequency (in MHz):$color $freq diff --git a/conkyrc-immudex b/conkyrc-immudex new file mode 100644 index 0000000..dd5f43f --- /dev/null +++ b/conkyrc-immudex @@ -0,0 +1,76 @@ +-- Conky, a system monitor https://github.com/brndnmtthws/conky +-- +-- This configuration file is Lua code. You can write code in here, and it will +-- execute when Conky loads. You can use it to generate your own advanced +-- configurations. +-- +-- Try this (remove the `--`): +-- +-- print("Loading Conky config") +-- +-- For more on Lua, see: +-- https://www.lua.org/pil/contents.html + +conky.config = { + alignment = 'top_right', + background = true, + border_width = 1, + cpu_avg_samples = 2, + default_color = 'red', + default_outline_color = 'brown', + default_shade_color = 'brown', + double_buffer = true, + draw_borders = false, + draw_graph_borders = true, + draw_outline = false, + draw_shades = false, + extra_newline = false, + font = 'DejaVu Sans Mono:size=12', + gap_x = 5, + gap_y = 0, + minimum_height = 5, + minimum_width = 5, + net_avg_samples = 2, + no_buffers = true, + out_to_console = false, + out_to_ncurses = false, + out_to_stderr = false, + out_to_x = true, + own_window = true, + own_window_transparent = true, + own_window_argb_visual = true, + own_window_class = 'Conky', + own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', + show_graph_range = false, + show_graph_scale = false, + stippled_borders = 0, + update_interval = 1.0, + uppercase = false, + use_spacer = 'none', + use_xft = true, +} + +conky.text = [[ +${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: +IP:$color ${execp ip addr show $(sed -n '2p' /proc/net/route | awk '{printf $1}') | grep 'inet\ ' | awk '{printf $2"\n"}'} +${color green}Up:$color ${upspeed ${gw_iface}} ${color green} - Down:$color ${downspeed ${gw_iface}} +$hr +${color green}Name PID CPU% MEM% +${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} +${color red} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4} +]] diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index 6dc8fb7..692f7b3 --- a/install.sh +++ b/install.sh @@ -8,35 +8,55 @@ set -e # 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 conky-all vim-gtk3 mutt; +sudo apt install -y ranger git qmmp vlc qutebrowser tmux keepassxc conky-all vim-gtk3 claws-mail; +if [ "$1" ] && [ "$1" = "--immudex" ]; then + + mkdir /etc/skel/.config; + cp -rvv xfce4 /etc/skel/.config; + cp -vv xfce4/xfconf/xfce-perchannel-xml/xfce4-panel-immudex.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml; + cp -vv mimeapps.list /etc/skel/.config; + + mkdir /etc/skel/.config/autostart; + cp conky.desktop /etc/skel/.config/autostart; + + cp vimrc /etc/skel/.vimrc; + cp conkyrc-immudex /etc/skel/.conkyrc; + 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; + cp icons/* /usr/share/icons; + ln -s /usr/share/icons/changes-prevent.png /usr/share/icons/padlock-icon.png; +else + if [ ! -d /home/${USER}/.config ]; then + mkdir /home/${USER}/.config; + fi + cp -rvv xfce4 /home/${USER}/.config; + cp -vv mimeapps.list /home/${USER}/.config; + + if [ ! -d /home/${USER}/.config/autostart ]; then + mkdir /home/${USER}/.config/autostart; + fi + cp conky.desktop /home/${USER}/.config/autostart; + + cp vimrc /home/${USER}/.vimrc; + cp conkyrc /home/${USER}/.conkyrc; + if [ -f /home/${USER}/.face ]; then rm /home/${USER}/.face; fi + ln -s /usr/share/icons/vendor/256x256/emblems/emblem-vendor.png /home/${USER}/.face; -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; +fi -mkdir /usr/share/fonts/truetype/meslo; -tar -xzvf fonts.tgz -C /usr/share/fonts/truetype/meslo; +sudo cp -vv mimeinfo.cache /usr/share/applications; +sudo mkdir /usr/share/fonts/truetype/meslo; +sudo tar -xzvf fonts.tgz -C /usr/share/fonts/truetype/meslo; -rm -rf /etc/lightdm; -cp -rvv lightdm /etc; +sudo rm -rf /etc/lightdm; +sudo cp -rvv lightdm /etc; -rm /usr/share/images/desktop-base/default; -cp -rvv images/* /usr/share/images/desktop-base; -ln -s /usr/share/images/desktop-base/d13_wallpaper.png /usr/share/images/desktop-base/default; +sudo rm /usr/share/images/desktop-base/default; +sudo cp -rvv images/* /usr/share/images/desktop-base; +sudo ln -s /usr/share/images/desktop-base/d13_wallpaper.png /usr/share/images/desktop-base/default; if [ -f /usr/share/backgrounds/xfce/xfce-x.svg ]; then - rm /usr/share/backgrounds/xfce/xfce-x.svg; - ln -s /usr/share/images/desktop-base/d13_wallpaper.png /usr/share/backgrounds/xfce/xfce-x.svg; + sudo rm /usr/share/backgrounds/xfce/xfce-x.svg; + sudo ln -s /usr/share/images/desktop-base/d13_wallpaper.png /usr/share/backgrounds/xfce/xfce-x.svg; fi -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; -sed -i 's/lightdm_wallpaper.jpg/d13_wallpaper.png/' /etc/lightdm/lightdm-gtk-greeter.conf; +sudo sed -i 's/lightdm_wallpaper.jpg/d13_wallpaper.png/' /etc/lightdm/lightdm-gtk-greeter.conf; -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-immudex.conf b/lightdm/lightdm-gtk-greeter-immudex.conf new file mode 100644 index 0000000..b8b17c3 --- /dev/null +++ b/lightdm/lightdm-gtk-greeter-immudex.conf @@ -0,0 +1,6 @@ +[greeter] +background = /usr/share/images/desktop-base/lightdm_wallpaper.jpg +theme-name = Adwaita-dark +icon-theme-name = Adwaita +default-user-image = /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png + diff --git a/lightdm/lightdm-gtk-greeter.conf b/lightdm/lightdm-gtk-greeter.conf index b8b17c3..e2a9066 100644 --- a/lightdm/lightdm-gtk-greeter.conf +++ b/lightdm/lightdm-gtk-greeter.conf @@ -2,5 +2,5 @@ background = /usr/share/images/desktop-base/lightdm_wallpaper.jpg theme-name = Adwaita-dark icon-theme-name = Adwaita -default-user-image = /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png +default-user-image = /usr/share/icons/vendor/256x256/emblems/emblem-vendor.png diff --git a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel-immudex.xml b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel-immudex.xml new file mode 100644 index 0000000..786221d --- /dev/null +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel-immudex.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 786221d..64861e5 100644 --- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -16,7 +16,6 @@ - @@ -104,12 +103,7 @@ - - - - - - +