pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge pull request 'Use our digga fork to fix bootstrap iso builds' (#125) from fix/bootstrap-iso into main

Browse source 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/125
Reviewed-by: hensoko <hensoko@noreply.example.org>
This commit is contained in:
teutat3s 2022-08-29 13:11:06 +00:00
parent 27e961da2c c1b672fe70
commit 132b2b1a91
No known key found for this signature in database
GPG key ID: 5FEAFA6A0FC8075D
4 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
flake.lock
View file

@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1657835815, "lastModified": 1661329936,
"narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=", "narHash": "sha256-dafFjAcJPo0SdegK3E+SnTI8CNMgV/bBm/6CeDf82f8=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "54a24f042f93c79f5679f133faddedec61955cf2", "rev": "ef0e7f41cdf8fae1d2390c4df246c90a364ed8d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -143,15 +143,16 @@
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1659622306, "lastModified": 1661600857,
"narHash": "sha256-Kpfm2PNs+kZU0W7qcugoPATLG8I2P7FJFGTgsf1LJiU=", "narHash": "sha256-KfQCcTtfvU0PXV4fD9XKIMcKx9lUUR0xWJoBgc12fKE=",
"owner": "divnix", "owner": "pub-solar",
"repo": "digga", "repo": "digga",
"rev": "d1193743a535d7fbbc7f3eda4e51295b10bd4d2c", "rev": "c902b3ef0aa45cb4f336c390f647bb182c38a221",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "divnix", "owner": "pub-solar",
"ref": "fix/bootstrap-iso",
"repo": "digga", "repo": "digga",
"type": "github" "type": "github"
} }
@ -307,11 +308,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1660305968, "lastModified": 1661361016,
"narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=", "narHash": "sha256-Bjf6ZDnDc6glTwIIItvwfcaeJ5zWFM6GYfPajSArdUY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d", "rev": "b784c5ae63dd288375af1b4d37b8a27dd8061887",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +359,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1660318005, "lastModified": 1661427965,
"narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=", "narHash": "sha256-LJeSDbiebN0/eRt9vyOm+Bxljdsq5ZdalmmTk9Xpp30=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c211b47aeadcc178c5320afd4e74c7eed5c389f", "rev": "058de3818577db19d1965c21e2479916a3eaaf95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +379,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1657748715, "lastModified": 1660727616,
"narHash": "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ=", "narHash": "sha256-zYTIvdPMYMx/EYqXODAwIIU30RiEHqNHdgarIHuEYZc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "3323b944d99b026aebfd8de439e001409dde067d", "rev": "adccd191a0e83039d537e021f19495b7bad546a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -11,7 +11,7 @@
nixos.url = "github:nixos/nixpkgs/nixos-22.05"; nixos.url = "github:nixos/nixpkgs/nixos-22.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
digga.url = "github:divnix/digga"; digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixlib.follows = "nixos"; digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";

5
hosts/bootstrap.nix
View file

@ -1,9 +1,6 @@
{ profiles, ... }: { profiles, ... }:
{ {
# build with: `nix build '.#nixosConfigurations.bootstrap.config.system.build.bootstrapIso'` # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
# reachable on the local link via ssh root@fe80::47%eno1
# where 'eno1' is replaced by your own machine's network
# interface that has the local link to the target machine
imports = [ imports = [
# profiles.networking # profiles.networking
profiles.users.root # make sure to configure ssh keys profiles.users.root # make sure to configure ssh keys

2
modules/graphical/default.nix
View file

@ -61,7 +61,7 @@ in
}; };
}; };
services.getty.autologinUser = mkIf cfg.autologin.enable "${psCfg.user.name}"; services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}");
qt5 = { qt5 = {
enable = true; enable = true;