diff --git a/flake.lock b/flake.lock index b3efea0..602213b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,27 @@ "type": "github" } }, + "b12f-nix-fonts": { + "inputs": { + "nixpkgs": [ + "latest" + ] + }, + "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" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -93,11 +114,11 @@ ] }, "locked": { - "lastModified": 1628068208, - "narHash": "sha256-akJBkj6os4bjO1drhketJvXNC21yPuy4ufL2pyius4M=", + "lastModified": 1628752686, + "narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d72174307d5b88ec24cc2e69e875228fe3d642ed", + "rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe", "type": "github" }, "original": { @@ -108,11 +129,11 @@ }, "devshell": { "locked": { - "lastModified": 1625086391, - "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=", + "lastModified": 1629275356, + "narHash": "sha256-R17M69EKXP6q8/mNHaK53ECwjFo1pdF+XaJC9Qq8zjg=", "owner": "numtide", "repo": "devshell", - "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7", + "rev": "26f25a12265f030917358a9632cd600b51af1d97", "type": "github" }, "original": { @@ -131,6 +152,7 @@ "home-manager": [ "home" ], + "nix": "nix", "nixlib": [ "nixos" ], @@ -140,11 +162,11 @@ ] }, "locked": { - "lastModified": 1628211944, - "narHash": "sha256-2q1dNUzitVd0JNRHYTubbyb8ks3fL9hPJOvQgofxELE=", + "lastModified": 1629419320, + "narHash": "sha256-ktoQQnRi/27juWC9YRNBj2RBG7lJU5h/kG8/KYFQt6M=", "owner": "divnix", "repo": "digga", - "rev": "760bb9c29063258ba547145de0ab96acd7eba4c0", + "rev": "50f10e12156a08f71a189cca98498161fae9c952", "type": "github" }, "original": { @@ -192,11 +214,11 @@ ] }, "locked": { - "lastModified": 1627071952, - "narHash": "sha256-FhE0KOuI9Kl4eyGJXu4bh9fBP2hbxjnD1DlKHljCcYs=", + "lastModified": 1628855985, + "narHash": "sha256-OqhVFoCCA6GfGuMhZXQ5CrmZUYsumCJTwI72FOMf82I=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "51a82925db31073bc4822c9b538a0a3ebf1134b2", + "rev": "a79a0b86e59dc087df6704f9b13b1ed951ef5c5f", "type": "github" }, "original": { @@ -206,6 +228,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -213,11 +250,11 @@ ] }, "locked": { - "lastModified": 1624228557, - "narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=", + "lastModified": 1630076227, + "narHash": "sha256-p3YdtqSPLnMudWsLMgd6XMEhQKB2oz1hvDkHtOlz5/Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "35a24648d155843a4d162de98c17b1afd5db51e4", + "rev": "f5adb9be829f487f99bcc0f1884f74ddb85f70c8", "type": "github" }, "original": { @@ -243,6 +280,23 @@ "type": "github" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1617481909, + "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "ref": "VERSION_0_8_4", + "repo": "lowdown", + "type": "github" + } + }, "naersk": { "inputs": { "nixpkgs": [ @@ -273,11 +327,11 @@ ] }, "locked": { - "lastModified": 1623927034, + "lastModified": 1629707199, "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=", "owner": "nmattia", "repo": "naersk", - "rev": "e09c320446c5c2516d430803f7b19f5833781337", + "rev": "df71f5e4babda41cd919a8684b72218e2e809fa9", "type": "github" }, "original": { @@ -286,13 +340,54 @@ "type": "github" } }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": [ + "digga", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1629360796, + "narHash": "sha256-KAcvr8eEhEqOQweDAsHurO9ECmfdptbU1UT7smcpyBs=", + "owner": "nixos", + "repo": "nix", + "rev": "ffa629b2c0ea6368deca700afdac53a6e14557aa", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nix", + "type": "github" + } + }, + "nix-dram": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1628492639, + "narHash": "sha256-ffF/oEhLs/stAsXXobruKHyH9jnMC2rt/SM3ASrs2U8=", + "owner": "dramforever", + "repo": "nix-dram", + "rev": "fba426108ea6bdeb1e362bac9da06cbd33726f41", + "type": "github" + }, + "original": { + "owner": "dramforever", + "repo": "nix-dram", + "type": "github" + } + }, "nixos": { "locked": { - "lastModified": 1628203131, - "narHash": "sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA=", + "lastModified": 1630598110, + "narHash": "sha256-FD1xIDoKMOjBE8tHHp95aa5HfxKDCa+3kf5T7AA47tY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "178da37860823d35e801c7df2f73d7866d3d598a", + "rev": "6bfe71f2a4e2e425dee26b25d2309f341ff1600d", "type": "github" }, "original": { @@ -342,6 +437,22 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1626556499, + "narHash": "sha256-c2ueMT7fi/yvCNq3nGLEC2v5GklS7eHpB1240LRSW9Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b59c06dc92f8d03660eb4155754d93a6c34cda83", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1626378135, @@ -389,6 +500,7 @@ "root": { "inputs": { "agenix": "agenix", + "b12f-nix-fonts": "b12f-nix-fonts", "blank": [ "digga", "blank" @@ -411,6 +523,7 @@ "home": "home", "latest": "latest", "naersk": "naersk_2", + "nix-dram": "nix-dram", "nixlib": [ "digga", "nixlib" diff --git a/flake.nix b/flake.nix index e6859d0..b6b0aee 100644 --- a/flake.nix +++ b/flake.nix @@ -50,11 +50,11 @@ # end ANTI CORRUPTION LAYER # PubSolarOS additions - # nix-dram.url = "github:dramforever/nix-dram"; + nix-dram.url = "github:dramforever/nix-dram"; # b12f additions - # b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; - # b12f-nix-fonts.inputs.nixpkgs.follows = "latest"; + b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; + b12f-nix-fonts.inputs.nixpkgs.follows = "latest"; }; outputs = @@ -68,8 +68,8 @@ , agenix , nvfetcher , deploy - # , nix-dram - # , b12f-nix-fonts + , nix-dram + , b12f-nix-fonts , ... } @ inputs: digga.lib.mkFlake @@ -87,8 +87,8 @@ agenix.overlay nvfetcher.overlay deploy.overlay - # nix-dram.overlay - # b12f-nix-fonts.overlay + nix-dram.overlay + b12f-nix-fonts.overlay ./pkgs/default.nix ]; }; diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 3f56c5c..f0f8b40 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -90,7 +90,7 @@ in }; nix = { - # package = pkgs.nix-dram; + package = pkgs.nix-dram; autoOptimiseStore = true; diff --git a/users/ben/default.nix b/users/ben/default.nix index 693ec66..a0d66f5 100644 --- a/users/ben/default.nix +++ b/users/ben/default.nix @@ -32,6 +32,6 @@ in ]; }; - # fonts.fonts = lib.attrValues pkgs.b12f.fonts; + fonts.fonts = lib.attrValues pkgs.b12f.fonts; }; }