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

b12f restructure #1

Merged
teutat3s merged 218 commits from b12f into main 2020-11-24 18:27:01 +00:00
Conversation 0 Commits 218 Files changed 87 +21 -21
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 490f064940 - Show all commits

8
.drone.yml
View file

@ -108,7 +108,9 @@ steps:
- nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256 - nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256
- name: "Publish ISO" - name: "Publish ISO"
image: appleboy/drone-scp # custom drone-scp image, source: https://git.b12f.io/pub-solar/drone-scp/
# docker build --tag registry.greenbaum.cloud/library/drone-scp:v1.6.5 --file ./docker/Dockerfile.linux.amd64 .
image: registry.greenbaum.cloud/library/drone-scp:v1.6.5
volumes: volumes:
- name: file-exchange - name: file-exchange
path: /var/nix/iso-cache path: /var/nix/iso-cache
@ -125,7 +127,7 @@ steps:
source: source:
- /var/nix/iso-cache/*.iso - /var/nix/iso-cache/*.iso
- /var/nix/iso-cache/*.iso.sha256 - /var/nix/iso-cache/*.iso.sha256
overwrite: true unlink_first: true
strip_components: 3 strip_components: 3
depends_on: depends_on:
@ -143,6 +145,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: 8823c7103f6a075bb291a497c7ab5d5db47a91f9bc7d8ef95329b5620c9cf91d hmac: 3e6a89e903e214f21d488eba82863683b130ef6dbc2dc352377d4fd94ab3cd0c
... ...

30
flake.lock
View file

@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1665392861, "lastModified": 1666776005,
"narHash": "sha256-bCd8fYJMAb0LzabsiXl4nxECDoz483bJOCa2hjox7N0=", "narHash": "sha256-HwSMF19PpczfqNHKcFsA6cF4PVbG00uUSdbq6q3jB5o=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ef56fd8979b5f4e800c4716f62076e00600b1172", "rev": "f6648ca0698d1611d7eadfa72b122252b833f86c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1665940183, "lastModified": 1666703756,
"narHash": "sha256-cPe3F7CtnxU9YbJpc3Adl4d9kX+turqTv5FxM98i8vg=", "narHash": "sha256-GwpMJ1hT+z1fMAUkaGtvbvofJQwdVFDEGVhfE82+AUk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "104e8082de1b20f9d0e1f05b1028795ed0e0e4bc", "rev": "f994293d1eb8812f032e8919e10a594567cf6ef7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1666015234, "lastModified": 1666792740,
"narHash": "sha256-7OvHbPJ2lbf5M/1qdZARW/HwNULkldP6BP6BwgbqazM=", "narHash": "sha256-T8N9dlTFJqc4NISNPgWsiLqVFJQcACz/WbeBDwCWM3I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d4cadb8aa4ac9d16f38699397bffdec2deebe308", "rev": "56695caa41f152011b2279fbd92b4868d51113f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -375,11 +375,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1665927063, "lastModified": 1666610816,
"narHash": "sha256-2oImLqwQqVOQhTXsGUahqrYpe+Pufq+8XTsceYwBfJs=", "narHash": "sha256-q4F2VNe5bpxXOvp16DyLwE1SgNZMbNO29ZQJPIomedg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8de8b98839d1f20089582cfe1a81207258fcc1f1", "rev": "6107f97012a0c134c5848125b5aa1b149b76d2c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -395,11 +395,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1660727616, "lastModified": 1666016402,
"narHash": "sha256-zYTIvdPMYMx/EYqXODAwIIU30RiEHqNHdgarIHuEYZc=", "narHash": "sha256-Cm/nrdUMXwXiFQforG1Mv8OA4o8yhuVx6E1eDFH4rew=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "adccd191a0e83039d537e021f19495b7bad546a1", "rev": "688db42a1eb34853f050267ff65c975f664312f0",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/core/hibernation.nix
View file

@ -27,9 +27,7 @@ in
config = { config = {
boot = mkIf cfg.enable { boot = mkIf cfg.enable {
resumeDevice = cfg.resumeDevice; resumeDevice = cfg.resumeDevice;
kernelParams = kernelParams = mkIf (cfg.resumeOffset != null) [ "resume_offset=${builtins.toString cfg.resumeOffset}" ];
if (cfg.resumeOffset == null && cfg.enable) then builtins.abort "config.pub-solar.resumeOffset has to be set if config.pub-solar.enable is true."
else [ "resume_offset=${builtins.toString cfg.resumeOffset}" ];
}; };
}; };
} }