From 0e4d5ada9727d9dfd996f18e444cc283faabdc6f Mon Sep 17 00:00:00 2001 From: Pyrox Date: Mon, 6 Mar 2023 22:24:01 -0500 Subject: [PATCH] flake: some updates --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- flake.nix | 33 +++++++++-------- 2 files changed, 69 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 14f720c..d47c9e0 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1677453742, - "narHash": "sha256-/DNOThcCGz21Met/aMhm7NGqughtpxQzrlAqTuq+YZQ=", + "lastModified": 1677969766, + "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", "owner": "ryantm", "repo": "agenix", - "rev": "4828951d9d05accd244bf8c24706f046b485aceb", + "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1677867078, - "narHash": "sha256-88QSWkOL6jSUBcrKyG13tirLvE4lZ+9iAiuQBvlFL48=", + "lastModified": 1678097883, + "narHash": "sha256-IG/v/syRMm0OLjT7F/naRjqN6bvAQEhlIlnS4U5y5EQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bc977d5c4f5c0463ac8f2bd13406625b80a18bae", + "rev": "3f8a6436e158849050e711574a97126a6d3fec02", "type": "github" }, "original": { @@ -588,11 +588,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1677783711, - "narHash": "sha256-eq5mOVk3gv5HITtLhPjKwi8bFnOaQplA3X0WFgHnmxE=", + "lastModified": 1678109311, + "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b9e3a29864798d55ec1d6579ab97876bb1ee9664", + "rev": "04d6cad67557512452decbfe888c68fa11338a96", "type": "github" }, "original": { @@ -609,11 +609,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1677852361, - "narHash": "sha256-XeBZLnM5b5exER1bM1Vbg4HPH80CRA9M7WR++N84rYQ=", + "lastModified": 1678093429, + "narHash": "sha256-TDegkSVDSTwOi9j1tc84xiIctxYwgt4kBLfKu88cjlQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "51ce3ddd670ca9fb7d359ec8be617354c23ba072", + "rev": "4f647a8e8be78d3817f126e41940bef49e81232e", "type": "github" }, "original": { @@ -655,11 +655,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1677488617, - "narHash": "sha256-7Y/xDEr2paX7m4+x9lP+5d8CCFVbNCP961NaXc62+Hk=", + "lastModified": 1678093477, + "narHash": "sha256-a3oj34aXs1Qp7lBVULJ6J4Xhfh+5wFlTCweu4SqmTpM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a3bff52602cf310e991153e4260b4aa01f4ecb29", + "rev": "3efb505a2a29de97accade8efee7a0505386a86d", "type": "github" }, "original": { @@ -739,11 +739,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1677831307, - "narHash": "sha256-crWj97VkASsPtpnqEZH7y17HxmJmyx/LkVr1i983dMU=", + "lastModified": 1678090567, + "narHash": "sha256-ZSKhaesPn2WHnqfshj6TDHO5ob1o+wgUjiP4oZ11eLc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d92b18485c6d15bc30725c548a465e077ff1b433", + "rev": "13bcb7770ffa76e5e35a9dc1c12b146c22f10bdf", "type": "github" }, "original": { @@ -762,11 +762,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1677826237, - "narHash": "sha256-/uPdyBjSqSijZW5zSPFm7v5bXOjmy4lIVpzZdwIqnro=", + "lastModified": 1678060331, + "narHash": "sha256-JnKiZsG4MlNDNaSy9WvRJF2a6gaeiqtw0BmYNQ4DquQ=", "owner": "neovim", "repo": "neovim", - "rev": "5311c9048a638fecdc066810bb68b60c3048e326", + "rev": "e389b189021cb6b72cfd7583ce6fb5d8d3346d45", "type": "github" }, "original": { @@ -797,11 +797,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1677676435, - "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", + "lastModified": 1677932085, + "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", + "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", "type": "github" }, "original": { @@ -929,11 +929,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1677851804, - "narHash": "sha256-4bzkZnN4ih8IkXTI0QBlA9WLN5ojqhyC2Xhaa6vXk1U=", + "lastModified": 1677884483, + "narHash": "sha256-UO/Kka6WbFqYg5gBpS72Zx3UH167n8M0h4AIOCayWpE=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "f739d495cd822f63b41f672fe7d1c9f7e992eeb0", + "rev": "e2050fb126d1353d6c33b626a8aaf2067b7abe4c", "type": "github" }, "original": { @@ -991,11 +991,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1677676435, - "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", + "lastModified": 1677932085, + "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", + "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", "type": "github" }, "original": { @@ -1038,11 +1038,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1675273418, - "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", + "lastModified": 1677676435, + "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", + "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "type": "github" }, "original": { @@ -1101,11 +1101,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1677816901, - "narHash": "sha256-oqe8Q9LlWNGfVfUDkKfpWAk+I9RRDBvMSyYVIOZCfPM=", + "lastModified": 1677995890, + "narHash": "sha256-eOnCn0o3I6LP48fAi8xWFcn49V2rL7oX5jCtJTeN1LI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0749042bfaa2f4efa70ac829c5387133cfc0a337", + "rev": "a1240f6b4a0bcc84fc48008b396a140d9f3638f6", "type": "github" }, "original": { @@ -1131,11 +1131,11 @@ }, "nur": { "locked": { - "lastModified": 1678113687, - "narHash": "sha256-yUade+oZI6VD4aCwM+voZhR9WoK9/Pq/QrAtCgvqGgw=", + "lastModified": 1678117608, + "narHash": "sha256-hgqRYieVMKmdW6/JIQxUxBvz1o0jea+VZPtvefeof+I=", "owner": "nix-community", "repo": "nur", - "rev": "3136e0d3d3b3cecfcbc5c2da9dbadcdb20c87df1", + "rev": "9613bf1f8846150d3453d6ea69f538264148c68a", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -1325,11 +1325,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1677813435, - "narHash": "sha256-/l/k2dnVXMaZG/90CnuZCeHfg6865aNZ4/+nA7G/2XA=", + "lastModified": 1678065578, + "narHash": "sha256-WrFsnTaZivIWWBCpRx2s04n06Xx4k4RFlS98q5ZMEPQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a81d0dfd67bad13ca7af4b09f79da7a0a63eff09", + "rev": "d96b7fad6e3645c47d73e296c52b4e9baad2f81f", "type": "github" }, "original": { @@ -1346,11 +1346,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1677832374, - "narHash": "sha256-9EPeVZ0tLO1s0rX/Ek4YkNrREMabGIM0++Rl5874P7Y=", + "lastModified": 1677972062, + "narHash": "sha256-wFPKRMxETus554IHuswYkSmYebxK9VJCdFb62syX+IY=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "160dbaf98edf82c0431007c0a12802efb78885e3", + "rev": "230a9a32675bebad61d026dc83ab012687a04643", "type": "github" }, "original": { @@ -1363,11 +1363,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1675374853, - "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", + "lastModified": 1677789111, + "narHash": "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=", "owner": "wlroots", "repo": "wlroots", - "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", + "rev": "5ae17de23f5fd9bb252a698f3771c840280e2c05", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 88d3302..baac18c 100644 --- a/flake.nix +++ b/flake.nix @@ -64,8 +64,23 @@ colmena-overlay = final: prev: {colmena = colmena.defaultPackage.${prev.system};}; system = "x86_64-linux"; + overlays = [ + (import ./overlays/treesitter.nix) + (import ./overlays/sumneko.nix) + my-pkgs + alejandra-overlay + colmena-overlay + emacs.overlay + golink.overlay + lanzaboote.overlays.default + neovim.overlay + nixpkgs-update-overlay + nur.overlay + wayland.overlays.default + ]; pkgs = import nixpkgs { + inherit overlays; localSystem = "x86_64-linux"; config = { allowUnfree = true; @@ -73,24 +88,10 @@ joypixels.acceptLicense = true; permittedInsecurePackages = [ "electron-19.0.7" ]; }; - overlays = [ - (import ./overlays/treesitter.nix) - (import ./overlays/sumneko.nix) - my-pkgs - alejandra-overlay - colmena-overlay - emacs.overlay - golink.overlay - lanzaboote.overlays.default - neovim.overlay - nixpkgs-update-overlay - nur.overlay - wayland.overlays.default - ]; }; lib = nixpkgs.lib; - config.lib = lib; + clib = import ./lib/colmena.nix { inherit inputs overlays; }; mkUser = { username ? "pyrox", profile ? "desktop", @@ -168,5 +169,7 @@ hyprland.homeManagerModules.default ]; }; + + colmena = clib.mkColmenaFromNixOSConfigurations self.nixosConfigurations; }; }