Merge branch 'master' of github.com:manjaro/iso-profiles

rebase
This commit is contained in:
excalibur1234 2018-04-28 22:01:08 +02:00
commit b028bf3c95
13 changed files with 287 additions and 89 deletions

View File

@ -76,6 +76,7 @@ ffmpegthumbnailer
speedtest-cli
sterminal
terminus-font
testdisk
thermald
tree
w3m

View File

@ -87,6 +87,7 @@ rofi-scripts
rootmenu
sxhkd
terminus-font
testdisk
thermald
xcape
xdg-su

View File

@ -85,6 +85,7 @@ speedtest-cli
sterminal
sxhkd
terminus-font
testdisk
thermald
tree
udevil

View File

@ -3,7 +3,7 @@ alsa-firmware
alsa-plugins
alsa-utils
arandr
artwork-i3
>extra artwork-i3
autoconf
automake
avahi
@ -51,6 +51,7 @@ gvfs-mtp
gvfs-smb
>extra hexchat
htop
i3-default-artwork
inxi
>extra isousb
json-c
@ -120,7 +121,6 @@ syslog-ng
terminus-font
tree
>extra ttf-bitstream-vera
>extra ttf-dejavu
>extra ttf-droid
>extra ttf-inconsolata
>extra ttf-indic-otf

View File

