From 5cd144ef3310f243aa004de5c336e89ea418588b Mon Sep 17 00:00:00 2001 From: pagedmov Date: Fri, 15 Nov 2024 01:03:07 -0500 Subject: [PATCH] changed my overlay packages to use 'with lib.maintainers [ pagedMov ]' since my name is on the maintainers list now :D also added a -a flag to rebuild to rebuild both home and system configurations --- modules/home/scripts/nix/rebuild.nix | 3 ++- overlay/breezex-cursor/package.nix | 13 ++----------- overlay/tinyfetch/package.nix | 11 +---------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/modules/home/scripts/nix/rebuild.nix b/modules/home/scripts/nix/rebuild.nix index a208693..16b755b 100755 --- a/modules/home/scripts/nix/rebuild.nix +++ b/modules/home/scripts/nix/rebuild.nix @@ -4,11 +4,12 @@ pkgs.writeShellApplication { text = '' hooray() { scheck && runbg aplay ${self}/assets/sound/update.wav; } damn() { scheck && runbg aplay ${self}/assets/sound/error.wav; } - [ $# -eq 0 ] && echo -e "\033[1;4;38;2;243;139;168mUsage\033[0m: rebuild -h for home config, rebuild -s for sys config" && damn && exit 1 + [ $# -eq 0 ] && echo -e "\033[1;4;38;2;243;139;168mUsage\033[0m: rebuild -h for home config, rebuild -s for sys config, rebuild -a for both" && damn && exit 1 scheck && runbg aplay ${self}/assets/sound/nixswitch-start.wav case $1 in "-h" ) if nh home switch -c ${host}Home "$FLAKEPATH"; then hooray; else damn; fi;; "-s" ) if nh os switch -H ${host} "$FLAKEPATH"; then hooray; else damn; fi;; + "-a" ) if sudo sleep 0.1 && nh os switch -H ${host} "$FLAKEPATH" && nh home switch -c ${host}Home "$FLAKEPATH"; then hooray; else damn; fi;; * ) echo -e "\033[1;4;38;2;243;139;168mUsage\033[0m: rebuild -h for home config, rebuild -s for sys config";; esac ''; diff --git a/overlay/breezex-cursor/package.nix b/overlay/breezex-cursor/package.nix index 4fecbfa..4855ba8 100644 --- a/overlay/breezex-cursor/package.nix +++ b/overlay/breezex-cursor/package.nix @@ -6,15 +6,6 @@ lib }: -let - pagedMov = { - email = "kylerclay@proton.me"; - github = "pagedMov"; - githubId = 19557376; - name = "Kyler Clay"; - keys = [ { fingerprint = "784B 3623 94E7 8F11 0B9D AE0F 56FD CFA6 2A93 B51E"; } ]; - }; -in stdenvNoCC.mkDerivation rec { pname = "breezex-cursor"; version = "2.0.1"; @@ -51,9 +42,9 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - description = "Extended KDE cursor, inspired by KDE Breeze"; + description = "Extended KDE cursor theme, inspired by KDE Breeze"; homepage = "https://github.com/ful1e5/BreezeX_Cursor"; license = lib.licenses.gpl3; - maintainers = [ pagedMov ]; + maintainers = with lib.maintainers; [ pagedMov ]; }; } diff --git a/overlay/tinyfetch/package.nix b/overlay/tinyfetch/package.nix index f748f8c..308823a 100644 --- a/overlay/tinyfetch/package.nix +++ b/overlay/tinyfetch/package.nix @@ -4,15 +4,6 @@ lib, }: -let - pagedMov = { - email = "kylerclay@proton.me"; - github = "pagedMov"; - githubId = 19557376; - name = "Kyler Clay"; - keys = [ { fingerprint = "784B 3623 94E7 8F11 0B9D AE0F 56FD CFA6 2A93 B51E"; } ]; - }; -in stdenv.mkDerivation { pname = "tinyfetch"; version = "0.2"; @@ -41,7 +32,7 @@ stdenv.mkDerivation { homepage = "https://github.com/abrik1/tinyfetch"; license = lib.licenses.mit; mainProgram = "tinyfetch"; - maintainers = [ pagedMov ]; + maintainers = with lib.maintainers; [ pagedMov ]; platforms = lib.platforms.unix; }; }