diff --git a/flake.lock b/flake.lock index 6f434af..aeb8d9a 100644 --- a/flake.lock +++ b/flake.lock @@ -730,6 +730,19 @@ "url": "https://git.ingolf-wagner.de/palo/polygon-art.git" } }, + "private_assets": { + "flake": false, + "locked": { + "lastModified": 1655930779, + "narHash": "sha256-QaIZ0HRwWD1lC3e+DwdXaBHtmhduOtEfoa1KGpw3Ew0=", + "path": "/home/palo/dev/private_assets", + "type": "path" + }, + "original": { + "path": "/home/palo/dev/private_assets", + "type": "path" + } + }, "revealjs": { "flake": false, "locked": { @@ -760,6 +773,7 @@ "nixpkgs-fmt": "nixpkgs-fmt", "nixpkgs-unstable": "nixpkgs-unstable", "polygon-art": "polygon-art", + "private_assets": "private_assets", "secrets": "secrets", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index 21cce8f..534031f 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; # colmena + # ------- colmena.url = "github:zhaofengli/colmena"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; polygon-art = { @@ -47,6 +48,10 @@ url = "github:mrVanDalo/grocy-scanner"; inputs.nixpkgs.follows = "nixpkgs"; }; + private_assets = { + url = "path:/home/palo/dev/private_assets"; + flake = false; + }; }; outputs = @@ -58,13 +63,14 @@ , grocy-scanner , home-manager , home-manager-utils + , krops , nixpkgs , nixpkgs-fmt , nixpkgs-unstable , polygon-art - , sops-nix - , krops + , private_assets , secrets + , sops-nix }: let system = "x86_64-linux"; @@ -108,6 +114,9 @@ ]; }; + specialArgs = { + inherit private_assets; + }; }; sterni = { name, nodes, pkgs, ... }: { diff --git a/nixos/modules/programs/taskwarrior.nix b/nixos/modules/programs/taskwarrior.nix index bb568cb..990a61d 100644 --- a/nixos/modules/programs/taskwarrior.nix +++ b/nixos/modules/programs/taskwarrior.nix @@ -68,7 +68,8 @@ in ${pkgs.khal}/bin/ikhal '') - unstable.python3Packages.bugwarrior + #unstable.python3Packages.bugwarrior + python3Packages.bugwarrior # bugwarrior #(let diff --git a/nixos/system/all/sshd-known-hosts-bootup.nix b/nixos/system/all/sshd-known-hosts-bootup.nix index 60bdc13..7b9231e 100644 --- a/nixos/system/all/sshd-known-hosts-bootup.nix +++ b/nixos/system/all/sshd-known-hosts-bootup.nix @@ -1,10 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, private_assets, ... }: with lib; let computers = { pepe = { - onionId = fileContents ../../private_assets/onion_id_pepe; + onionId = fileContents "${private_assets}/onion_id_pepe"; # SHA256:aOZbqpgc5CcTNtRAzjuG/0BQZ9MF5c9u/N+UC88y8kI publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5K4UHD8cIcXB33UiOj5vyXJj+4CyyiLFDMwcyad92a"; };