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

b12f-to-master #16

Merged
teutat3s merged 29 commits from refs/pull/16/head into b12f 2021-09-08 22:00:04 +00:00
Conversation 0 Commits 29 Files changed 54 +49 -30
3 changed files with 49 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6025d489ac - Show all commits

70
flake.lock
View file

@ -20,6 +20,25 @@
"type": "github" "type": "github"
} }
}, },
"b12f-nix-fonts": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1622501268,
"narHash": "sha256-wITrQEsJ5zWEl9yGUUPOUUpBN08Sva7MaB7uwYHmX7s=",
"ref": "main",
"rev": "51f94ad589c096e7fbb6a1f58f3b07037ef035bd",
"revCount": 4,
"type": "git",
"url": "https://git.b12f.io/b12f/nix-fonts"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.b12f.io/b12f/nix-fonts"
}
},
"ci-agent": { "ci-agent": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -72,7 +91,7 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -109,7 +128,7 @@
"deploy": "deploy", "deploy": "deploy",
"devshell": "devshell", "devshell": "devshell",
"nixlib": "nixlib", "nixlib": "nixlib",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
@ -211,12 +230,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1626192309, "lastModified": 1626195678,
"narHash": "sha256-uMl42Cn1Zb3qe8Iw0Rz7x62DUEG1JPCtJNU3ZK5gEFQ=", "narHash": "sha256-fPjSHiZ0JqkmhWiPDPEqbs/fEjZukFCU80YMocg/MRg=",
"owner": "NixOS", "path": "/nix/store/nnzn6zsmdi6ass7yd6krvc2rdkxxp8nh-source",
"repo": "nixpkgs", "rev": "e223f84cd8c279b892c53f5d779d6e63eb4277eb",
"rev": "4036bb94c78329292ef44c233bb42da40b8bd4d2", "type": "path"
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@ -267,7 +285,7 @@
"nix-dram": { "nix-dram": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1620663773, "lastModified": 1620663773,
@ -329,6 +347,21 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1622059058,
"narHash": "sha256-t1/ZMtyxClVSfcV4Pt5C1YpkeJ/UwFF3oitLD7Ch/UA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "84aa23742f6c72501f9cc209f29c438766f5352d",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixpkgs-unstable",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1610942247, "lastModified": 1610942247,
"narHash": "sha256-PKo1ATAlC6BmfYSRmX0TVmNoFbrec+A5OKcabGEu2yU=", "narHash": "sha256-PKo1ATAlC6BmfYSRmX0TVmNoFbrec+A5OKcabGEu2yU=",
@ -344,7 +377,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1620962350, "lastModified": 1620962350,
"narHash": "sha256-9ASW4d4/Z8HmRvuJI8rxbEOTbXTBpQ8y+CmFYBwtXzE=", "narHash": "sha256-9ASW4d4/Z8HmRvuJI8rxbEOTbXTBpQ8y+CmFYBwtXzE=",
@ -359,7 +392,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1620340338, "lastModified": 1620340338,
"narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=", "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=",
@ -375,19 +408,6 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"locked": {
"lastModified": 1626188191,
"narHash": "sha256-63A/IjYpfKb/R+AiWZE6YHsaxkDnYIVSUgPw7QEQnA8=",
"path": "/nix/store/hjc7qr7xsbvx32092bpfsjyi6vk29fg4-source",
"rev": "5caa4740529326001714f4c49a5e9f7b2c40f737",
"type": "path"
},
"original": {
"id": "nur",
"type": "indirect"
}
},
"pkgs": { "pkgs": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -423,6 +443,7 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"b12f-nix-fonts": "b12f-nix-fonts",
"ci-agent": "ci-agent", "ci-agent": "ci-agent",
"darwin": "darwin", "darwin": "darwin",
"digga": "digga", "digga": "digga",
@ -432,7 +453,6 @@
"nix-dram": "nix-dram", "nix-dram": "nix-dram",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur",
"pkgs": "pkgs" "pkgs": "pkgs"
} }
}, },

7
flake.nix
View file

@ -25,11 +25,10 @@
pkgs.inputs.nixpkgs.follows = "nixos"; pkgs.inputs.nixpkgs.follows = "nixos";
# PubSolarOS additions # PubSolarOS additions
nix-dram.url = "github:dramforever/nix-dram"; nix-dram.url = "github:dramforever/nix-dram";
# b12f additions # b12f additions
# b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main";
}; };
outputs = outputs =
@ -42,7 +41,7 @@
, nixos-hardware , nixos-hardware
, agenix , agenix
, nix-dram , nix-dram
# , b12f-nix-fonts , b12f-nix-fonts
, ... , ...
}: digga.lib.mkFlake { }: digga.lib.mkFlake {
inherit self inputs; inherit self inputs;
@ -57,7 +56,7 @@
pkgs.overlay # for `srcs` pkgs.overlay # for `srcs`
agenix.overlay agenix.overlay
nix-dram.overlay nix-dram.overlay
# b12f-nix-fonts.overlay b12f-nix-fonts.overlay
]; ];
}; };
latest = { }; latest = { };

2
users/ben/default.nix
View file

@ -32,6 +32,6 @@ in
]; ];
}; };
# fonts.fonts = lib.attrValues pkgs.b12f.fonts; fonts.fonts = lib.attrValues pkgs.b12f.fonts;
}; };
} }