dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: port to devos develop again

Browse Source
This commit is contained in:
dusk 2021-05-10 14:19:05 +03:00
parent d0757f69c5
commit 1fd44952ec
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

@ -28,7 +28,7 @@
}; };
}; };
outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, ... }: outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, nixosPersistence, ... }:
digga.lib.mkFlake { digga.lib.mkFlake {
inherit self inputs; inherit self inputs;
@ -65,6 +65,7 @@
{ _module.args.ourLib = self.lib; } { _module.args.ourLib = self.lib; }
ci-agent.nixosModules.agent-profile ci-agent.nixosModules.agent-profile
home.nixosModules.home-manager home.nixosModules.home-manager
nixosPersistence.nixosModules.impermanence
./modules/customBuilds.nix ./modules/customBuilds.nix
]; ];
}; };
@ -75,8 +76,9 @@
NixOS = { }; NixOS = { };
}; };
profiles = [ ./profiles ./users ]; profiles = [ ./profiles ./users ];
suites = { profiles, users, ... }: with profiles; rec { suites = { profiles, users, ... }: with profiles; {
base = [ core users.nixos users.root ]; base = [ cachix core users.root ];
work = [ users.patriot develop ];
}; };
}; };
@ -84,8 +86,8 @@
modules = ./users/modules/module-list.nix; modules = ./users/modules/module-list.nix;
externalModules = [ ]; externalModules = [ ];
profiles = [ ./users/profiles ]; profiles = [ ./users/profiles ];
suites = { profiles, ... }: with profiles; rec { suites = { profiles, ... }: with profiles; {
base = [ direnv git ]; base = [ direnv git starship ];
}; };
}; };

4
lib/default.nix
View File

@ -1,2 +1,4 @@
{ lib }: { lib }:
lib.makeExtensible (self: { }) lib.makeExtensible (self: {
pkgBinNoDep = pkgs: name: "${pkgs.${name}}/bin/${name}";
})

6
profiles/core/default.nix
View File

@ -1,9 +1,7 @@
{ self, config, pkgs, ... }: { self, config, pkgs, lib, ... }:
let let
lib = pkgs.lib;
inherit (lib) fileContents mkIf; inherit (lib) fileContents mkIf;
pkgBin = lib.dev.pkgBinNoDep pkgs; pkgBin = pkgs.ourlib.pkgBinNoDep pkgs;
coreBin = v: "${pkgs.coreutils}/bin/${v}"; coreBin = v: "${pkgs.coreutils}/bin/${v}";
nixBin = "${config.nix.package}/bin/nix"; nixBin = "${config.nix.package}/bin/nix";

6
users/patriot/default.nix
View File

@ -1,10 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
let let
lib = pkgs.lib;
inherit (lib) mapAttrs' nameValuePair; inherit (lib) mapAttrs' nameValuePair;
inherit (builtins) readDir fetchGit; inherit (builtins) readDir fetchGit;
pkgBin = lib.dev.pkgBinNoDep pkgs; pkgBin = pkgs.ourlib.pkgBinNoDep pkgs;
nixosConfig = config; nixosConfig = config;
in in