diff --git a/flake.lock b/flake.lock index 534bfb9..572faf0 100644 --- a/flake.lock +++ b/flake.lock @@ -122,6 +122,27 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -242,6 +263,32 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1700836255, + "narHash": "sha256-GMqLhIKOqSG6Rd92d5PjpjGl7f81hHnEcMKc3zhP4nY=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "c819fba7902996cac21a27c9090f3f61457e45f3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", @@ -252,6 +299,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgsMaster": "nixpkgsMaster", "nur": "nur", + "poetry2nix": "poetry2nix", "sops-nix": "sops-nix" } }, @@ -290,6 +338,41 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f350836..13dd219 100644 --- a/flake.nix +++ b/flake.nix @@ -37,16 +37,24 @@ }; }; + poetry2nix = { + url = "github:nix-community/poetry2nix"; + inputs = { + flake-utils.follows = "flake-utils"; + nixpkgs.follows = "nixpkgs"; + }; + }; }; outputs = { self - , nixpkgs , flake-utils - , krops , gomod2nix , home-manager - , nur + , krops , nix-pre-commit-hooks + , nixpkgs + , nur + , poetry2nix , ... }@inputs: flake-utils.lib.eachSystem [ "x86_64-linux" diff --git a/hosts/aluminium/configuration.nix b/hosts/aluminium/configuration.nix index 0228b51..f81c9e1 100644 --- a/hosts/aluminium/configuration.nix +++ b/hosts/aluminium/configuration.nix @@ -120,7 +120,7 @@ in # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.05"; # Did you read the comment? + system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/hosts/aluminium/services/dyndns.nix b/hosts/aluminium/services/dyndns.nix index cfca934..6312727 100644 --- a/hosts/aluminium/services/dyndns.nix +++ b/hosts/aluminium/services/dyndns.nix @@ -11,6 +11,5 @@ username = "nouser"; passwordFile = config.sops.secrets.duckdns-secret.path; domains = [ "jalr-k" ]; - ipv6 = false; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 1d92bc8..e1b97c1 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,6 +3,7 @@ final: prev: let inherit (prev) callPackage system; + poetry2nix = callPackage inputs.poetry2nix { }; in { ariang = callPackage ./ariang { }; @@ -13,7 +14,9 @@ in docker-machine-gitlab = callPackage ./docker-machine-gitlab { }; fpvout = callPackage ./fpvout { }; mute-indicator = callPackage ./mute-indicator { }; - myintercom-doorbell = callPackage ./myintercom-doorbell { }; + myintercom-doorbell = callPackage ./myintercom-doorbell { + inherit poetry2nix; + }; pretix = callPackage ./pretix/pretix.nix { }; pretix-banktool = callPackage ./pretix/pretix-banktool.nix { }; pretix-static = callPackage ./pretix/pretix-static.nix { };