From 79f525022fb4020b217ad60cca581499eba8cf2b Mon Sep 17 00:00:00 2001 From: Sebastian Moser Date: Wed, 22 Nov 2023 18:14:33 +0100 Subject: [PATCH] ... --- flake.lock | 143 +++++++++++++++++++++++++++++++++++++---------------- flake.nix | 21 ++++++-- 2 files changed, 116 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index d135eea..d56305b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "androidPkgs": { "inputs": { "devshell": "devshell", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -322,24 +322,6 @@ } }, "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -506,6 +488,29 @@ "type": "github" } }, + "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt" + }, + "locked": { + "lastModified": 1694984852, + "narHash": "sha256-A1x55uLb2LT9evsTWYc1U9+iki1AmE5ROxOuCKPf3JE=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "23795a4daf29ce784b3edc13b9776c7b445c453b", + "type": "github" + }, + "original": { + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -528,22 +533,25 @@ }, "nix-on-droid": { "inputs": { - "flake-utils": "flake-utils_3", "home-manager": "home-manager_2", + "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", + "nmd": "nmd_2" }, "locked": { - "lastModified": 1638138546, - "narHash": "sha256-RVt7Mo4HIw3MbHFqM1YSDU/PzZKezfO6NuPdcTO6qfs=", - "owner": "zhaofengli", + "lastModified": 1688144254, + "narHash": "sha256-8KL1l/7eP2Zm1aJjdVaSOk0W5kTnJo9kcgW03gqWuiI=", + "owner": "nix-community", "repo": "nix-on-droid", - "rev": "6b9e3fbbec5b45da45883aea5a360e7919d5a9f0", + "rev": "2301e01d48c90b60751005317de7a84a51a87eb6", "type": "github" }, "original": { - "owner": "zhaofengli", + "owner": "nix-community", + "ref": "release-23.05", "repo": "nix-on-droid", "type": "github" } @@ -567,7 +575,7 @@ "nix-wsl": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -667,6 +675,22 @@ "type": "github" } }, + "nixpkgs-for-bootstrap_2": { + "locked": { + "lastModified": 1686921029, + "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1698540503, @@ -777,6 +801,54 @@ "type": "github" } }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", + "repo": "nmd", + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmd_2": { + "flake": false, + "locked": { + "lastModified": 1680213367, + "narHash": "sha256-NbSXxpFAK5IMcsQTK0vSGy099HExx3SEagqW4Lpc+X8=", + "owner": "rycee", + "repo": "nmd", + "rev": "abb15317ebd17e5a0a7dd105e2ce52f2700185a8", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nose": { "flake": false, "locked": { @@ -921,7 +993,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap_2", "robotnix": "robotnix", "rpi-nixpkgs": "rpi-nixpkgs" } @@ -1019,21 +1091,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "ts-fold": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1b46bb0..9e78d7f 100644 --- a/flake.nix +++ b/flake.nix @@ -168,16 +168,27 @@ modules = [ #./users/me/headless.nix ({ pkgs, ... }: { - users.users.nix-on-droid.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFjgXf9S9hxjyph2EEFh1el0z4OUT9fMoFAaDanjiuKa me@main" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICWsqiz0gEepvPONYxqhKKq4Vxfe1h+jo11k88QozUch me@bitwarden" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAioUu4ow6k+OMjjLdzogiQM4ZEM3TNekGNasaSDzQQE me@phone" - ]; environment.packages = with pkgs; [ vim openssh ]; system.stateVersion = "23.05"; + home-manager.extraSpecialArgs = { + inherit self; + hostname = "phone"; + }; + + home-manager.config = { + home.stateVersion = "22.11"; + home.file.".ssh/authorizedKeys".text = '' + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFjgXf9S9hxjyph2EEFh1el0z4OUT9fMoFAaDanjiuKa me@main" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICWsqiz0gEepvPONYxqhKKq4Vxfe1h+jo11k88QozUch me@bitwarden" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAioUu4ow6k+OMjjLdzogiQM4ZEM3TNekGNasaSDzQQE me@phone" + ''; + imports = [ + #./users/common/home.nix + ]; + }; }) ]; };