From 33cab5d19ee5af84fef685c9b1b56ef7b33b06bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Mon, 22 Nov 2021 10:55:14 +0100 Subject: [PATCH] chore(flake): update inputs --- flake.lock | 54 +++++++++++++++++++++--------------------- flake.nix | 10 -------- home/shell/default.nix | 5 +--- 3 files changed, 28 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 58fdfef..49438df 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1636274622, - "narHash": "sha256-tZYuGhqcfH7piCsrUrIYM0P3oPJcoBxGkuxeFNVxkCc=", + "lastModified": 1637516270, + "narHash": "sha256-qTffAQ0kWA2qXMJUVMDsgXVbzMNI0BfR78vB/4QFA+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "2917ef23b398a22ee33fb34b5766b28728228ab1", + "rev": "15ae861e1bfad90e0d14106551544e9e07cbcb10", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1636384973, - "narHash": "sha256-xl05XNVgj55cJTmWu7ft3nACOdFkrm3Hn7DKcxWku7M=", + "lastModified": 1637598128, + "narHash": "sha256-/bEs1+BUDXf8aYbnpHQDa4x/l0qOZDeoAxL/MSODV3g=", "owner": "neovim", "repo": "neovim", - "rev": "4174244d8b6718c703f8b8d3e907809bde9430bd", + "rev": "fd6df7481a88006fd60bc8980b4db1000ddeda27", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1636317251, - "narHash": "sha256-u1cWvvtGH5mfGkeIKrqw2usk4IL7wDiRcnJkUSiZq3Q=", + "lastModified": 1637564544, + "narHash": "sha256-wwdjkfdQEbFn+Gr1iBiA5DGgl+Q7PASL83Swo/Wqwy0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fd6f34afcf062761fb5035230f6297752bfedcba", + "rev": "08cda8e3a5a4e685af525e5a589dfeb74267d505", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1636267212, - "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", + "lastModified": 1637155076, + "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", + "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "nur": { "locked": { - "lastModified": 1636403209, - "narHash": "sha256-rxDsxcm8s1WGqdNuWWAcHbgNi9WjUhRSx3/xM7eMqoc=", + "lastModified": 1637603003, + "narHash": "sha256-DqJzTj3vi//VAaT0/sQapdRwcAkcrLJY3cRkfjwAiUU=", "owner": "nix-community", "repo": "NUR", - "rev": "c1d70a6b7ddd4609e1df2dfdb2071bbbed8ea6b9", + "rev": "3d2fe906f0367d1651d9067d98e0b93fb05c5c18", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nvim-ts-context-commentstring": { "flake": false, "locked": { - "lastModified": 1635968444, - "narHash": "sha256-nzlaKZhH+Q+/mGU1DZhbKJkPziJ/eavQ3lAaISylTUA=", + "lastModified": 1637433652, + "narHash": "sha256-Vd3F476JCCvVXNkeL0QU3ki5cMdskXExFILd3usBBak=", "owner": "JoosepAlviste", "repo": "nvim-ts-context-commentstring", - "rev": "159c5b9a2cdb8a8fe342078b7ac8139de76bad62", + "rev": "9f5e422e1030e7073e593ad32c5354aa0bcb0176", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "ranz2nix": "ranz2nix" }, "locked": { - "lastModified": 1636345926, - "narHash": "sha256-tRgGWkkZQ2FNyZgN93FEVsR8sSmEiYnhy5eEVDaEeNI=", + "lastModified": 1637558782, + "narHash": "sha256-HM+OEEVx7G08VEd0VeBwAVx4e4WvSuJI+Dz5n+FsucY=", "owner": "GTrunSec", "repo": "photoprism-flake", - "rev": "e3d7217dc565235f30639d496c4ef238702ae3e3", + "rev": "f309d463b1154a4dec6c250f24dac0d31e0e38a3", "type": "github" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1634595438, - "narHash": "sha256-hV9D41fqTateTligwNd9dmJKQ0R0w6RpCN92xR3LhHk=", + "lastModified": 1636988353, + "narHash": "sha256-KZoMUmLgJVYnmohhJ/ENeiH8fCN7rY3VyG/4UpDNEWA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "06fa80325b6fe3b28d136071dd0ce55d4817e9fd", + "rev": "50cfce93606c020b9e69dce24f039b39c34a4c2d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0f9d8cd..9f2a50f 100644 --- a/flake.nix +++ b/flake.nix @@ -68,16 +68,6 @@ }; buildInputs = old.buildInputs ++ [ self.wayland-protocols ]; }); - xwayland = super.xwayland.overrideAttrs (old: rec { - version = "21.1.3"; - src = self.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "xorg"; - repo = "xserver"; - rev = "xwayland-21.1.3"; - sha256 = "VnFzKyxg/6gVBg+bHTwDbUwCQHWt04gmiaAFLSwg7XA="; - }; - }); }; neovim = self: super: let diff --git a/home/shell/default.nix b/home/shell/default.nix index b01ed67..eb9e770 100644 --- a/home/shell/default.nix +++ b/home/shell/default.nix @@ -76,10 +76,7 @@ in { programs.direnv = { enable = true; - nix-direnv = { - enable = true; - enableFlakes = true; - }; + nix-direnv.enable = true; }; # for .envrc's in child directories add "source_up"