From aed3dbd602fadfdd2857452721b9f89b9c61dd64 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 30 Aug 2024 07:30:04 +0700 Subject: [PATCH] :truck: private_assets -> private-parts --- flake.lock | 76 +++++++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 21 +++++++-------- 2 files changed, 77 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 4355c79..96b4b2a 100644 --- a/flake.lock +++ b/flake.lock @@ -282,6 +282,24 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1644229661, @@ -642,6 +660,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + } + }, "nixpkgs-unstable-small": { "locked": { "lastModified": 1724938759, @@ -790,20 +820,27 @@ "url": "https://git.ingolf-wagner.de/palo/polygon-art.git" } }, - "private_assets": { + "private-parts": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_3" + }, "locked": { - "lastModified": 1724799656, - "narHash": "sha256-cvRt3MTi/2UbJBqG4jCDgZJR6fWaWnvA7vUwGc2mzF4=", + "lastModified": 1724916929, + "narHash": "sha256-QM8qdmnENvNGvfhLv0LsQsZgIot75Q7R8QV0Mm5I5yM=", "ref": "main", - "rev": "a1c29567b3da9a2aa33f8eb4d88f44f4f4d46deb", - "revCount": 68, + "rev": "82083225da7402d2bde9cfd3172374a96429b579", + "revCount": 72, "type": "git", - "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git" + "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git" }, "original": { "ref": "main", "type": "git", - "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git" + "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git" } }, "retiolum": { @@ -839,12 +876,12 @@ "nixpkgs-unstable-small": "nixpkgs-unstable-small", "permown": "permown", "polygon-art": "polygon-art", - "private_assets": "private_assets", + "private-parts": "private-parts", "retiolum": "retiolum", "srvos": "srvos", "stylix": "stylix", "taskshell": "taskshell", - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix_4" } }, "sops-nix": { @@ -1032,6 +1069,27 @@ } }, "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "private-parts", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724833132, + "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_4": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index cdfadd9..e2d1057 100644 --- a/flake.nix +++ b/flake.nix @@ -45,10 +45,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - private_assets = { - #url = "git+file:///home/palo/dev/nixos/nixos-private-assets"; - url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main"; - flake = true; + # only private input + # you should be able to run `nix flake check` removing this input from this flake.nix + private-parts = { + #url = "git+file:///home/palo/dev/nixos/nixos-private-parts"; + url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git?ref=main"; + inputs.nixpkgs.follows = "nixpkgs"; }; retiolum = { @@ -114,7 +116,7 @@ nixpkgs-unstable-small, permown, polygon-art, - private_assets, + private-parts, retiolum, srvos, stylix, @@ -364,7 +366,6 @@ home-manager.nixosModules.home-manager ]; home-manager.extraSpecialArgs = { - #inherit private_assets; assets = ./assets; }; home-manager.useGlobalPkgs = true; @@ -411,8 +412,7 @@ zerotierModules nixos-hardware.nixosModules.framework-12th-gen-intel retiolum.nixosModules.retiolum - private_assets.nixosModules.cream - private_assets.nixosModules.yubikey + private-parts.nixosModules.cream homeManagerModules stylixModules { home-manager.users.mainUser.gui.enable = true; } @@ -433,8 +433,7 @@ zerotierModules nixos-hardware.nixosModules.framework-13th-gen-intel retiolum.nixosModules.retiolum - private_assets.nixosModules.yubikey - private_assets.nixosModules.cherry + private-parts.nixosModules.cherry homeManagerModules stylixModules { home-manager.users.mainUser.gui.enable = true; } @@ -457,7 +456,7 @@ homeManagerModules stylixModules retiolum.nixosModules.retiolum - private_assets.nixosModules.chungus + private-parts.nixosModules.chungus { home-manager.users.mainUser = import ./homes/palo; home-manager.users.root = import ./homes/root;