Utworznie plików niezależnych lub specjalnych dla immudex. Dostosowanie projektu...

diff --git a/conkyrc b/conkyrc
index dd5f43f57f5d1cc1e1c36d4eb8702199f34eefcf..ed64055332a5a2b2cf7b0ace9150602a604b6103 100644 (file)
--- 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 (file)
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 (file)
new mode 100755 (executable)
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 (file)
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 b8b17c32029cfa248d25f1d1ed552390a87a5a34..e2a90668e961b5d67d2ab4a5558e892d20bc8e27 100644 (file)
--- 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 (file)
index 0000000..786221d
--- /dev/null
+++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel-immudex.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="configver" type="int" value="2"/>
+  <property name="panels" type="array">
+    <value type="int" value="1"/>
+    <property name="dark-mode" type="bool" value="true"/>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=8;x=640;y=786"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="icon-size" type="uint" value="16"/>
+      <property name="size" type="uint" value="26"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="15"/>
+        <value type="int" value="5"/>
+        <value type="int" value="7"/>
+        <value type="int" value="14"/>
+        <value type="int" value="2"/>
+        <value type="int" value="3"/>
+        <value type="int" value="6"/>
+        <value type="int" value="8"/>
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="12"/>
+        <value type="int" value="13"/>
+        <value type="int" value="4"/>
+      </property>
+      <property name="enable-struts" type="bool" value="true"/>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-2" type="string" value="tasklist">
+      <property name="grouping" type="uint" value="1"/>
+    </property>
+    <property name="plugin-3" type="string" value="separator">
+      <property name="expand" type="bool" value="true"/>
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-6" type="string" value="systray">
+      <property name="square-icons" type="bool" value="true"/>
+      <property name="known-legacy-items" type="array">
+        <value type="string" value="nawiązano ethernetowe połączenie sieciowe „połączenie przewodowe 1”"/>
+        <value type="string" value="nawiązano ethernetowe połączenie sieciowe „wired connection 1”"/>
+        <value type="string" value="aplet networkmanager"/>
+      </property>
+      <property name="known-items" type="array">
+        <value type="string" value="vlc"/>
+      </property>
+    </property>
+    <property name="plugin-8" type="string" value="pulseaudio">
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+      <property name="show-notifications" type="bool" value="true"/>
+      <property name="mpris-players" type="string" value="vlc"/>
+    </property>
+    <property name="plugin-9" type="string" value="power-manager-plugin"/>
+    <property name="plugin-10" type="string" value="notification-plugin"/>
+    <property name="plugin-11" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-12" type="string" value="clock">
+      <property name="digital-format" type="string" value="%_H:%M"/>
+      <property name="digital-time-format" type="string" value="%_H:%M"/>
+      <property name="digital-layout" type="uint" value="3"/>
+    </property>
+    <property name="plugin-13" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-1" type="string" value="whiskermenu">
+      <property name="button-title" type="string" value="Start"/>
+      <property name="button-icon" type="string" value="debian-logo"/>
+      <property name="show-button-title" type="bool" value="true"/>
+      <property name="launcher-icon-size" type="int" value="3"/>
+      <property name="favorites-in-recent" type="bool" value="true"/>
+      <property name="position-search-alternate" type="bool" value="true"/>
+      <property name="position-categories-alternate" type="bool" value="true"/>
+      <property name="show-command-logoutuser" type="bool" value="true"/>
+      <property name="show-command-restart" type="bool" value="true"/>
+      <property name="show-command-shutdown" type="bool" value="true"/>
+      <property name="show-command-suspend" type="bool" value="true"/>
+      <property name="show-command-logout" type="bool" value="false"/>
+      <property name="favorites" type="array">
+        <value type="string" value="xfce4-web-browser.desktop"/>
+        <value type="string" value="xfce4-file-manager.desktop"/>
+        <value type="string" value="xfce4-terminal-emulator.desktop"/>
+        <value type="string" value="qmmp-1.desktop"/>
+        <value type="string" value="gvim.desktop"/>
+        <value type="string" value="vlc.desktop"/>
+        <value type="string" value="virt-manager.desktop"/>
+      </property>
+      <property name="recent" type="array">
+      </property>
+    </property>
+    <property name="plugin-4" type="string" value="showdesktop"/>
+    <property name="plugin-5" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16844254192.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-7" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16844254905.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-14" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16844255236.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-15" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+  </property>
+</channel>

diff --git a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 786221d017842def0e8a7a6441d60cace35bb084..64861e5a7772c0e9741b480abe1c43fc549e2bd0 100644 (file)
--- a/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -16,7 +16,6 @@
         <value type="int" value="15"/>
         <value type="int" value="5"/>
         <value type="int" value="7"/>
-        <value type="int" value="14"/>
         <value type="int" value="2"/>
         <value type="int" value="3"/>
         <value type="int" value="6"/>
@@ -104,12 +103,7 @@
         <value type="string" value="16844254905.desktop"/>
       </property>
     </property>
-    <property name="plugin-14" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="16844255236.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-15" type="string" value="separator">
+        <property name="plugin-15" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
     </property>
   </property>