From 09f3ff98134c715daec245460b14e696cd2c344d Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 13 Jun 2023 10:22:57 +0200 Subject: [PATCH] Update deps --- flake.lock | 62 ++++++++++++++++++----------- flake.nix | 4 +- home/programs/nvim/plugins.nix | 72 +++++++++++++++++----------------- system/hosts/mediaserver.nix | 2 +- system/shared/ssh-keys.nix | 2 + 5 files changed, 81 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index da147ed..cf76a52 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1685309025, - "narHash": "sha256-pZxMM3AMP/ojwhrFD0A2ML4NOgehlBLGHseInnO5evc=", + "lastModified": 1686620679, + "narHash": "sha256-Ck/r3f+W9mOn3cHn5ii/fogBiJtosFnDaOQveaJ0zVU=", "owner": "zhaofengli", "repo": "attic", - "rev": "b1fb790b5f2afaaa1b2f7f18979b8318abe604bb", + "rev": "4fedffe6a1020edfcfa7bef18d21321d4983b3a7", "type": "github" }, "original": { @@ -211,12 +211,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -253,11 +256,11 @@ ] }, "locked": { - "lastModified": 1686391840, - "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", + "lastModified": 1686639065, + "narHash": "sha256-ZBDPI1GCsZaQBzPd6zjowqfNj58sRE+PTpZiThQCj68=", "owner": "nix-community", "repo": "home-manager", - "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", + "rev": "d437f0d4e0f72fe76688142e954a4a9b61ac9833", "type": "github" }, "original": { @@ -276,11 +279,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1686422003, - "narHash": "sha256-Ekqqm2/FigfyhuCfx1BkePPsABdTwm7PJdiTaHPXems=", + "lastModified": 1686552079, + "narHash": "sha256-hAbhrZzFgOLefz1NWSKrfTuFISBTXmLEjUZoLyKAZJc=", "owner": "neovim", "repo": "neovim", - "rev": "302d3cfb96d7f0c856262e1a4252d058e3300c8b", + "rev": "551cc3a2a3e2ee180234910cbe2ef81bd37508de", "type": "github" }, "original": { @@ -301,11 +304,11 @@ "weewx-proxy-flake": "weewx-proxy-flake" }, "locked": { - "lastModified": 1686422999, - "narHash": "sha256-fff9iL5FpfNBqhUlqOfryU+3Yy9g9rErLH6wBLFudUc=", + "lastModified": 1686558002, + "narHash": "sha256-tOFyFd9qk9TqfNgxs+tgN+okoNptgX0GXrk3tMY8KYQ=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "7e7cb91118286be804a85f5cfdf1c4ad980f62d1", + "rev": "3cac8607c7e2d75943ba323be8ae3d857bf73e83", "type": "github" }, "original": { @@ -316,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1686396027, - "narHash": "sha256-gE+csxJoXuNn5ZnlgNj0GnMQ2y4heBtDqkB1af8vfjU=", + "lastModified": 1686452266, + "narHash": "sha256-zLKiX0iu6jZFeZDpR1gE6fNyMr8eiM8GLnj9SoUCjFs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "70d5f55faee9c1e141e32e6be1e77d13e5a570db", + "rev": "2a807ad6e8dc458db08588b78cc3c0f0ec4ff321", "type": "github" }, "original": { @@ -332,17 +335,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686025136, - "narHash": "sha256-yd/Lr6RjjeyF7PpA+TpFT4E5LZeDyiMLVJUXIWxB4Rs=", + "lastModified": 1686519857, + "narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22467e240f390f029d6c745ce031f0ffbdc40916", + "rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "22467e240f390f029d6c745ce031f0ffbdc40916", "type": "github" } }, @@ -419,6 +422,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index 23739c1..bbcc3b5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { - #nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs.url = "github:nixos/nixpkgs?rev=22467e240f390f029d6c745ce031f0ffbdc40916"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + #nixpkgs.url = "github:nixos/nixpkgs?rev=22467e240f390f029d6c745ce031f0ffbdc40916"; darwin = { url = "github:lnl7/nix-darwin"; diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index d23fe27..d1fd6a8 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -96,34 +96,34 @@ in }; dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-06-02"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "52f6d1c48589479d519c1aaea93dba1dd550a7a4"; - sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl"; + rev = "5716b1395b32a5865476dd3314bd8888e5f91532"; + sha256 = "1z011hnbmr0r99r0v920ywfdn2v1dqair2py0h19v6xxgw50cd0n"; fetchSubmodules = false; }; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-10"; + version = "2023-06-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f9d701176cb9a3e206a4c690920a8993630c3ec8"; - sha256 = "08zc1irs12clw8fy140j4lk9m4wfjmmmm64dw915gyl0l6r9g0rb"; + rev = "2847aac9d40516c8fc29ab4864e665da09fe14d6"; + sha256 = "1zih82f3dm3ix4l1p6m2az2bky5b8c6p4ambgc26ifm65bm7gjri"; fetchSubmodules = false; }; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-06-04"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "HiPhish"; repo = "nvim-ts-rainbow2"; - rev = "e1783c843fd0a604d071cb9f0c6919ac93bcd96e"; - sha256 = "0jh0rjg8swya2647nm5csmmv0b706s2piiiw5ngw8avm77z2f2dc"; + rev = "60e34278a87b1a9f2ae59a67b4a062c5f6b9b8e7"; + sha256 = "05a45pw8kv5w71qfcs7zsczyx9ladlz7h03wbbid4xkkm7ibybzl"; fetchSubmodules = false; }; }; @@ -140,12 +140,12 @@ in }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-06-10"; + version = "2023-06-13"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "116dbea5800c908de4afa6e793f28f782621c65d"; - sha256 = "1scp1pr8innnpk35wz9rq9npkha5j3hacpggrbafy0madvs92x60"; + rev = "00cf15074a2997487813672a75f946d2ead95eb0"; + sha256 = "0zfdcgs67nvhx73nmhv3ppilh9wkf2lv88pniwmf67pnks9x94i3"; fetchSubmodules = false; }; }; @@ -220,12 +220,12 @@ in }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "08f1f347c718e945c3b1712ebb68c6834182cf3a"; - sha256 = "0kqxbyb5hg6r4rv79bxjj8dvm3440137xxppp2a5idxi8sisdqad"; + rev = "fefba589c56a5568a089299e36a4c8242502faaa"; + sha256 = "128q0l2br61q2gn09ra99g67dp2bfc7czpdpfv2k58dmas0y0wmb"; fetchSubmodules = false; }; }; @@ -275,23 +275,23 @@ in }; nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-05-29"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "58a4fee3d61a6fb3166163c55fe0b2eb29464f9c"; - sha256 = "1rh5hhgr3lzq144a7bm2wn25fcdd29y1sanw2y5i82ks159ivdk5"; + rev = "ed93c624e91b575f00d0834f2fecbdc6d3918096"; + sha256 = "17n8k151cf570fjxjivkkakb0ganb8iz56bj2088ifjrj50phsjf"; fetchSubmodules = false; }; }; comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-06-01"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "c8043290f2d77f61025494d839d88e414608c460"; - sha256 = "126bbdlbsl0byxihwzj5j1lbkk1dcqrki4qh5wqa8i71d0dy7vva"; + rev = "176e85eeb63f1a5970d6b88f1725039d85ca0055"; + sha256 = "0y3zhv82hi8avxhmp1c9h0r17kfclwxphzyk7701f6wjky375ksw"; fetchSubmodules = false; }; }; @@ -308,23 +308,23 @@ in }; friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74"; - sha256 = "0jxj57996c4ab54p0zd4h5ldkz9yad1jy0ylzikfq8ylvw7z4p31"; + rev = "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b"; + sha256 = "1bdavn7sw4kxyad8667am7vsam4p4aq88ii618sp1xy6r7n5qf4w"; fetchSubmodules = false; }; }; nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-06-10"; + version = "2023-06-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "69e7d280cbe17e318b549a10ae3cae5810946be6"; - sha256 = "119cfn70bb5bbfaq9rfc51dms64qfzzkn6aknj4lnd2dx1r56k00"; + rev = "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65"; + sha256 = "1xh3pzcdbz2hqa3vl14gwn77pqjv939q9jfq1y4ln676jz5ljr4q"; fetchSubmodules = false; }; }; @@ -418,12 +418,12 @@ in }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-05-12"; + version = "2023-06-13"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2d5d071d5957681ae677ee06f6eb879a61b7b618"; - sha256 = "17rs8k6xzy4c8nkiap84h5n7m0wcam06r6mv2z207di0cck2f4pk"; + rev = "1412d2016a772aef6aea818c840eb7803ade0312"; + sha256 = "172wyky154gwwnwhlr64l29l99ssb9m2gw15jkcpkrn0pg9zyz10"; fetchSubmodules = false; }; }; @@ -550,12 +550,12 @@ in }; nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-06-10"; + version = "2023-06-13"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "64bdc579873fa5bd303f6951ead2b419493c88e8"; - sha256 = "1hffqk9vz6lw6jrixqy9sxj1wv2z7cbj08ykccyfym2zpij40gx6"; + rev = "9230eb01fb34f81b7b31ac77dcfdf356a71e487e"; + sha256 = "1q2kicd027rva881qlcm6whkm2hjdgjdp5959539g4kcws9kq4w2"; fetchSubmodules = false; }; }; @@ -572,12 +572,12 @@ in }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-06-10"; + version = "2023-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "a070cb87a180fd7e2c4387accff0be90268fb736"; - sha256 = "0838s3vqp2f6g8q7dwd4ga0m4qr8kj02snbrxd6xz4zzzaz1hlbq"; + rev = "a3318600bc1eba2cca84e879048c1ab8d4a0262d"; + sha256 = "1hba8idla910jwwpm9dgsa200nb0jw3054rnan7dyawg694d67bv"; fetchSubmodules = false; }; }; diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix index 2702c53..056af02 100644 --- a/system/hosts/mediaserver.nix +++ b/system/hosts/mediaserver.nix @@ -145,7 +145,7 @@ in description = "Daniel"; extraGroups = [ "wheel" ]; shell = pkgs.fish; - openssh.authorizedKeys.keys = [ ssh-keys.LAN ]; + openssh.authorizedKeys.keys = [ ssh-keys.LAN ssh-keys.ShellFish ]; }; }; } diff --git a/system/shared/ssh-keys.nix b/system/shared/ssh-keys.nix index c349675..f7a7289 100644 --- a/system/shared/ssh-keys.nix +++ b/system/shared/ssh-keys.nix @@ -6,4 +6,6 @@ Hetzner = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTRKrX0wVWoauI+dSfFpKIr7qwh8imrp1OVlxWyCuFssZI2o6chmRBZq4EbOkVvfdgdOGJ4hTSwQOTwusZVrZHwxtinusX5c2M3HMrhMvLFAYh2vKrvP5UZBTA/7laenSM6uLGxrM2CNc+G8ryAyY7dLoU2xaXiqgcfC6MaU/leTMTXWH5fHvqUk2pxI4ihObTGiDE5kvvFbv3AhFFtcMmkzdHN1vlVp8olKG0lYOLM9O3PpVGJtiOTA2Z9YuTC44iH984HPmk3KkJsK/PZFI1d4K7oW7298w44pszElGwjIW0GyB7X4qo6yOxsq1OsL/c7T9VHWVw3na2QvAJODBNM8rYGMACo8oSEThRsi1hhXPe7MhLPqwhn3OHbbofupbqk7WpKVaMLrO7793DgNatPNhGgbz9WtVCC65YPY3De3sowsh4M4u0HC5lRg0IgjBMgUjMAHWqcxytYRUKPRrdKbcaoOoMquMnja+bcLfHxVOkcLMgEfzPtjxgZCvenUsy0Q73dwxAtJx73xscMZUWb/LbkLWoOzAh3jjyjIeZeT8ZyIOhfcgoxLFE4Ik7eIiszEg0xQ7jXzR+K3RL+2O93RvNTvc5WaDVypiL6Zics30EZAYMYtBoY69a1PxeJ42sLp3O35QNFbwfN4cnsx9YXgvUmTcwCijU/LbvNAgl2Q=="; LAN = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDrF80S1XX9KDHxJpm3gJsYQOCPAcrkOHK3rWrNGTegWB9wcjYQyKcuFyA+E2o3czx+lCDbDMjJOTS8L7RNBShEKxFDENqfNSpPrpCzw0MX5qhzF0CYhgMjgnPZK3qjdR+5424y3rK90mrOxWHuRtTM+Lm0GQUaOr/HMDq69JLNlPdI+Ww2hHx1PyzS30zKaHnFFRdEcdsQAY2dhEoh6J06XD8q8yRb2aNsDzDcXzNlkZl1K6FE0qqEsuLSF0cYJuXZh3anE3+AzL7NSj/nL33WInEEjmbib46K8lPXzG0P3LDcx/roPslgr0IAxFHOoCb32CO/mN6raaPBrb+eHwBCaE2nLDIaxPXRQO/gxYW7Qk1Q7AkuH/ytdNreE/4QfsUjCXQd4gWLYTh+WVIJDMC7sX+xsCAGQzGe3UVXkUp//6Ye9BA3fquhpSl8He/0MZqj051q53eEuwnA6OnIjmVFtz/4X3lMUwLxBs9yzn+LDmFUMB6Q6RcmzwQz5+ErwVLPm+/Jbzbwpp6JdyTwDjEd7BMPz0Xm2/41XAsUTYY7H8OnFDjQSzIQiSLCQU5tQeCP09zuyx1Dv2nPr08RW1wT4Jpquk9tut4smEsyLDrFA7ijRsS+1TYx9cDEXujheCxqLmuNZhBLEiscBChZMxcyzBG1Yktm/kepKAWEvWqz7w=="; + + ShellFish = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGU56Ebq41/DAKmfSHRO3xv2XBFFq+rMWH1L70L1qgcX"; }