diff --git a/archlive/airootfs/etc/oblogout.conf b/archlive/airootfs/etc/oblogout.conf new file mode 100644 index 00000000..4595c766 --- /dev/null +++ b/archlive/airootfs/etc/oblogout.conf @@ -0,0 +1,20 @@ +[settings] +usehal = false + +[looks] +opacity = 70 +bgcolor = black +buttontheme = foom +#buttons = cancel, logout, restart, shutdown, suspend, hibernate, lock +buttons = restart, shutdown, logout + +[shortcuts] +cancel = Escape +shutdown = S +restart = R +logout = L + +[commands] +shutdown = systemctl poweroff +restart = systemctl reboot +logout = openbox --exit diff --git a/archlive/airootfs/etc/skel/.Xresources b/archlive/airootfs/etc/skel/.Xresources index 0e7c9bd7..68054af5 100644 --- a/archlive/airootfs/etc/skel/.Xresources +++ b/archlive/airootfs/etc/skel/.Xresources @@ -1,25 +1,31 @@ -Xft.autohint: 0 -Xft.antialias: 1 -Xft.hinting: true -Xft.hintstyle: hintslight -Xft.rgba: rgb -Xft.lcdfilter: lcddefault +! general settings +URxvt*saveline: 15000 +URxvt*termName: rxvt-256color +URxvt*iso14755: false -URxvt*font: xft:Inconsolata:size=11 -#URxvt.letterSpace: -3 - -! The line below will be modified by ~/.urxvt_default_res -URxvt*geometry: 96x32+24+24 - -URxvt.scrollBar_right: True -URxvt.scrollstyle: plain - -URxvt.shading: 13 +! appearance +URxvt*depth: 32 +!URxvt*background: rgba:0000/0000/0000/AAAA +!URxvt*background: [80]#404552 +!URxvt*background: [100]#2f343f +!URxvt*foreground: #F8F8FF +!URxvt.underlineColor: #4682B4 +!URxvt.highlightColor: #4682B4 +!URxvt.throughColor: Blue +!URxvt*cursorColor: #dc8cc3 +!URxvt*cursorColor2: Black +URxvt*scrollBar: false +URxvt*scrollBar_right: false +URxvt*internalBorder: 0 +URxvt*externalBorder: 0 +!URxvt.colorIT: #87af5f +!URxvt.colorBD: #c5c8c6 +!URxvt.colorUL: #87afd7 +URxvt.geometry: 92x16 +URxvt.internalBorder: 8 +URxvt.shading: 10 URxvt.transparent: true -URxvt.iso14755: false -URxvt.iso14755_52: false - ! Base16 Isotope ! Scheme: Jan T. Sott !! Modified by 2Shirt @@ -45,3 +51,14 @@ URxvt.iso14755_52: false *.color13: #e0e0e0 *.color14: #3300ff *.color15: #ffffff + +! fonts +Xft.autohint: 0 +Xft.antialias: 1 +Xft.hinting: true +Xft.hintstyle: hintslight +Xft.rgba: rgb +Xft.lcdfilter: lcddefault +URxvt.font: xft:Inconsolata:size=12 +!URxvt.letterSpace: -3 + diff --git a/archlive/airootfs/etc/skel/.bashrc b/archlive/airootfs/etc/skel/.bashrc index a76d83ac..cb37e84b 100644 --- a/archlive/airootfs/etc/skel/.bashrc +++ b/archlive/airootfs/etc/skel/.bashrc @@ -10,6 +10,5 @@ PS1='[\u@\h \W]\$ ' ## Load aliases . $HOME/.aliases -## Start ssh agent -eval $(/usr/bin/ssh-agent) - +# Update LS_COLORS +eval $(dircolors ~/.dircolors) diff --git a/archlive/airootfs/etc/skel/.config/dunst/dunstrc b/archlive/airootfs/etc/skel/.config/dunst/dunstrc new file mode 100644 index 00000000..6d56bc6f --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/dunst/dunstrc @@ -0,0 +1,322 @@ +[global] + ### Display ### + + # Which monitor should the notifications be displayed on. + monitor = 0 + + # Display notification on focused monitor. Possible modes are: + # mouse: follow mouse pointer + # keyboard: follow window with keyboard focus + # none: don't follow anything + # + # "keyboard" needs a window manager that exports the + # _NET_ACTIVE_WINDOW property. + # This should be the case for almost all modern window managers. + # + # If this option is set to mouse or keyboard, the monitor option + # will be ignored. + follow = mouse + + # The geometry of the window: + # [{width}]x{height}[+/-{x}+/-{y}] + # The geometry of the message window. + # The height is measured in number of notifications everything else + # in pixels. If the width is omitted but the height is given + # ("-geometry x2"), the message window expands over the whole screen + # (dmenu-like). If width is 0, the window expands to the longest + # message displayed. A positive x is measured from the left, a + # negative from the right side of the screen. Y is measured from + # the top and down respectively. + # The width can be negative. In this case the actual width is the + # screen width minus the width defined in within the geometry option. + geometry = "300x5-30+20" + + # Show how many messages are currently hidden (because of geometry). + indicate_hidden = yes + + # Shrink window if it's smaller than the width. Will be ignored if + # width is 0. + shrink = no + + # The transparency of the window. Range: [0; 100]. + # This option will only work if a compositing window manager is + # present (e.g. xcompmgr, compiz, etc.). + transparency = 20 + + # The height of the entire notification. If the height is smaller + # than the font height and padding combined, it will be raised + # to the font height and padding. + notification_height = 0 + + # Draw a line of "separator_height" pixel height between two + # notifications. + # Set to 0 to disable. + separator_height = 2 + + # Padding between text and separator. + padding = 8 + + # Horizontal padding. + horizontal_padding = 8 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 3 + + # Defines color of the frame around the notification window. + #frame_color = "#3300ff" + + # Define a color for the separator. + # possible values are: + # * auto: dunst tries to find a color fitting to the background; + # * foreground: use the same color as the foreground; + # * frame: use the same color as the frame; + # * anything else will be interpreted as a X color. + separator_color = frame + + # Sort messages by urgency. + sort = yes + + # Don't remove messages, if the user is idle (no mouse or keyboard input) + # for longer than idle_threshold seconds. + # Set to 0 to disable. + idle_threshold = 120 + + ### Text ### + + font = Inconsolata 8 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 0 + + # Possible values are: + # full: Allow a small subset of html markup in notifications: + # bold + # italic + # strikethrough + # underline + # + # For a complete reference see + # . + # + # strip: This setting is provided for compatibility with some broken + # clients that send markup even though it's not enabled on the + # server. Dunst will try to strip the markup but the parsing is + # simplistic so using this option outside of matching rules for + # specific applications *IS GREATLY DISCOURAGED*. + # + # no: Disable markup parsing, incoming notifications will be treated as + # plain text. Dunst will not advertise that it has the body-markup + # capability if this is set as a global setting. + # + # It's important to note that markup inside the format option will be parsed + # regardless of what this is set to. + markup = full + + # The format of the message. Possible variables are: + # %a appname + # %s summary + # %b body + # %i iconname (including its path) + # %I iconname (without its path) + # %p progress value if set ([ 0%] to [100%]) or nothing + # %n progress value if set without any extra characters + # Markup is allowed + format = "%s\n%b" + + # Alignment of message text. + # Possible values are "left", "center" and "right". + alignment = left + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Split notifications into multiple lines if they don't fit into + # geometry. + word_wrap = yes + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Merge multiple notifications with the same content + stack_duplicates = true + + # Hide the count of merged notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = yes + + ### Icons ### + + # Align icons left/right/off + icon_position = off + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 32 + + # Paths to default icons. + icon_folders = /usr/share/icons/Papirus-Dark/16x16/status/:/usr/share/icons/Papirus-Dark/16x16/devices/ + + ### History ### + + # Should a notification popped up from history be sticky or timeout + # as if it would normally do. + sticky_history = yes + + # Maximum amount of notifications kept in history + history_length = 20 + + ### Misc/Advanced ### + + # dmenu path. + dmenu = /usr/bin/dmenu -p dunst: + + # Browser for opening urls in context menu. + browser = /usr/bin/firefox -new-tab + + # Always run rule-defined scripts, even if the notification is suppressed + always_run_script = true + + # Define the title of the windows spawned by dunst + title = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Print a notification on startup. + # This is mainly for error detection, since dbus (re-)starts dunst + # automatically after a crash. + startup_notification = false + + ### Legacy + + # Use the Xinerama extension instead of RandR for multi-monitor support. + # This setting is provided for compatibility with older nVidia drivers that + # do not support RandR and using it on systems that support RandR is highly + # discouraged. + # + # By enabling this setting dunst will not be able to detect when a monitor + # is connected or disconnected which might break follow mode if the screen + # layout changes. + force_xinerama = false + +# Experimental features that may or may not work correctly. Do not expect them +# to have a consistent behaviour across releases. +[experimental] + # Calculate the dpi to use on a per-monitor basis. + # If this setting is enabled the Xft.dpi value will be ignored and instead + # dunst will attempt to calculate an appropriate dpi value for each monitor + # using the resolution and physical size. This might be useful in setups + # where there are multiple screens with very different dpi values. + per_monitor_dpi = false + +[shortcuts] + + # Shortcuts are specified as [modifier+][modifier+]...key + # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", + # "mod3" and "mod4" (windows-key). + # Xev might be helpful to find names for keys. + + # Close notification. + close = ctrl+space + + # Close all notifications. + close_all = ctrl+shift+space + + # Redisplay last message(s). + # On the US keyboard layout "grave" is normally above TAB and left + # of "1". Make sure this key actually exists on your keyboard layout, + # e.g. check output of 'xmodmap -pke' + history = ctrl+grave + + # Context menu. + context = ctrl+shift+period + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + frame_color = "#2d3036" + background = "#222222" + foreground = "#22ee22" + timeout = 5 + # Icon for notifications with low urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_normal] + frame_color = "#2d3036" + background = "#222222" + foreground = "#e6d947" + timeout = 5 + # Icon for notifications with normal urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_critical] + frame_color = "#2d3036" + background = "#800000" + foreground = "#ffffff" + timeout = 0 + # Icon for notifications with critical urgency, uncomment to enable + #icon = /path/to/icon + +# Every section that isn't one of the above is interpreted as a rules to +# override settings for certain messages. +# Messages can be matched by "appname", "summary", "body", "icon", "category", +# "msg_urgency" and you can override the "timeout", "urgency", "foreground", +# "background", "new_icon" and "format". +# Shell-like globbing will get expanded. +# +# SCRIPTING +# You can specify a script that gets run when the rule matches by +# setting the "script" option. +# The script will be called as follows: +# script appname summary body icon urgency +# where urgency can be "LOW", "NORMAL" or "CRITICAL". +# +# NOTE: if you don't want a notification to be displayed, set the format +# to "". +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh + +#[script-test] +# summary = "*script*" +# script = dunst_test.sh + +#[ignore] +# # This notification will not be displayed +# summary = "foobar" +# format = "" + +#[history-ignore] +# # This notification will not be saved in history +# summary = "foobar" +# history_ignore = yes + +#[signed_on] +# appname = Pidgin +# summary = "*signed on*" +# urgency = low +# +#[signed_off] +# appname = Pidgin +# summary = *signed off* +# urgency = low +# +#[says] +# appname = Pidgin +# summary = *says* +# urgency = critical +# +#[twitter] +# appname = Pidgin +# summary = *twitter.com* +# urgency = normal +# +# vim: ft=cfg diff --git a/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini new file mode 100644 index 00000000..8ba66579 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini @@ -0,0 +1,16 @@ +[Settings] +gtk-theme-name=Arc-Dark +gtk-icon-theme-name=Papirus-Dark +gtk-font-name=Noto Sans 11 +gtk-cursor-theme-name=Adwaita +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb diff --git a/archlive/airootfs/etc/skel/.config/openbox/autostart b/archlive/airootfs/etc/skel/.config/openbox/autostart new file mode 100644 index 00000000..21fd52e5 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/openbox/autostart @@ -0,0 +1,19 @@ +# +# These things are run when an Openbox X Session is started. +# You may place a similar script in $HOME/.config/openbox/autostart +# to run user-specific things. +# + +# If you want to use GNOME config tools... +# +#if test -x /usr/lib/openbox/gnome-settings-daemon >/dev/null; then +# /usr/lib/openbox/gnome-settings-daemon & +#elif which gnome-settings-daemon >/dev/null 2>&1; then +# gnome-settings-daemon & +#fi + +# If you want to use XFCE config tools... +# +#xfce-mcs-manager & + +tint2 & diff --git a/archlive/airootfs/etc/skel/.config/openbox/environment b/archlive/airootfs/etc/skel/.config/openbox/environment new file mode 100644 index 00000000..3311bd6f --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/openbox/environment @@ -0,0 +1,10 @@ +# +# Set system-wide environment variables here for Openbox +# User-specific variables should be placed in $HOME/.config/openbox/environment +# + +# To set your language for displaying messages and time/date formats, use the following: +#LANG=en_CA.UTF8 + +# To set your keyboard layout, you need to modify your X config: +# http://www.google.com/search?q=how+to+set+keyboard+layout+xorg diff --git a/archlive/airootfs/etc/skel/.config/openbox/menu.xml b/archlive/airootfs/etc/skel/.config/openbox/menu.xml new file mode 100644 index 00000000..d0131dc3 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/openbox/menu.xml @@ -0,0 +1,240 @@ + + + + + + + urxvt -t "Hardware Diagnostics" -e hw-diags + + + hardinfo + + + Thunar + + + gparted + + + gsmartcontrol + + + urxvt -title "Network Diagnostics" -hold -e hw-diags-network + + + firefox + + + + + + idle + + + urxvt -e python + + + urxvt -e python2.7 + + + urxvt -e tclsh8.6 + + + + + urxvt -e hexedit + + + urxvt -e nano + + + urxvt -e vi + + + urxvt -e vim + + + + + urxvt -e alsamixer + + + mpv + + + pavucontrol + + + qv4l2 + + + + + bssh + + + bvnc + + + urxvt -e elinks + + + firefox + + + urxvt -e ftp + + + urxvt -e irssi + + + urxvt -e lftp + + + urxvt -e mail + + + exo-open --launch MailReader + + + urxvt -e talk + + + urxvt -e telnet + + + urxvt -e tkvnc + + + exo-open --launch WebBrowser + + + zenmap + + + /usr/share/zenmap/su-to-zenmap.sh + + + + + urxvt -e bc + + + urxvt -e dc + + + + + urxvt -e mc + + + thunar + + + urxvt + + + urxvtc + + + urxvt-tabbed + + + uurxvt + + + + + + + nm-connection-editor + + + + thunar-settings + + + exo-preferred-applications + + + tint2conf + + + + avahi-discover + + + /usr/lib/Thunar/ThunarBulkRename + + + urxvt -e conky + + + gparted + + + gsmartcontrol_polkit + + + urxvt -e htop + + + obmenu + + + urxvt -e pstree + + + urxvt -e /usr/bin/pstree.x11 + + + urxvt -e pstree.x11 + + + hardinfo + + + tint2 + + + urxvt -e top + + + veracrypt + + + + + xfce4-about + + + compton --xrender-sync-fence + + + urxvt -e cmatrix + + + exo-open --launch FileManager + + + urxvt -e info + + + exo-open --launch TerminalEmulator + + + urxvt -e xev + + + + + + + + + + + oblogout + + + diff --git a/archlive/airootfs/etc/skel/.config/openbox/rc.xml b/archlive/airootfs/etc/skel/.config/openbox/rc.xml new file mode 100644 index 00000000..a52cb7cc --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/openbox/rc.xml @@ -0,0 +1,806 @@ + + + + + 10 + 20 + + + yes + + no + + yes + + no + + 200 + + no + + + + Smart + +
yes
+ + Primary + + 1 + + + + + 4 + Triste-Orange + NLIMC + + yes + yes + + sans + 8 + + bold + + normal + + + + sans + 8 + + bold + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + bold + + normal + + + + sans + 9 + + bold + + normal + + + + + + 1 + 1 + + Arch + + 875 + + + + yes + Nonpixel + + Center + + + + 10 + + 10 + + + + + + 0 + 0 + 0 + 0 + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + C-g + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + + + + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + yes + yes + + + + + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + + + root-menu + + + + + urxvt -title "Hardware Diagnostics" -e hw-diags + + + + + thunar + + + + + hardinfo + + + + + urxvt -title "Mount all Volumes" -e mount-all-volumes-foh + + + + + rofi -combi-modi window,drun,run -show combi -modi combi + + + + + urxvt -title "Hardware Diagnostics" -e hw-diags foh + + + + + urxvt + + + + + urxvt -title "Hardware Sensors" -e hw-diags-sensors + + + + + firefox + + + + + oblogout + + + + + 1 + + 500 + + 400 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + top + + + + + + + left + + + + + + + right + + + + + + + bottom + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + + + horizontal + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + + + + client-list-combined-menu + + + + + root-menu + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + menu.xml + 200 + + no + + 100 + + 400 + + yes + + yes + + + + + + diff --git a/archlive/airootfs/etc/skel/.config/rofi/config b/archlive/airootfs/etc/skel/.config/rofi/config new file mode 100644 index 00000000..5c27c752 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/rofi/config @@ -0,0 +1,11 @@ +! rofi theme +rofi.color-enabled: true +! bg border separator +rofi.color-window: argb:d02d3036, #2d3036, #d64937 +! bg fg bg-alt hl-bg hl-fg +rofi.color-normal: argb:d02d3036, #d8d8d8, argb:d02d3036, #2d3036, #d64937 +rofi.color-active: argb:d0222222, #d64937, argb:d0222222, #d64937, #d8d8d8 +rofi.color-urgent: argb:d0888888, #d8d8d8, argb:d0888888, #888888, #d64937 + +rofi.separator-style: solid +rofi.hide-scrollbar: true diff --git a/archlive/airootfs/etc/skel/.config/tint2/tint2rc b/archlive/airootfs/etc/skel/.config/tint2/tint2rc new file mode 100644 index 00000000..a0319768 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/tint2/tint2rc @@ -0,0 +1,250 @@ +#---- Generated by tint2conf 2152 ---- +# See https://gitlab.com/o9000/tint2/wikis/Configure for +# full documentation of the configuration options. +#------------------------------------- +# Gradients +#------------------------------------- +# Backgrounds +# Background 1: Active task, Active taskbar, Default task, Iconified task, Inactive desktop name, Inactive taskbar, Panel, Urgent task +rounded = 0 +border_width = 0 +border_sides = TBLR +background_color = #2d3036 100 +border_color = #2d3036 100 +background_color_hover = #2d3036 100 +border_color_hover = #2d3036 100 +background_color_pressed = #2d3036 100 +border_color_pressed = #2d3036 100 + +# Background 2: +rounded = 1 +border_width = 0 +border_sides = TBLR +background_color = #d8d8d8 30 +border_color = #d8d8d8 30 +background_color_hover = #d8d8d8 30 +border_color_hover = #d8d8d8 30 +background_color_pressed = #d8d8d8 30 +border_color_pressed = #d8d8d8 30 + +# Background 3: +rounded = 1 +border_width = 0 +border_sides = TBLR +background_color = #000000 0 +border_color = #000000 0 +background_color_hover = #000000 0 +border_color_hover = #000000 0 +background_color_pressed = #000000 0 +border_color_pressed = #000000 0 + +# Background 4: +rounded = 1 +border_width = 1 +border_sides = TBLR +background_color = #888888 20 +border_color = #ed2323 60 +background_color_hover = #888888 20 +border_color_hover = #ed2323 60 +background_color_pressed = #888888 20 +border_color_pressed = #ed2323 60 + +# Background 5: +rounded = 0 +border_width = 1 +border_sides = TBLR +background_color = #000000 0 +border_color = #000000 0 +background_color_hover = #000000 0 +border_color_hover = #000000 0 +background_color_pressed = #000000 0 +border_color_pressed = #000000 0 + +# Background 6: +rounded = 0 +border_width = 1 +border_sides = TBLR +background_color = #d8d8d8 8 +border_color = #d8d8d8 0 +background_color_hover = #d8d8d8 8 +border_color_hover = #d8d8d8 0 +background_color_pressed = #d8d8d8 8 +border_color_pressed = #d8d8d8 0 + +# Background 7: Tooltip +rounded = 3 +border_width = 0 +border_sides = TBLR +background_color = #222222 90 +border_color = #222222 90 +background_color_hover = #222222 90 +border_color_hover = #222222 90 +background_color_pressed = #222222 90 +border_color_pressed = #222222 90 + +# Background 8: +rounded = 1 +border_width = 1 +border_sides = TBLR +background_color = #888888 20 +border_color = #888888 20 +background_color_hover = #888888 20 +border_color_hover = #888888 20 +background_color_pressed = #888888 20 +border_color_pressed = #888888 20 + +# Background 9: Active desktop name, Clock +rounded = 1 +border_width = 1 +border_sides = TBLR +background_color = #d64937 100 +border_color = #d64937 100 +background_color_hover = #d64937 100 +border_color_hover = #d64937 100 +gradient_id_hover = 0 +background_color_pressed = #d64937 100 +border_color_pressed = #d64937 100 + +#------------------------------------- +# Panel +panel_items = TSC +panel_size = 100% 30 +panel_margin = 0 0 +panel_padding = 0 0 0 +panel_background_id = 1 +wm_menu = 1 +panel_dock = 0 +panel_position = bottom center horizontal +panel_layer = bottom +panel_monitor = all +primary_monitor_first = 0 +panel_shrink = 0 +autohide = 0 +autohide_show_timeout = 0.3 +autohide_hide_timeout = 1.5 +autohide_height = 6 +strut_policy = follow_size +panel_window_name = tint2 +disable_transparency = 0 +mouse_effects = 0 +font_shadow = 0 +mouse_hover_icon_asb = 100 0 10 +mouse_pressed_icon_asb = 100 0 0 + +#------------------------------------- +# Taskbar +taskbar_mode = single_desktop +taskbar_hide_if_empty = 0 +taskbar_padding = 2 2 0 +taskbar_background_id = 1 +taskbar_active_background_id = 1 +taskbar_name = 1 +taskbar_hide_inactive_tasks = 0 +taskbar_hide_different_monitor = 0 +taskbar_always_show_all_desktop_tasks = 1 +taskbar_name_padding = 5 2 +taskbar_name_background_id = 1 +taskbar_name_active_background_id = 9 +taskbar_name_font = Inconsolata 10 +taskbar_name_font_color = #a9a9a9 100 +taskbar_name_active_font_color = #ffffff 100 +taskbar_distribute_size = 1 +taskbar_sort_order = title +task_align = left + +#------------------------------------- +# Task +task_text = 1 +task_icon = 0 +task_centered = 1 +urgent_nb_of_blink = 20 +task_maximum_size = 200 30 +task_padding = 2 2 2 +task_font = Inconsolata 10 +task_tooltip = 1 +task_font_color = #a8adb5 100 +task_active_font_color = #ffffff 100 +task_urgent_font_color = #a8adb5 100 +task_iconified_font_color = #a8adb5 100 +task_icon_asb = 100 0 0 +task_active_icon_asb = 100 0 0 +task_urgent_icon_asb = 100 0 0 +task_iconified_icon_asb = 80 0 0 +task_background_id = 1 +task_active_background_id = 1 +task_urgent_background_id = 1 +task_iconified_background_id = 1 +mouse_left = toggle_iconify +mouse_middle = none +mouse_right = close +mouse_scroll_up = toggle +mouse_scroll_down = iconify + +#------------------------------------- +# System tray (notification area) +systray_padding = 4 2 3 +systray_background_id = 0 +systray_sort = right2left +systray_icon_size = 24 +systray_icon_asb = 100 0 0 +systray_monitor = 1 +systray_name_filter = + +#------------------------------------- +# Launcher +launcher_padding = 8 4 4 +launcher_background_id = 0 +launcher_icon_background_id = 0 +launcher_icon_size = 0 +launcher_icon_asb = 100 0 0 +launcher_icon_theme_override = 0 +startup_notifications = 0 +launcher_tooltip = 1 + +#------------------------------------- +# Clock +#time1_format = %a, %d %B @ %H:%M +time1_format = %F %H:%M +time2_format = +time1_font = Inconsolata 10 +time1_timezone = +time2_timezone = +clock_font_color = #ffffff 100 +clock_padding = 4 4 +clock_background_id = 9 +clock_tooltip = +clock_tooltip_timezone = +clock_lclick_command = +clock_rclick_command = +clock_mclick_command = +clock_uwheel_command = +clock_dwheel_command = + +#------------------------------------- +# Battery +battery_tooltip = 1 +battery_low_status = 20 +battery_low_cmd = notify-send "battery low" +bat1_font = Inconsolata 12 +bat2_font = Inconsolata 12 +battery_font_color = #b5b5b5 100 +battery_padding = 2 0 +battery_background_id = 0 +battery_hide = 96 +battery_lclick_command = +battery_rclick_command = +battery_mclick_command = +battery_uwheel_command = +battery_dwheel_command = +ac_connected_cmd = +ac_disconnected_cmd = + +#------------------------------------- +# Tooltip +tooltip_show_timeout = 0 +tooltip_hide_timeout = 0 +tooltip_padding = 2 2 +tooltip_background_id = 7 +tooltip_font_color = #d8d8d8 100 +tooltip_font = Inconsolata 12 + diff --git a/archlive/airootfs/etc/skel/.conkyrc b/archlive/airootfs/etc/skel/.conkyrc index e6be18a8..adfd5cbb 100644 --- a/archlive/airootfs/etc/skel/.conkyrc +++ b/archlive/airootfs/etc/skel/.conkyrc @@ -13,7 +13,7 @@ # pkill -xf "conky -q -c $HOME/.config/conky/BL-Default.conkyrc" & ### Begin Window Settings ##################### own_window yes -own_window_type override +#own_window_type override own_window_transparent no own_window_hints undecorated,below,skip_taskbar,skip_pager,sticky own_window_colour 000000 @@ -150,6 +150,8 @@ Disk I/O: ${diskiograph 20,180 ${color} ${color}} Down: ${downspeed}${goto 115}Up:${alignr}${upspeed} +#Network + ${alignc}S H O R T C U T K E Y S ${hr} [Super] + d${alignr}HW Diagnostics diff --git a/archlive/airootfs/etc/skel/.dircolors b/archlive/airootfs/etc/skel/.dircolors new file mode 100644 index 00000000..ccb0d187 --- /dev/null +++ b/archlive/airootfs/etc/skel/.dircolors @@ -0,0 +1,193 @@ +# Configuration file for dircolors, a utility to help you set the +# LS_COLORS environment variable used by GNU ls with the --color option. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copying and distribution of this file, with or without modification, +# are permitted provided the copyright notice and this notice are preserved. +# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +# slackware version of dircolors) are recognized but ignored. +# Below are TERM entries, which can be a glob patterns, to match +# against the TERM environment variable to determine if it is colorizable. +TERM Eterm +TERM ansi +TERM *color* +TERM con[0-9]*x[0-9]* +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM gnome +TERM hurd +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mlterm +TERM putty +TERM rxvt* +TERM screen* +TERM st +TERM terminator +TERM tmux* +TERM vt100 +TERM xterm* +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +#NORMAL 00 # no color code at all +#FILE 00 # regular file: use no color at all +RESET 0 # reset to "normal" color +DIR 01;34 # directory +LINK 01;36 # symbolic link. (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00 # regular file with more than one link +FIFO 40;33 # pipe +SOCK 01;35 # socket +DOOR 01;35 # door +BLK 40;33;01 # block device driver +CHR 40;33;01 # character device driver +ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ... +MISSING 00 # ... and the files they point to +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 40;33;01 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 40;33 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable +# This is for files with execute permission: +EXEC 01;32 +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') +# If you use DOS-style suffixes, you may want to uncomment the following: +#.cmd 01;32 # executables (bright green) +#.exe 01;32 +#.com 01;32 +#.btm 01;32 +#.bat 01;32 +# Or if you want to colorize scripts even if they do not have the +# executable bit actually set. +#.sh 01;32 +#.csh 01;32 + # archives or compressed (bright red) +.tar 01;31 +.tgz 01;31 +.arc 01;31 +.arj 01;31 +.taz 01;31 +.lha 01;31 +.lz4 01;31 +.lzh 01;31 +.lzma 01;31 +.tlz 01;31 +.txz 01;31 +.tzo 01;31 +.t7z 01;31 +.zip 01;31 +.z 01;31 +.Z 01;31 +.dz 01;31 +.gz 01;31 +.lrz 01;31 +.lz 01;31 +.lzo 01;31 +.xz 01;31 +.zst 01;31 +.tzst 01;31 +.bz2 01;31 +.bz 01;31 +.tbz 01;31 +.tbz2 01;31 +.tz 01;31 +.deb 01;31 +.rpm 01;31 +.jar 01;31 +.war 01;31 +.ear 01;31 +.sar 01;31 +.rar 01;31 +.alz 01;31 +.ace 01;31 +.zoo 01;31 +.cpio 01;31 +.7z 01;31 +.rz 01;31 +.cab 01;31 +.wim 01;31 +.swm 01;31 +.dwm 01;31 +.esd 01;31 +# image formats +.jpg 01;35 +.jpeg 01;35 +.mjpg 01;35 +.mjpeg 01;35 +.gif 01;35 +.bmp 01;35 +.pbm 01;35 +.pgm 01;35 +.ppm 01;35 +.tga 01;35 +.xbm 01;35 +.xpm 01;35 +.tif 01;35 +.tiff 01;35 +.png 01;35 +.svg 01;35 +.svgz 01;35 +.mng 01;35 +.pcx 01;35 +.mov 01;35 +.mpg 01;35 +.mpeg 01;35 +.m2v 01;35 +.mkv 01;35 +.webm 01;35 +.ogm 01;35 +.mp4 01;35 +.m4v 01;35 +.mp4v 01;35 +.vob 01;35 +.qt 01;35 +.nuv 01;35 +.wmv 01;35 +.asf 01;35 +.rm 01;35 +.rmvb 01;35 +.flc 01;35 +.avi 01;35 +.fli 01;35 +.flv 01;35 +.gl 01;35 +.dl 01;35 +.xcf 01;35 +.xwd 01;35 +.yuv 01;35 +.cgm 01;35 +.emf 01;35 +# https://wiki.xiph.org/MIME_Types_and_File_Extensions +.ogv 01;35 +.ogx 01;35 +# audio formats +.aac 00;36 +.au 00;36 +.flac 00;36 +.m4a 00;36 +.mid 00;36 +.midi 00;36 +.mka 00;36 +.mp3 00;36 +.mpc 00;36 +.ogg 00;36 +.ra 00;36 +.wav 00;36 +# https://wiki.xiph.org/MIME_Types_and_File_Extensions +.oga 00;36 +.opus 00;36 +.spx 00;36 +.xspf 00;36 diff --git a/archlive/airootfs/etc/skel/.dmrc b/archlive/airootfs/etc/skel/.dmrc deleted file mode 100644 index 9cd11917..00000000 --- a/archlive/airootfs/etc/skel/.dmrc +++ /dev/null @@ -1,3 +0,0 @@ -[Desktop] -Language=en_US.utf8 -Session=xfce diff --git a/archlive/airootfs/etc/skel/.gtkrc-2.0 b/archlive/airootfs/etc/skel/.gtkrc-2.0 new file mode 100644 index 00000000..b54a0f5f --- /dev/null +++ b/archlive/airootfs/etc/skel/.gtkrc-2.0 @@ -0,0 +1,19 @@ +# DO NOT EDIT! This file will be overwritten by LXAppearance. +# Any customization should be done in ~/.gtkrc-2.0.mine instead. + +include "/home/wktech/.gtkrc-2.0.mine" +gtk-theme-name="Arc-Dark" +gtk-icon-theme-name="Papirus-Dark" +gtk-font-name="Noto Sans 11" +gtk-cursor-theme-name="Adwaita" +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle="hintslight" +gtk-xft-rgba="rgb" diff --git a/archlive/airootfs/etc/skel/.update_conky b/archlive/airootfs/etc/skel/.update_conky new file mode 100644 index 00000000..8fba9f91 --- /dev/null +++ b/archlive/airootfs/etc/skel/.update_conky @@ -0,0 +1,12 @@ +#!/bin/bash + +IF_LIST=($(ip l | egrep '^[0-9]+:\s+(eth|en|wl)' | sed -r 's/^[0-9]+:\s+(\w+):.*/\1/' | sort)) + + +for i in "${IF_LIST[@]}"; do + if [[ "${i:0:1}" == "e" ]]; then + sed -i -r "s/#Network/Wired:\${alignr}\${addr $i}\n#Network/" ~/.conkyrc + else + sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" ~/.conkyrc + fi +done diff --git a/archlive/airootfs/etc/skel/.xinitrc b/archlive/airootfs/etc/skel/.xinitrc index a674ec72..1ed2ec3e 100644 --- a/archlive/airootfs/etc/skel/.xinitrc +++ b/archlive/airootfs/etc/skel/.xinitrc @@ -1,10 +1,19 @@ #!/bin/sh +dbus-update-activation-environment --systemd DISPLAY xrdb -merge $HOME/.Xresources +xset s off +xset -dpms +eval $(ssh-agent) +export SSH_AUTH_SOCK compton & sleep 1s conky -d +nm-applet & +cbatticon & +pasystray & $HOME/.network_start & $HOME/.urxvt_default_res & $HOME/.update_wallpaper & -exec i3 +$HOME/.update_conky & +exec openbox-session diff --git a/archlive/airootfs/etc/skel/.zlogin b/archlive/airootfs/etc/skel/.zlogin index 799f452a..5e685b31 100644 --- a/archlive/airootfs/etc/skel/.zlogin +++ b/archlive/airootfs/etc/skel/.zlogin @@ -1,6 +1,10 @@ setterm -blank 0 -powerdown 0 if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then if ! fgrep -q "nox" /proc/cmdline; then + if fgrep -q "i3" /proc/cmdline; then + sed -i -r 's/#(own_window_type override)/\1/' ~/.conkyrc + sed -i -r 's/openbox-session/i3/' ~/.xinitrc + fi startx else hw-diags cli diff --git a/archlive/airootfs/etc/skel/.zshrc b/archlive/airootfs/etc/skel/.zshrc index c4e9f93c..23320e13 100644 --- a/archlive/airootfs/etc/skel/.zshrc +++ b/archlive/airootfs/etc/skel/.zshrc @@ -86,3 +86,5 @@ source $ZSH/oh-my-zsh.sh ## Load aliases . $HOME/.aliases +## Update LS_COLORS +eval $(dircolors ~/.dircolors) diff --git a/archlive/airootfs/root/customize_airootfs.sh b/archlive/airootfs/root/customize_airootfs.sh index 6efee777..6d70438f 100644 --- a/archlive/airootfs/root/customize_airootfs.sh +++ b/archlive/airootfs/root/customize_airootfs.sh @@ -22,6 +22,7 @@ sed -i 's/#FallbackNTP/NTP/' /etc/systemd/timesyncd.conf echo "[customize_airootfs] INFO: Setup root user" usermod -s /usr/bin/zsh root cp -aT /etc/skel/ /root/ +rm /root/.ssh/id* rm /root/.zlogin chmod 700 /root echo "root:Abracadabra" | chpasswd @@ -38,32 +39,21 @@ echo '%wheel ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers # Misc echo "[customize_airootfs] INFO: Misc Settings" -sed -i -r 's/extensions.autoDisableScopes", [0-9]+/extensions.autoDisableScopes", 0/' /usr/lib/firefox/browser/defaults/preferences/vendor.js +#sed -i -r 's/extensions.autoDisableScopes", [0-9]+/extensions.autoDisableScopes", 0/' /usr/lib/firefox/browser/defaults/preferences/vendor.js +mkdir /media # Set mirrorlist echo "[customize_airootfs] INFO: Setup pacman mirrorlist" -## Process: -## Replace newlines with ~ to treat as single line -## Uncomment all US mirrors -## Resetore newlines -## Rank mirrors to only use the top 10 mirrors -### BROKEN ### -#mv -bv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak -#tmp_file="$(mktemp)" -#tr '\n' '~' < /etc/pacman.d/mirrorlist.bak | sed -r 's/([0-1]\.[0-9], United States)~#/\1~/g' | tr '~' '\n' > "$tmp_file" -#rankmirrors -n 10 "$tmp_file" | egrep '^S' > /etc/pacman.d/mirrorlist -#rm -v "$tmp_file" -### List ranked on 2017-06-08 ### -echo 'Server = http://mirror.htnshost.com/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist -echo 'Server = http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = http://mirrors.cat.pdx.edu/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = http://mirror.lty.me/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirror.lty.me/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = http://mirrors.xmission.com/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.ocf.berkeley.edu/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = http://mirrors.ocf.berkeley.edu/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +# Ranked on 2017-10-19 +echo 'Server = http://mirrors.cat.pdx.edu/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist +echo 'Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = http://archlinux.surlyjake.com/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = https://archlinux.surlyjake.com/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = http://ca.us.mirror.archlinux-br.org/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = https://arlm.tyzoid.com/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = http://il.us.mirror.archlinux-br.org/$repo/os/$arch' >> /etc/pacman.d/mirrorlist # journald settings (from archiso) echo "[customize_airootfs] INFO: Setup journald" diff --git a/archlive/packages.both b/archlive/packages.both index e8fe8359..31fa6dbf 100644 --- a/archlive/packages.both +++ b/archlive/packages.both @@ -7,6 +7,7 @@ bc bluez bluez-utils btrfs-progs +cbatticon chntpw cmatrix colordiff @@ -40,6 +41,7 @@ gparted gptfdisk grub gsmartcontrol +gtk-theme-arc-git hardinfo hdparm hexedit @@ -71,19 +73,24 @@ mtools mupdf ncdu ndisc6 +network-manager-applet networkmanager nfs-utils nilfs-utils nmap ntfs-3g ntp +oblogout +openbox-patched openconnect openssh openvpn p7zip +papirus-icon-theme partclone parted partimage +pasystray pavucontrol ppp pptpclient @@ -107,6 +114,8 @@ sudo tcpdump terminus-font testdisk-wip +thunar +tint2 tk tmux tree diff --git a/archlive/pacman.conf b/archlive/pacman.conf index 7e5ad8a9..06b23f70 100644 --- a/archlive/pacman.conf +++ b/archlive/pacman.conf @@ -71,7 +71,7 @@ LocalFileSigLevel = Optional [wk-repo] SigLevel = Optional TrustAll -Server = file:///home/builduser/Projects/wk-arch/wk-repo +Server = file:///home/builduser/wk-arch/wk-repo #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/build-wk b/build-wk index ef584bb7..dcdefca8 100644 --- a/build-wk +++ b/build-wk @@ -1,9 +1,9 @@ #!/bin/bash #/srv/ArchBuilds # Set Vars -LOG_DIR="/srv/ArchBuilds/BuildLogs" -OUT_DIR="/srv/ArchBuilds/isos" -TMP_DIR="/srv/ScratchDir" +LOG_DIR="/mnt/Build/logs" +OUT_DIR="/mnt/Build/isos" +TMP_DIR="/mnt/Scratch" DATE="$(date +%F)" DATETIME="$(date +%F_%H%M)" @@ -12,6 +12,8 @@ if [[ "$EUID" -eq 0 ]]; then # Set permissions echo "Setting permissions..." chown root.root archlive -R + chmod 700 archlive/airootfs/etc/skel/.ssh + chmod 600 archlive/airootfs/etc/skel/.ssh/id_rsa # Modify build.sh if ! grep -iq 'customize_iso' archlive/build.sh; then @@ -56,7 +58,7 @@ else # Build custom repo packages mkdir _done/$AFTER - for p in aic94xx-firmware bash-pipes i3-gaps i3lock-fancy-git mprime-bin testdisk-wip ttf-font-awesome wd719x-firmware wimlib; do + for p in aic94xx-firmware bash-pipes gtk-theme-arc-git hfsprogs i3-gaps i3lock-fancy-git mprime-bin openbox-patched papirus-icon-theme pasystray testdisk-wip ttf-font-awesome wd719x-firmware wimlib; do echo "Building: $p" curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz tar xf $p.tar.gz