set correct flake path for nh

This commit is contained in:
Joakim Repomaa
2025-02-13 16:03:54 +02:00
parent 1cf3c7d8dd
commit 6a10625d4e
3 changed files with 6 additions and 7 deletions

View File

@@ -61,11 +61,11 @@
flake = false; flake = false;
}; };
}; };
outputs = { flake-parts, agenix, nixpkgs, ... }@inputs: outputs = { flake-parts, agenix, nixpkgs, self, ... }@inputs:
flake-parts.lib.mkFlake { inherit inputs; } ( flake-parts.lib.mkFlake { inherit inputs; } (
let let
ssh.publicKeys.yubikey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIUkESu5NnBi1M0+ZjYrkp6/rIFuwc3aguspf98jmOydNce6l65cnS3GRzc9oWx4lu11ahi87ZuE+pYV+gaHm4="; ssh.publicKeys.yubikey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIUkESu5NnBi1M0+ZjYrkp6/rIFuwc3aguspf98jmOydNce6l65cnS3GRzc9oWx4lu11ahi87ZuE+pYV+gaHm4=";
specialArgs = { inherit inputs ssh; }; specialArgs = { inherit inputs ssh self; };
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
in in
{ {

View File

@@ -1,5 +1,4 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, inputs, self, ... }: {
{
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
imports = [ ../gnome ../custom-programs ./neovim ./dnote.nix ]; imports = [ ../gnome ../custom-programs ./neovim ./dnote.nix ];
@@ -70,7 +69,7 @@
programs = { programs = {
nh = { nh = {
enable = true; enable = true;
flake = "/etc/nixos"; flake = self;
}; };
dnote.enable = true; dnote.enable = true;
home-manager.enable = true; home-manager.enable = true;

View File

@@ -1,11 +1,11 @@
{ inputs, ... }: { inputs, self, ... }:
{ {
home-manager = { home-manager = {
users = { users = {
jokke = import ./jokke; jokke = import ./jokke;
moco = import ./moco; moco = import ./moco;
}; };
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs self; };
sharedModules = [ (import ./common) ]; sharedModules = [ (import ./common) ];
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;