From bc5bf3684979f844d60f6f7af4fddc8e0fa8a33d Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 1 Jun 2023 05:53:42 +0200 Subject: [PATCH] chore: add additional nixConfig settings --- flake.lock | 86 ++++++++++++++++----------------- flake.nix | 7 ++- home/apps/neovim/lazy-lock.json | 6 +-- machines/common/default.nix | 8 +-- 4 files changed, 56 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 754a649..f337769 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1684929416, - "narHash": "sha256-HRaq5cZPZbAlv1gkZeaOXjxWFu26lh+Dq0mCnRSbpMI=", + "lastModified": 1685379842, + "narHash": "sha256-DvrBhXNnxX01cW4yY5zfmj97h6LXhbX3FnHWbem+I3g=", "owner": "caarlos0", "repo": "nur", - "rev": "c4a25faa5bc55ba49b0f1dc037615d104d471e8b", + "rev": "6860070645d27d87c702c52caec81f708b1202c9", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1684774948, - "narHash": "sha256-hJTaw4dYzcB+lsasKejnafq0CxPsVetn9RLXrcL+4jE=", + "lastModified": 1685559570, + "narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "b8c286c82c6b47826a6c0377e7017052ad91353c", + "rev": "4338bc869e9874d54a4c89539af72f16666b2abe", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1684824189, - "narHash": "sha256-k3nCkn5Qy67rCguuw6YkGuL6hOUNRKxQoKOjnapk5sU=", + "lastModified": 1685573046, + "narHash": "sha256-IktTf92Fl1yU8qI2s0MRx3//k6NDmFuqZrGHKJV8i4M=", "owner": "nix-community", "repo": "home-manager", - "rev": "58eb968c21d309a6c2b020ea8d64e25c38ceebba", + "rev": "96078e4a939b5e5fec1cfd83a11b3df7146a58ff", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "wezterm-src": "wezterm-src" }, "locked": { - "lastModified": 1684953042, - "narHash": "sha256-Qgrvc9GniZpMctOwde9cUCVlV5CIZUdsm1iLEZt3qDk=", + "lastModified": 1685516712, + "narHash": "sha256-12jRUKFRCEFajGn+R8vRf/X5EwAMS7syjzh1Cgl0rS4=", "owner": "nekowinston", "repo": "nur", - "rev": "7fa43456e8079d7624224b98c3077c3a27d11c21", + "rev": "8d7582ca117274ec894d871001fff39125d54be4", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1684632198, - "narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=", + "lastModified": 1685215858, + "narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247", + "rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1684849778, - "narHash": "sha256-MofuVcgMZY8lVWv4uEC5Eo3fbZsBZJDscUpLeYMDoJo=", + "lastModified": 1685399834, + "narHash": "sha256-Lt7//5snriXSdJo5hlVcDkpERL1piiih0UXIz1RUcC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30b82a186bc585872624a298a5169d1d237ce6a4", + "rev": "58c85835512b0db938600b6fe13cc3e3dc4b364e", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1684911969, - "narHash": "sha256-j2tz1P2rA3d1WYHk8+1WbYDIJO33BqW1EfQSvi+/O8s=", + "lastModified": 1685498995, + "narHash": "sha256-rdyjnkq87tJp+T2Bm1OD/9NXKSsh/vLlPeqCc/mm7qs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "87f9156865ab09e3bde39aadb4131ae364ae704e", + "rev": "9cfaa8a1a00830d17487cb60a19bb86f96f09b27", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1684585791, - "narHash": "sha256-lYPboblKrchmbkGMoAcAivomiOscZCjtGxxTSCY51SM=", + "lastModified": 1685012353, + "narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eea79d584eff53bf7a76aeb63f8845da6d386129", + "rev": "aeb75dba965e790de427b73315d5addf91a54955", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nur": { "locked": { - "lastModified": 1684959207, - "narHash": "sha256-lROs3YxWZDGeEPrcv0AYEfyps+gSW01E/VoTkmHU768=", + "lastModified": 1685576737, + "narHash": "sha256-pZvEMDJD8d3lj50XNErbWH95Qg3Dp9BBeq0iV1sLZZs=", "owner": "nix-community", "repo": "nur", - "rev": "c4e46e935ba827acf70979c5e02a8431cf14cc5a", + "rev": "1691edcbdfa3a0962d4327ff68bfda699938ce84", "type": "github" }, "original": { @@ -389,11 +389,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1684842236, - "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=", + "lastModified": 1685361114, + "narHash": "sha256-4RjrlSb+OO+e1nzTExKW58o3WRwVGpXwj97iCta8aj4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "61e567d6497bc9556f391faebe5e410e6623217f", + "rev": "ca2fdbf3edda2a38140184da6381d49f8206eaf4", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1684637723, - "narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=", + "lastModified": 1685434555, + "narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9", + "rev": "876846cde9762ae563f018c17993354875e2538e", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1684894900, - "narHash": "sha256-Lt/Ux6gTd6d0qA49WVGUn/czM3LGBd0SmRG1O5lESaM=", + "lastModified": 1685420338, + "narHash": "sha256-KvrP6NmWsRAz223Ckgo6FzOt9CgOaq8gGYzCCyPPUPQ=", "owner": "willpower3309", "repo": "swayfx", - "rev": "8e6667ddadb4646e7d43ad5a004c77458ef88fcb", + "rev": "c95306fcdf6fc11d4dd39309b392c0954784970a", "type": "github" }, "original": { @@ -502,11 +502,11 @@ "wezterm-src": { "flake": false, "locked": { - "lastModified": 1684781995, - "narHash": "sha256-O/r0bG1okOYMnxh+c0IDakqOPHlH1JNL+UrRD6/BeyE=", + "lastModified": 1685453249, + "narHash": "sha256-w/iQoWng7nrE+HAg0umpq8RCU0bjw5JogR2HHufspI8=", "ref": "refs/heads/main", - "rev": "bb23d0463c1d2e055d380f9112676422a8901a59", - "revCount": 7226, + "rev": "95e44f2199d9779e353bccf387a1eb2dbaf41f44", + "revCount": 7255, "submodules": true, "type": "git", "url": "https://github.com/wez/wezterm" diff --git a/flake.nix b/flake.nix index da2c800..d92c0bc 100644 --- a/flake.nix +++ b/flake.nix @@ -30,19 +30,22 @@ nixConfig = { extra-substituters = [ - "https://catppuccin.cachix.org" + "https://cache.garnix.io" "https://mic92.cachix.org" "https://nekowinston.cachix.org" "https://nix-community.cachix.org" "https://pre-commit-hooks.cachix.org" ]; extra-trusted-public-keys = [ - "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ=" "nekowinston.cachix.org-1:lucpmaO+JwtoZj16HCO1p1fOv68s/RL1gumpVzRHRDs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" ]; + extra-trusted-users = ["@wheel"]; + tarball-ttl = 604800; + warn-dirty = false; }; outputs = { diff --git a/home/apps/neovim/lazy-lock.json b/home/apps/neovim/lazy-lock.json index 331fc91..5eca7bb 100644 --- a/home/apps/neovim/lazy-lock.json +++ b/home/apps/neovim/lazy-lock.json @@ -17,9 +17,9 @@ "dressing.nvim": { "branch": "master", "commit": "f19cbd56f7f8cad212c58a7285d09c5d9c273896" }, "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "7006e69b60a559837ff6cdb7fe610af4f6ca823c" }, + "friendly-snippets": { "branch": "main", "commit": "0dd6114bea08276d9111d58c5dce5e256bbc8921" }, "gitsigns.nvim": { "branch": "main", "commit": "f868d82a36f7f7f5e110eb0a9659993984f59875" }, - "go.nvim": { "branch": "master", "commit": "9fc0312c1ae08c24ca730c6f7f836965be5c1922" }, + "go.nvim": { "branch": "master", "commit": "8a0498ee48a26f928b1dc1c02fb3d84d648a1c63" }, "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" }, "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, @@ -45,7 +45,7 @@ "nvim-spectre": { "branch": "master", "commit": "1abe23ec9b7bc3082164f4cb842d521ef70e080e" }, "nvim-surround": { "branch": "main", "commit": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18" }, "nvim-tree.lua": { "branch": "master", "commit": "e2a4c9d09d205ebe5f071264f43f73a0077c43a3" }, - "nvim-treesitter": { "branch": "master", "commit": "23dfae4db84f71e2ddb56c024845b322035182ee" }, + "nvim-treesitter": { "branch": "master", "commit": "62146fe415193879290c523b54cb5072e1f5dbbc" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "95b76b95eff25e1e64f363938cd853852355d70a" }, "nvim-ts-autotag": { "branch": "main", "commit": "40615e96075c743ef47aaf9de966dc348bec6459" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "5becf2cec4b8e06b6df745cf515ac35c6c2e6308" }, diff --git a/machines/common/default.nix b/machines/common/default.nix index 69d98f1..7285844 100644 --- a/machines/common/default.nix +++ b/machines/common/default.nix @@ -4,10 +4,12 @@ gc.automatic = true; package = pkgs.nixVersions.nix_2_15; settings = { - experimental-features = ["nix-command" "flakes" "repl-flake"]; + experimental-features = [ + "flakes" + "nix-command" + "repl-flake" + ]; auto-optimise-store = pkgs.stdenv.isLinux; - # consider downloaded tarballs as fresh for 7 days - tarball-ttl = 604800; }; }; }