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 29b6af0..0000000 Binary files a/snowblocks/tilix/bookmarks-archbook.json.igloocrypt and /dev/null differ 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 fb6bf3b..0000000 Binary files a/snowblocks/xdg/gtk-3.0/bookmarks-archbook.igloocrypt and /dev/null differ diff --git a/snowblocks/xdg/snowblock.json b/snowblocks/xdg/snowblock.json index 2a2852e..86230df 100644 --- a/snowblocks/xdg/snowblock.json +++ b/snowblocks/xdg/snowblock.json @@ -22,7 +22,6 @@ "create": true, "force": true, "hosts": { - "archbook": "gtk-3.0/bookmarks-archbook.igloocrypt", "igloo": "gtk-3.0/bookmarks-igloo.igloocrypt" } }, @@ -75,7 +74,6 @@ "create": true, "force": true, "hosts": { - "archbook": "autostart/plank.desktop.archbook", "igloo": "autostart/plank.desktop.igloo" } }, diff --git a/snowflakes/systemd/README.md b/snowflakes/systemd/README.md index 186d38f..692ea5c 100644 --- a/snowflakes/systemd/README.md +++ b/snowflakes/systemd/README.md @@ -23,10 +23,10 @@ The changes will be applied after the `systemd-logind` daemon has been restarted ### custom suspend service -Install the [`igloo-mbp-lid-suspend.service.archbook`][gh-unit-suspend] suspend/resume service file, a single hook that does all the work for different phases (sleep/resume) and for different targets (suspend/hibernate/hybrid-sleep). +Install the [`igloo-mbp-lid-suspend.service`][gh-unit-suspend] suspend/resume service file, a single hook that does all the work for different phases (sleep/resume) and for different targets (suspend/hibernate/hybrid-sleep). ```sh -sudo cp snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service.archbook /lib/systemd/system/igloo-mbp-lid-suspend.service +sudo cp snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service /lib/systemd/system/igloo-mbp-lid-suspend.service sudo systemctl daemon-reload sudo systemctl enable igloo-mbp-lid-suspend.service ``` @@ -38,10 +38,10 @@ sudo systemctl enable igloo-mbp-lid-suspend.service * either `pre` or `post`: Depending on whether the machine is going to *sleep* or *waking* up * `suspend`, `hibernate` or `hybrid-sleep`: Depending on which is being invoked -Install the [`igloo-mbp-lid-suspend.service.sh.archbook`][gh-hook-system-sleep] *system-sleep* hook: +Install the [`igloo-mbp-lid-suspend.service.sh`][gh-hook-system-sleep] *system-sleep* hook: ```sh -sudo cp snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.service.sh.archbook /lib/systemd/system-sleep/igloo-mbp-lid-suspend.service.sh +sudo cp snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.service.sh /lib/systemd/system-sleep/igloo-mbp-lid-suspend.service.sh sudo systemctl daemon-reload ``` @@ -65,8 +65,8 @@ References: [archw-pw-mng-inst-wakeup]: https://wiki.archlinux.org/index.php/Power_management/Suspend_and_hibernate#Instantaneous_wakeups_from_suspend [archw-suspend-service]: https://wiki.archlinux.org/index.php/Power_management#Combined_Suspend.2Fresume_service_file [archw-system-sleep-hook]: https://wiki.archlinux.org/index.php/Power_management#Hooks_in_.2Fusr.2Flib.2Fsystemd.2Fsystem-sleep -[gh-hook-system-sleep]: https://github.com/arcticicestudio/igloo/blob/develop/snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.sh.archbook +[gh-hook-system-sleep]: https://github.com/arcticicestudio/igloo/blob/develop/snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.sh [gh-lk-fix-commit]: https://github.com/torvalds/linux/commit/13cfc732160f7bc7e596128ce34cda361c556966 -[gh-unit-suspend]: https://github.com/arcticicestudio/igloo/blob/develop/snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service.archbook +[gh-unit-suspend]: https://github.com/arcticicestudio/igloo/blob/develop/snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service [man-systemd.sleep]: https://www.freedesktop.org/software/systemd/man/sleep.conf.d.html [man-systemd.special]: https://www.freedesktop.org/software/systemd/man/systemd.special.html diff --git a/snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.sh.archbook b/snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.sh similarity index 100% rename from snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.sh.archbook rename to snowflakes/systemd/hooks/system-sleep/igloo-mbp-lid-suspend.sh diff --git a/snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service.archbook b/snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service similarity index 100% rename from snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service.archbook rename to snowflakes/systemd/units/system/igloo-mbp-lid-suspend.service