From fd0f7cb1185d6de935b746912f88484e480f95a9 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Tue, 3 Jan 2023 01:53:17 -0500 Subject: [PATCH] gpgkey and fix macos --- Makefile | 6 +-- home/gpg/pubkey.asc | 63 ++++++++++++++++++++++++++++ hosts/ts-tl-mbp/flake.lock | 85 ++++++++++++++++++++++++++++++++++++++ hosts/ts-tl-mbp/flake.nix | 2 +- rebuild-macos.sh | 4 +- 5 files changed, 153 insertions(+), 7 deletions(-) create mode 100644 home/gpg/pubkey.asc create mode 100644 hosts/ts-tl-mbp/flake.lock diff --git a/Makefile b/Makefile index 258fd32..d1e5c5d 100644 --- a/Makefile +++ b/Makefile @@ -23,9 +23,7 @@ clean: home-manager expire-generations "-7 days" rebuild-macos: git-add - ./result/sw/bin/darwin-rebuild switch --flake _macos -v + ./rebuild-macos.sh rebuild-ubuntu: git-add - NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/tyrel/channels/nixpkgs:/nix/var/nix/profiles/per-user/tyrel/channels - nix run ./_ubuntu switch -vv - home-manager switch --flake ./_ubuntu + ./rebuild-ubuntu.sh diff --git a/home/gpg/pubkey.asc b/home/gpg/pubkey.asc new file mode 100644 index 0000000..989ee0b --- /dev/null +++ b/home/gpg/pubkey.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +f/Jmaccap38YvvT/kUKz3Q== +=WV1L +-----END PGP PUBLIC KEY BLOCK----- diff --git a/hosts/ts-tl-mbp/flake.lock b/hosts/ts-tl-mbp/flake.lock new file mode 100644 index 0000000..1542cfd --- /dev/null +++ b/hosts/ts-tl-mbp/flake.lock @@ -0,0 +1,85 @@ +{ + "nodes": { + "darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671891118, + "narHash": "sha256-+GJYiT7QbfA306ex4sGMlFB8Ts297pn3OdQ9kTd4aDw=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "267040e7a2b8644f1fdfcf57b7e808c286dbdc7b", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1672688183, + "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1672600835, + "narHash": "sha256-PCrIP7joW/SaDYbKlZGV44bBcLOXI/woLVnVHwcJlWc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fe1c6a5547c10a5f6b6debb22d548017f7e14263", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + }, + "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/hosts/ts-tl-mbp/flake.nix b/hosts/ts-tl-mbp/flake.nix index 603ac00..52383aa 100644 --- a/hosts/ts-tl-mbp/flake.nix +++ b/hosts/ts-tl-mbp/flake.nix @@ -18,7 +18,7 @@ ./default.nix ./home-manager.nix ./brew.nix - ../hosts/_common/fonts.nix + ../_common/fonts.nix ]; }; }; diff --git a/rebuild-macos.sh b/rebuild-macos.sh index 6c6af87..0c06b9b 100755 --- a/rebuild-macos.sh +++ b/rebuild-macos.sh @@ -1,4 +1,4 @@ #!/bin/bash -git add . # YOLO -./result/sw/bin/darwin-rebuild switch --flake _macos +hostname=$(hostname| sed 's/.local//') +./result/sw/bin/darwin-rebuild switch --flake ./hosts/$hostname