diff --git a/nix-conf/home-manager/base/alacritty.nix b/nix-conf/home-manager/base/alacritty.nix index b919c1e..e69f9b2 100644 --- a/nix-conf/home-manager/base/alacritty.nix +++ b/nix-conf/home-manager/base/alacritty.nix @@ -9,28 +9,37 @@ let cfg = config.base.alacritty; in { - options.base.alacritty.font.family = myLib.mkOption { - type = myLib.types.singleLineStr; - default = actualConfig.font.normal.family; - description = '' - The font family for Alacritty - ''; - example = "DroidSansMono NF"; - }; - options.base.alacritty.enable = myLib.mkOption { - type = myLib.types.bool; - default = true; - description = '' - Enables alacritty - ''; - example = true; - }; - options.base.alacritty._actualConfig = myLib.mkOption { - type = myLib.types.attrs; - visible = false; - default = actualConfig; - description = "underlying default config"; - }; + options.base.alacritty = + { + font.family = myLib.mkOption { + type = myLib.types.singleLineStr; + default = actualConfig.font.normal.family; + description = '' + The font family for Alacritty + ''; + example = "DroidSansMono NF"; + }; + enable = myLib.mkOption { + type = myLib.types.bool; + default = true; + description = '' + Enables alacritty + ''; + example = true; + }; + _actualConfig = myLib.mkOption { + type = myLib.types.attrs; + visible = false; + default = actualConfig; + description = "underlying default config"; + }; + additionalConfigPath = myLib.mkOption { + type = myLib.types.nullOr myLib.types.path; + visible = false; + default = null; + description = "impurely write our alacritty.yml to this path"; + }; + }; config.programs.alacritty = { enable = cfg.enable; diff --git a/nix-conf/home-manager/default.nix b/nix-conf/home-manager/default.nix new file mode 100644 index 0000000..2026ca8 --- /dev/null +++ b/nix-conf/home-manager/default.nix @@ -0,0 +1,12 @@ +(import + ( + # Get corresponding version of flake-compat declared in on ./flake.lock + let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { src = ./.; } # calls flake.nix +).defaultNix + diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index 36a6e70..aec14d4 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -53,11 +69,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1669071065, - "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=", + "lastModified": 1670970889, + "narHash": "sha256-TWJo3/X3Q3r+HeX16QN4FE6ddBpGtAboymSEF+4Nnc0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f7641a3ff398ccce952e19a199d775934e518c1d", + "rev": "e412025fffdcd6219ddd21c65d9a1b90005ce508", "type": "github" }, "original": { @@ -102,11 +118,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669140675, - "narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=", + "lastModified": 1670929434, + "narHash": "sha256-n5UBO6XBV4h3TB7FYu2yAuNQMEYOrQyKeODUwKe06ow=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c", + "rev": "1710ed1f6f8ceb75cf7d1cf55ee0cc21760e1c7a", "type": "github" }, "original": { @@ -134,6 +150,7 @@ }, "root": { "inputs": { + "flake-compat": "flake-compat", "flake-utils": "flake-utils", "home-manager": "home-manager", "nixgl": "nixgl", @@ -147,11 +164,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1669170936, - "narHash": "sha256-TKPH4Pzkjw5gAPo9hejs3O4mWJW6V/RSiOj8UuSFRTs=", + "lastModified": 1670985057, + "narHash": "sha256-QfLKTSQUc82HXeIipukznInr5IXXgK1YKm5dplm1Q+A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c90c223c4aef334356029b89c72bb65e26f7efe6", + "rev": "da99b6227d450438d53ba4b0cf64e43ad2e93e58", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 5d2dad1..83b5fef 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -9,6 +9,11 @@ flake-utils.url = "github:numtide/flake-utils"; nixgl.url = "github:guibou/nixGL"; rust-overlay.url = "github:oxalica/rust-overlay"; + # Allows default.nix to call onto flake.nix. Useful for nix eval and automations + flake-compat = { + url = "github:edolstra/flake-compat"; + flake = false; + }; }; outputs = diff --git a/nix-conf/pkgs/default.nix b/nix-conf/pkgs/default.nix index 2a516dd..57da39a 100644 --- a/nix-conf/pkgs/default.nix +++ b/nix-conf/pkgs/default.nix @@ -2,4 +2,7 @@ # personalized/custom packages { pkgs, lib, ... }@pkgs_input: { # dot-hwtr = import "./dot-hwtr" pkgs_input; + cargo-bacon = pkgs.rustPlatform.buildRustPackage rec { + pname = "bacon"; + }; }