@ -337,14 +337,14 @@ bar {
strip_workspace_numbers yes
colors {
background #283339
background #202A2E
statusline #F9FAF9
separator #454947
# border backgr. text
focused_workspace #F9FAF9 #16a085 #292F34
active_workspace #595B5B #353836 #FDF6E3
inactive_workspace #595B5B #283339 #EEE8D5
inactive_workspace #595B5B #202A2E #EEE8D5
binding_mode #16a085 #2C2C2C #F9FAF9
urgent_workspace #16a085 #FDF6E3 #E5201D
}
@ -368,8 +368,8 @@ bindsym $mod+m bar mode toggle
#############################
# Set inner/outer gaps
gaps inner 10
gaps outer -4
gaps inner 14
gaps outer -2
# Additionally, you can issue commands with the following syntax. This is useful to bind keys to changing the gap size.
# gaps inner|outer current|all set|plus|minus <px>

View File

@ -10,26 +10,17 @@ xf86-input-libinput
xf86-input-mouse
## system requirements
adwaita-icon-theme # system icons
bash-completion
gamin
gksu
gnome-icon-theme # gnome icons
gnome-icon-theme-extras # -
gnome-icon-theme-symbolic # -
gnome-keyring
gnome-themes-extra # extra gnome theming
gtk3-classic # toolkit
gvfs # gnome virtual filesystem
gvfs-afc # apple
gvfs-mtp # android
gvfs-smb # windows network shares
polkit # policy
poppler
poppler
python2-xdg
ttf-dejavu # ttf fonts
ttf-droid # -
ttf-roboto # -
xdg-user-dirs
xdg-utils
@ -37,7 +28,7 @@ xdg-utils
manjaro-settings-manager
## window manager and helpers
compton # transparency
compton # compositor
conky # info on screen
dunst # messages
i3lock # lockscreen
@ -48,6 +39,7 @@ libmpdclient # polybar media controlling
lxmenu-data # openbox-menu data
nitrogen # wallpaper management
ob-autostart # openbox autostart
obconf # openbox config
obkey-gtk3 # openbox keypress editor
obmenu-generator # openbox menu generator
openbox # window manager
@ -55,6 +47,7 @@ polybar # next generation bar/launcher
rofi # menu selector
skippy-xd # expose style window switcher
scrot # screen capture
stalonetray # system tray
tint2 # old school bar/launcher
wireless_tools # tools used by polybar
wmctrl # controlling window manager
@ -68,7 +61,6 @@ exo-gtk3 # open with default programs
lxappearance-gtk3 # openbox appearance manager
lxappearance-obconf-gtk3 # obconf plugin
lxsession-gtk3 # session manager
xfce4-settings-gtk3
## package manager
pacui # console systemtool pacman/yaourt wrapper
@ -80,13 +72,13 @@ lightdm-slick-greeter # greeter
## terminal
termite # nonsense terminal
xfce4-terminal # xfce terminal
guake # dropdown terminal
## filemanager
catfish # filesearch utility
file-roller # archive manager utility
mc # norton commander clone file manager
ranger # highspeed console file manager
catfish # filesearch
file-roller # archive manager
mc # norton commander clone
ranger # alternative
thunar-gtk3 # well reputed file manager
thunar-archive-plugin-gtk3 # plugin for archives
thunar-media-tags-plugin # plugin for media
@ -110,14 +102,22 @@ chromium # opensource browser
sylpheed # slim and fast mail client
## theming
adwaita-icon-theme # system icons
gnome-icon-theme # gnome icons
gnome-icon-theme-extras # -
gnome-icon-theme-symbolic # -
gnome-keyring
gnome-themes-extra # extra gnome theming
gtk-theme-breath
hicolor-icon-theme
manjaro-base-skel
manjaro-openbox-common
manjaro-openbox-grub-theme
manjaro-wallpapers-18.0
manjaro-zsh-config
openbox-themes
ttf-dejavu # ttf fonts
ttf-droid # -
ttf-roboto # -
vibrancy-colors
xcursor-breeze
@ -148,6 +148,11 @@ screenfetch # show off your system
sublime-text-dev # multi-purpose text editor
# proprietary preview - no timelimit - occacional nag screen
## disk utilities
clonezilla
fsarchiver
testdisk
## media, audio & codec
manjaro-pulse
mpv # mediaplayer

View File

@ -3,4 +3,5 @@ Section "InputClass"
MatchIsTouchpad "on"
MatchDriver "libinput"
Option "Tapping" "on"
Option "NaturalScrolling" "true"
EndSection

View File

@ -1,15 +1,16 @@
# compton
sleep 1; manjaro-compositor --start &
manjaro-compositor --start; sleep 0.5 &
# enable numlock, commented out for laptop users
#sleep 1; numlockx &
#numlockx; sleep 0.5 &
# restore wallpaper
sleep 1; nitrogen --restore &
sleep 1; manjaro-polybar-session &
nitrogen --restore &
manjaro-polybar-session; sleep 0.5 &
manjaro-conky-session; sleep 0.5 &
# Openbox autostart
sleep 1; ob-autostart -d &
ob-autostart -d; sleep 0.5 &
# Required for xfce settings to work
xfsettingsd &

View File

@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openbox_menu>
<menu id="installer" label="Installation">
<item label="Calamares Installer">
<action name="Execute">
<command>sudo calamares</command>
</action>
</item>
<item label="Architect Installer">
<action name="Execute">
<command>termite -e "sudo setup"</command>
</action>
</item>
</menu>
<menu id="accessories" label="Accessories">
<item label="Calculator">
<action name="Execute">
@ -64,42 +52,47 @@
</menu>
<menu id="preferences" label="Preferences">
<menu id="obConfig" label="Openbox">
<item label="Settings Editor">
<item label="LX Appearance Configuration">
<action name="Execute">
<command>lxappearance</command>
</action>
</item>
<item label="ObConf Appearance Configuration">
<action name="Execute">
<command>obconf</command>
</action>
</item>
<item label="Menu Editor">
<action name="Execute">
<command>kickshaw</command>
</action>
</item>
<item label="Keybind Editor">
<action name="Execute">
<command>obkey</command>
</action>
</item>
<item label="Autostart Editor">
<action name="Execute">
<command>ob-autostart</command>
</action>
</item>
<separator/>
<item label="Edit menu.xml">
<item label="Keybind Editor">
<action name="Execute">
<command>obkey</command>
</action>
</item>
<separator label="Configuration files"/>
<item label="Open autostart">
<action name="Execute">
<command>exo-open ~/.config/openbox/autostart</command>
</action>
</item>
<item label="Open menu.xml">
<action name="Execute">
<command>exo-open ~/.config/openbox/menu.xml</command>
</action>
</item>
<item label="Edit rc.xml">
<item label="Open rc.xml">
<action name="Execute">
<command>exo-open ~/.config/openbox/rc.xml</command>
</action>
</item>
<item label="Edit autostart">
<action name="Execute">
<command>exo-open ~/.config/openbox/autostart</command>
</action>
</item>
<separator/>
<item label="Openbox Reconfigure">
<action name="Reconfigure"/>
@ -172,11 +165,23 @@
</action>
</item>
</menu>
<menu id="installer" label="Installation">
<item label="Calamares Installer">
<action name="Execute">
<command>sudo calamares</command>
</action>
</item>
<item label="Architect Installer">
<action name="Execute">
<command>termite -e "sudo setup"</command>
</action>
</item>
</menu>
<menu id="root-menu" label="Openbox 3">
<separator label="Manjaro Openbox"/>
<menu id="installer"/>
<separator/>
<separator/>
<item label="Terminal">
<action name="Execute">
<command>exo-open --launch TerminalEmulator</command>
@ -192,12 +197,16 @@
<command>exo-open --launch WebBrowser</command>
</action>
</item>
<item label="Mail Reader">
<action name="Execute">
<command>exo-open --launch MailReader</command>
</action>
</item>
<item label="Text Editor">
<action name="Execute">
<command>subl3</command>
</action>
</item>
<separator/>
</item> <separator/>
<menu id="applications" label="Applications" execute="/usr/bin/obmenu-generator -S ~/.config/obmenu-generator/applications.pl"/>
<menu id="accessories"/>
<menu id="screenshot"/>

View File

@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openbox_menu>
<menu id="installer" label="Installation">
<item label="Calamares Installer">
<action name="Execute">
<command>sudo calamares</command>
</action>
</item>
<item label="Architect Installer">
<action name="Execute">
<command>termite -e "sudo setup"</command>
</action>
</item>
</menu>
<menu id="accessories" label="Accessories">
<item label="Calculator">
<action name="Execute">
@ -64,42 +52,47 @@
</menu>
<menu id="preferences" label="Preferences">
<menu id="obConfig" label="Openbox">
<item label="Settings Editor">
<item label="LX Appearance Configuration">
<action name="Execute">
<command>lxappearance</command>
</action>
</item>
<item label="ObConf Appearance Configuration">
<action name="Execute">
<command>obconf</command>
</action>
</item>
<item label="Menu Editor">
<action name="Execute">
<command>kickshaw</command>
</action>
</item>
<item label="Keybind Editor">
<action name="Execute">
<command>obkey</command>
</action>
</item>
<item label="Autostart Editor">
<action name="Execute">
<command>ob-autostart</command>
</action>
</item>
<separator/>
<item label="Edit menu.xml">
<item label="Keybind Editor">
<action name="Execute">
<command>obkey</command>
</action>
</item>
<separator label="Configuration files"/>
<item label="Open autostart">
<action name="Execute">
<command>exo-open ~/.config/openbox/autostart</command>
</action>
</item>
<item label="Open menu.xml">
<action name="Execute">
<command>exo-open ~/.config/openbox/menu.xml</command>
</action>
</item>
<item label="Edit rc.xml">
<item label="Open rc.xml">
<action name="Execute">
<command>exo-open ~/.config/openbox/rc.xml</command>
</action>
</item>
<item label="Edit autostart">
<action name="Execute">
<command>exo-open ~/.config/openbox/autostart</command>
</action>
</item>
<separator/>
<item label="Openbox Reconfigure">
<action name="Reconfigure"/>
@ -172,11 +165,23 @@
</action>
</item>
</menu>
<menu id="installer" label="Installation">
<item label="Calamares Installer">
<action name="Execute">
<command>sudo calamares</command>
</action>
</item>
<item label="Architect Installer">
<action name="Execute">
<command>termite -e "sudo setup"</command>
</action>
</item>
</menu>
<menu id="root-menu" label="Openbox 3">
<separator label="Manjaro Openbox"/>
<menu id="installer"/>
<separator/>
<separator/>
<item label="Terminal">
<action name="Execute">
<command>exo-open --launch TerminalEmulator</command>
@ -192,12 +197,16 @@
<command>exo-open --launch WebBrowser</command>
</action>
</item>
<item label="Mail Reader">
<action name="Execute">
<command>exo-open --launch MailReader</command>
</action>
</item>
<item label="Text Editor">
<action name="Execute">
<command>subl3</command>
</action>
</item>
<separator/>
</item> <separator/>
<menu id="applications" label="Applications" execute="/usr/bin/obmenu-generator -S ~/.config/obmenu-generator/applications.pl"/>
<menu id="accessories"/>
<menu id="screenshot"/>

View File

@ -0,0 +1,170 @@
/*******************************************************************************
* Manjaro-Openbox
* User: fhdk
* Copyright: fhdk
*******************************************************************************/
* {
lightblue: rgb( 98, 128, 142, 100%);
darkblue: rgb( 48, 64, 72, 100%);
lightbrightblue: rgb( 0, 188, 212, 100%);
darkbrightblue: rgb( 0, 106, 120, 100%);
lightyellow: rgb( 200, 159, 0, 100%);
darkyellow: rgb( 160, 127, 0, 100%);
brightyellow: rgb( 240, 193, 0, 100%);
lightmaia: rgb( 22, 160, 133, 100%);
darkmaia: rgb( 15, 105, 87, 100%);
brightmaia: rgb( 30, 209, 177, 100%);
lightorange: rgb( 255, 105, 5, 100%);
darkorange: rgb( 200, 80, 0, 100%);
white: rgb( 224, 226, 227, 100%);
gold: rgb( 184, 161, 117, 100%);
foreground: @lightblue;
normal-foreground: @foreground;
alternate-normal-foreground: @foreground;
selected-normal-foreground: @lightbrightblue;
active-foreground: @lightbrightblue;
selected-active-foreground: @lightmaia;
alternate-active-foreground: @active-foreground;
background: @darkblue;
normal-background: @darkblue;
selected-normal-background: @lightblue;
alternate-normal-background: @background;
active-background: @lightmaia;
alternate-active-background: @darkmaia;
selected-active-background: @active-background;
urgent-foreground: @brightyellow;
selected-urgent-foreground: @brightyellow;
alternate-urgent-foreground: @urgent-foreground;
urgent-background: @darkorange;
selected-urgent-background: @lightorange;
alternate-urgent-background: @urgent-background;
red: @darkorange;
blue: @darkblue;
lightfg: @lightblue;
lightbg: @darkblue;
bordercolor: @white;
border-color: @white;
separatorcolor: @white;
background-color: @background;
spacing: 2;
}
#window {
background-color: @background;
border: 1;
padding: 5;
}
#mainbox {
border: 0;
padding: 0;
}
#message {
border: 1px dash 0px 0px ;
border-color: @separatorcolor;
padding: 1px ;
}
#textbox {
text-color: @foreground;
}
#listview {
fixed-height: 0;
border: 2px dash 0px 0px ;
border-color: @separatorcolor;
spacing: 2px ;
scrollbar: true;
padding: 2px 0px 0px ;
}
#element {
border: 0;
padding: 1px ;
}
#element.normal.normal {
background-color: @normal-background;
text-color: @normal-foreground;
}
#element.normal.urgent {
background-color: @urgent-background;
text-color: @urgent-foreground;
}
#element.normal.active {
background-color: @active-background;
text-color: @active-foreground;
}
#element.selected.normal {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
#element.selected.urgent {
background-color: @selected-urgent-background;
text-color: @selected-urgent-foreground;
}
#element.selected.active {
background-color: @selected-active-background;
text-color: @selected-active-foreground;
}
#element.alternate.normal {
background-color: @alternate-normal-background;
text-color: @alternate-normal-foreground;
}
#element.alternate.urgent {
background-color: @alternate-urgent-background;
text-color: @alternate-urgent-foreground;
}
#element.alternate.active {
background-color: @alternate-active-background;
text-color: @alternate-active-foreground;
}
#scrollbar {
width: 4px ;
border: 0;
handle-width: 8px ;
padding: 0;
}
#sidebar {
border: 2px dash 0px 0px ;
border-color: @separatorcolor;
}
#button.selected {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
#inputbar {
spacing: 0;
text-color: @normal-foreground;
padding: 1px ;
}
#case-indicator {
spacing: 0;
text-color: @normal-foreground;
}
#entry {
spacing: 0;
text-color: @normal-foreground;
}
#prompt {
spacing: 0;
text-color: @normal-foreground;
}
#inputbar {
children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
}
#textbox-prompt-colon {
expand: false;
str: ":";
margin: 0px 0.3em 0em 0em ;
text-color: @normal-foreground;
}

View File

@ -73,7 +73,7 @@ manjaro-artwork
manjaro-wallpapers-17.0
manjaro-browser-settings
manjaro-settings-manager-notifier
manjaro-gnome-settings
manjaro-gnome-assets
manjaro-hotfixes
manjaro-pulse
manjaro-hello

View File

@ -264,5 +264,5 @@ xdg-su
## Misc
manjaro-hotfixes
vibrancy-colors
vibrancy-icons-teal