From 546a654c0f8ce96eedc9af98813c5867ab6c77cb Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Wed, 6 Dec 2017 17:47:06 -0800 Subject: [PATCH] 2016-05: Retroactive Updates * Added build-wk script * This will (hopefully) keep the arch-hh folder clean allowing for a better git workflow * Rebuilt the default settings for wktech for most programs * Made the theme/icons more consistant between programs * Changed whiskermenu to more closely match a Windows Start Menu * Lots of hw-diags updates: * Connects to the network automatically * Copies all results files to $HOME/Tickets * Creates valid tgz archives of the results * Uses `mktemp` for setting TMP_DIR * mount-all-drives now opens the FileManager if lauched w/ Super+M * Probably more... --- .gitignore | 1 + archlive/airootfs/etc/skel/.Xresources | 3 +- .../etc/skel/.config/Thunar/accels.scm | 71 ++++++++++++++++++ .../airootfs/etc/skel/.config/Thunar/uca.xml | 13 ++++ .../etc/skel/.config/autostart/wifi.desktop | 12 --- .../skel/.config/gtk-2.0/gtkfilechooser.ini | 11 +++ .../etc/skel/.config/gtk-3.0/settings.ini | 16 +--- .../airootfs/etc/skel/.config/midori/config | 21 ++++++ .../airootfs/etc/skel/.config/mimeapps.list | 25 ++++++ .../xfce4/desktop/icons.screen0-1008x672.rc | 11 --- .../xfce4/desktop/icons.screen0-1008x711.rc | 19 ----- .../xfce4/desktop/icons.screen0-1008x752.rc | 11 --- .../etc/skel/.config/xfce4/helpers.rc | 1 + .../skel/.config/xfce4/panel/cpugraph-9.rc | 17 ----- .../{whiskermenu-18.rc => whiskermenu-1.rc} | 18 ++--- .../skel/.config/xfce4/terminal/terminalrc | 7 -- .../skel/.config/xfce4/xfce4-taskmanager.rc | 4 +- .../xfconf/xfce-perchannel-xml/ristretto.xml | 9 +++ .../xfconf/xfce-perchannel-xml/thunar.xml | 8 +- .../xfce-perchannel-xml/xfce4-desktop.xml | 12 +-- .../xfce4-keyboard-shortcuts.xml | 26 +++---- .../xfce4-mime-settings.xml | 11 --- .../xfce-perchannel-xml/xfce4-mixer.xml | 28 +++++++ .../xfce-perchannel-xml/xfce4-notifyd.xml | 5 ++ .../xfce-perchannel-xml/xfce4-panel.xml | 68 ++++++++++------- .../xfce4-power-manager.xml | 4 +- .../xfce-perchannel-xml/xfce4-session.xml | 22 ++---- .../xfce4-settings-manager.xml | 2 +- .../xfconf/xfce-perchannel-xml/xfwm4.xml | 14 ++-- .../xfconf/xfce-perchannel-xml/xsettings.xml | 4 +- archlive/airootfs/etc/skel/.conky_start | 2 +- .../skel/.gstreamer-0.10/registry.x86_64.bin | Bin 0 -> 101400 bytes .../etc/skel/.local/share/notes/Notes/Notes | 0 .../etc/skel/.local/share/recently-used.xbel | 16 ++++ archlive/airootfs/etc/skel/.tmux.conf | 1 + archlive/airootfs/etc/skel/.wifi | 5 -- archlive/airootfs/etc/skel/.zsh_aliases | 1 + .../airootfs/usr/local/bin/hw-diags-badblocks | 2 +- .../airootfs/usr/local/bin/hw-diags-inner | 38 ++++++++-- .../airootfs/usr/local/bin/hw-diags-prime95 | 2 +- .../airootfs/usr/local/bin/hw-diags-sensors | 2 +- .../airootfs/usr/local/bin/mount-all-volumes | 6 ++ .../usr/local/bin/mount-backup-shares | 4 +- archlive/airootfs/usr/local/bin/msword-search | 16 +++- archlive/packages.both | 7 +- build-wk | 13 ++++ 46 files changed, 370 insertions(+), 219 deletions(-) create mode 100644 .gitignore create mode 100644 archlive/airootfs/etc/skel/.config/Thunar/accels.scm create mode 100644 archlive/airootfs/etc/skel/.config/Thunar/uca.xml delete mode 100644 archlive/airootfs/etc/skel/.config/autostart/wifi.desktop create mode 100644 archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini create mode 100644 archlive/airootfs/etc/skel/.config/midori/config create mode 100644 archlive/airootfs/etc/skel/.config/mimeapps.list delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x711.rc delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x752.rc delete mode 100644 archlive/airootfs/etc/skel/.config/xfce4/panel/cpugraph-9.rc rename archlive/airootfs/etc/skel/.config/xfce4/panel/{whiskermenu-18.rc => whiskermenu-1.rc} (68%) create 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/xfce4-mime-settings.xml create mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml create mode 100644 archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml create mode 100644 archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin create mode 100644 archlive/airootfs/etc/skel/.local/share/notes/Notes/Notes create mode 100644 archlive/airootfs/etc/skel/.local/share/recently-used.xbel delete mode 100644 archlive/airootfs/etc/skel/.wifi create mode 100644 build-wk diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ba26e229 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wk_tmp \ No newline at end of file diff --git a/archlive/airootfs/etc/skel/.Xresources b/archlive/airootfs/etc/skel/.Xresources index 5a39a77c..ce6e4b9a 100644 --- a/archlive/airootfs/etc/skel/.Xresources +++ b/archlive/airootfs/etc/skel/.Xresources @@ -1,6 +1,7 @@ URxvt*font: xft:Inconsolata:size=11 -URxvt*geometry: 128x32+24+24 +! The line below will be modified by ~/.urxvt_default_res +URxvt*geometry: 96x32+24+24 URxvt*scrollBar_right: True URxvt*scrollstyle: plain diff --git a/archlive/airootfs/etc/skel/.config/Thunar/accels.scm b/archlive/airootfs/etc/skel/.config/Thunar/accels.scm new file mode 100644 index 00000000..7876f2fe --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/Thunar/accels.scm @@ -0,0 +1,71 @@ +; Thunar GtkAccelMap rc-file -*- scheme -*- +; this file is an automated accelerator map dump +; +; (gtk_accel_path "/ThunarLauncher/sendto-desktop" "") +; (gtk_accel_path "/ThunarStandardView/create-folder" "n") +; (gtk_accel_path "/ThunarShortcutsPane/sendto-shortcuts" "") +; (gtk_accel_path "/ThunarWindow/view-side-pane-menu" "") +; (gtk_accel_path "/ThunarStandardView/paste-into-folder" "v") +; (gtk_accel_path "/ThunarWindow/open-home" "Home") +; (gtk_accel_path "/ThunarWindow/view-menu" "") +; (gtk_accel_path "/ThunarLauncher/open" "o") +; (gtk_accel_path "/ThunarWindow/go-menu" "") +; (gtk_accel_path "/ThunarActions/uca-action-1462127723240094-1" "") +; (gtk_accel_path "/ThunarWindow/open-file-system" "") +; (gtk_accel_path "/ThunarWindow/zoom-out" "minus") +; (gtk_accel_path "/ThunarStandardView/paste" "v") +; (gtk_accel_path "/ThunarLauncher/open-with-menu" "") +; (gtk_accel_path "/ThunarWindow/help-menu" "") +; (gtk_accel_path "/ThunarWindow/file-menu" "") +; (gtk_accel_path "/ThunarLauncher/open-with-other-in-menu" "") +; (gtk_accel_path "/ThunarWindow/detach-tab" "") +; (gtk_accel_path "/ThunarLauncher/open-in-new-tab" "p") +; (gtk_accel_path "/ThunarWindow/view-menubar" "m") +; (gtk_accel_path "/ThunarStandardView/back" "Left") +; (gtk_accel_path "/ThunarWindow/close-tab" "w") +; (gtk_accel_path "/ThunarWindow/view-as-compact-list" "3") +; (gtk_accel_path "/ThunarWindow/view-side-pane-tree" "e") +; (gtk_accel_path "/ThunarStandardView/restore" "") +; (gtk_accel_path "/ThunarWindow/open-network" "") +; (gtk_accel_path "/ThunarActions/Tap::create-archive" "") +; (gtk_accel_path "/ThunarWindow/new-tab" "t") +; (gtk_accel_path "/ThunarWindow/preferences" "") +; (gtk_accel_path "/ThunarStandardView/rename" "F2") +; (gtk_accel_path "/ThunarWindow/sendto-menu" "") +; (gtk_accel_path "/ThunarWindow/edit-menu" "") +; (gtk_accel_path "/ThunarLauncher/open-with-other" "") +; (gtk_accel_path "/ThunarWindow/view-location-selector-toolbar" "") +; (gtk_accel_path "/ThunarStandardView/invert-selection" "") +; (gtk_accel_path "/ThunarStandardView/make-link" "") +; (gtk_accel_path "/ThunarWindow/view-as-icons" "1") +; (gtk_accel_path "/ThunarWindow/new-window" "n") +; (gtk_accel_path "/ThunarStandardView/forward" "Right") +; (gtk_accel_path "/ThunarStandardView/move-to-trash" "") +; (gtk_accel_path "/ThunarStandardView/select-by-pattern" "s") +; (gtk_accel_path "/ThunarWindow/about" "") +; (gtk_accel_path "/ThunarStandardView/setup-columns" "") +; (gtk_accel_path "/ThunarWindow/contents" "F1") +; (gtk_accel_path "/ThunarWindow/open-desktop" "") +; (gtk_accel_path "/ThunarWindow/close-all-windows" "w") +; (gtk_accel_path "/ThunarWindow/zoom-in" "plus") +; (gtk_accel_path "/ThunarStandardView/duplicate" "") +; (gtk_accel_path "/ThunarWindow/open-parent" "Up") +; (gtk_accel_path "/ThunarWindow/view-side-pane-shortcuts" "b") +; (gtk_accel_path "/ThunarWindow/reload" "r") +; (gtk_accel_path "/ThunarWindow/open-templates" "") +; (gtk_accel_path "/ThunarStandardView/copy" "c") +; (gtk_accel_path "/ThunarWindow/view-location-selector-pathbar" "") +; (gtk_accel_path "/ThunarStandardView/properties" "Return") +; (gtk_accel_path "/ThunarStandardView/delete" "") +; (gtk_accel_path "/ThunarActions/Twp::setwallpaper" "") +; (gtk_accel_path "/ThunarWindow/empty-trash" "") +; (gtk_accel_path "/ThunarWindow/view-location-selector-menu" "") +; (gtk_accel_path "/ThunarLauncher/open-in-new-window" "o") +; (gtk_accel_path "/ThunarStandardView/cut" "x") +; (gtk_accel_path "/ThunarWindow/close-window" "q") +; (gtk_accel_path "/ThunarStandardView/select-all-files" "") +; (gtk_accel_path "/ThunarWindow/open-location" "l") +; (gtk_accel_path "/ThunarWindow/zoom-reset" "0") +; (gtk_accel_path "/ThunarWindow/view-statusbar" "") +; (gtk_accel_path "/ThunarWindow/show-hidden" "h") +; (gtk_accel_path "/ThunarWindow/view-as-detailed-list" "2") diff --git a/archlive/airootfs/etc/skel/.config/Thunar/uca.xml b/archlive/airootfs/etc/skel/.config/Thunar/uca.xml new file mode 100644 index 00000000..74185535 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/Thunar/uca.xml @@ -0,0 +1,13 @@ + + + + utilities-terminal + Open Terminal Here + 1462127723240094-1 + exo-open --working-directory %f --launch TerminalEmulator + Example for a custom action + * + + + + diff --git a/archlive/airootfs/etc/skel/.config/autostart/wifi.desktop b/archlive/airootfs/etc/skel/.config/autostart/wifi.desktop deleted file mode 100644 index 2459b12d..00000000 --- a/archlive/airootfs/etc/skel/.config/autostart/wifi.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=0.9.4 -Type=Application -Name=WiFi -Comment=WiFi -Exec=/home/wktech/.wifi -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 new file mode 100644 index 00000000..62930e9d --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini @@ -0,0 +1,11 @@ +[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 index 55e57f9b..3a73097e 100644 --- a/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini +++ b/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini @@ -1,15 +1,5 @@ [Settings] -gtk-theme-name=Numix -gtk-icon-theme-name=Adwaita +gtk-theme-name=Arc +gtk-icon-theme-name=Numic Circle gtk-font-name=Noto Sans 10 -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=hintfull -gtk-xft-rgba=none + diff --git a/archlive/airootfs/etc/skel/.config/midori/config b/archlive/airootfs/etc/skel/.config/midori/config new file mode 100644 index 00000000..30a10bcf --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/midori/config @@ -0,0 +1,21 @@ +[settings] +default-encoding=ISO-8859-1 +default-font-family=Noto Sans +monospace-font-family=Noto Mono +enable-developer-extras=true +enable-site-specific-quirks=true +enable-javascript=true +default-charset=ISO-8859-1 +last-panel-position=249 +last-panel-page=3 +last-window-state=MIDORI_WINDOW_MAXIMIZED +location-entry-search=https://duckduckgo.com/?q=%s +toolbar-items=TabNew,Back,NextForward,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu +homepage=https://www.google.com/ +tabhome=about:dial +download-folder=/home/wktech +load-on-startup=MIDORI_STARTUP_HOMEPAGE +user-agent=Mozilla/5.0 (X11; Linux) AppleWebKit/538.15 (KHTML, like Gecko) Chrome/18.0.1025.133 Safari/538.15 Midori/0.5 + +[extensions] +libadblock.so=true diff --git a/archlive/airootfs/etc/skel/.config/mimeapps.list b/archlive/airootfs/etc/skel/.config/mimeapps.list new file mode 100644 index 00000000..e8beceeb --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/mimeapps.list @@ -0,0 +1,25 @@ +[Added Associations] +application/pdf=mupdf.desktop; +application/vnd.adobe.flash.movie=mpv.desktop; +application/vnd.ms-asf=mpv.desktop; +audio/flac=mpv.desktop; +audio/mp4=mpv.desktop; +audio/mpeg=mpv.desktop; +audio/x-vorbis+ogg=mpv.desktop; +image/bmp=ristretto.desktop; +image/gif=ristretto.desktop; +image/jpeg=ristretto.desktop; +image/png=ristretto.desktop; +image/vnd.microsoft.icon=ristretto.desktop; +inode/directory=exo-file-manager.desktop +text/plain=mousepad.desktop; +video/mp4=mpv.desktop; +video/mpeg=mpv.desktop; +video/quicktime=mpv.desktop; +video/x-flv=mpv.desktop; +video/x-matroska=mpv.desktop; +video/x-msvideo=mpv.desktop; +video/x-ms-wmv=mpv.desktop; +x-scheme-handler/http=exo-web-browser.desktop +x-scheme-handler/https=exo-web-browser.desktop +x-scheme-handler/trash=exo-file-manager.desktop diff --git a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc b/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc deleted file mode 100644 index dd31bbe4..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc +++ /dev/null @@ -1,11 +0,0 @@ -[xfdesktop-version-4.10.3+-rcfile_format] -4.10.3+=true - -[/] -row=0 -col=0 - -[/home/wktech] -row=1 -col=0 - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x711.rc b/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x711.rc deleted file mode 100644 index f8a12092..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x711.rc +++ /dev/null @@ -1,19 +0,0 @@ -[xfdesktop-version-4.10.3+-rcfile_format] -4.10.3+=true - -[/home/wktech/Desktop/SpeedTest.desktop] -row=2 -col=0 - -[/home/wktech/Desktop/HW Diagnostics.desktop] -row=3 -col=0 - -[/] -row=0 -col=0 - -[/home/wktech] -row=1 -col=0 - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x752.rc b/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x752.rc deleted file mode 100644 index dd31bbe4..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x752.rc +++ /dev/null @@ -1,11 +0,0 @@ -[xfdesktop-version-4.10.3+-rcfile_format] -4.10.3+=true - -[/] -row=0 -col=0 - -[/home/wktech] -row=1 -col=0 - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc b/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc index 889c575f..61bd79cd 100644 --- a/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc +++ b/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc @@ -1,3 +1,4 @@ WebBrowser=midori +FileManager=Thunar TerminalEmulator=urxvt diff --git a/archlive/airootfs/etc/skel/.config/xfce4/panel/cpugraph-9.rc b/archlive/airootfs/etc/skel/.config/xfce4/panel/cpugraph-9.rc deleted file mode 100644 index 220e1d4b..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/panel/cpugraph-9.rc +++ /dev/null @@ -1,17 +0,0 @@ -UpdateInterval=0 -TimeScale=0 -Size=32 -Mode=0 -Frame=1 -Border=1 -Bars=0 -TrackedCore=0 -Command=xfce4-taskmanager -InTerminal=0 -StartupNotification=1 -ColorMode=0 -Foreground1=#2b2b6363b1b1 -Foreground2=#ffff00000000 -Foreground3=#00000000ffff -Background=#2b2b2e2e3737 - diff --git a/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-18.rc b/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc similarity index 68% rename from archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-18.rc rename to archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc index 00f15a7d..93ffb654 100644 --- a/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-18.rc +++ b/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc @@ -1,12 +1,12 @@ -favorites=exo-file-manager.desktop,hwdiags.desktop,gparted.desktop,gsmartcontrol.desktop,truecrypt.desktop,speedtest.desktop,exo-web-browser.desktop -recent=exo-web-browser.desktop +favorites=Hardware Diagnostics.desktop,exo-file-manager.desktop,gparted.desktop,gsmartcontrol.desktop,SpeedTest.desktop,truecrypt.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=desktop-environment-xfce +button-icon=distributor-logo-archlinux button-single-row=false show-button-title=false show-button-icon=true launcher-show-name=true -launcher-show-description=true +launcher-show-description=false item-icon-size=3 hover-switch-category=false category-icon-size=1 @@ -14,11 +14,11 @@ load-hierarchy=false recent-items-max=10 favorites-in-recent=true display-recent-default=false -position-search-alternate=false -position-commands-alternate=false +position-search-alternate=true +position-commands-alternate=true position-categories-alternate=false -menu-width=399 -menu-height=508 +menu-width=400 +menu-height=500 menu-opacity=100 command-settings=xfce4-settings-manager show-command-settings=true @@ -29,7 +29,7 @@ show-command-switchuser=false command-logout=xfce4-session-logout show-command-logout=true command-menueditor=menulibre -show-command-menueditor=true +show-command-menueditor=false command-profile=mugshot show-command-profile=false search-actions=4 diff --git a/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc b/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc index 15984ea3..41bfc4df 100644 --- a/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc +++ b/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc @@ -16,11 +16,4 @@ MiscTabCloseButtons=TRUE MiscTabCloseMiddleClick=TRUE MiscTabPosition=GTK_POS_TOP MiscHighlightUrls=TRUE -ColorForeground=#839496 -ColorBackground=#002b36 -ColorCursor=#93a1a1 -ColorPalette=#073642;#dc322f;#859900;#b58900;#268bd2;#d33682;#2aa198;#eee8d5;#002b36;#cb4b16;#586e75;#657b83;#839496;#6c71c4;#93a1a1;#fdf6e3 -ColorBold=#93a1a1 -ColorBoldUseDefault=FALSE -TabActivityColor=#dc322f diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc b/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc index dfbd1328..bc341e3b 100644 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc +++ b/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc @@ -19,7 +19,7 @@ ColumnCPU=TRUE ColumnPriority=FALSE SortColumn=0 SortType=0 -WindowWidth=838 -WindowHeight=591 +WindowWidth=490 +WindowHeight=465 HandlePosition=100 ProcessTreeView=FALSE 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 new file mode 100644 index 00000000..781e4e71 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml @@ -0,0 +1,9 @@ + + + + + + + + + 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 index 020078d0..567ac037 100644 --- 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 @@ -1,10 +1,12 @@ - + - + + + + - 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 index 0337f6f7..f1b3664f 100644 --- 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 @@ -8,6 +8,7 @@ + @@ -27,18 +28,13 @@ - - - - - - - - + + + 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 index f52b0e10..cf01628b 100644 --- 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 @@ -29,26 +29,20 @@ + + + + + + + + + - - - - - - - - - - - - - - - @@ -164,7 +158,7 @@ - + diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml deleted file mode 100644 index 33cccb13..00000000 --- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml +++ /dev/null @@ -1,11 +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 new file mode 100644 index 00000000..49d6bca6 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..5cf67af8 --- /dev/null +++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml @@ -0,0 +1,5 @@ + + + + + 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 index bd7b830d..14332612 100644 --- 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 @@ -5,49 +5,61 @@ - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + 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 index ff8fb309..94ae4a47 100644 --- 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 @@ -2,9 +2,9 @@ + - - + 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 index 0e99df2f..bfaccb81 100644 --- 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 @@ -3,8 +3,9 @@ - + + @@ -23,24 +24,13 @@ - - - - - - - - - - - - + + + + - - - 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 index a9444be1..cd059aab 100644 --- 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 @@ -2,7 +2,7 @@ - + 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 index edfe5c35..aebf9edd 100644 --- 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 @@ -11,7 +11,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -72,16 +72,16 @@ + + + + + - - - - - 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 index c00d8438..2284a963 100644 --- 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 @@ -3,7 +3,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/archlive/airootfs/etc/skel/.conky_start b/archlive/airootfs/etc/skel/.conky_start index 811f7722..8ebe5067 100644 --- a/archlive/airootfs/etc/skel/.conky_start +++ b/archlive/airootfs/etc/skel/.conky_start @@ -1,3 +1,3 @@ #!/bin/bash -sleep 3s && conky +sleep 5s && conky diff --git a/archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin b/archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin new file mode 100644 index 0000000000000000000000000000000000000000..e7f302f4c2fab287fd974ac9cf084d5bd1ba12c1 GIT binary patch literal 101400 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 rw?} + + + + + + + + + + + + \ No newline at end of file diff --git a/archlive/airootfs/etc/skel/.tmux.conf b/archlive/airootfs/etc/skel/.tmux.conf index cdf5a3f2..29cf429c 100644 --- a/archlive/airootfs/etc/skel/.tmux.conf +++ b/archlive/airootfs/etc/skel/.tmux.conf @@ -1 +1,2 @@ set -g status off +set -g pane-active-border-fg white diff --git a/archlive/airootfs/etc/skel/.wifi b/archlive/airootfs/etc/skel/.wifi deleted file mode 100644 index 859c57b5..00000000 --- a/archlive/airootfs/etc/skel/.wifi +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -sleep 1s -nmcli dev wifi con "SomeWiFi" password "Abracadabra" - diff --git a/archlive/airootfs/etc/skel/.zsh_aliases b/archlive/airootfs/etc/skel/.zsh_aliases index 417a3e84..b6c91916 100644 --- a/archlive/airootfs/etc/skel/.zsh_aliases +++ b/archlive/airootfs/etc/skel/.zsh_aliases @@ -5,6 +5,7 @@ alias 7z3='7z a -t7z -mx=3' alias 7z5='7z a -t7z -mx=5' alias 7z7='7z a -t7z -mx=7' alias 7z9='7z a -t7z -mx=9' +alias diff='colordiff' -ur alias du='du -sch --apparent-size' alias fidentify="/usr/bin/fidentify-wip$(getconf LONG_BIT)" alias fix-perms='find -type d -exec chmod 755 "{}" \; && find -type f -exec chmod 644 "{}" \;' diff --git a/archlive/airootfs/usr/local/bin/hw-diags-badblocks b/archlive/airootfs/usr/local/bin/hw-diags-badblocks index 8b5d75dc..817996d3 100644 --- a/archlive/airootfs/usr/local/bin/hw-diags-badblocks +++ b/archlive/airootfs/usr/local/bin/hw-diags-badblocks @@ -4,7 +4,7 @@ function usage { echo "Usage: $0 log-dir device" - echo " e.g. $0 /var/tmp/hw-diags/9001 /dev/sda" + echo " e.g. $0 /tmp/tmp.7Mh5f1RhSL9001 /dev/sda" } # Bail early diff --git a/archlive/airootfs/usr/local/bin/hw-diags-inner b/archlive/airootfs/usr/local/bin/hw-diags-inner index 28b4d600..1bc5bde3 100644 --- a/archlive/airootfs/usr/local/bin/hw-diags-inner +++ b/archlive/airootfs/usr/local/bin/hw-diags-inner @@ -2,10 +2,6 @@ # ## WK HW Diagnostics - Main script -# Setup tmux -# tmux set remain-on-exit on -tmux set status off - # Get TICKET# TICKET="" while [[ "$TICKET" == "" ]]; do @@ -26,7 +22,7 @@ DIAG_SERVER_AVAIL="False" DIAG_SERVER="10.0.0.10" DIAG_DEST="/srv/Diagnostics/${TICKET}/${DIAG_DATE}" DIAG_USER="wkdiag" -TMP_DIR="/var/tmp/hw-diags/${TICKET}/${DIAG_DATE}" +TMP_DIR="$(mktemp -d)" ERRORS="False" ERROR_IMG="$TMP_DIR/error.jpg" PASSED_IMG="$TMP_DIR/passed.jpg" @@ -46,6 +42,29 @@ for d in "${ARCH_DRIVES[@]}"; do DRIVES=(${DRIVES[@]//*$d*}) done +# Connect to network +if ! ip a | grep -q '192.168.1'; then + # LAN + if ! ip l | grep -Eq '[0-9]+: +en'; then + ## Reload the tg3/broadcom driver (known fix for some Dell systems) + echo "No wired network adapters found; reloading drivers..." + sudo modprobe -r tg3 + sudo modprobe broadcom + sudo modprobe tg3 + sleep 5s + fi + + # WiFi + if ip l | grep -Eq '[0-9]+: +wl'; then + ## Skip if we're already connected (e.g. the code above worked) + if ! ip a | grep -q '192.168.1'; then + echo "Attempting to connect to SomeWiFi..." + nmcli dev wifi con "SomeWiFi" password "Abracadabra" + sleep 5s + fi + fi +fi + # Test connection to DIAG_SERVER if ip a | grep -q '192.168.1' && \ ping -c 1 -q $DIAG_SERVER >/dev/null 2>&1; then @@ -408,7 +427,7 @@ if [[ "$TEST_BADBLOCKS" == "True" ]]; then echo "Testing drive: ${tmp_device}" # Split and run - tmux split-window -d -v -l 7 "hw-diags-badblocks $TMP_DIR /dev/${tmp_device}" + tmux split-window -v -l 7 "hw-diags-badblocks $TMP_DIR /dev/${tmp_device}" # Wait until done sleep 2s @@ -472,10 +491,15 @@ sudo inxi -CDdGlMmNopRsc 0 | grep -Ev '(/dev/ram|No RAID devices|Display Server| # Cleanup mkdir "$HOME/Tickets/$TICKET" -p 2>/dev/null -rsync -aS "$TMP_DIR" "$HOME/Tickets/" +rsync -aS "$TMP_DIR/" "$HOME/Tickets/$TICKET/" popd >/dev/null cd "$HOME/Tickets" && tar czf "${TICKET}.tgz" "$TICKET" +# Update Server +if [[ "$DIAG_SERVER_AVAIL" == "True" ]]; then + rsync -aqz "$TMP_DIR/" "${TICKET}.tgz" $DIAG_USER@$DIAG_SERVER:"$DIAG_DEST/" --exclude '*.out' +fi + # End echo -n "Press Enter to exit..." read -r diff --git a/archlive/airootfs/usr/local/bin/hw-diags-prime95 b/archlive/airootfs/usr/local/bin/hw-diags-prime95 index 191639e5..6e29b670 100644 --- a/archlive/airootfs/usr/local/bin/hw-diags-prime95 +++ b/archlive/airootfs/usr/local/bin/hw-diags-prime95 @@ -7,7 +7,7 @@ MPRIME="/usr/bin/mprime$(getconf LONG_BIT)" function usage { echo "Usage: $0 log-dir" - echo " e.g. $0 /var/tmp/hw-diags/9001" + echo " e.g. $0 /tmp/tmp.7Mh5f1RhSL9001" } # Bail early diff --git a/archlive/airootfs/usr/local/bin/hw-diags-sensors b/archlive/airootfs/usr/local/bin/hw-diags-sensors index 66cddcc0..32fa7dc4 100644 --- a/archlive/airootfs/usr/local/bin/hw-diags-sensors +++ b/archlive/airootfs/usr/local/bin/hw-diags-sensors @@ -6,7 +6,7 @@ LOG_DIR="$1" function usage { echo "Usage: $0 log-dir" - echo " e.g. $0 /var/tmp/hw-diags/9001" + echo " e.g. $0 /tmp/tmp.7Mh5f1RhSL9001" } # Bail early diff --git a/archlive/airootfs/usr/local/bin/mount-all-volumes b/archlive/airootfs/usr/local/bin/mount-all-volumes index fe50a427..edf3094a 100644 --- a/archlive/airootfs/usr/local/bin/mount-all-volumes +++ b/archlive/airootfs/usr/local/bin/mount-all-volumes @@ -12,3 +12,9 @@ for v in $(inxi -Do | grep -E "$regex" | sed -r "s#.*($regex).*#\1#"); do echo "Failed to mount." fi done + +if [[ "$1" == "foh" && -n $DISPLAY ]]; then + sleep 1s + exo-open --launch FileManager "$HOME" +fi +echo "Done." diff --git a/archlive/airootfs/usr/local/bin/mount-backup-shares b/archlive/airootfs/usr/local/bin/mount-backup-shares index be313995..36e44645 100644 --- a/archlive/airootfs/usr/local/bin/mount-backup-shares +++ b/archlive/airootfs/usr/local/bin/mount-backup-shares @@ -3,8 +3,8 @@ ## Mount NAS backup shares echo "Mounting NAS backup shares" -sudo mkdir /Backups/ServerOne +sudo mkdir /Backups/ServerOne -p sudo mount //10.0.0.10/Backups /Backups/ServerOne -o username=backup,password=Abracadabra -sudo mkdir /Backups/ServerTwo +sudo mkdir /Backups/ServerTwo -p sudo mount //10.0.0.11/Backups /Backups/ServerTwo -o username=backup,password=Abracadabra diff --git a/archlive/airootfs/usr/local/bin/msword-search b/archlive/airootfs/usr/local/bin/msword-search index bc7d4aa5..5917d660 100644 --- a/archlive/airootfs/usr/local/bin/msword-search +++ b/archlive/airootfs/usr/local/bin/msword-search @@ -1,5 +1,7 @@ #!/bin/bash +TMP_FILE="$(mktemp)" + IFS=$'\n' for s in $*; do REGEX="$s" @@ -9,7 +11,7 @@ for s in $*; do for d in *doc; do if antiword "$d" | grep -iqsP "($REGEX)"; then echo "Possible match: $d" - echo "$d" >> msword.tmp + echo "$d" >> "$TMP_FILE" fi done @@ -17,14 +19,20 @@ for s in $*; do for d in *docx; do if unzip -p "$d" word/document.xml | grep -iqsP "($REGEX)"; then echo "Possible match: $d" - echo "$d" >> msword.tmp + echo "$d" >> "$TMP_FILE" fi done done # Cleanup results -if [[ -f msword.tmp ]]; then - sort -u msword.tmp >> msword-matches.txt +if [[ -s "$TMP_FILE" ]]; then + sort -u "$TMP_FILE" >> "$HOME/msword-matches.txt" fi +rm "$TMP_FILE" +# Done +if [[ -s "$HOME/msword-matches.txt" ]]; then + echo "Found $(wc -l "$HOME/msword-matches.txt") possible matches" + echo "The results have been saved to $HOME" +fi \ No newline at end of file diff --git a/archlive/packages.both b/archlive/packages.both index 5db6acf4..b87730d9 100644 --- a/archlive/packages.both +++ b/archlive/packages.both @@ -5,6 +5,8 @@ b43-fwcutter btrfs-progs chntpw clonezilla +cmatrix +colordiff conky crda curl @@ -33,6 +35,7 @@ grub gsmartcontrol gtk-engine-murrine hdparm +hexedit hfsprogs htop inxi @@ -49,7 +52,8 @@ mc mdadm mediainfo mesa -midori +mesa-demos +midori-gtk2 mkvtoolnix-cli mpv mtools @@ -93,6 +97,7 @@ truecrypt ttf-inconsolata udevil udisks2 +unzip usb_modeswitch vim vpnc diff --git a/build-wk b/build-wk new file mode 100644 index 00000000..2ffa0d3b --- /dev/null +++ b/build-wk @@ -0,0 +1,13 @@ +#!/bin/bash + +# Set Vars +TMP_DIR="$(pwd)/wk_tmp" +OUT_DIR="$TMP_DIR/out" + +# Build ISO +mkdir $TMP_DIR +mkdir $OUT_DIR +./archlive/build.sh -N "arch-wk" -V "$(date +%F)" -L "ARCH_WK" -w "$TMP_DIR" -o "$OUT_DIR" -v + +# Cleanup +mv -nv "$OUT_DIR"/*iso "$HOME/" && rm "$TMP_DIR" -Rf