From 3b991b7563227d905797e7b8427a3f91d5cecce7 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 24 Sep 2023 13:23:03 +0200 Subject: [PATCH] Update deps --- flake.lock | 35 +++++++++------------------------- flake.nix | 4 ++-- home/programs/nvim/plugins.nix | 24 +++++++++++------------ system/flakes/tanker.nix | 6 +++--- system/nixos/mastodon.nix | 2 +- 5 files changed, 27 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 4cd3abd..7f40818 100644 --- a/flake.lock +++ b/flake.lock @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1695495225, - "narHash": "sha256-4i4XCjN60llr7U6/03bhPKsFoeKecLnW4WScQEc4n+A=", + "lastModified": 1695550077, + "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e0c70942c0e7178a56289adea20c056a3cda7c5e", + "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", "type": "github" }, "original": { @@ -381,11 +381,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695109627, - "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=", + "lastModified": 1695541019, + "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a", + "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { @@ -463,22 +463,6 @@ "type": "github" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1695495354, - "narHash": "sha256-kY1ZKz1KLBWwasaxp87Q0Oa4nD94lmmIvXXUdLVCKQM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1ff350f7b806e02c65c1bbc78b905b80244df5d6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1685004253, @@ -549,7 +533,6 @@ "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" } diff --git a/flake.nix b/flake.nix index 885d472..9e0adea 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-master.url = "github:nixos/nixpkgs/master"; + # nixpkgs-master.url = "github:nixos/nixpkgs/master"; # Tools @@ -76,7 +76,7 @@ tanker = import ./system/flakes/tanker.nix { nixpkgs = inputs.nixos-unstable; - inherit (inputs) nixpkgs-master disko deploy-rs home-manager agenix attic; + inherit (inputs) disko deploy-rs home-manager agenix attic; inherit inputs; }; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index b2d6f83..595bedc 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -30,12 +30,12 @@ in }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-09-23"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "b844d3da4affb77fb2ba56ed235946f0ba0ab200"; - sha256 = "0xr5i7rvfb7b74rl88wnrgkam20sa1b98zcd6kiqx777mmadym41"; + rev = "480a756df82a0c231622c9bf2173bb6634713716"; + sha256 = "05b1gflnk4252x8m5w9v3dmahg3sncdx3z1lhgw0z7425ascxnyw"; fetchSubmodules = false; }; }; @@ -118,12 +118,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-09-23"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "af6b3ecea9b3cff18b9244027e23e7f2c34ebdd5"; - sha256 = "1swad6y06a5xnib92ksqxqy794yvp5y1dgkbvbw5zsmxa844rigm"; + rev = "0960322686bfa38afd4f1e0b9660473cf77e24b6"; + sha256 = "0gzj6k34h0847sf382dfc0q2cjs7qd2v2192rniijiy4hy1scv6m"; fetchSubmodules = false; }; }; @@ -162,12 +162,12 @@ in }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-09-20"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "40c8d2fc2b729dd442eda093cf8c9496d6e23732"; - sha256 = "08nxnnglli2j07k70xxfjnd02iysr3zbac26xqjv0b1rdn24w9gx"; + rev = "ed9574dd6dde143d009b2528ea6d79bd34bbe6c8"; + sha256 = "0w7hbzcw5bckgyp0hacg1v6aw064mixhl97mycix47gxa86iqbjb"; fetchSubmodules = false; }; }; @@ -319,12 +319,12 @@ in }; LuaSnip = buildVimPluginFrom2Nix { pname = "LuaSnip"; - version = "2023-09-21"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "L3MON4D3"; repo = "LuaSnip"; - rev = "c5fb16a934892086d4ba01bac48b77c65435025e"; - sha256 = "08gqbwpsqnlvrn11g51h44npfhh1gbxkw55sl7qpa5q3bvh8q5q1"; + rev = "1fd22fa96c11573248f9fdd09f25e724c7bb3dd4"; + sha256 = "1lxw6l6rw07p50phmynnwid60gwz6pgq7p3z9j2yyp8alchxx7z5"; fetchSubmodules = false; }; }; diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix index 5d0ffa6..9014f4e 100644 --- a/system/flakes/tanker.nix +++ b/system/flakes/tanker.nix @@ -1,15 +1,15 @@ -{ nixpkgs, nixpkgs-master, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }: +{ nixpkgs, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }: let default-system = "x86_64-linux"; - overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; + # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ - overlay-master + # overlay-master overlay-deploy-rs overlay-nifoc ]; diff --git a/system/nixos/mastodon.nix b/system/nixos/mastodon.nix index 61efe0a..e65f47c 100644 --- a/system/nixos/mastodon.nix +++ b/system/nixos/mastodon.nix @@ -7,7 +7,7 @@ in services.mastodon = { enable = true; - package = pkgs.pkgs-master.mastodon; + # package = pkgs.pkgs-master.mastodon; configureNginx = false;