]> gitweb.morketsmerke.org Git - xfcedebian.git/commitdiff
Merge z gałęzią d13. Powód: unifikacja projektów immudex. Projekt xfcedebian jest...
authorxf0r3m <jakubstasinski@protonmail.com>
Sun, 31 Dec 2023 17:54:36 +0000 (18:54 +0100)
committerxf0r3m <jakubstasinski@protonmail.com>
Sun, 31 Dec 2023 17:54:36 +0000 (18:54 +0100)
1  2 
README.md
conkyrc
install.sh
lightdm/lightdm-gtk-greeter.conf
xfce4/panel/whiskermenu-1.rc
xfce4/terminal/terminalrc
xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

diff --cc README.md
index edd696f1d84151cfa4740ab235319cf836626a44,287576f26c7774fc9a40f3e8f8f09c69220fe018..41542bc9c96ddf2f372dbedc034d08de9a7feef6
+++ 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 c309e4e666032a7e81f285fef4de741f8366d16d,be783cf5944d455dcc04670398943a91e5072e3a..ecdf070b9b45d1aca7f67f34741198e571177ee1
+++ 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 2578bea8120cca553cea3205411a45f7f6c934e1,a625f3045cb22a40b6b452b9e811ffb7776ec907..114516a000c4ef532f57af0c256216874902a492
@@@ -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;
index 65cad0fe06d93e6dde3f62169a3d717808046169,b8b17c32029cfa248d25f1d1ed552390a87a5a34..a45b629fef278df87dd4f124e028d226a318254c
@@@ -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
index 0f70fb63b660e9173f73c167ef7356c66d6eaaf9,feb5ad4d36c54387a287e33f45395d14303b9d7e..3014d811e54ab4bd774003a6d43d0a1279c5927c
@@@ -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
index d194e06438d8262ec22d05f1f44b547c20d2b33e,b321ecee2994d15ed2f7d225156765babd008386..ed4a9f34bdc75c6ac438270ffd63af6af7ef8fdd
@@@ -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
  
index ccb6fb6eee32f10ac7aecf89bd3364f5f8f698f6,1a1aecfbaca0bccb161a726ec54efc7d9e5cd8da..33aad95761b2d5396d316daef428ae43b99efbc8
          <property name="workspace0" type="empty">
            <property name="color-style" type="int" value="1"/>
            <property name="image-style" type="int" value="5"/>
++<<<<<<< HEAD
 +          <property name="last-image" type="string" value="/usr/share/images/desktop-base/altai_1920x1080.png"/>
++=======
+           <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
++>>>>>>> origin/d13
          </property>
          <property name="workspace1" type="empty">
            <property name="color-style" type="int" value="1"/>
index c48417d3136df682db142d7928ad942e65485909,41589028e592e7f0f4430b8921bfa1b6f8543be8..b40b3b5b0f4962a02dcc04c7e2b282332693bd02
@@@ -4,6 -4,7 +4,10 @@@
    <property name="applications" type="empty">
      <property name="known_applications" type="array">
        <value type="string" value="nm-applet"/>
++<<<<<<< HEAD
++=======
+       <value type="string" value="org.freedesktop.network-manager-applet"/>
++>>>>>>> origin/d13
      </property>
    </property>
  </channel>
index 9535fae2dc03994e3a247d05226e100dcac71ba2,786221d017842def0e8a7a6441d60cace35bb084..e82f9416d9c2fc8f5a0fed24cd7c695c39a8e0b0
        <property name="size" type="uint" value="26"/>
        <property name="plugin-ids" type="array">
          <value type="int" value="1"/>
++<<<<<<< HEAD
++=======
+         <value type="int" value="15"/>
+         <value type="int" value="5"/>
+         <value type="int" value="7"/>
+         <value type="int" value="14"/>
++>>>>>>> origin/d13
          <value type="int" value="2"/>
          <value type="int" value="3"/>
          <value type="int" value="6"/>
          <value type="int" value="13"/>
          <value type="int" value="4"/>
        </property>
++<<<<<<< HEAD
 +      <property name="disable-struts" type="bool" value="false"/>
++=======
+       <property name="enable-struts" type="bool" value="true"/>
++>>>>>>> origin/d13
      </property>
    </property>
    <property name="plugins" type="empty">
      <property name="plugin-6" type="string" value="systray">
        <property name="square-icons" type="bool" value="true"/>
        <property name="known-legacy-items" type="array">
++<<<<<<< HEAD
 +        <value type="string" value="aplet networkmanager"/>
 +      </property>
++=======
+         <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>
++>>>>>>> origin/d13
      </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"/>
++<<<<<<< HEAD
++=======
+       <property name="mpris-players" type="string" value="vlc"/>
++>>>>>>> origin/d13
      </property>
      <property name="plugin-9" type="string" value="power-manager-plugin"/>
      <property name="plugin-10" type="string" value="notification-plugin"/>
      <property name="plugin-13" type="string" value="separator">
        <property name="style" type="uint" value="0"/>
      </property>
++<<<<<<< HEAD
 +    <property name="plugin-1" type="string" value="whiskermenu"/>
 +    <property name="plugin-4" type="string" value="showdesktop"/>
++=======
+     <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>
++>>>>>>> origin/d13
    </property>
  </channel>