From c08ca24ce2909b4ae4a058fb23561ead02d7b128 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Wed, 19 Sep 2018 06:13:45 +0200 Subject: [PATCH] Replace/Update "archbook" with new "iceowl" host There are various snowblock/snowflake configurations that contain the `archbook` host (1) which doesn't exist anymore and can be replaced in most cases with the new `iceowl` host. In cases where the snowblock/snowflake is only targeted for Linux the `archbook` host should be removed to make it host independently. These can be updated when a new Linux host is introduced. References: (1) https://github.com/search?l=&q=archbook+repo%3Aarcticicestudio%2Figloo+created%3A%3E2018-09-18&type=Code Epic: GH-131 Closes GH-143 --- snowblocks/git/snowblock.json | 8 +- snowblocks/npm/snowblock.json | 2 +- snowblocks/pacman/pacman.conf.archbook | 90 ------------------ snowblocks/pacman/snowblock.json | 3 +- snowblocks/plank/README.md | 3 +- .../plank/launchers/archbook/atom.dockitem | 2 - .../launchers/archbook/google-chrome.dockitem | 2 - .../archbook/jetbrains-idea.dockitem | 2 - .../archbook/org.gnome.Nautilus.dockitem | 2 - .../archbook/org.gnome.Screenshot.dockitem | 2 - .../plank/launchers/archbook/pycharm.dockitem | 2 - snowblocks/plank/snowblock.json | 7 -- snowblocks/systemd/snowblock.json | 1 - snowblocks/taskwarrior/snowblock.json | 6 +- .../tilix/bookmarks-archbook.json.igloocrypt | Bin 2344 -> 0 bytes snowblocks/tilix/snowblock.json | 1 - snowblocks/timewarrior/snowblock.json | 2 - .../xdg/autostart/plank.desktop.archbook | 12 --- .../xdg/gtk-3.0/bookmarks-archbook.igloocrypt | Bin 328 -> 0 bytes snowblocks/xdg/snowblock.json | 2 - snowflakes/systemd/README.md | 12 +-- ...d.sh.archbook => igloo-mbp-lid-suspend.sh} | 0 ...archbook => igloo-mbp-lid-suspend.service} | 0 23 files changed, 16 insertions(+), 145 deletions(-) delete mode 100644 snowblocks/pacman/pacman.conf.archbook delete mode 100644 snowblocks/plank/launchers/archbook/atom.dockitem delete mode 100644 snowblocks/plank/launchers/archbook/google-chrome.dockitem delete mode 100644 snowblocks/plank/launchers/archbook/jetbrains-idea.dockitem delete mode 100644 snowblocks/plank/launchers/archbook/org.gnome.Nautilus.dockitem delete mode 100644 snowblocks/plank/launchers/archbook/org.gnome.Screenshot.dockitem delete mode 100644 snowblocks/plank/launchers/archbook/pycharm.dockitem delete mode 100644 snowblocks/tilix/bookmarks-archbook.json.igloocrypt delete mode 100644 snowblocks/xdg/autostart/plank.desktop.archbook delete mode 100644 snowblocks/xdg/gtk-3.0/bookmarks-archbook.igloocrypt rename snowflakes/systemd/hooks/system-sleep/{igloo-mbp-lid-suspend.sh.archbook => igloo-mbp-lid-suspend.sh} (100%) rename snowflakes/systemd/units/system/{igloo-mbp-lid-suspend.service.archbook => igloo-mbp-lid-suspend.service} (100%) diff --git a/snowblocks/git/snowblock.json b/snowblocks/git/snowblock.json index 295f264..9a802a7 100644 --- a/snowblocks/git/snowblock.json +++ b/snowblocks/git/snowblock.json @@ -6,7 +6,7 @@ "link": { "~/.gitattributes": { "hosts": { - "archbook": "gitattributes", + "iceowl": "gitattributes", "igloo": "gitattributes" } }, @@ -14,19 +14,19 @@ "~/.gitconfig": null, "~/.gitconfig-auth": { "hosts": { - "archbook": "gitconfig-auth.igloocrypt", + "iceowl": "gitconfig-auth.igloocrypt", "igloo": "gitconfig-auth.igloocrypt" } }, "~/.gitconfig-auth-svengreb": { "hosts": { - "archbook": "gitconfig-auth-svengreb.igloocrypt", + "iceowl": "gitconfig-auth-svengreb.igloocrypt", "igloo": "gitconfig-auth-svengreb.igloocrypt" } }, "~/.gitconfig-auth-job": { "hosts": { - "archbook": "gitconfig-auth-job.igloocrypt", + "iceowl": "gitconfig-auth-job.igloocrypt", "igloo": "gitconfig-auth-job.igloocrypt" } }, diff --git a/snowblocks/npm/snowblock.json b/snowblocks/npm/snowblock.json index fd558de..a3c76f6 100644 --- a/snowblocks/npm/snowblock.json +++ b/snowblocks/npm/snowblock.json @@ -6,7 +6,7 @@ "link": { "~/.npmrc": { "hosts": { - "archbook": "npmrc", + "iceowl": "npmrc", "igloo": "npmrc" } } diff --git a/snowblocks/pacman/pacman.conf.archbook b/snowblocks/pacman/pacman.conf.archbook deleted file mode 100644 index c850dd7..0000000 --- a/snowblocks/pacman/pacman.conf.archbook +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT -# References: -# pacman(8) -# pacman.conf(5) -# repo-add(8) -# https://wiki.archlinux.org/index.php/pacman -# https://www.archlinux.org/pacman/pacman.8.html -# https://www.archlinux.org/pacman/pacman.conf.5.html -# https://www.archlinux.org/pacman/repo-add.8.html - -# [GPG] -# Initialize the local keyring before first using pacman by running "pacman-key --init". -# Populate with the keys of all official Arch Linux packagers by running "pacman-key --populate archlinux". - -# +---------+ -# + Options + -# +---------+ -[options] -# Set the package architecture "i686" or "x86_64" for sync operations. -# The special value "auto" uses the system architecture. -# If unset, no architecture checks are made. -# Packages with the special architecture "any" can always be installed, as they are meant to be architecture -# independent. -Architecture = auto - -# Set the default location of the package cache directory. -# Multiple cache directories can be specified as absolute path and they are tried in the order they are listed. -# If a file is not found in any cache directory, it will be downloaded to the first cache directory with write access. -CacheDir = /var/cache/pacman/pkg/ $STORE_PKGS - -# List packages that should be protected against removement. -# Shell-style glob patterns are allowed. -HoldPkg = pacman glibc - -# Instruct pacman to ignore any upgrades for the specified packages when performing a "--sysupgrade". -# Shell-style glob patterns are allowed. -IgnorePkg = - -# Instruct pacman to ignore any upgrades for all packages in the specified groups when performing a "--sysupgrade". -# Shell-style glob patterns are allowed. -IgnoreGroup = - -# Enable tty color support. -Color - -# Everyone loves candies! -ILoveCandy - -# Perform an approximate check for adequate available disk space before installing packages. -CheckSpace - -# Display name, version and size of target packages formatted as a table for upgrade, sync and remove operations. -VerbosePkgLists - -# Set the default signature verification level. -SigLevel = Required DatabaseOptional - -# Sets the signature verification level for installing packages using the sync "-U" operation on a local file. -# Uses the value from the "SigLevel" options as the default. -LocalFileSigLevel = Optional - -# +--------------+ -# + Repositories + -# +--------------+ -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -[bitfroest] -SigLevel = Optional TrustAll -Server = file:///home/sgreb/store/bitfroest diff --git a/snowblocks/pacman/snowblock.json b/snowblocks/pacman/snowblock.json index 50f8f11..fd1c93e 100644 --- a/snowblocks/pacman/snowblock.json +++ b/snowblocks/pacman/snowblock.json @@ -7,8 +7,7 @@ "~/.makepkg.conf": null, "~/.pacman.conf": { "hosts": { - "igloo": "pacman.conf.igloo", - "archbook": "pacman.conf.archbook" + "igloo": "pacman.conf.igloo" } } } diff --git a/snowblocks/plank/README.md b/snowblocks/plank/README.md index e7f60b9..8202c01 100644 --- a/snowblocks/plank/README.md +++ b/snowblocks/plank/README.md @@ -17,7 +17,7 @@ dconf dump /net/launchpad/plank/ > plank.dconf # Autostart -The [xdg snowblock][gh-sb-xdg] provides host specific [autostart][gh-sb-xdg-autostart] configurations for the [igloo][gh-sb-xdg-autostart-igloo] and [archbook][gh-sb-xdg-autostart-archbook] Plank launcher profiles. +The [xdg snowblock][gh-sb-xdg] provides host specific [autostart][gh-sb-xdg-autostart] configurations for the [igloo][gh-sb-xdg-autostart-igloo] Plank launcher profile(s). # References @@ -27,6 +27,5 @@ The [xdg snowblock][gh-sb-xdg] provides host specific [autostart][gh-sb-xdg-auto [dconf]: https://wiki.gnome.org/Projects/dconf [gh-sb-xdg]: https://github.com/arcticicestudio/igloo/tree/develop/snowblocks/xdg [gh-sb-xdg-autostart]: https://github.com/arcticicestudio/igloo/tree/develop/snowblocks/xdg/autostart -[gh-sb-xdg-autostart-archbook]: https://github.com/arcticicestudio/igloo/blob/develop/snowblocks/xdg/autostart/plank.desktop.archbook [gh-sb-xdg-autostart-igloo]: https://github.com/arcticicestudio/igloo/blob/develop/snowblocks/xdg/autostart/plank.desktop.igloo [plank-gh]: https://github.com/ricotz/plank diff --git a/snowblocks/plank/launchers/archbook/atom.dockitem b/snowblocks/plank/launchers/archbook/atom.dockitem deleted file mode 100644 index e502f51..0000000 --- a/snowblocks/plank/launchers/archbook/atom.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///home/sgreb/.local/share/applications/atom.desktop diff --git a/snowblocks/plank/launchers/archbook/google-chrome.dockitem b/snowblocks/plank/launchers/archbook/google-chrome.dockitem deleted file mode 100644 index cd04294..0000000 --- a/snowblocks/plank/launchers/archbook/google-chrome.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/google-chrome.desktop diff --git a/snowblocks/plank/launchers/archbook/jetbrains-idea.dockitem b/snowblocks/plank/launchers/archbook/jetbrains-idea.dockitem deleted file mode 100644 index 21126b5..0000000 --- a/snowblocks/plank/launchers/archbook/jetbrains-idea.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/jetbrains-idea.desktop diff --git a/snowblocks/plank/launchers/archbook/org.gnome.Nautilus.dockitem b/snowblocks/plank/launchers/archbook/org.gnome.Nautilus.dockitem deleted file mode 100644 index ae5f8d9..0000000 --- a/snowblocks/plank/launchers/archbook/org.gnome.Nautilus.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/org.gnome.Nautilus.desktop diff --git a/snowblocks/plank/launchers/archbook/org.gnome.Screenshot.dockitem b/snowblocks/plank/launchers/archbook/org.gnome.Screenshot.dockitem deleted file mode 100644 index 33272ee..0000000 --- a/snowblocks/plank/launchers/archbook/org.gnome.Screenshot.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/org.gnome.Screenshot.desktop diff --git a/snowblocks/plank/launchers/archbook/pycharm.dockitem b/snowblocks/plank/launchers/archbook/pycharm.dockitem deleted file mode 100644 index 84149c3..0000000 --- a/snowblocks/plank/launchers/archbook/pycharm.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/pycharm.desktop diff --git a/snowblocks/plank/snowblock.json b/snowblocks/plank/snowblock.json index e04f425..35b0aac 100644 --- a/snowblocks/plank/snowblock.json +++ b/snowblocks/plank/snowblock.json @@ -14,13 +14,6 @@ "igloo": "launchers/igloo" } }, - "~/.config/plank/archbook/launchers": { - "create": true, - "force": true, - "hosts": { - "archbook": "launchers/archbook" - } - }, "~/.local/share/plank/themes/igloo": { "create": true, "force": true, diff --git a/snowblocks/systemd/snowblock.json b/snowblocks/systemd/snowblock.json index 3aef248..efda0a0 100644 --- a/snowblocks/systemd/snowblock.json +++ b/snowblocks/systemd/snowblock.json @@ -7,7 +7,6 @@ "~/.config/systemd/user/igloosync-dropbox.service": { "create": true, "hosts": { - "archbook": "units/user/igloosync-dropbox.service", "igloo": "units/user/igloosync-dropbox.service" } }, diff --git a/snowblocks/taskwarrior/snowblock.json b/snowblocks/taskwarrior/snowblock.json index c8e34c9..99d3be6 100644 --- a/snowblocks/taskwarrior/snowblock.json +++ b/snowblocks/taskwarrior/snowblock.json @@ -10,14 +10,14 @@ "~/.taskrc": { "force": true, "hosts": { - "archbook": "taskrc", + "iceowl": "taskrc", "igloo": "taskrc" } }, "~/.taskopenrc": { "force": true, "hosts": { - "archbook": "taskopenrc", + "iceowl": "taskopenrc", "igloo": "taskopenrc" } }, @@ -25,7 +25,7 @@ "create": true, "force": true, "hosts": { - "archbook": "nord.theme", + "iceowl": "nord.theme", "igloo": "nord.theme" } }, diff --git a/snowblocks/tilix/bookmarks-archbook.json.igloocrypt b/snowblocks/tilix/bookmarks-archbook.json.igloocrypt deleted file mode 100644 index 29b6af04786d9e1844d42961599e69a8617fa82e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2344 zcmV+@3D@=jM@dveQdv+`0MdHZ1+BWp9z7E1nu2#PMg0tUeLwzYw&IraYrC9iqB?X5 zkfDVDCjGxI0;PQ9_-8YTje8qX{r$Y;Uo;j{F<9JRLdnV~cM*{wQv*#r zIK~W4Mk!MxWMg2%Va#yOp>IA4-aX{$)=-abz{LsW1is+#JfjYe)wX#*kwopqnSeI$ zKnr8qAHlP`1*k5;ZpttCI1F0$t_4Zs6|Jb8{jf@nR(|=NJWh(BQFhftAw0-(UYRXe zb_pppc3U!rc*JKmyF8QpHtS-4o|>OwcGj*}5Pv#%^nY3B5s_+pgf$m37J>|_NJ>-( zl-a6?L=QIy42*-EAme||NVX~vip^^^b2k;#NlN-{wX-dj%OUY8aL+v?{amiL%bkGb z_^Wyho{FNF^znL&g)ZUZxj)8r`%bYf!l=4+eOd)_7k>?=-vE31eJWZ@vrRWg4H?%m z8e&g1^3rCA5C-V)s3?1!5a&d{#{g(T^5b7flHhq7m3Js#sIFs)MNb7-Cg(q-CG1XT z&v+L($4=zFlu+T(VW zXgfHR0-x{C4v{3bu(5#_IK{DKnW!w3wO|-wN;3GYA_g)oOHg}V${n**<`=S~cJ~?L z_ef3C6!$7wT!>|?sF1WahpgYnOT5?zyn>XuOaKv{4Wm$^FXw9QDXAQ@rOrU-SVX~T zH1i|YzRG|1JCP&AU+zH*PWzt{DC^G$kd#D!Ed10-g18E4sCu>3?W+^qJ#dofWx+X3 zU_CK)85tt1Vy$}YnO2D~CONE7WHyD!dHbUqRSNpRw96ju2>#p}dkv86jO>$R*vNxd z)qjHOXf+a^PFGY^L5V0t!!YdGJ+F>k)xfdcRQRoD*&hGS?_^1Hh3Y3aTam2tgCbq{Wv zj97$kxCH;ZTPRLuhp_FqVm9t(&DMGubt-22ku*5q?MH|$JsHDMiG^tJ3rwCZt&3#1 zWVK%ee423~Wu>QfPF|k~&iBj0=0#6xLyw~pFEKItaX)N7EO2TqAVpL1(MB|RVfH!E zg1TLzI?V?@W=x+HZggp?;X0(RuGTuodsxcwDj#n7L;h=Pb$4T z&GgU<>s`8}Cg{h?Y4bt|gu~ceV>Wu^I z8xX7K0C}$;K}R-`xZY9*HUQrBYle2fQC$j^!U~__!)ej-@Pb~$7jpIo5!on;+e>XB zR48o25|WV(UxPfKeekFyD)_f`?>FOgo{;#e60BUsTs!v=Nr>P5qN5-+kt*R$+g*PX>#oiTt}>pxqAOquzs z1M;*5emy2r>c27@b)45tgOI9|5~D)S1Mg!T76hmNkrL_gCD@W61>aYLL{iADem)K( zc`ICnHAzj~tYg1vwPhtfyFPjFAY%H^X`$VTQ}Z&5;I`iTZ@f|hMv;iQ`|LN(I&#6-jut1H$x*< zS7rr;)`4HFbVRl^Hnr%33I3B?AMswZsVf$mx?ioM|Ggg%KM6IAFmFTEou=W(bqp?08lZG&u^fTsn$<06#|o2G#X zAIal5oOn!`|C&*B1qGqJbahZ4O={yC0Zxj34Q(^ZRZprxnHl2E)XItk4$~q+%;?gV z*W*aUCG#k0O?bTRa zE~%)%v4nj3ta|#jho;*mK(e diff --git a/snowblocks/tilix/snowblock.json b/snowblocks/tilix/snowblock.json index 6c87581..4e6aeee 100644 --- a/snowblocks/tilix/snowblock.json +++ b/snowblocks/tilix/snowblock.json @@ -7,7 +7,6 @@ "~/.config/tilix/bookmarks.json": { "create": true, "hosts": { - "archbook": "bookmarks-archbook.json.igloocrypt", "igloo": "bookmarks-igloo.json.igloocrypt" } } diff --git a/snowblocks/timewarrior/snowblock.json b/snowblocks/timewarrior/snowblock.json index ed3f460..f9c9a31 100644 --- a/snowblocks/timewarrior/snowblock.json +++ b/snowblocks/timewarrior/snowblock.json @@ -11,7 +11,6 @@ "create": true, "force": true, "hosts": { - "archbook": "timewarrior.cfg.archbook", "igloo": "timewarrior.cfg.igloo" } }, @@ -19,7 +18,6 @@ "create": true, "force": true, "hosts": { - "archbook": "nord.theme", "igloo": "nord.theme" } } diff --git a/snowblocks/xdg/autostart/plank.desktop.archbook b/snowblocks/xdg/autostart/plank.desktop.archbook deleted file mode 100644 index 1a258a5..0000000 --- a/snowblocks/xdg/autostart/plank.desktop.archbook +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2016-present Arctic Ice Studio -# Copyright (C) 2016-present Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -[Desktop Entry] -Name=Plank -Type=Application -Exec=plank -n archbook -Icon=plank diff --git a/snowblocks/xdg/gtk-3.0/bookmarks-archbook.igloocrypt b/snowblocks/xdg/gtk-3.0/bookmarks-archbook.igloocrypt deleted file mode 100644 index fb6bf3b82a870424e19d95a713cde6977098b67c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmV-O0k{4DM@dveQdv+`0DHJl=hUImfAkM~mW>J_#Eh*(aW0~;Hr~N4hWTQ~eg}1- zkCh4Z`Yx%KVgbA#50VABM_Q;Dnt$dF-=U~VOgPAtS!WmS$TH3eTtV%LRhYO5{o#)M z2{L2vJ<&ywP^5ss0-X7ri6BG<^>ikazY)FG63JZ6tUbC|b>7`W^!$1kz?Osx@`=7Y z0%gbUZpqhiSpu0$&gUp^e1vo*L9Dm6XP}F+bpJ<~k4l{7M=PQIR~qMtm(--i%nelZ zeUG|(AX@!Mz0PizQpqh@%OI=l3BtxFzcSny`Ip0TWfshKrR$FkPgIXG&(&%RCyoxl zo|Fbp34(=NnzLj?HvsM+o$wdC&5uC7ed%Z#lKM!_Un5b_#H_3