From 6078a9bc463d21583e78851e91a49e825d4c1dc2 Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Mon, 8 Jul 2024 09:20:07 +0100 Subject: [PATCH] Update flake.lock (#131) Co-authored-by: github-actions[bot] --- flake.lock | 94 ++++++++++++----------------- flake.nix | 7 +-- home/nix-index.nix | 11 ++-- home/packages/simon.nix | 1 - minimal/home.nix | 2 +- system/darwin/mba/configuration.nix | 1 - 6 files changed, 47 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 9eb14f9d..e671d107 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1719845423, + "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "ec12b88104d6c117871fad55e931addac4626756", "type": "github" }, "original": { @@ -53,11 +53,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -117,21 +117,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -182,11 +167,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -224,11 +209,11 @@ ] }, "locked": { - "lastModified": 1717097707, - "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", + "lastModified": 1720135141, + "narHash": "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", + "rev": "c514e862cd5705e51edb6fe8d01146fdeec661f2", "type": "github" }, "original": { @@ -245,11 +230,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -265,11 +250,11 @@ ] }, "locked": { - "lastModified": 1716940971, - "narHash": "sha256-kU7gCYhtsAQD+7LqJ2Ur7lWj/mjKqWE8/UqGxEm+B8I=", + "lastModified": 1719360167, + "narHash": "sha256-xHauc2ap+Lkm2nTBHXrlt9MvJe5nLce0A69sXKXEFPs=", "owner": "genericnerdyusername", "repo": "jetbrains-updater", - "rev": "4fb109db371f6e758c0149c9af1f91fc782d96e1", + "rev": "28346e431ef9cb98a4510cfb09fb89b7d8c51ab8", "type": "gitlab" }, "original": { @@ -286,11 +271,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1719845423, + "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "ec12b88104d6c117871fad55e931addac4626756", "type": "github" }, "original": { @@ -306,11 +291,11 @@ ] }, "locked": { - "lastModified": 1716772633, - "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", + "lastModified": 1719832725, + "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", + "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", "type": "github" }, "original": { @@ -321,11 +306,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717070961, - "narHash": "sha256-0JN98HVWPMlxj48Ot9K3eF0CWfwvo7/7VAYO+VAHg1Q=", + "lastModified": 1720087678, + "narHash": "sha256-uOhYJU3ldDKXYV+mFaXcPtyjq/UIMh/6SCuoVNU9rxM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aa61b27554a5fc282758bf0324781e3464ef2cde", + "rev": "1afc5440469f94e7ed26e8648820971b102afdc3", "type": "github" }, "original": { @@ -340,7 +325,6 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -350,11 +334,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717100844, - "narHash": "sha256-cKEGHGLaZoiNroMd34RrDgVDB7xgfff7HBShMz7cEy8=", + "lastModified": 1720126856, + "narHash": "sha256-xtRwIUKv7EpuyGtvq+rO7PoZZIpD55AYe6rl+plEhY8=", "owner": "nix-community", "repo": "nixvim", - "rev": "6ff3493c9bc85063ae829f0c25c21be3bde5c5b3", + "rev": "92e9f5466dcfd51e8e2e7627e992c1c9d5fc6fd6", "type": "github" }, "original": { @@ -365,11 +349,11 @@ }, "nur": { "locked": { - "lastModified": 1717128264, - "narHash": "sha256-G1v5wsi6TAyKWUZcfU8yvbhRrXXL2jVsX3OP3o3PIfQ=", + "lastModified": 1720152265, + "narHash": "sha256-SIpYIwoVGuXhup7lpHHFyDBQu5WgSjOiLemBs0VGMkg=", "owner": "nix-community", "repo": "NUR", - "rev": "5087d4ff41071cbc7d2f376df89d81bde2e00745", + "rev": "2f589da1e9e2a59f6451c40a6b4ed502a53a565e", "type": "github" }, "original": { @@ -471,11 +455,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d7cb105e..b1abda01 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,6 @@ flake-utils, home-manager, jetbrains-updater, - nix-index-database, vscode-server, cert-info, nur, @@ -72,7 +71,6 @@ keymapp = final.callPackage ./derivations/keymapp {pkgs = final;}; listprojects = final.callPackage ./derivations/listprojects {}; notify-wrapper = final.callPackage ./derivations/notify-wrapper {}; - database = nix-index-database.legacyPackages.${system}.database; monaspace = final.callPackage ./derivations/monaspace {}; ansi = final.callPackage ./derivations/ansi {}; wally = final.callPackage ./derivations/wally {}; @@ -142,10 +140,10 @@ imports = [ ./home/home.nix nixvim.homeManagerModules.nixvim + inputs.nix-index-database.hmModules.nix-index ]; }; } - nix-index-database.nixosModules.nix-index vscode-server.nixosModule ({ config, @@ -197,10 +195,10 @@ imports = [ ./home/home.nix nixvim.homeManagerModules.nixvim + inputs.nix-index-database.hmModules.nix-index ]; }; } - nix-index-database.darwinModules.nix-index ]; }; }; @@ -220,6 +218,7 @@ modules = [ ./home/home.nix nixvim.homeManagerModules.nixvim + inputs.nix-index-database.hmModules.nix-index ]; # stop infinite recusion when trying to access # pkgs.stdenv.is{Linux,Darwin} from within a module diff --git a/home/nix-index.nix b/home/nix-index.nix index 369b1748..90945bb5 100644 --- a/home/nix-index.nix +++ b/home/nix-index.nix @@ -1,9 +1,6 @@ -# add symlink to nix-index database { - lib, - pkgs, - config, - ... -}: { - home.file."${config.xdg.cacheHome}/nix-index/files".source = pkgs.database; + programs = { + nix-index-database.comma.enable = true; + nix-index.enable = true; + }; } diff --git a/home/packages/simon.nix b/home/packages/simon.nix index 9fc3b458..c20dccc6 100644 --- a/home/packages/simon.nix +++ b/home/packages/simon.nix @@ -30,7 +30,6 @@ in { bat cachix cert-info - comma curlie custom-curl devenv diff --git a/minimal/home.nix b/minimal/home.nix index b75c7a3a..7a774918 100644 --- a/minimal/home.nix +++ b/minimal/home.nix @@ -21,7 +21,7 @@ in { ../home/fzf.nix ../home/jq.nix ../home/nixvim - ../home/nix-index.nix + # ../home/nix-index.nix ../home/tmux.nix ../home/git/global.nix ]; diff --git a/system/darwin/mba/configuration.nix b/system/darwin/mba/configuration.nix index aef11a9c..eb752dd5 100644 --- a/system/darwin/mba/configuration.nix +++ b/system/darwin/mba/configuration.nix @@ -47,7 +47,6 @@ programs.fish.enable = true; programs.zsh.enable = true; - programs.nix-index.enable = true; programs.gnupg.agent.enable = true; system.keyboard.enableKeyMapping = true;