♻️ migrated pkgs to flake-parts
This commit is contained in:
parent
09d8f33a01
commit
db2187a2e7
3 changed files with 20 additions and 28 deletions
20
flake.nix
20
flake.nix
|
@ -123,9 +123,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
#system = "x86_64-linux";
|
||||
|
||||
#pkgs = nixpkgs.legacyPackages.${system};
|
||||
inherit (nixpkgs) lib;
|
||||
|
||||
meta = rec {
|
||||
|
@ -163,9 +160,8 @@
|
|||
landingpage = landingpage.packages.${system}.plain;
|
||||
kmonad = kmonad.packages.${system}.kmonad;
|
||||
tasksh = taskshell.packages.${system}.tasksh;
|
||||
pkl = self.packages.${system}.pkl;
|
||||
inherit (self.packages.${system}) otpmenu taskwarrior-hooks;
|
||||
})
|
||||
(import ./pkgs)
|
||||
];
|
||||
};
|
||||
specialArgs = {
|
||||
|
@ -382,7 +378,12 @@
|
|||
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
|
||||
|
@ -392,14 +393,9 @@
|
|||
imports = [
|
||||
clan-core.flakeModules.default
|
||||
./nix/formatter.nix
|
||||
./nix/packages.nix
|
||||
];
|
||||
|
||||
perSystem =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
packages.pkl = pkgs.callPackage ./pkgs/pkl { };
|
||||
};
|
||||
|
||||
# Define your clan
|
||||
clan = {
|
||||
# Clan wide settings.
|
||||
|
|
12
nix/packages.nix
Normal file
12
nix/packages.nix
Normal file
|
@ -0,0 +1,12 @@
|
|||
_: {
|
||||
perSystem =
|
||||
{ pkgs, ... }:
|
||||
with pkgs;
|
||||
{
|
||||
packages.pkl = callPackage ../pkgs/pkl { };
|
||||
packages.otpmenu = callPackage ../pkgs/otpmenu { };
|
||||
#packages.sononym = callPackage ../pkgs/sononym { };
|
||||
#packages.sononym-crawler = callPackage ../pkgs/sononym-crawler { };
|
||||
packages.taskwarrior-hooks = callPackage ../pkgs/taskwarrior-hooks { };
|
||||
};
|
||||
}
|
|
@ -1,16 +0,0 @@
|
|||
# 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 { };
|
||||
|
||||
}
|
Loading…
Reference in a new issue