Skip to content
Snippets Groups Projects
Commit b0a2602d authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

resolve conflicts

parents 3f28592a 276120cb
No related branches found
No related tags found
No related merge requests found
Showing
with 258 additions and 422 deletions
......@@ -46,6 +46,7 @@ wpa_supplicant
obarun-install
obarun-install-themes
pacopts
obnews
#-------------------
## fonts
......
......@@ -54,7 +54,7 @@ parole
polkit-gnome
scrot
spacefm
terminator
sakura
udevil
volumeicon
xarchiver-gtk2
......
......@@ -24,6 +24,7 @@ Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = systemd
IgnorePkg = libsystemd
IgnorePkg = systemd-libs
#IgnoreGroup =
#NoUpgrade =
......@@ -76,18 +77,22 @@ Server = https://repo.obarun.org/66-repo
#SigLevel = Required
#Server = https://repo.obarun.org/obcore/testing/
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obcore]
SigLevel = Required
Server = https://repo.obarun.org/obcore
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obextra]
SigLevel = Required
Server = https://repo.obarun.org/obextra
[observice]
SigLevel = Required
Server = https://repo.obarun.org/observice
#[testing]
#Include = /etc/pacman.d/mirrorlist
......
# Copyright (c) 2015-2019 Eric Vidal <eric@obarun.org>
# All rights reserved.
#
# This file is part of Obarun. It is subject to the license terms in
# the LICENSE file found in the top-level directory of this
# distribution.
# This file may not be copied, modified, propagated, or distributed
# except according to the terms contained in the LICENSE file.
##################
## Main variable
##################
# allow to update the obarun-install script when it launched [yes|no]
UPDATE_INS="yes"
# allow to update the obarun-install-themes script when it launched [yes|no]
UPDATE_TPL="yes"
# Be more/less verbose
# 1 for more, 0 for less
DEBUG=0
# git source of obarun-install package
GIT_ADDR="https://framagit.org/Obarun/obarun-install.git"
# git branch to use, if not set master is took by default
BRANCH=""
# gpg directory used during the installation
GPG_DIR="/var/lib/obarun/gnupg"
# editor used during the installation
EDITOR="mcedit"
# valid mountpoint for installation
NEWROOT="/mnt"
# configuration files directory used for the installation
CONFIG_DIR="jwm"
# cache directory used during the installation
CACHE_DIR="/var/cache/pacman/pkg"
# use rankmirrors to find the fastest local mirror
# expected value are yes or no without uppercase
RANKMIRRORS="no"
#########################
## Customization variable
#########################
# define name of the host for the new installation
HOSTNAME="Ob66"
# define the locale for the new installation
LOCALE="en_US.UTF-8"
# define the zone for the new installation e.g Europe
ZONE="GMT"
# define the subzone for the new installation e.g. Londres
SUBZONE=""
# define the keymap for the console for the new installation
KEYMAP="us"
# define the keymap for the Desktop for the new installation
XKEYMAP="us"
# define the name for a new user for the new installation
NEWUSER="oblive"
#
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives
#
# GENERAL OPTIONS
#
[options]
# The following paths are commented out with their default values listed.
# If you wish to use different paths, uncomment and update the paths.
#RootDir = /
#DBPath = /var/lib/pacman/
#CacheDir = /var/cache/pacman/pkg/
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
#UseDelta = 0.7
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = systemd
IgnorePkg = libsystemd
#IgnoreGroup =
#NoUpgrade =
NoExtract = /usr/lib/libsystemd*.*
# Misc options
#UseSyslog
Color
TotalDownload
CheckSpace
#VerbosePkgLists
# By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages.
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
#RemoteFileSigLevel = Required
# NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Arch Linux
# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
# - can be defined here or included from another file
# - pacman will search repositories in the order defined here
# - local/custom mirrors can be added here or in separate files
# - repositories listed first will take precedence when packages
# have identical names, regardless of version number
# - URLs will have $repo replaced by the name of the current repo
# - URLs will have $arch replaced by the name of the architecture
#
# Repository entries are of the format:
# [repo-name]
# Server = ServerName
# Include = IncludePath
#
# The header [repo-name] is crucial - it must be present and
# uncommented to enable the repo.
#
# The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.
[66]
SigLevel = Required
Server = https://repo.obarun.org/66-repo
#[obcore-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obcore/testing/
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obcore]
SigLevel = Required
Server = https://repo.obarun.org/obcore
[obextra]
SigLevel = Required
Server = https://repo.obarun.org/obextra
#[testing]
#Include = /etc/pacman.d/mirrorlist
[core]
Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
#[community-testing]
#Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist
#[multilib]
#Include = /etc/pacman.d/mirrorlist
<?xml version="1.0"?>
<JWM>
<Font>Liberation Sans-9</Font>
<!-- Window button -->
<ButtonClose>/usr/share/themes/Arc/unity/close.svg</ButtonClose>
<ButtonMax>/usr/share/themes/Arc/unity/unmaximize_dash_prelight.svg</ButtonMax>
......@@ -8,7 +8,7 @@
<ButtonMin>/usr/share/themes/Arc/unity/minimize_dash_prelight.svg</ButtonMin>
<!-- Visual Style Window. -->
<WindowStyle decorations="flat">
<Font>Liberation Sans-9</Font>
<Width>1</Width>
<Height>25</Height>
<Corner>5</Corner>
......@@ -25,7 +25,7 @@
<!-- Visual Style Tray. -->
<TrayStyle decorations="flat">
<Font>Liberation Sans-9</Font>
<Background>#444444</Background>
<Foreground>white</Foreground>
<Active>
......@@ -37,7 +37,7 @@
<!-- Visual Style Pager. -->
<PagerStyle>
<Font>Liberation Sans-9</Font>
<Outline>#444444</Outline>
<Text>white</Text>
<Foreground>#444444</Foreground>
......@@ -50,7 +50,7 @@
<!-- Visual Style Menu. -->
<MenuStyle>
<Font>Liberation Sans-9</Font>
<Foreground>white</Foreground>
<Background>#444444</Background>
<Active>
......@@ -62,7 +62,7 @@
<!-- Visual Style Pop. -->
<PopupStyle>
<Font>Liberation Sans-9</Font>
<Outline>#FFFFFF</Outline>
<Foreground>#000000</Foreground>
<Background>#FFFFFF</Background>
......
......@@ -17,7 +17,7 @@
<Spacer width="2"/>
<TrayButton icon="geany">root:4</TrayButton>
<Spacer width="2"/>
<TrayButton icon="terminator">exec:terminator</TrayButton>
<TrayButton icon="terminal">exec:sakura</TrayButton>
<Spacer width="5"/>
<!-- pager -->
......
[global_config]
always_split_with_profile = True
enabled_plugins = LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler
suppress_multiple_term_dialog = True
title_receive_bg_color = "#310000"
title_transmit_bg_color = "#310000"
[keybindings]
[layouts]
[[default]]
[[[child1]]]
parent = window0
profile = default
type = Terminal
[[[window0]]]
parent = ""
type = Window
[plugins]
[profiles]
[[default]]
background_darkness = 0.76
background_image = None
background_type = transparent
icon_bell = False
scrollback_infinite = True
show_titlebar = False
......@@ -14,7 +14,7 @@ LOGIN AND PASSWORD
------------------
root login : root
user login : obarun
user login : oblive
root password : toor
obarun password : toor
......
......@@ -46,6 +46,7 @@ wpa_supplicant
obarun-install
obarun-install-themes
pacopts
obnews
#-------------------
## fonts
......
......@@ -24,6 +24,7 @@ Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = systemd
IgnorePkg = libsystemd
IgnorePkg = systemd-libs
#IgnoreGroup =
#NoUpgrade =
......@@ -76,18 +77,22 @@ Server = https://repo.obarun.org/66-repo
#SigLevel = Required
#Server = https://repo.obarun.org/obcore/testing/
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obcore]
SigLevel = Required
Server = https://repo.obarun.org/obcore
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obextra]
SigLevel = Required
Server = https://repo.obarun.org/obextra
[observice]
SigLevel = Required
Server = https://repo.obarun.org/observice
#[testing]
#Include = /etc/pacman.d/mirrorlist
......
# Copyright (c) 2015-2019 Eric Vidal <eric@obarun.org>
# All rights reserved.
#
# This file is part of Obarun. It is subject to the license terms in
# the LICENSE file found in the top-level directory of this
# distribution.
# This file may not be copied, modified, propagated, or distributed
# except according to the terms contained in the LICENSE file.
##################
## Main variable
##################
# allow to update the obarun-install script when it launched [yes|no]
UPDATE_INS="yes"
# allow to update the obarun-install-themes script when it launched [yes|no]
UPDATE_TPL="yes"
# Be more/less verbose
# 1 for more, 0 for less
DEBUG=0
# git source of obarun-install package
GIT_ADDR="https://framagit.org/Obarun/obarun-install.git"
# git branch to use, if not set master is took by default
BRANCH=""
# gpg directory used during the installation
GPG_DIR="/var/lib/obarun/gnupg"
# editor used during the installation
EDITOR="mcedit"
# valid mountpoint for installation
NEWROOT="/mnt"
# configuration files directory used for the installation
CONFIG_DIR="minimal"
# cache directory used during the installation
CACHE_DIR="/var/cache/pacman/pkg"
# use rankmirrors to find the fastest local mirror
# expected value are yes or no without uppercase
RANKMIRRORS="no"
#########################
## Customization variable
#########################
# define name of the host for the new installation
HOSTNAME="Ob66"
# define the locale for the new installation
LOCALE="en_US.UTF-8"
# define the zone for the new installation e.g Europe
ZONE="GMT"
# define the subzone for the new installation e.g. Londres
SUBZONE=""
# define the keymap for the console for the new installation
KEYMAP="us"
# define the keymap for the Desktop for the new installation
XKEYMAP="us"
# define the name for a new user for the new installation
NEWUSER="oblive"
#
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives
#
# GENERAL OPTIONS
#
[options]
# The following paths are commented out with their default values listed.
# If you wish to use different paths, uncomment and update the paths.
#RootDir = /
#DBPath = /var/lib/pacman/
#CacheDir = /var/cache/pacman/pkg/
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
#UseDelta = 0.7
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = systemd
IgnorePkg = libsystemd
#IgnoreGroup =
#NoUpgrade =
NoExtract = /usr/lib/libsystemd*.*
# Misc options
#UseSyslog
Color
TotalDownload
CheckSpace
#VerbosePkgLists
# By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages.
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
#RemoteFileSigLevel = Required
# NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Arch Linux
# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
# - can be defined here or included from another file
# - pacman will search repositories in the order defined here
# - local/custom mirrors can be added here or in separate files
# - repositories listed first will take precedence when packages
# have identical names, regardless of version number
# - URLs will have $repo replaced by the name of the current repo
# - URLs will have $arch replaced by the name of the architecture
#
# Repository entries are of the format:
# [repo-name]
# Server = ServerName
# Include = IncludePath
#
# The header [repo-name] is crucial - it must be present and
# uncommented to enable the repo.
#
# The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.
[66]
SigLevel = Required
Server = https://repo.obarun.org/66-repo
#[obcore-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obcore/testing/
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obcore]
SigLevel = Required
Server = https://repo.obarun.org/obcore
[obextra]
SigLevel = Required
Server = https://repo.obarun.org/obextra
#[testing]
#Include = /etc/pacman.d/mirrorlist
[core]
Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
#[community-testing]
#Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist
#[multilib]
#Include = /etc/pacman.d/mirrorlist
......@@ -46,6 +46,7 @@ wpa_supplicant
obarun-install
obarun-install-themes
pacopts
obnews
#-------------------
## fonts
......
......@@ -58,7 +58,7 @@ parole
polkit-gnome
scrot
spacefm
terminator
sakura
udevil
volumeicon
xarchiver-gtk2
......
......@@ -24,6 +24,7 @@ Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = systemd
IgnorePkg = libsystemd
IgnorePkg = systemd-libs
#IgnoreGroup =
#NoUpgrade =
......@@ -76,18 +77,22 @@ Server = https://repo.obarun.org/66-repo
#SigLevel = Required
#Server = https://repo.obarun.org/obcore/testing/
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obcore]
SigLevel = Required
Server = https://repo.obarun.org/obcore
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obextra]
SigLevel = Required
Server = https://repo.obarun.org/obextra
[observice]
SigLevel = Required
Server = https://repo.obarun.org/observice
#[testing]
#Include = /etc/pacman.d/mirrorlist
......
# Copyright (c) 2015-2019 Eric Vidal <eric@obarun.org>
# All rights reserved.
#
# This file is part of Obarun. It is subject to the license terms in
# the LICENSE file found in the top-level directory of this
# distribution.
# This file may not be copied, modified, propagated, or distributed
# except according to the terms contained in the LICENSE file.
##################
## Main variable
##################
# allow to update the obarun-install script when it launched [yes|no]
UPDATE_INS="yes"
# allow to update the obarun-install-themes script when it launched [yes|no]
UPDATE_TPL="yes"
# Be more/less verbose
# 1 for more, 0 for less
DEBUG=0
# git source of obarun-install package
GIT_ADDR="https://framagit.org/Obarun/obarun-install.git"
# git branch to use, if not set master is took by default
BRANCH=""
# gpg directory used during the installation
GPG_DIR="/var/lib/obarun/gnupg"
# editor used during the installation
EDITOR="mcedit"
# valid mountpoint for installation
NEWROOT="/mnt"
# configuration files directory used for the installation
CONFIG_DIR="openbox"
# cache directory used during the installation
CACHE_DIR="/var/cache/pacman/pkg"
# use rankmirrors to find the fastest local mirror
# expected value are yes or no without uppercase
RANKMIRRORS="no"
#########################
## Customization variable
#########################
# define name of the host for the new installation
HOSTNAME="Ob66"
# define the locale for the new installation
LOCALE="en_US.UTF-8"
# define the zone for the new installation e.g Europe
ZONE="GMT"
# define the subzone for the new installation e.g. Londres
SUBZONE=""
# define the keymap for the console for the new installation
KEYMAP="us"
# define the keymap for the Desktop for the new installation
XKEYMAP="us"
# define the name for a new user for the new installation
NEWUSER="oblive"
#
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives
#
# GENERAL OPTIONS
#
[options]
# The following paths are commented out with their default values listed.
# If you wish to use different paths, uncomment and update the paths.
#RootDir = /
#DBPath = /var/lib/pacman/
#CacheDir = /var/cache/pacman/pkg/
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
#UseDelta = 0.7
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = systemd
IgnorePkg = libsystemd
#IgnoreGroup =
#NoUpgrade =
NoExtract = /usr/lib/libsystemd*.*
# Misc options
#UseSyslog
Color
TotalDownload
CheckSpace
#VerbosePkgLists
# By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages.
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
#RemoteFileSigLevel = Required
# NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Arch Linux
# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
# - can be defined here or included from another file
# - pacman will search repositories in the order defined here
# - local/custom mirrors can be added here or in separate files
# - repositories listed first will take precedence when packages
# have identical names, regardless of version number
# - URLs will have $repo replaced by the name of the current repo
# - URLs will have $arch replaced by the name of the architecture
#
# Repository entries are of the format:
# [repo-name]
# Server = ServerName
# Include = IncludePath
#
# The header [repo-name] is crucial - it must be present and
# uncommented to enable the repo.
#
# The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.
[66]
SigLevel = Required
Server = https://repo.obarun.org/66-repo
#[obcore-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obcore/testing/
#[obextra-testing]
#SigLevel = Required
#Server = https://repo.obarun.org/obextra/testing
[obcore]
SigLevel = Required
Server = https://repo.obarun.org/obcore
[obextra]
SigLevel = Required
Server = https://repo.obarun.org/obextra
#[testing]
#Include = /etc/pacman.d/mirrorlist
[core]
Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
#[community-testing]
#Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist
#[multilib]
#Include = /etc/pacman.d/mirrorlist
......@@ -93,9 +93,9 @@
<command>sudo -A geany</command>
</action>
</item>
<item label="Terminator" icon="/usr/share/icons/Faenza/apps/24/terminator.png">
<item label="Sakura" icon="/usr/share/icons/Faenza/apps/24/Terminal.png">
<action name="Execute">
<command>terminator</command>
<command>sakura</command>
</action>
</item>
<item label="Pictures" icon="/usr/share/icons/Faenza/apps/24/gpicview.png">
......
[global_config]
always_split_with_profile = True
enabled_plugins = LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler
suppress_multiple_term_dialog = True
title_receive_bg_color = "#310000"
title_transmit_bg_color = "#310000"
[keybindings]
[layouts]
[[default]]
[[[child1]]]
parent = window0
profile = default
type = Terminal
[[[window0]]]
parent = ""
type = Window
[plugins]
[profiles]
[[default]]
background_darkness = 0.76
background_image = None
background_type = transparent
icon_bell = False
scrollback_infinite = True
show_titlebar = False
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment