flake.lock

@@ -282,24 +282,6 @@
         "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,
@@ -660,18 +642,6 @@
         "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,
@@ -820,27 +790,20 @@
         "url": "https://git.ingolf-wagner.de/palo/polygon-art.git"
       }
     },
-    "private-parts": {
+    "private_assets": {
-      "inputs": {
-        "flake-parts": "flake-parts_4",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix_3"
-      },
       "locked": {
-        "lastModified": 1724916929,
+        "lastModified": 1724799656,
-        "narHash": "sha256-QM8qdmnENvNGvfhLv0LsQsZgIot75Q7R8QV0Mm5I5yM=",
+        "narHash": "sha256-cvRt3MTi/2UbJBqG4jCDgZJR6fWaWnvA7vUwGc2mzF4=",
         "ref": "main",
-        "rev": "82083225da7402d2bde9cfd3172374a96429b579",
+        "rev": "a1c29567b3da9a2aa33f8eb4d88f44f4f4d46deb",
-        "revCount": 72,
+        "revCount": 68,
         "type": "git",
-        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git"
+        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git"
       },
       "original": {
         "ref": "main",
         "type": "git",
-        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git"
+        "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git"
       }
     },
     "retiolum": {
@@ -876,12 +839,12 @@
         "nixpkgs-unstable-small": "nixpkgs-unstable-small",
         "permown": "permown",
         "polygon-art": "polygon-art",
-        "private-parts": "private-parts",
+        "private_assets": "private_assets",
         "retiolum": "retiolum",
         "srvos": "srvos",
         "stylix": "stylix",
         "taskshell": "taskshell",
-        "treefmt-nix": "treefmt-nix_4"
+        "treefmt-nix": "treefmt-nix_3"
       }
     },
     "sops-nix": {
@@ -1069,27 +1032,6 @@
       }
     },
     "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"

flake.nix

@@ -45,12 +45,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # only private input
+    private_assets = {
-    # you should be able to run `nix flake check` removing this input from this flake.nix
+      #url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
-    private-parts = {
+      url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
-      #url = "git+file:///home/palo/dev/nixos/nixos-private-parts";
+      flake = true;
-      url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-parts.git?ref=main";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     retiolum = {
@@ -116,7 +114,7 @@
       nixpkgs-unstable-small,
       permown,
       polygon-art,
-      private-parts,
+      private_assets,
       retiolum,
       srvos,
       stylix,
@@ -125,6 +123,9 @@
     }:
 
     let
+      #system = "x86_64-linux";
+
+      #pkgs = nixpkgs.legacyPackages.${system};
       inherit (nixpkgs) lib;
 
       meta = rec {
@@ -162,8 +163,9 @@
               landingpage = landingpage.packages.${system}.plain;
               kmonad = kmonad.packages.${system}.kmonad;
               tasksh = taskshell.packages.${system}.tasksh;
-              inherit (self.packages.${system}) otpmenu taskwarrior-hooks;
+              pkl = self.packages.${system}.pkl;
             })
+            (import ./pkgs)
           ];
         };
         specialArgs = {
@@ -366,6 +368,7 @@
             home-manager.nixosModules.home-manager
           ];
           home-manager.extraSpecialArgs = {
+            #inherit private_assets;
             assets = ./assets;
           };
           home-manager.useGlobalPkgs = true;
@@ -379,12 +382,7 @@
     in
 
     flake-parts.lib.mkFlake { inherit inputs; } (
-      {
+      { self, pkgs, ... }:
-        self,
-        self',
-        pkgs,
-        ...
-      }:
       {
         # We define our own systems below. you can still use this to add system specific outputs to your flake.
         # See: https://flake.parts/getting-started
@@ -394,9 +392,14 @@
         imports = [
           clan-core.flakeModules.default
           ./nix/formatter.nix
-          ./nix/packages
         ];
 
+        perSystem =
+          { pkgs, ... }:
+          {
+            packages.pkl = pkgs.callPackage ./pkgs/pkl { };
+          };
+
         # Define your clan
         clan = {
           # Clan wide settings.
@@ -412,7 +415,8 @@
                 zerotierModules
                 nixos-hardware.nixosModules.framework-12th-gen-intel
                 retiolum.nixosModules.retiolum
-                private-parts.nixosModules.cream
+                private_assets.nixosModules.cream
+                private_assets.nixosModules.yubikey
                 homeManagerModules
                 stylixModules
                 { home-manager.users.mainUser.gui.enable = true; }
@@ -433,7 +437,8 @@
                 zerotierModules
                 nixos-hardware.nixosModules.framework-13th-gen-intel
                 retiolum.nixosModules.retiolum
-                private-parts.nixosModules.cherry
+                private_assets.nixosModules.yubikey
+                private_assets.nixosModules.cherry
                 homeManagerModules
                 stylixModules
                 { home-manager.users.mainUser.gui.enable = true; }
@@ -456,7 +461,7 @@
                 homeManagerModules
                 stylixModules
                 retiolum.nixosModules.retiolum
-                private-parts.nixosModules.chungus
+                private_assets.nixosModules.chungus
                 {
                   home-manager.users.mainUser = import ./homes/palo;
                   home-manager.users.root = import ./homes/root;

nix/packages/default.nix

@@ -1,12 +0,0 @@
-_: {
-  perSystem =
-    { pkgs, ... }:
-    with pkgs;
-    {
-      packages.pkl = callPackage ./pkl { };
-      packages.otpmenu = callPackage ./otpmenu { };
-      #packages.sononym = callPackage ./sononym { };
-      #packages.sononym-crawler = callPackage ./sononym-crawler { };
-      packages.taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
-    };
-}

pkgs/default.nix

@@ -0,0 +1,16 @@
+# This overlay extends nixpkgs .
+
+self: super:
+
+let
+  callPackage = super.pkgs.callPackage;
+
+in
+{
+
+  otpmenu = callPackage ./otpmenu { };
+  #sononym = callPackage ./sononym { };
+  #sononym-crawler = callPackage ./sononym-crawler { };
+  taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
+
+}