clean up of secrets and a better namespace for delta
This commit is contained in:
1 parent
11f1207418
commit
0737f21ccb
16 files changed
+57
-33
No files matched your search
@@ -11,6 +11,10 @@
|
||||
type = lib.types.path;
|
||||
description = "Top-level path of the nixos-setup repo (set by the flake).";
|
||||
};
|
||||
skyg.configsDir = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "Path to the configs directory (set by the flake).";
|
||||
};
|
||||
};
|
||||
config = {
|
||||
nixpkgs.overlays = [
|
||||
@@ -24,8 +28,8 @@
|
||||
buzz-desktop = final.callPackage ../../pkgs/buzz-desktop { };
|
||||
# Superset Desktop AppImage wrapper, see pkgs/superset-desktop.
|
||||
superset-desktop = final.callPackage ../../pkgs/superset-desktop { };
|
||||
# Delta (Zed Industries) prebuilt tarball, see pkgs/delta.
|
||||
delta = final.callPackage ../../pkgs/delta { };
|
||||
# Delta Editor (Zed Industries) prebuilt tarball, see pkgs/delta-editor.
|
||||
delta-editor = final.callPackage ../../pkgs/delta-editor { };
|
||||
|
||||
# herdr (herdrdev/herdr) — see flake.nix input.
|
||||
herdr = herdr.packages.${final.stdenv.hostPlatform.system}.default;
|
||||
|
||||
+3
-1
@@ -2,6 +2,7 @@
|
||||
, nixpkgs-unstable
|
||||
, user
|
||||
, rootDir
|
||||
, configsDir
|
||||
, determinate
|
||||
, home-manager
|
||||
, nix-darwin
|
||||
@@ -32,7 +33,7 @@ let
|
||||
niri-touchscreen-gestures = final.callPackage ../pkgs/niri-touchscreen-gestures { };
|
||||
buzz-desktop = final.callPackage ../pkgs/buzz-desktop { };
|
||||
superset-desktop = final.callPackage ../pkgs/superset-desktop { };
|
||||
delta = final.callPackage ../pkgs/delta { };
|
||||
delta-editor = final.callPackage ../pkgs/delta-editor { };
|
||||
})
|
||||
];
|
||||
}
|
||||
@@ -112,6 +113,7 @@ in
|
||||
inherit
|
||||
user
|
||||
rootDir
|
||||
configsDir
|
||||
hostName
|
||||
systemStateVersion;
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, systemStateVersion
|
||||
, hostName
|
||||
, rootDir
|
||||
, configsDir
|
||||
, ...
|
||||
}:
|
||||
{ lib, ... }: {
|
||||
@@ -17,6 +18,7 @@
|
||||
email = lib.mkDefault user.email;
|
||||
};
|
||||
skyg.rootDir = rootDir;
|
||||
skyg.configsDir = configsDir;
|
||||
skyg.core.hostName = hostName;
|
||||
skyg.home-manager.version = lib.mkDefault "26.05";
|
||||
system.stateVersion = systemStateVersion;
|
||||
|
||||
Reference in new issue
Block a user