From 4d6cca2a928d949e06f25112efaf3fc04443490f Mon Sep 17 00:00:00 2001 From: "Agatha V. Lovelace" Date: Wed, 19 Apr 2023 10:24:08 +0200 Subject: [PATCH] Add colmena devshell --- .envrc | 1 + .gitignore | 3 +- common/fragments/graphical/default.nix | 1 + flake.lock | 193 ++++++++++++++++++------- flake.nix | 17 ++- 5 files changed, 159 insertions(+), 56 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index d5b7911..1b0e1b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ secrets -ops/home/.gcroots \ No newline at end of file +ops/home/.gcroots +.direnv \ No newline at end of file diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix index 744ece1..21c6f18 100644 --- a/common/fragments/graphical/default.nix +++ b/common/fragments/graphical/default.nix @@ -176,6 +176,7 @@ }; fonts.fontconfig.enable = true; + fonts.fontDir.enable = true; fonts.fonts = with pkgs; [ (nerdfonts.override { fonts = [ "DaddyTimeMono" "NerdFontsSymbolsOnly" ]; }) cantarell-fonts diff --git a/flake.lock b/flake.lock index 9592bfd..659d5c5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,30 @@ { "nodes": { + "colmena": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "stable": "stable" + }, + "locked": { + "lastModified": 1681413750, + "narHash": "sha256-mouot7Dk89BeFBAI8rn5DnuKGreHzQZ+AI/cmYpeHig=", + "owner": "AgathaSorceress", + "repo": "colmena", + "rev": "e4cc19580cb07fdd3be263a8e01a04adbc4e8949", + "type": "github" + }, + "original": { + "owner": "AgathaSorceress", + "repo": "colmena", + "type": "github" + } + }, "colorpickle": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -48,7 +69,7 @@ "nci" ], "drv-parts": "drv-parts", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": [ "helix", "nci", @@ -143,6 +164,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -158,7 +195,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1668681692, @@ -190,6 +227,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -207,7 +259,7 @@ "frq-friend": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils_2" }, "locked": { @@ -227,16 +279,16 @@ "helix": { "inputs": { "nci": "nci", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "parts": "parts_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1681484601, - "narHash": "sha256-P4PKDkK34HcKpz+JM6J/A+xalX6JS0T4OpOK68vmf1c=", + "lastModified": 1681780219, + "narHash": "sha256-whY/Ae5/szGGvZV9db7OQm30Z646HIjkL7bOLNiR0Go=", "owner": "helix-editor", "repo": "helix", - "rev": "4cdba7cccdd6a9fe5fbb3d15c9db3edc147b7a90", + "rev": "ca65d312e715413cd5675cafd599d74534900d3f", "type": "github" }, "original": { @@ -252,11 +304,11 @@ ] }, "locked": { - "lastModified": 1681468923, - "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=", + "lastModified": 1681799488, + "narHash": "sha256-aAK/Mzf2yZ20stXkmPmtvtDQFy2XaEjAyZ3Fo56FbQc=", "owner": "nix-community", "repo": "home-manager", - "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189", + "rev": "2dcb61d396b45f10d9e0621a7358b361f94323ff", "type": "github" }, "original": { @@ -299,8 +351,8 @@ }, "mms": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", "nix": "nix", "nixpkgs": [ "nixpkgs" @@ -322,7 +374,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1679567394, @@ -341,7 +393,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1679567394, @@ -360,7 +412,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1679567394, @@ -408,7 +460,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -427,16 +479,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681002951, - "narHash": "sha256-nD9fXN7EVKGovtjrXIuA7Si9M6PD9b02GNtvQPTSuOk=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "431bf1e6cdd494e5230fbb72884afb4ca612c578", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -488,7 +542,37 @@ "type": "indirect" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1680273054, + "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1681002951, + "narHash": "sha256-nD9fXN7EVKGovtjrXIuA7Si9M6PD9b02GNtvQPTSuOk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "431bf1e6cdd494e5230fbb72884afb4ca612c578", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1681002951, "narHash": "sha256-nD9fXN7EVKGovtjrXIuA7Si9M6PD9b02GNtvQPTSuOk=", @@ -504,7 +588,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1681272286, "narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=", @@ -518,7 +602,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1681272286, "narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=", @@ -534,7 +618,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1680213900, "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", @@ -550,7 +634,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -566,13 +650,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1681349002, - "narHash": "sha256-9Ckc2WvSwuYrPfk3ZXgPasM1ir/cgs6UV0EpIWyPGZE=", + "lastModified": 1681696129, + "narHash": "sha256-Ba2y1lmsWmmAOAoTD5G9UnTS/UqV0ZFyzysgdfu7qag=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b1bba76a13ed39c7abc0a6e8f74f9e168cf3c7c", + "rev": "de66115c552acc4e0c0f92c5a5efb32e37dfa216", "type": "github" }, "original": { @@ -581,20 +665,6 @@ "type": "indirect" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1680273054, - "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_9": { "locked": { "lastModified": 1680273054, @@ -605,10 +675,8 @@ "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "parts": { @@ -653,18 +721,19 @@ }, "root": { "inputs": { + "colmena": "colmena", "colorpickle": "colorpickle", "frq-friend": "frq-friend", "helix": "helix", "home-manager": "home-manager", "mms": "mms", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "url-eater": "url-eater" } }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "helix", "nixpkgs" @@ -684,6 +753,22 @@ "type": "github" } }, + "stable": { + "locked": { + "lastModified": 1669735802, + "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "731cc710aeebecbf45a258e977e8b68350549522", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -717,15 +802,15 @@ "url-eater": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "utils": "utils_3" }, "locked": { - "lastModified": 1681559430, - "narHash": "sha256-d2Xh2YoFALsNqmsQgwGVEda7pGFvLF+WS0DMDBmYHSI=", + "lastModified": 1681562998, + "narHash": "sha256-VpuZIgIywqnB/JGMSfm1tJ9hai0u+CuRCnOLBCTAtuk=", "owner": "AgathaSorceress", "repo": "url-eater", - "rev": "d007d1f2f7d9b4c658d684c60b2767718e5f2383", + "rev": "be1fed9ee7ffb7b61b2f16d143e1c62177ed3234", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fac3c00..38073d4 100644 --- a/flake.nix +++ b/flake.nix @@ -16,12 +16,15 @@ colorpickle.url = "github:AgathaSorceress/colorpickle"; + # Latest colmena + prettier loading icons + colmena.url = "github:AgathaSorceress/colmena"; + frq-friend.url = "git+https://git.xenua.me/xenua/fedi-frq-friend"; helix.url = "github:helix-editor/helix"; }; outputs = { nixpkgs, home-manager, mms, helix, url-eater, colorpickle - , frq-friend, ... }: { + , frq-friend, colmena, ... }: { colmena = { network = { description = "Agatha's Nix Infra"; @@ -34,6 +37,7 @@ colorpickle = colorpickle.defaultPackage.${final.system}; frq-friend = frq-friend.defaultPackage.${final.system}; }) + colmena.overlay ]; }; }; @@ -85,5 +89,16 @@ }; }; }; + devShells."x86_64-linux".default = + let pkgs = import nixpkgs { system = "x86_64-linux"; }; + in pkgs.mkShell { + buildInputs = [ + (pkgs.writeShellScriptBin "colmena" '' + ${ + colmena.defaultPackage.${pkgs.system} + }/bin/colmena --disable-emoji $@ + '') + ]; + }; }; }