From 542d584b4a4b5e2566b7d258e4a5310adc3557d6 Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Wed, 6 Dec 2017 17:58:58 -0800 Subject: [PATCH] 2017-08: Retroactive Updates Switched to i3/dunst/rofi over xfce4 * Custom Repo overhaul * build-wk downloads, builds, and adds packages to the custom-repo * Dropped i686 support * HW-Diag scripts should now "support" virtual drives * e.g. /dev/vda (for easier testing) * Bugfix: removed resolv.conf symlink to fix NetworkManager --- .gitignore | 3 +- archlive/airootfs/etc/lightdm/lightdm.conf | 165 --------- archlive/airootfs/etc/resolv.conf | 1 - archlive/airootfs/etc/skel/.Xresources | 19 +- .../etc/skel/.config/autostart/Conky.desktop | 12 - .../skel/.config/autostart/Network.desktop | 12 - .../skel/.config/autostart/Wallpaper.desktop | 12 - .../autostart/urxvt-default-res.desktop | 12 - .../skel/.config/gtk-2.0/gtkfilechooser.ini | 11 - .../etc/skel/.config/gtk-3.0/settings.ini | 5 - .../airootfs/etc/skel/.config/htop/htoprc | 26 -- archlive/airootfs/etc/skel/.config/i3/config | 314 ++++++++++++++++++ .../airootfs/etc/skel/.config/i3status/config | 76 +++++ .../etc/skel/.config/xfce4/helpers.rc | 4 - .../skel/.config/xfce4/panel/whiskermenu-1.rc | 60 ---- .../skel/.config/xfce4/terminal/terminalrc | 19 -- .../skel/.config/xfce4/xfce4-taskmanager.rc | 25 -- .../xfconf/xfce-perchannel-xml/displays.xml | 18 - .../xfconf/xfce-perchannel-xml/keyboards.xml | 7 - .../xfconf/xfce-perchannel-xml/ristretto.xml | 9 - .../xfconf/xfce-perchannel-xml/thunar.xml | 12 - .../xfce-perchannel-xml/xfce4-appfinder.xml | 46 --- .../xfce-perchannel-xml/xfce4-desktop.xml | 40 --- .../xfce4-keyboard-shortcuts.xml | 164 --------- .../xfce-perchannel-xml/xfce4-mixer.xml | 28 -- .../xfce-perchannel-xml/xfce4-notifyd.xml | 5 - .../xfce-perchannel-xml/xfce4-panel.xml | 64 ---- .../xfce4-power-manager.xml | 10 - .../xfce-perchannel-xml/xfce4-session.xml | 37 --- .../xfce4-settings-editor.xml | 9 - .../xfce4-settings-manager.xml | 8 - .../xfconf/xfce-perchannel-xml/xfwm4.xml | 87 ----- .../xfconf/xfce-perchannel-xml/xsettings.xml | 38 --- archlive/airootfs/etc/skel/.conkyrc | 5 +- archlive/airootfs/etc/skel/.update_wallpaper | 7 +- archlive/airootfs/etc/skel/.urxvt_default_res | 5 +- archlive/airootfs/etc/skel/.xinitrc | 31 +- archlive/airootfs/etc/skel/.zlogin | 7 +- archlive/airootfs/etc/skel/.zshrc | 3 - archlive/airootfs/root/customize_airootfs.sh | 2 +- .../usr/local/bin/{applefans => apple_fans} | 0 .../airootfs/usr/local/bin/hw-diags-inner | 2 +- .../applications/Hardware Diagnostics.desktop | 2 +- .../applications/Hardware Information.desktop | 2 +- .../share/applications/NetworkTest.desktop | 2 +- .../usr/share/applications/SpeedTest.desktop | 2 +- archlive/packages.both | 29 +- archlive/pacman.conf | 4 +- build-wk | 94 ++++-- custom-repo/update | 17 - 50 files changed, 517 insertions(+), 1055 deletions(-) delete mode 100644 archlive/airootfs/etc/lightdm/lightdm.conf delete mode 100644 archlive/airootfs/etc/resolv.conf delete mode 100644 archlive/airootfs/etc/skel/.config/autostart/Conky.desktop delete mode 100644 archlive/airootfs/etc/skel/.config/autostart/Network.desktop delete mode 100644 archlive/airootfs/etc/skel/.config/autostart/Wallpaper.desktop delete mode 100644 archlive/airootfs/etc/skel/.config/autostart/urxvt-default-res.desktop delete mode 100644 archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini delete mode 100644 archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini delete mode 100644 archlive/airootfs/etc/skel/.config/htop/htoprc create mode 100644 archlive/airootfs/etc/skel/.config/i3/config create mode 100644 archlive/airootfs/etc/skel/.config/i3status/config delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/helpers.rc delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename archlive/airootfs/usr/local/bin/{applefans => apple_fans} (100%) delete mode 100644 custom-repo/update diff --git a/.gitignore b/.gitignore index ba26e229..5495eced 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -wk_tmp \ No newline at end of file +wk_tmp +wk-repo diff --git a/archlive/airootfs/etc/lightdm/lightdm.conf b/archlive/airootfs/etc/lightdm/lightdm.conf deleted file mode 100644 index 5aea533a..00000000 --- a/archlive/airootfs/etc/lightdm/lightdm.conf +++ /dev/null @@ -1,165 +0,0 @@ -# -# General configuration -# -# start-default-seat = True to always start one seat if none are defined in the configuration -# greeter-user = User to run greeter as -# minimum-display-number = Minimum display number to use for X servers -# minimum-vt = First VT to run displays on -# lock-memory = True to prevent memory from being paged to disk -# user-authority-in-system-dir = True if session authority should be in the system location -# guest-account-script = Script to be run to setup guest account -# logind-check-graphical = True to on start seats that are marked as graphical by logind -# log-directory = Directory to log information to -# run-directory = Directory to put running state in -# cache-directory = Directory to cache to -# sessions-directory = Directory to find sessions -# remote-sessions-directory = Directory to find remote sessions -# greeters-directory = Directory to find greeters -# backup-logs = True to move add a .old suffix to old log files when opening new ones -# -[LightDM] -#start-default-seat=true -#greeter-user=lightdm -#minimum-display-number=0 -#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799 -#lock-memory=true -#user-authority-in-system-dir=false -#guest-account-script=guest-account -#logind-check-graphical=false -#log-directory=/var/log/lightdm -run-directory=/run/lightdm -#cache-directory=/var/cache/lightdm -#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions -#remote-sessions-directory=/usr/share/lightdm/remote-sessions -#greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters -#backup-logs=true - -# -# Seat configuration -# -# Seat configuration is matched against the seat name glob in the section, for example: -# [Seat:*] matches all seats and is applied first. -# [Seat:seat0] matches the seat named "seat0". -# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client". -# -# type = Seat type (xlocal, xremote, unity) -# pam-service = PAM service to use for login -# pam-autologin-service = PAM service to use for autologin -# pam-greeter-service = PAM service to use for greeters -# xserver-command = X server command to run (can also contain arguments e.g. X -special-option) -# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option) -# xserver-config = Config file to pass to X server -# xserver-layout = Layout to pass to X server -# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server -# xserver-share = True if the X server is shared for both greeter and session -# xserver-hostname = Hostname of X server (only for type=xremote) -# xserver-display-number = Display number of X server (only for type=xremote) -# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true) -# xdmcp-port = XDMCP UDP/IP port to communicate on -# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf) -# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option) -# unity-compositor-timeout = Number of seconds to wait for compositor to start -# greeter-session = Session to load for greeter -# greeter-hide-users = True to hide the user list -# greeter-allow-guest = True if the greeter should show a guest login option -# greeter-show-manual-login = True if the greeter should offer a manual login option -# greeter-show-remote-login = True if the greeter should offer a remote login option -# user-session = Session to load for users -# allow-user-switching = True if allowed to switch users -# allow-guest = True if guest login is allowed -# guest-session = Session to load for guests (overrides user-session) -# session-wrapper = Wrapper script to run session with -# greeter-wrapper = Wrapper script to run greeter with -# guest-wrapper = Wrapper script to run guest sessions with -# display-setup-script = Script to run when starting a greeter session (runs as root) -# display-stopped-script = Script to run after stopping the display server (runs as root) -# greeter-setup-script = Script to run when starting a greeter (runs as root) -# session-setup-script = Script to run when starting a user session (runs as root) -# session-cleanup-script = Script to run when quitting a user session (runs as root) -# autologin-guest = True to log in as guest by default -# autologin-user = User to log in with by default (overrides autologin-guest) -# autologin-user-timeout = Number of seconds to wait before loading default user -# autologin-session = Session to load for automatic login (overrides user-session) -# autologin-in-background = True if autologin session should not be immediately activated -# exit-on-failure = True if the daemon should exit if this seat fails -# -[Seat:*] -#type=xlocal -pam-service=lightdm -pam-autologin-service=lightdm-autologin -#pam-greeter-service=lightdm-greeter -#xserver-command=X -#xmir-command=Xmir -#xserver-config= -#xserver-layout= -#xserver-allow-tcp=false -#xserver-share=true -#xserver-hostname= -#xserver-display-number= -#xdmcp-manager= -#xdmcp-port=177 -#xdmcp-key= -#unity-compositor-command=unity-system-compositor -#unity-compositor-timeout=60 -#greeter-session=example-gtk-gnome -#greeter-hide-users=false -#greeter-allow-guest=true -#greeter-show-manual-login=false -#greeter-show-remote-login=true -#user-session=default -#allow-user-switching=true -#allow-guest=true -#guest-session= -session-wrapper=/etc/lightdm/Xsession -#greeter-wrapper= -#guest-wrapper= -#display-setup-script= -#display-stopped-script= -#greeter-setup-script= -#session-setup-script= -#session-cleanup-script= -#autologin-guest=false -autologin-user=wktech -autologin-user-timeout=0 -#autologin-in-background=false -#autologin-session= -#exit-on-failure=false - -# -# XDMCP Server configuration -# -# enabled = True if XDMCP connections should be allowed -# port = UDP/IP port to listen for connections on -# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present) -# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf) -# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset) -# -# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn. Alternatively -# it can be a word and the first 7 characters are used as the key. -# -[XDMCPServer] -#enabled=false -#port=177 -#listen-address= -#key= -#hostname= - -# -# VNC Server configuration -# -# enabled = True if VNC connections should be allowed -# command = Command to run Xvnc server with -# port = TCP/IP port to listen for connections on -# listen-address = Host/address to listen for VNC connections (use all addresses if not present) -# width = Width of display to use -# height = Height of display to use -# depth = Color depth of display to use -# -[VNCServer] -#enabled=false -#command=Xvnc -#port=5900 -#listen-address= -#width=1024 -#height=768 -#depth=8 diff --git a/archlive/airootfs/etc/resolv.conf b/archlive/airootfs/etc/resolv.conf deleted file mode 100644 index 89efb950..00000000 --- a/archlive/airootfs/etc/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -/run/systemd/resolve/resolv.conf \ No newline at end of file diff --git a/archlive/airootfs/etc/skel/.Xresources b/archlive/airootfs/etc/skel/.Xresources index b349dcba..0e7c9bd7 100644 --- a/archlive/airootfs/etc/skel/.Xresources +++ b/archlive/airootfs/etc/skel/.Xresources @@ -1,13 +1,24 @@ +Xft.autohint: 0 +Xft.antialias: 1 +Xft.hinting: true +Xft.hintstyle: hintslight +Xft.rgba: rgb +Xft.lcdfilter: lcddefault + 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.scrollBar_right: True +URxvt.scrollstyle: plain -URxvt*shading: 13 -URxvt*transparent: true +URxvt.shading: 13 +URxvt.transparent: true + +URxvt.iso14755: false +URxvt.iso14755_52: false ! Base16 Isotope ! Scheme: Jan T. Sott diff --git a/archlive/airootfs/etc/skel/.config/autostart/Conky.desktop b/archlive/airootfs/etc/skel/.config/autostart/Conky.desktop deleted file mode 100644 index 56eb2051..00000000 --- a/archlive/airootfs/etc/skel/.config/autostart/Conky.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=0.9.4 -Type=Application -Name=Conky -Comment=Conky -Exec=/home/wktech/.conky_start -OnlyShowIn=XFCE; -StartupNotify=false -Terminal=false -Hidden=false - diff --git a/archlive/airootfs/etc/skel/.config/autostart/Network.desktop b/archlive/airootfs/etc/skel/.config/autostart/Network.desktop deleted file mode 100644 index fc74de1b..00000000 --- a/archlive/airootfs/etc/skel/.config/autostart/Network.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=0.9.4 -Type=Application -Name=NetworkManager -Comment=NetworkManager -Exec=/home/wktech/.network_start -OnlyShowIn=XFCE; -StartupNotify=false -Terminal=false -Hidden=false - diff --git a/archlive/airootfs/etc/skel/.config/autostart/Wallpaper.desktop b/archlive/airootfs/etc/skel/.config/autostart/Wallpaper.desktop deleted file mode 100644 index 49037aa4..00000000 --- a/archlive/airootfs/etc/skel/.config/autostart/Wallpaper.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=0.0.1 -Type=Application -Name=Update Wallpaper -Comment=Update Wallpaper -Exec=/home/wktech/.update_wallpaper -OnlyShowIn=XFCE; -StartupNotify=false -Terminal=false -Hidden=false - diff --git a/archlive/airootfs/etc/skel/.config/autostart/urxvt-default-res.desktop b/archlive/airootfs/etc/skel/.config/autostart/urxvt-default-res.desktop deleted file mode 100644 index 7ee94394..00000000 --- a/archlive/airootfs/etc/skel/.config/autostart/urxvt-default-res.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=0.9.4 -Type=Application -Name=urxvt-Resolution -Comment=urxvt-Resolution -Exec=/home/wktech/.urxvt_default_res -OnlyShowIn=XFCE; -StartupNotify=false -Terminal=false -Hidden=false - diff --git a/archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini b/archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini deleted file mode 100644 index 62930e9d..00000000 --- a/archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini +++ /dev/null @@ -1,11 +0,0 @@ -[Filechooser Settings] -LocationMode=path-bar -ShowHidden=false -ShowSizeColumn=true -GeometryX=-1 -GeometryY=-1 -GeometryWidth=-1 -GeometryHeight=-1 -SortColumn=name -SortOrder=ascending -StartupMode=recent diff --git a/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini deleted file mode 100644 index 2dba9975..00000000 --- a/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini +++ /dev/null @@ -1,5 +0,0 @@ -[Settings] -gtk-theme-name=Arc -gtk-icon-theme-name=Numic Square -gtk-font-name=Noto Sans 10 - diff --git a/archlive/airootfs/etc/skel/.config/htop/htoprc b/archlive/airootfs/etc/skel/.config/htop/htoprc deleted file mode 100644 index 37f78cb4..00000000 --- a/archlive/airootfs/etc/skel/.config/htop/htoprc +++ /dev/null @@ -1,26 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=1 -hide_threads=0 -hide_kernel_threads=1 -hide_userland_threads=0 -shadow_other_users=0 -show_thread_names=0 -show_program_path=1 -highlight_base_name=0 -highlight_megabytes=1 -highlight_threads=1 -tree_view=0 -header_margin=1 -detailed_cpu_time=0 -cpu_count_from_zero=0 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=0 -delay=15 -left_meters=AllCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=Tasks LoadAverage Uptime -right_meter_modes=2 2 2 diff --git a/archlive/airootfs/etc/skel/.config/i3/config b/archlive/airootfs/etc/skel/.config/i3/config new file mode 100644 index 00000000..6cb3baa0 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/i3/config @@ -0,0 +1,314 @@ +# This file has been auto-generated by i3-config-wizard(1). +# It will not be overwritten, so edit it as you like. +# +# Should you change your keyboard layout some time, delete +# this file and re-run i3-config-wizard(1). +# + +# i3 config file (v4) +# +# Please see http://i3wm.org/docs/userguide.html for a complete reference! + +set $mod Mod4 + +# Configure border style +new_window pixel 1 +new_float normal + +# Hide borders +hide_edge_borders none + +# Pulse Audio controls +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound + +# alt+tab navi +bindsym Mod1+Tab workspace next +bindsym Mod1+Shift+Tab workspace prev + +# change borders +bindsym $mod+u border none +bindsym $mod+y border pixel 1 +bindsym $mod+n border normal + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +#font Inconsolata:monospace 8 +font pango:Noto Sans Mono 10, FontAwesome 10 + +# This font is widely installed, provides lots of unicode glyphs, right-to-left +# text rendering and scalability on retina/hidpi displays (thanks to pango). +#font pango:DejaVu Sans Mono 8 + +# Before i3 v4.8, we used to recommend this one as the default: +# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 +# The font above is very space-efficient, that is, it looks good, sharp and +# clear in small sizes. However, its unicode glyph coverage is limited, the old +# X core fonts rendering does not support right-to-left and this being a bitmap +# font, it doesn’t scale on retina/hidpi displays. + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# start a terminal +bindsym $mod+Return exec i3-sensible-terminal + +# kill focused window +bindsym $mod+Shift+q kill +bindsym $mod+q kill +bindsym Mod1+F4 kill + +# start dmenu (a program launcher) +#bindsym $mod+Shift+d exec dmenu_run +# There also is the (new) i3-dmenu-desktop which only displays applications +# shipping a .desktop file. It is a wrapper around dmenu, so you need that +# installed. +#bindsym $mod+Shift+d exec --no-startup-id i3-dmenu-desktop +bindsym $mod+r exec "rofi -combi-modi window,drun,run -show combi -modi combi" + +# misc app shortcuts +bindsym $mod+d exec "urxvt -title 'Hardware Diagnostics' -e hw-diags" +bindsym $mod+f exec "thunar ~" +bindsym $mod+i exec "hardinfo" +bindsym $mod+m exec "urxvt -title 'Mount All Volumes' -e mount-all-volumes" +bindsym $mod+s exec "urxvt -title 'Hardware Diagnostics' -e hw-diags foh" +bindsym $mod+t exec "urxvt" +bindsym $mod+v exec "urxvt -title 'Hardware Sensors' -e hw-diags-sensors" +bindsym $mod+w exec "firefox" + +focus_follows_mouse no + +# change focus +bindsym $mod+j focus left +bindsym $mod+k focus down +bindsym $mod+l focus up +bindsym $mod+semicolon focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+j move left +bindsym $mod+Shift+k move down +bindsym $mod+Shift+l move up +bindsym $mod+Shift+semicolon move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# workspace back and forth (with/without active container) +workspace_auto_back_and_forth yes +bindsym $mod+b workspace back_and_forth +bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth + +# split orientation +bindsym $mod+Shift+h split h +bindsym $mod+Shift+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+Shift+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+Shift+s layout stacking +bindsym $mod+Shift+w layout tabbed +bindsym $mod+Shift+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +#bindsym $mod+a focus parent + +# move the currently focused window to the scratchpad +bindsym $mod+Shift+minus move scratchpad + +# Show the next scratchpad window or hide the focused scratchpad window. +# If there are multiple scratchpad windows, this command cycles through them. +bindsym $mod+minus scratchpad show + +# focus the child container +#bindsym $mod+d focus child + +# Workspace names +set $ws1 "一" +set $ws2 "二" +set $ws3 "三" +set $ws4 "四" +set $ws5 "五" +set $ws6 "六" +set $ws7 "七" +set $ws8 "八" +set $ws9 "九" +set $ws10 "十" + +# switch to workspace +bindsym $mod+1 workspace $ws1 +bindsym $mod+2 workspace $ws2 +bindsym $mod+3 workspace $ws3 +bindsym $mod+4 workspace $ws4 +bindsym $mod+5 workspace $ws5 +bindsym $mod+6 workspace $ws6 +bindsym $mod+7 workspace $ws7 +bindsym $mod+8 workspace $ws8 +bindsym $mod+9 workspace $ws9 +bindsym $mod+0 workspace $ws10 + +# move focused container to workspace +bindsym $mod+Ctrl+1 move container to workspace $ws1 +bindsym $mod+Ctrl+2 move container to workspace $ws2 +bindsym $mod+Ctrl+3 move container to workspace $ws3 +bindsym $mod+Ctrl+4 move container to workspace $ws4 +bindsym $mod+Ctrl+5 move container to workspace $ws5 +bindsym $mod+Ctrl+6 move container to workspace $ws6 +bindsym $mod+Ctrl+7 move container to workspace $ws7 +bindsym $mod+Ctrl+8 move container to workspace $ws8 +bindsym $mod+Ctrl+9 move container to workspace $ws9 +bindsym $mod+Ctrl+0 move container to workspace $ws10 + +# move focused container to workspace and follow +bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1 +bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2 +bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3 +bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4 +bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5 +bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6 +bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7 +bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8 +bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 +bindsym $mod+Shift+0 move container to workspace $ws10; workspace $ws10 + +# Open specific applications in floating mode +for_window [title="Slack"] floating enable +for_window [title="Screen Layout Editor"] floating enable +for_window [class="Galculator"] floating enable border pixel 1 +for_window [class="Nitrogen"] floating enable sticky enable border normal +for_window [title="Hardware Diagnostics"] floating enable +for_window [title="Hardware Sensors"] floating enable +for_window [title="Mount All Volumes"] floating enable +for_window [title="Firefox"] floating enable border normal + +# switch to workspace with urgent window automatically +for_window [urgent=latest] focus + +# reload the configuration file +#bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +#bindsym $mod+Shift+r restart + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +bindsym $mod+Shift+r mode "resize" + +# "System" menu +bindsym $mod+x mode "$mode_system" +set $mode_system (l)ock, (e)xit, (r)eboot, (s)hutdown, (c)onfig, (i)3 +mode "$mode_system" { + bindsym l exec --no-startup-id i3lock, mode "default" + bindsym e exit, mode "default" + bindsym r exec reboot, mode "default" + bindsym s exec poweroff, mode "default" + bindsym c reload, mode "default" + bindsym i restart, mode "default" + + # exit system mode: "Enter" or "Escape" + bindsym Return mode "default" + bindsym Escape mode "default" +} + +############################# +### settings for i3-gaps: ### +############################# + +# Set inner/outer gaps +gaps inner 10 +gaps outer 4 + +# 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 +# gaps inner all set 10 +# gaps outer all plus 5 + +# Smart gaps (gaps used if only more than one container on the workspace) +smart_gaps on + +# Smart borders (draw borders around container only if it is not the only container on this workspace) +# on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) +smart_borders on + +# Press $mod+Shift+g to enter the gap mode. Choose o or i for modifying outer/inner gaps. Press one of + / - (in-/decrement for current workspace) or 0 (remove gaps for current workspace). If you also press Shift with these keys, the change will be global for all workspaces. +set $mode_gaps Gaps: (o) outer, (i) inner +set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global) +set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global) +bindsym $mod+Shift+g mode "$mode_gaps" + +mode "$mode_gaps" { + bindsym o mode "$mode_gaps_outer" + bindsym i mode "$mode_gaps_inner" + bindsym Return mode "default" + bindsym Escape mode "default" +} +mode "$mode_gaps_inner" { + bindsym plus gaps inner current plus 5 + bindsym minus gaps inner current minus 5 + bindsym 0 gaps inner current set 0 + + bindsym Shift+plus gaps inner all plus 5 + bindsym Shift+minus gaps inner all minus 5 + bindsym Shift+0 gaps inner all set 0 + + bindsym Return mode "default" + bindsym Escape mode "default" +} +mode "$mode_gaps_outer" { + bindsym plus gaps outer current plus 5 + bindsym minus gaps outer current minus 5 + bindsym 0 gaps outer current set 0 + + bindsym Shift+plus gaps outer all plus 5 + bindsym Shift+minus gaps outer all minus 5 + bindsym Shift+0 gaps outer all set 0 + + bindsym Return mode "default" + bindsym Escape mode "default" +} + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + position bottom + separator_symbol " " + status_command i3status + height 26 +} diff --git a/archlive/airootfs/etc/skel/.config/i3status/config b/archlive/airootfs/etc/skel/.config/i3status/config new file mode 100644 index 00000000..d36294a4 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/i3status/config @@ -0,0 +1,76 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + interval = 5 +} + +#order += "disk /" +order += "wireless _first_" +order += "ethernet _first_" +order += "cpu_usage" +order += "battery all" +order += "volume master" +order += "tztime local" +#order += "tztime utc" + +cpu_usage { + format = " %usage" + max_threshold = 90 + #format_above_threshold = " %usage" + degraded_threshold = 75 + #format_above_degraded_threshold = " %usage" +} + +wireless _first_ { + format_up = " (%quality at %essid) %ip" + format_down = " Down" +} + +ethernet _first_ { + # if you use %speed, i3status requires root privileges + format_up = " %ip" + format_down = " Down" +} + +battery all { + integer_battery_capacity = true + format = "%status %percentage" + format_down = "" + status_chr = "" + status_bat = "" + status_unk = "" + status_full = "" + path = "/sys/class/power_supply/BAT%d/uevent" + low_threshold = 25 + threshold_type = percentage +} + +volume master { + format = " %volume" + format_muted = " muted" + device = "pulse" +} + +tztime local { + format = "%F %H:%M" +} + +tztime utc { + format = "%H:%M" + timezone = "UTC" +} + +load { + format = "%1min" +} + +disk "/" { + format = "%avail" +} diff --git a/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc b/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc deleted file mode 100644 index e5d08646..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc +++ /dev/null @@ -1,4 +0,0 @@ -WebBrowser=firefox -FileManager=Thunar -TerminalEmulator=urxvt - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc deleted file mode 100644 index 78004419..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc +++ /dev/null @@ -1,60 +0,0 @@ -favorites=Hardware Diagnostics.desktop,Hardware Information.desktop,exo-file-manager.desktop,gparted.desktop,gsmartcontrol.desktop,NetworkTest.desktop,exo-web-browser.desktop -recent=xfce4-settings-editor.desktop,xfce-session-settings.desktop,xfce4-power-manager-settings.desktop,gsmartcontrol.desktop,gparted.desktop -button-title=Applications -button-icon=distributor-logo-archlinux -button-single-row=false -show-button-title=false -show-button-icon=true -launcher-show-name=true -launcher-show-description=false -item-icon-size=3 -hover-switch-category=false -category-icon-size=1 -load-hierarchy=false -recent-items-max=10 -favorites-in-recent=true -display-recent-default=false -position-search-alternate=true -position-commands-alternate=true -position-categories-alternate=false -menu-width=400 -menu-height=500 -menu-opacity=100 -command-settings=xfce4-settings-manager -show-command-settings=true -command-lockscreen=xflock4 -show-command-lockscreen=false -command-switchuser=gdmflexiserver -show-command-switchuser=false -command-logout=xfce4-session-logout -show-command-logout=true -command-menueditor=menulibre -show-command-menueditor=false -command-profile=mugshot -show-command-profile=false -search-actions=4 - -[action0] -name=Man Pages -pattern=# -command=exo-open --launch TerminalEmulator man %s -regex=false - -[action1] -name=Wikipedia -pattern=!w -command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u -regex=false - -[action2] -name=Run in Terminal -pattern=! -command=exo-open --launch TerminalEmulator %s -regex=false - -[action3] -name=Open URI -pattern=^(file|http|https):\\/\\/(.*)$ -command=exo-open \\0 -regex=true - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc b/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc deleted file mode 100644 index 41bfc4df..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc +++ /dev/null @@ -1,19 +0,0 @@ -[Configuration] -FontName=Inconsolata 13 -MiscAlwaysShowTabs=FALSE -MiscBell=FALSE -MiscBordersDefault=TRUE -MiscCursorBlinks=FALSE -MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK -MiscDefaultGeometry=80x24 -MiscInheritGeometry=FALSE -MiscMenubarDefault=TRUE -MiscMouseAutohide=FALSE -MiscToolbarDefault=FALSE -MiscConfirmClose=TRUE -MiscCycleTabs=TRUE -MiscTabCloseButtons=TRUE -MiscTabCloseMiddleClick=TRUE -MiscTabPosition=GTK_POS_TOP -MiscHighlightUrls=TRUE - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc b/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc deleted file mode 100644 index bc341e3b..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc +++ /dev/null @@ -1,25 +0,0 @@ -[Settings] -ShowAllProcesses=FALSE -MorePrecision=FALSE -FullCommandLine=FALSE -ShowStatusIcon=FALSE -ShowMemoryInXBytes=FALSE -MonitorPaintBox=TRUE -ShowApplicationIcons=TRUE -ToolbarStyle=DEFAULT -PromptTerminateTask=TRUE -RefreshRate=750 -ColumnUID=FALSE -ColumnPID=TRUE -ColumnPPID=FALSE -ColumnState=FALSE -ColumnVSZ=FALSE -ColumnRSS=TRUE -ColumnCPU=TRUE -ColumnPriority=FALSE -SortColumn=0 -SortType=0 -WindowWidth=490 -WindowHeight=465 -HandlePosition=100 -ProcessTreeView=FALSE diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml deleted file mode 100644 index 3fab8b73..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml deleted file mode 100644 index 9fd09d61..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml deleted file mode 100644 index 781e4e71..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml deleted file mode 100644 index 567ac037..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml deleted file mode 100644 index c135c100..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index f1b3664f..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml deleted file mode 100644 index e63b0f5f..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml deleted file mode 100644 index 49d6bca6..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml deleted file mode 100644 index 5cf67af8..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index aa79af3c..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml deleted file mode 100644 index 94ae4a47..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml deleted file mode 100644 index fd93ee1c..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml deleted file mode 100644 index a7c84531..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml deleted file mode 100644 index cd059aab..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index aebf9edd..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index 81ab1f1c..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archlive/airootfs/etc/skel/.conkyrc b/archlive/airootfs/etc/skel/.conkyrc index bd492c9b..e6be18a8 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 normal +own_window_type override own_window_transparent no own_window_hints undecorated,below,skip_taskbar,skip_pager,sticky own_window_colour 000000 @@ -31,7 +31,7 @@ own_window_argb_visual yes # Options: yes or no ### Use: own_window_type normal ### Use: own_window_transparent no ### Valid range is 0-255, where 0 is 0% opacity, and 255 is 100% opacity. -own_window_argb_value 160 +own_window_argb_value 224 minimum_size 180 0 ### width | height maximum_width 180 @@ -154,7 +154,6 @@ ${alignc}S H O R T C U T K E Y S ${hr} [Super] + d${alignr}HW Diagnostics [Super] + f${alignr}File Manager -[Super] + h${alignr}Task Manager [Super] + i${alignr}HW Information [Super] + m${alignr}Mount Volumes [Super] + r${alignr}Run Dialog diff --git a/archlive/airootfs/etc/skel/.update_wallpaper b/archlive/airootfs/etc/skel/.update_wallpaper index 14f502df..7bffa12b 100644 --- a/archlive/airootfs/etc/skel/.update_wallpaper +++ b/archlive/airootfs/etc/skel/.update_wallpaper @@ -18,9 +18,4 @@ for f in "$BOOT_PATH"/{Arch,arch}.{jpg,png} "$BURNED_IN"; do fi done -# Update Xfce4 (mostly redundant, but will catch multi-display setups) -for monitor in monitor{0..2}; do - for workspace in workspace{0..3}; do - xfconf-query -c xfce4-desktop -p /backdrop/screen0/$monitor/$workspace/last-image -s "$WALLPAPER" 2>/dev/null - done -done +feh --bg-fill "$WALLPAPER" diff --git a/archlive/airootfs/etc/skel/.urxvt_default_res b/archlive/airootfs/etc/skel/.urxvt_default_res index 92923ebd..1e146090 100644 --- a/archlive/airootfs/etc/skel/.urxvt_default_res +++ b/archlive/airootfs/etc/skel/.urxvt_default_res @@ -3,9 +3,8 @@ XWIDTH="$(xrandr 2>/dev/null | grep '*' | sed -r 's/^\s+([0-9]+)x.*/\1/')" XHEIGHT="$(xrandr 2>/dev/null | grep '*' | sed -r 's/^\s+[0-9]+x([0-9]+).*/\1/')" -WIDTH="$(echo "${XWIDTH}*96/1024" | bc)" +WIDTH="$(echo "${XWIDTH}*92/1024" | bc)" HEIGHT="$(echo "${XHEIGHT}*32/768" | bc)" -sed -i -r "s/96x32/${WIDTH}x${HEIGHT}/" ~/.Xresources +sed -i -r "s/(URxvt.geometry:\s+).*/\1${WIDTH}x${HEIGHT}+24+24/" ~/.Xresources xrdb -merge ~/.Xresources - diff --git a/archlive/airootfs/etc/skel/.xinitrc b/archlive/airootfs/etc/skel/.xinitrc index bb0a24da..a674ec72 100644 --- a/archlive/airootfs/etc/skel/.xinitrc +++ b/archlive/airootfs/etc/skel/.xinitrc @@ -1,25 +1,10 @@ #!/bin/sh -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# Start GNOME-Keyring -eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) -export SSH_AUTH_SOCK - +xrdb -merge $HOME/.Xresources +compton & +sleep 1s +conky -d +$HOME/.network_start & +$HOME/.urxvt_default_res & +$HOME/.update_wallpaper & +exec i3 diff --git a/archlive/airootfs/etc/skel/.zlogin b/archlive/airootfs/etc/skel/.zlogin index d428626f..799f452a 100644 --- a/archlive/airootfs/etc/skel/.zlogin +++ b/archlive/airootfs/etc/skel/.zlogin @@ -1,4 +1,9 @@ setterm -blank 0 -powerdown 0 if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then - hw-diags cli + if ! fgrep -q "nox" /proc/cmdline; then + startx + else + hw-diags cli + fi fi + diff --git a/archlive/airootfs/etc/skel/.zshrc b/archlive/airootfs/etc/skel/.zshrc index 6c8cde57..c4e9f93c 100644 --- a/archlive/airootfs/etc/skel/.zshrc +++ b/archlive/airootfs/etc/skel/.zshrc @@ -86,6 +86,3 @@ source $ZSH/oh-my-zsh.sh ## Load aliases . $HOME/.aliases -## Start ssh agent -eval $(/usr/bin/ssh-agent)>/dev/null - diff --git a/archlive/airootfs/root/customize_airootfs.sh b/archlive/airootfs/root/customize_airootfs.sh index 57e8b9b9..6efee777 100644 --- a/archlive/airootfs/root/customize_airootfs.sh +++ b/archlive/airootfs/root/customize_airootfs.sh @@ -77,6 +77,6 @@ sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf echo "[customize_airootfs] INFO: Setup systemd" #systemctl enable pacman-init.service choose-mirror.service -systemctl set-default graphical.target +#systemctl set-default graphical.target echo "[customize_airootfs] INFO: Completed." diff --git a/archlive/airootfs/usr/local/bin/applefans b/archlive/airootfs/usr/local/bin/apple_fans similarity index 100% rename from archlive/airootfs/usr/local/bin/applefans rename to archlive/airootfs/usr/local/bin/apple_fans diff --git a/archlive/airootfs/usr/local/bin/hw-diags-inner b/archlive/airootfs/usr/local/bin/hw-diags-inner index a007fa68..45f83a9a 100644 --- a/archlive/airootfs/usr/local/bin/hw-diags-inner +++ b/archlive/airootfs/usr/local/bin/hw-diags-inner @@ -60,7 +60,7 @@ OUT="$TMP_DIR/hw-diags.out" ## Some code borrowed from stackoverflow.com/a/10020397 ARCH_DRIVES=($(ls -l /dev/disk/by-label | grep -iE 'ARCH.*[hs]d[a-z]' | sed -r 's#.*/([hs]d[a-z])[0-9]+#\1#' | sort | uniq)) -DRIVES=($(inxi -Dxx -c 0 | grep -E "ID-[0-9]+" | sed -r 's#.*/dev/([hs]d[a-z]|nvme[0-9]n[0-9]).*#\1#' | sort)) +DRIVES=($(inxi -Dxx -c 0 | grep -E "ID-[0-9]+" | sed -r 's#.*/dev/([hsv]d[a-z]|nvme[0-9]n[0-9]).*#\1#' | sort)) for d in "${ARCH_DRIVES[@]}"; do DRIVES=(${DRIVES[@]//*$d*}) done diff --git a/archlive/airootfs/usr/share/applications/Hardware Diagnostics.desktop b/archlive/airootfs/usr/share/applications/Hardware Diagnostics.desktop index 77e8821a..bd3e2196 100644 --- a/archlive/airootfs/usr/share/applications/Hardware Diagnostics.desktop +++ b/archlive/airootfs/usr/share/applications/Hardware Diagnostics.desktop @@ -5,6 +5,6 @@ Name=Hardware Diagnostics Comment=Hardware Diagnostics Exec=urxvt -title "Hardware Diagnostics" -e hw-diags Icon=utilities-system-monitor -Path= +Path=/usr/local/bin Terminal=false StartupNotify=false diff --git a/archlive/airootfs/usr/share/applications/Hardware Information.desktop b/archlive/airootfs/usr/share/applications/Hardware Information.desktop index 432cb2cb..5481206d 100644 --- a/archlive/airootfs/usr/share/applications/Hardware Information.desktop +++ b/archlive/airootfs/usr/share/applications/Hardware Information.desktop @@ -5,6 +5,6 @@ Name=Hardware Information Comment=Hardware Information Exec=hardinfo Icon=hardinfo -Path= +Path=/usr/local/bin Terminal=false StartupNotify=false diff --git a/archlive/airootfs/usr/share/applications/NetworkTest.desktop b/archlive/airootfs/usr/share/applications/NetworkTest.desktop index c89e0ae1..4889b549 100644 --- a/archlive/airootfs/usr/share/applications/NetworkTest.desktop +++ b/archlive/airootfs/usr/share/applications/NetworkTest.desktop @@ -5,6 +5,6 @@ Name=NetworkTest Comment=Diagnose network connectivity Exec=urxvt -title "Network Diagnostics" -hold -e hw-diags-network Icon=network-workgroup -Path= +Path=/usr/local/bin Terminal=false StartupNotify=false diff --git a/archlive/airootfs/usr/share/applications/SpeedTest.desktop b/archlive/airootfs/usr/share/applications/SpeedTest.desktop index cea5f356..d59dd602 100644 --- a/archlive/airootfs/usr/share/applications/SpeedTest.desktop +++ b/archlive/airootfs/usr/share/applications/SpeedTest.desktop @@ -5,6 +5,6 @@ Name=SpeedTest Comment= Exec=urxvt -titile SpeedTest -hold -e speedtest Icon=network-workgroup -Path= +Path=/usr/local/bin Terminal=false StartupNotify=false diff --git a/archlive/packages.both b/archlive/packages.both index 8c567f02..e8fe8359 100644 --- a/archlive/packages.both +++ b/archlive/packages.both @@ -10,6 +10,7 @@ btrfs-progs chntpw cmatrix colordiff +compton conky crda curl @@ -23,11 +24,13 @@ dnsmasq dnsutils dos2unix dosfstools +dunst e2fsprogs elinks ethtool exfat-utils f2fs-tools +feh ffmpeg firefox fsarchiver @@ -37,12 +40,14 @@ gparted gptfdisk grub gsmartcontrol -gtk-theme-arc-git hardinfo hdparm hexedit hfsprogs htop +i3-gaps +i3lock-fancy-git +i3status inxi ipw2100-fw ipw2200-fw @@ -51,13 +56,10 @@ ldns lftp libewf libinput -lightdm -lightdm-gtk-greeter linux-atm linux-firmware lm_sensors lsscsi -mbpfan-git mc mdadm mediainfo @@ -69,17 +71,12 @@ mtools mupdf ncdu ndisc6 -network-manager-applet networkmanager nfs-utils nilfs-utils nmap -noto-fonts ntfs-3g ntp -numix-square-icon-theme-git -nvidia -nvidia-utils openconnect openssh openvpn @@ -87,13 +84,16 @@ p7zip partclone parted partimage +pavucontrol ppp pptpclient progsreiserfs -refind-efi +pulseaudio +qemu-guest-agent reiserfsprogs rfkill rng-tools +rofi rp-pppoe rsync rxvt-unicode @@ -102,6 +102,7 @@ sg3_utils smartmontools speedtest-cli speedtouch +spice-vdagent sudo tcpdump terminus-font @@ -109,6 +110,7 @@ testdisk-wip tk tmux tree +ttf-font-awesome ttf-inconsolata udevil udisks2 @@ -118,7 +120,7 @@ usb_modeswitch veracrypt vim virtualbox-guest-modules-arch -virtualbox-guest-utils-nox +virtualbox-guest-utils vpnc wd719x-firmware wget @@ -130,14 +132,13 @@ xf86-input-libinput xf86-video-amdgpu xf86-video-fbdev xf86-video-intel +xf86-video-nouveau xf86-video-vesa -xfce4 -xfce4-goodies -xfce4-notifyd xl2tpd xorg-server xorg-xdpyinfo xorg-xev +xorg-xinit xorg-xinput zd1211-firmware zsh diff --git a/archlive/pacman.conf b/archlive/pacman.conf index aea88d93..7e5ad8a9 100644 --- a/archlive/pacman.conf +++ b/archlive/pacman.conf @@ -69,9 +69,9 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -[customrepo] +[wk-repo] SigLevel = Optional TrustAll -Server = file:///home/builduser/Projects/wk-arch/custom-repo/$arch +Server = file:///home/builduser/Projects/wk-arch/wk-repo #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/build-wk b/build-wk index cf688fcd..ef584bb7 100644 --- a/build-wk +++ b/build-wk @@ -7,30 +7,72 @@ TMP_DIR="/srv/ScratchDir" DATE="$(date +%F)" DATETIME="$(date +%F_%H%M)" -# Ensure that we're running with root privileges -if [[ "$EUID" -ne 0 ]]; then - echo "Please run with root permissions (i.e. sudo $0)" - exit +if [[ "$EUID" -eq 0 ]]; then + ## Elevated section ## + # Set permissions + echo "Setting permissions..." + chown root.root archlive -R + + # Modify build.sh + if ! grep -iq 'customize_iso' archlive/build.sh; then + sed -ir 's!run_once make_iso!# customize_iso\ncp -a ${script_path}/extra/* ${work_dir}/iso/\n\nrun_once make_iso!' archlive/build.sh + fi + + # Build ISO + mkdir $LOG_DIR + mkdir $OUT_DIR + mkdir $TMP_DIR + ./archlive/build.sh -N "wk-arch" -V "$DATE" -L "WK_ARCH" -w "$TMP_DIR" -o "$OUT_DIR" -v | tee -a "$LOG_DIR/$DATETIME.log" + + # Cleanup + echo "Removing temp files..." + rm "$TMP_DIR" -Rf | tee -a "$LOG_DIR/$DATETIME.log" + + echo "Reverting permissions..." + chown builduser.builduser archlive -R +else + ## Non-elevated section ## + # Prep + mkdir wk-repo + pushd wk-repo >/dev/null + BEFORE=$(date "+%F_%H%M%S") + mkdir _done/$BEFORE -p + find . -maxdepth 1 -not -name 'update' -and -not -name '_done' -exec mv -nv "{}" _done/$BEFORE/ \; + rmdir _done/* --ignore-fail-on-non-empty + sleep 1s + AFTER=$(date "+%F_%H%M%S") + + # Install Dependancies + sudo pacman -Syu base-devel libewf attr progsreiserfs --needed --noconfirm + #for p in lha; do + # echo "Installing dependancy: $p" + # curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz + # tar xf $p.tar.gz + # pushd $p >/dev/null + # makepkg -si --needed --noconfirm + # popd >/dev/null + # mv -n $p $p.tar.gz _done/$AFTER/ + #done + + # 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 + echo "Building: $p" + curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz + tar xf $p.tar.gz + pushd $p >/dev/null + makepkg -s --noconfirm + popd >/dev/null + mv -n $p/*xz ./ + mv -n $p $p.tar.gz _done/$AFTER/ + done + + # Build custom repo database + for p in *xz; do + repo-add wk-repo.db.tar.gz $p + done + popd >/dev/null + + # Rerun script as root to start Archiso build process + sudo "$0" fi - -# Set permissions -echo "Setting permissions..." -chown root.root archlive -R - -# Modify build.sh -if ! grep -iq 'customize_iso' archlive/build.sh; then - sed -ir 's!run_once make_iso!# customize_iso\ncp -a ${script_path}/extra/* ${work_dir}/iso/\n\nrun_once make_iso!' archlive/build.sh -fi - -# Build ISO -mkdir $LOG_DIR -mkdir $OUT_DIR -mkdir $TMP_DIR -./archlive/build.sh -N "wk-arch" -V "$DATE" -L "WK_ARCH" -w "$TMP_DIR" -o "$OUT_DIR" -v | tee -a "$LOG_DIR/$DATETIME.log" - -# Cleanup -echo "Removing temp files..." -rm "$TMP_DIR" -Rf | tee -a "$LOG_DIR/$DATETIME.log" - -echo "Reverting permissions..." -chown builduser.builduser archlive -R diff --git a/custom-repo/update b/custom-repo/update deleted file mode 100644 index 6016005b..00000000 --- a/custom-repo/update +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Symlink all packages from ~/.cache/pacaur and rebuild repo database - -pushd i686 -rm *pkg.tar.xz -cp -ans $HOME/.cache/pacaur/*/*pkg.tar.xz ./ -rm *x86_64* -for p in *pkg.tar.xz; do repo-add customrepo.db.tar.gz $p; done -popd - -pushd x86_64 -rm *pkg.tar.xz -cp -ans $HOME/.cache/pacaur/*/*pkg.tar.xz ./ -rm *i686* -for p in *pkg.tar.xz; do repo-add customrepo.db.tar.gz $p; done -popd