From eb3f9e87435be5941278d819351bac0ece172051 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 20 Apr 2023 22:10:21 -0400 Subject: move to my external lib --- flake.lock | 6 +- flake.nix | 9 +- hosts/_turret/default.nix | 38 +++++ hosts/_turret/files/etc/config/dhcp | 55 +++++++ hosts/_turret/files/etc/config/dropbear | 5 + hosts/_turret/files/etc/config/firewall | 189 +++++++++++++++++++++++ hosts/_turret/files/etc/config/https-dns-proxy | 18 +++ hosts/_turret/files/etc/config/luci | 41 +++++ hosts/_turret/files/etc/config/network | 29 ++++ hosts/_turret/files/etc/config/rpcd | 10 ++ hosts/_turret/files/etc/config/system | 16 ++ hosts/_turret/files/etc/config/ucitrack | 56 +++++++ hosts/_turret/files/etc/config/uhttpd | 31 ++++ hosts/_turret/files/etc/config/wireless | Bin 0 -> 827 bytes hosts/_turret/files/etc/dropbear/authorized_keys | 1 + hosts/default.nix | 31 +++- hosts/glados-wsl/default.nix | 3 +- hosts/glados/default.nix | 10 +- hosts/turret/default.nix | 38 ----- hosts/turret/files/etc/config/dhcp | 55 ------- hosts/turret/files/etc/config/dropbear | 5 - hosts/turret/files/etc/config/firewall | 189 ----------------------- hosts/turret/files/etc/config/https-dns-proxy | 18 --- hosts/turret/files/etc/config/luci | 41 ----- hosts/turret/files/etc/config/network | 29 ---- hosts/turret/files/etc/config/rpcd | 10 -- hosts/turret/files/etc/config/system | 16 -- hosts/turret/files/etc/config/ucitrack | 56 ------- hosts/turret/files/etc/config/uhttpd | 31 ---- hosts/turret/files/etc/config/wireless | Bin 827 -> 0 bytes hosts/turret/files/etc/dropbear/authorized_keys | 1 - lib/default.nix | 16 -- lib/host.nix | 44 ------ lib/user.nix | 35 ----- users/_secrets/rootPassword.age | Bin 0 -> 365 bytes users/_secrets/secrets.nix | 6 + users/_secrets/sethPassword.age | 9 ++ users/default.nix | 6 +- users/secrets/rootPassword.age | Bin 365 -> 0 bytes users/secrets/secrets.nix | 6 - users/secrets/sethPassword.age | 9 -- users/seth/home.nix | 8 +- 42 files changed, 555 insertions(+), 621 deletions(-) create mode 100644 hosts/_turret/default.nix create mode 100644 hosts/_turret/files/etc/config/dhcp create mode 100644 hosts/_turret/files/etc/config/dropbear create mode 100644 hosts/_turret/files/etc/config/firewall create mode 100644 hosts/_turret/files/etc/config/https-dns-proxy create mode 100644 hosts/_turret/files/etc/config/luci create mode 100644 hosts/_turret/files/etc/config/network create mode 100644 hosts/_turret/files/etc/config/rpcd create mode 100644 hosts/_turret/files/etc/config/system create mode 100644 hosts/_turret/files/etc/config/ucitrack create mode 100644 hosts/_turret/files/etc/config/uhttpd create mode 100644 hosts/_turret/files/etc/config/wireless create mode 100644 hosts/_turret/files/etc/dropbear/authorized_keys delete mode 100644 hosts/turret/default.nix delete mode 100644 hosts/turret/files/etc/config/dhcp delete mode 100644 hosts/turret/files/etc/config/dropbear delete mode 100644 hosts/turret/files/etc/config/firewall delete mode 100644 hosts/turret/files/etc/config/https-dns-proxy delete mode 100644 hosts/turret/files/etc/config/luci delete mode 100644 hosts/turret/files/etc/config/network delete mode 100644 hosts/turret/files/etc/config/rpcd delete mode 100644 hosts/turret/files/etc/config/system delete mode 100644 hosts/turret/files/etc/config/ucitrack delete mode 100644 hosts/turret/files/etc/config/uhttpd delete mode 100644 hosts/turret/files/etc/config/wireless delete mode 100644 hosts/turret/files/etc/dropbear/authorized_keys delete mode 100644 lib/default.nix delete mode 100644 lib/host.nix delete mode 100644 lib/user.nix create mode 100644 users/_secrets/rootPassword.age create mode 100644 users/_secrets/secrets.nix create mode 100644 users/_secrets/sethPassword.age delete mode 100644 users/secrets/rootPassword.age delete mode 100644 users/secrets/secrets.nix delete mode 100644 users/secrets/sethPassword.age diff --git a/flake.lock b/flake.lock index ea1381a..9657098 100644 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1681774655, - "narHash": "sha256-FutQ3V1KMuySMeGbxKeCQ6i3b4FZ7WbKJLRTbp/u+JU=", + "lastModified": 1682040726, + "narHash": "sha256-0wnUd7rCeANBvLOhawNhZxB0wW146q2GrfVkbHpbi70=", "owner": "getchoo", "repo": "overlay", - "rev": "76817703bb1cf925e6f99a2ba8ad78d2ec560b6e", + "rev": "5e476304b0ec6109cb9d09a89872a6b9a138efbf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1b13e27..63e969b 100644 --- a/flake.nix +++ b/flake.nix @@ -68,12 +68,15 @@ self, nixpkgs, agenix, + getchoo, flake-utils, openwrt-imagebuilder, pre-commit-hooks, ... }: let - inherit (import ./lib {inherit (nixpkgs) lib;}) mapHosts mapHMUsers; + getchooLib = getchoo.lib (inputs // {inherit self;}); + + inherit (getchooLib.configs) mapHMUsers mapHosts; in flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -110,10 +113,10 @@ formatter = pkgs.alejandra; - homeConfigurations = mapHMUsers inputs system; + homeConfigurations = mapHMUsers system ./users; }) // { - nixosConfigurations = mapHosts inputs; + nixosConfigurations = mapHosts ./hosts; nixosModules.getchoo = import ./modules; diff --git a/hosts/_turret/default.nix b/hosts/_turret/default.nix new file mode 100644 index 0000000..faac3d2 --- /dev/null +++ b/hosts/_turret/default.nix @@ -0,0 +1,38 @@ +{ + pkgs, + openwrt-imagebuilder, + ... +}: let + inherit (pkgs) runCommand; + inherit (pkgs.stdenv) mkDerivation; + inherit (openwrt-imagebuilder.lib) build profiles; + wrtProfiles = profiles { + inherit pkgs; + release = "22.03.3"; + }; + config = mkDerivation { + name = "openwrt-config-files"; + src = ./files; + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + }; + image = + wrtProfiles.identifyProfile "netgear_wac104" + // { + packages = ["https-dns-proxy"]; + + files = runCommand "image-files" {} '' + mkdir -p $out/etc/uci-defaults + cat > $out/etc/uci-defaults/99-custom < $out/etc/uci-defaults/99-custom < ssh-ed25519 I92A3Q q+D1MbCtfpsmJ3RdGSWAJlkA5gKgmly5c+qLG+Hc3x8 +Y33KURx8gx4JD4BnY0YhqUaMewqfl9aumd09Oh+T3hA +-> &y]9Y:zi-grease +nOkEeca63qmZNxxQ+zMRUhij/3kthFTt8kGfM7CICkSWnkqCMpjj5rAiEvJvi72y +qhUBxkMdCn9Obfoa0Ru1bUb1Nrjn0m1BHexk6B4rWsFKMAv61OaNmQUHdDR2X5Wq +qQ +--- 0KWr82Hu6LaurOmGtqAeyrygHMh9c5XZsPallag2MCc +=yýKYév0g<‰|íÊ‹©÷á¡*ðÚèä—sÁF Ö¼N \ No newline at end of file diff --git a/users/default.nix b/users/default.nix index 964fc3d..3fe9d4a 100644 --- a/users/default.nix +++ b/users/default.nix @@ -1,11 +1,11 @@ -inputs: system: +system: inputs: with inputs; { seth = { pkgs = import nixpkgsUnstable { inherit system; overlays = [nur.overlay getchoo.overlays.default]; }; - - stateVersion = "23.05"; + modules = []; + extraSpecialArgs = {}; }; } diff --git a/users/secrets/rootPassword.age b/users/secrets/rootPassword.age deleted file mode 100644 index 7a2ede3..0000000 Binary files a/users/secrets/rootPassword.age and /dev/null differ diff --git a/users/secrets/secrets.nix b/users/secrets/secrets.nix deleted file mode 100644 index c85e64a..0000000 --- a/users/secrets/secrets.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5K+yLHuz4kyCkJDX2Gd/uGVNEJroIAU/h0f9E2Mapn getchoo-nix"; -in { - "rootPassword.age".publicKeys = [key]; - "sethPassword.age".publicKeys = [key]; -} diff --git a/users/secrets/sethPassword.age b/users/secrets/sethPassword.age deleted file mode 100644 index 43040ff..0000000 --- a/users/secrets/sethPassword.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 I92A3Q q+D1MbCtfpsmJ3RdGSWAJlkA5gKgmly5c+qLG+Hc3x8 -Y33KURx8gx4JD4BnY0YhqUaMewqfl9aumd09Oh+T3hA --> &y]9Y:zi-grease -nOkEeca63qmZNxxQ+zMRUhij/3kthFTt8kGfM7CICkSWnkqCMpjj5rAiEvJvi72y -qhUBxkMdCn9Obfoa0Ru1bUb1Nrjn0m1BHexk6B4rWsFKMAv61OaNmQUHdDR2X5Wq -qQ ---- 0KWr82Hu6LaurOmGtqAeyrygHMh9c5XZsPallag2MCc -=yýKYév0g<‰|íÊ‹©÷á¡*ðÚèä—sÁF Ö¼N \ No newline at end of file diff --git a/users/seth/home.nix b/users/seth/home.nix index 239782e..a10f061 100644 --- a/users/seth/home.nix +++ b/users/seth/home.nix @@ -8,7 +8,14 @@ ./shell ]; + home = { + username = "seth"; + homeDirectory = "/home/seth"; + stateVersion = "23.05"; + }; + nix.package = lib.mkDefault pkgs.nixFlakes; + xdg = { enable = true; configFile."nixpkgs/config.nix".text = '' @@ -18,5 +25,4 @@ } ''; }; - home.stateVersion = "23.05"; } -- cgit v1.2.3