diff --git a/flake.lock b/flake.lock index 5067941..96307c6 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1670438727, - "narHash": "sha256-c8SAz45BtQTZLxX0BRoj7aGlk6jogjlTE7Tj40lQr6Q=", + "lastModified": 1672740976, + "narHash": "sha256-r+th+iHy+nwnxH0OjyZynjA+3yP1m1yH7e6QLFFYw8Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e9c4d10bbb4e810cbfe5e31248fe835e08efb35a", + "rev": "0505d6fa58724b02898c3ca2b7373dcf699ae3b5", "type": "github" }, "original": { @@ -56,11 +56,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1668450977, - "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", + "lastModified": 1672616755, + "narHash": "sha256-dvwU2ORLpiP6ZMXL3CJ/qrqmtLBLF6VAc+Fois7Qfew=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", + "rev": "87673d7c13a799d95ce25ff5dc7b9e15f01af2ea", "type": "github" }, "original": { @@ -116,15 +116,17 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { - "lastModified": 1670280307, - "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", + "lastModified": 1672688183, + "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", + "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", "type": "github" }, "original": { @@ -136,16 +138,18 @@ "mailserver": { "inputs": { "blobs": "blobs", - "nixpkgs": "nixpkgs_3", - "nixpkgs-22_05": "nixpkgs-22_05", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-22_11": "nixpkgs-22_11", "utils": "utils_2" }, "locked": { - "lastModified": 1669807829, - "narHash": "sha256-rgQ8MYV1UD4Ynw0wzfl9hatgsV5GV7X6eM6ioSPKzls=", + "lastModified": 1671659164, + "narHash": "sha256-DbpT+v1POwFOInbrDL+vMbYV3mVbTkMxmJ5j50QnOcA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "694e7d34f60028f4877517e1c7c73c9527fad400", + "rev": "bc667fb6afc45f6cc2d118ab77658faf2227cffd", "type": "gitlab" }, "original": { @@ -156,15 +160,17 @@ }, "nbfc": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils_3" }, "locked": { - "lastModified": 1663533210, - "narHash": "sha256-it24pt41yHYhcpfqnEaws7utoNxFFrH/HwBCD/9omkY=", + "lastModified": 1672050722, + "narHash": "sha256-+6assS03GsJB5YpoUpBsh3irX5nBfLxLwB0EQzV2dlA=", "owner": "nbfc-linux", "repo": "nbfc-linux", - "rev": "0396c35b2afc02a705bb53c2fadb7b4f54915d97", + "rev": "e3cdbf5e59fdcd5693367179d53efa78ea3f4b44", "type": "github" }, "original": { @@ -183,11 +189,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1670395896, - "narHash": "sha256-Nz4ZCPER+Z1JGMf5XDJAcssr/wg6h7PASwy6baym8kY=", + "lastModified": 1672728900, + "narHash": "sha256-VroAlqUj2N5wgbXpf47qaPdyI075AA1cgReTHFhA2a8=", "owner": "neovim", "repo": "neovim", - "rev": "0caae2376e6c8f6665143e77e4e7a0cdf2b054c4", + "rev": "4dd793a256fefb481159f9f93bf7572391e266de", "type": "github" }, "original": { @@ -199,14 +205,16 @@ }, "nix-gaming": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1670183910, - "narHash": "sha256-qRZaqZ+KdxT7hXQBmRHxrpE4MqwiaBOQtOAxuJKtS0U=", + "lastModified": 1672665710, + "narHash": "sha256-kK9DB+J7zDSs5H0X0AxEn85VKROLKYnUbPijtZEPrYY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ba6dd04cdb03d796054d0d2bb81f949690fc6efa", + "rev": "66c8cbbde08af5a7e87cd3aa4fb4725f20966db2", "type": "github" }, "original": { @@ -229,29 +237,29 @@ "type": "indirect" } }, - "nixpkgs-22_05": { + "nixpkgs-22_11": { "locked": { - "lastModified": 1654936503, - "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", + "lastModified": 1669558522, + "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", + "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "lastModified": 1672350804, + "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", "type": "github" }, "original": { @@ -264,99 +272,37 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1669969257, - "narHash": "sha256-mOS13sK3v+kfgP+1Mh56ohiG8uVhLHAo7m/q9kqAehc=", + "lastModified": 1672633908, + "narHash": "sha256-sP0BMp4DprVCBjcTYPsTPwkJMsc45vM0FxHdDx6qE8U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b72b8b94cf0c012b0252a9100a636cad69696666", + "rev": "a4379d2b0deefedc8dba360897557707ea9ee9a7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1642635915, - "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", - "owner": "NixOS", + "lastModified": 1672633908, + "narHash": "sha256-sP0BMp4DprVCBjcTYPsTPwkJMsc45vM0FxHdDx6qE8U=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f", + "rev": "a4379d2b0deefedc8dba360897557707ea9ee9a7", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { - "locked": { - "lastModified": 1646811357, - "narHash": "sha256-JJdz8QJ8Gz9ZChGfl4P9Cm8C9mYJLRGVsXcY9gNPtuI=", - "owner": "nixOS", - "repo": "nixpkgs", - "rev": "e1f52cabc3cf7e22015f6ef940d3fb31ef1f0d40", - "type": "github" - }, - "original": { - "owner": "nixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1663491030, - "narHash": "sha256-MVsfBhE9US5DvLtBAaTRjwYdv1tLO8xjahM8qLXTgTo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "767542707d394ff15ac1981e903e005ba69528b5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1670235252, - "narHash": "sha256-5YWCit/Brz4EDT/TIwXT/5wxRxb+cz1Nls7ZodQeKiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "543070eafe8d5e86ebaa3095fd1e568db09b9b73", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1670267727, - "narHash": "sha256-hUFAn5gjNHIBpLQT0CmqpuQjQwgWUm+D6aziGAYsDmw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a5f661b80e4c163510a5013b585a040a5c7ef55e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1665296151, "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", @@ -376,14 +322,14 @@ "inputs": { "flake-compat": "flake-compat", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1670400905, - "narHash": "sha256-g7zvYhGPxqZnrueTo1NR7AU1j1ejatDO9W6GGzAfk6o=", + "lastModified": 1672733667, + "narHash": "sha256-RHcgShzAHJhywtwCyz0woIUza8K78I31eZAo9AwZ8E8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "36b9905aa2f520da2be8703ffcd887b7f1162f72", + "rev": "adfef49a8d0c66eda55256a2b6d7b9d31e0bde29", "type": "github" }, "original": { @@ -400,7 +346,7 @@ "mailserver": "mailserver", "nbfc": "nbfc", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_2", "nvim-overlay": "nvim-overlay", "rust-overlay": "rust-overlay" } @@ -408,14 +354,14 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1670380307, - "narHash": "sha256-7fJN5ndnE8YbrrtYdqMo3gDV/BW37M4wNBRhjdfP/XY=", + "lastModified": 1672712534, + "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fc98242f5f49d39b8fd3a611c146741a35dc012d", + "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 53a38af..364ea2d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,18 +3,30 @@ inputs = { nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable; - home-manager.url = github:nix-community/home-manager; + home-manager = { + url = github:nix-community/home-manager; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-parts.url = github:hercules-ci/flake-parts; nvim-overlay.url = github:nix-community/neovim-nightly-overlay; - mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver; + mailserver = { + url = gitlab:simple-nixos-mailserver/nixos-mailserver; + inputs.nixpkgs.follows = "nixpkgs"; + }; emacs-overlay.url = github:nix-community/emacs-overlay; rust-overlay.url = github:oxalica/rust-overlay; - nix-gaming.url = github:fufexan/nix-gaming; - nbfc.url = github:nbfc-linux/nbfc-linux; + nix-gaming = { + url = github:fufexan/nix-gaming; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nbfc = { + url = github:nbfc-linux/nbfc-linux; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, nixpkgs, ... }: - inputs.flake-parts.lib.mkFlake { inherit self; } { + inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" ]; imports = [ ./hosts @@ -25,7 +37,10 @@ perSystem = { pkgs, system, ... }: rec { legacyPackages = import inputs.nixpkgs { inherit system; - config.allowUnfree = true; + config = { + allowUnfree = true; + allowBroken = true; + }; overlays = [ inputs.nvim-overlay.overlay inputs.emacs-overlay.overlay @@ -34,10 +49,6 @@ }; formatter = pkgs.nixpkgs-fmt; - - devShells.default = pkgs.mkShell { - packages = [ formatter ]; - }; }; }; }