From c3b02c5f7bd2454c53132b91394abfe3e5e59d36 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 24 Feb 2025 13:19:36 +1000 Subject: [PATCH] improved organisation moved host modules to hosts/modules and modified deploy script --- deploy | 16 ++++++++++++++++ deploy-remote | 13 ------------- homes/modules/ags/config.js | 10 +++++++--- homes/modules/ags/widgets/fullscreen.js | 8 ++++---- {modules => hosts/modules}/colmena.nix | 0 {modules => hosts/modules}/core/bluetooth.nix | 0 .../modules}/core/bootloader/grub.nix | 0 .../modules}/core/bootloader/systemd-boot.nix | 0 .../modules}/core/garbage-collector.nix | 0 .../modules}/core/sound/default.nix | 0 .../modules}/core/sound/pipewire.nix | 0 {modules => hosts/modules}/discord/nixcord.nix | 0 {flakes => hosts/modules/flakes}/wishlist/README | 0 .../modules/flakes}/wishlist/flake.nix | 0 .../modules/flakes}/wishlist/wishlist.nix | 0 {modules => hosts/modules}/hyprland/default.nix | 0 {modules => hosts/modules}/wishlist.nix | 0 {modules => hosts/modules}/wishlist.nix.bak | 0 18 files changed, 27 insertions(+), 20 deletions(-) delete mode 100755 deploy-remote rename {modules => hosts/modules}/colmena.nix (100%) rename {modules => hosts/modules}/core/bluetooth.nix (100%) rename {modules => hosts/modules}/core/bootloader/grub.nix (100%) rename {modules => hosts/modules}/core/bootloader/systemd-boot.nix (100%) rename {modules => hosts/modules}/core/garbage-collector.nix (100%) rename {modules => hosts/modules}/core/sound/default.nix (100%) rename {modules => hosts/modules}/core/sound/pipewire.nix (100%) rename {modules => hosts/modules}/discord/nixcord.nix (100%) rename {flakes => hosts/modules/flakes}/wishlist/README (100%) rename {flakes => hosts/modules/flakes}/wishlist/flake.nix (100%) rename {flakes => hosts/modules/flakes}/wishlist/wishlist.nix (100%) rename {modules => hosts/modules}/hyprland/default.nix (100%) rename {modules => hosts/modules}/wishlist.nix (100%) rename {modules => hosts/modules}/wishlist.nix.bak (100%) diff --git a/deploy b/deploy index 4dc0576..adec8b2 100755 --- a/deploy +++ b/deploy @@ -6,6 +6,7 @@ usage="Usage: $(basename $0) [OPTIONS] Options: -f, --fresh Remove old content in the nixstore (good for debugging) -b, --bootloader Reinstall the bootloader + -r, --remote Locally build and remotely deploy Colmena hive -h, --help Show this message (^_^)" # delete all cached entries @@ -25,11 +26,26 @@ rebuild_flake () { fi } +deploy_hive () { + echo "[+] Adding keys to ssh-agent" + ssh-add ~/.ssh/id_hyrule + printf "\n" + + git add . --verbose + # Deploy to all Colmena hives + colmena build --experimental-flake-eval + colmena apply --experimental-flake-eval + # colmena apply --on hyrule --experimental-flake-eval +} + # check which flags were given flag_fresh=false flag_bootloader=false for flag in "$@"; do case "$flag" in + -r|--remote) + deploy_hive + exit 0 ;; -f|--fresh) flag_fresh=true ;; -b|--bootloader) diff --git a/deploy-remote b/deploy-remote deleted file mode 100755 index be09c7d..0000000 --- a/deploy-remote +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e # terminate if any command fails - -echo "[+] Adding keys to ssh-agent" -ssh-add ~/.ssh/id_hyrule -printf "\n" - -git add . -# Deploy to all Colmena hives -colmena build --experimental-flake-eval -colmena apply --experimental-flake-eval -# colmena apply --on hyrule --experimental-flake-eval diff --git a/homes/modules/ags/config.js b/homes/modules/ags/config.js index 904ba9e..5a11efc 100755 --- a/homes/modules/ags/config.js +++ b/homes/modules/ags/config.js @@ -1,24 +1,28 @@ import { AppLauncher } from "./widgets/applauncher.js" -import { Notifications } from "./widgets/notifications.js" +//import { Notifications } from "./widgets/notifications.js" +/* const date = Variable('', { poll: [1000, 'date'], }) +*/ +/* const Bar = (monitor = 0) => Widget.Window({ monitor, name: 'bar${monitor}', anchor: ['top', 'left', 'right'], child: Widget.Label({ label: date.bind() }), }) +*/ App.config({ style: "./style.css", // icons: "./assets", windows: [ - Bar(), + //Bar(), AppLauncher, - Notifications() + //Notifications() ] // gtkTheme: "Adwaita-dark", // cursorTheme: "Qogir", diff --git a/homes/modules/ags/widgets/fullscreen.js b/homes/modules/ags/widgets/fullscreen.js index a6c60f0..72682f2 100755 --- a/homes/modules/ags/widgets/fullscreen.js +++ b/homes/modules/ags/widgets/fullscreen.js @@ -2,10 +2,10 @@ const WINDOW_NAME = "fullscreen"; const Fullscreen = (children) => Widget.Box({ vertical: true, - css: "background-image: url('https://images2.alphacoders.com/135/1351579.png');" - + "background-size: cover;" - + "background-position: center;" - + "background-repeat: no-repeat;", + css: "background-image: url('~/downloads/wallpaper/kill-my-firstborn/astronaut-pink-blue.png');", + //+ "background-size: cover;" + //+ "background-position: center;" + //+ "background-repeat: no-repeat;", children: children, }) diff --git a/modules/colmena.nix b/hosts/modules/colmena.nix similarity index 100% rename from modules/colmena.nix rename to hosts/modules/colmena.nix diff --git a/modules/core/bluetooth.nix b/hosts/modules/core/bluetooth.nix similarity index 100% rename from modules/core/bluetooth.nix rename to hosts/modules/core/bluetooth.nix diff --git a/modules/core/bootloader/grub.nix b/hosts/modules/core/bootloader/grub.nix similarity index 100% rename from modules/core/bootloader/grub.nix rename to hosts/modules/core/bootloader/grub.nix diff --git a/modules/core/bootloader/systemd-boot.nix b/hosts/modules/core/bootloader/systemd-boot.nix similarity index 100% rename from modules/core/bootloader/systemd-boot.nix rename to hosts/modules/core/bootloader/systemd-boot.nix diff --git a/modules/core/garbage-collector.nix b/hosts/modules/core/garbage-collector.nix similarity index 100% rename from modules/core/garbage-collector.nix rename to hosts/modules/core/garbage-collector.nix diff --git a/modules/core/sound/default.nix b/hosts/modules/core/sound/default.nix similarity index 100% rename from modules/core/sound/default.nix rename to hosts/modules/core/sound/default.nix diff --git a/modules/core/sound/pipewire.nix b/hosts/modules/core/sound/pipewire.nix similarity index 100% rename from modules/core/sound/pipewire.nix rename to hosts/modules/core/sound/pipewire.nix diff --git a/modules/discord/nixcord.nix b/hosts/modules/discord/nixcord.nix similarity index 100% rename from modules/discord/nixcord.nix rename to hosts/modules/discord/nixcord.nix diff --git a/flakes/wishlist/README b/hosts/modules/flakes/wishlist/README similarity index 100% rename from flakes/wishlist/README rename to hosts/modules/flakes/wishlist/README diff --git a/flakes/wishlist/flake.nix b/hosts/modules/flakes/wishlist/flake.nix similarity index 100% rename from flakes/wishlist/flake.nix rename to hosts/modules/flakes/wishlist/flake.nix diff --git a/flakes/wishlist/wishlist.nix b/hosts/modules/flakes/wishlist/wishlist.nix similarity index 100% rename from flakes/wishlist/wishlist.nix rename to hosts/modules/flakes/wishlist/wishlist.nix diff --git a/modules/hyprland/default.nix b/hosts/modules/hyprland/default.nix similarity index 100% rename from modules/hyprland/default.nix rename to hosts/modules/hyprland/default.nix diff --git a/modules/wishlist.nix b/hosts/modules/wishlist.nix similarity index 100% rename from modules/wishlist.nix rename to hosts/modules/wishlist.nix diff --git a/modules/wishlist.nix.bak b/hosts/modules/wishlist.nix.bak similarity index 100% rename from modules/wishlist.nix.bak rename to hosts/modules/wishlist.nix.bak