diff options
| -rw-r--r-- | flake.lock | 92 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | packages/nixfiles.nix | 5 |
3 files changed, 59 insertions, 39 deletions
diff --git a/flake.lock b/flake.lock index 6560523..328bf3f 100644 --- a/flake.lock +++ b/flake.lock @@ -10,14 +10,15 @@ ], "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1701216516, - "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -124,11 +125,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1703415240, + "narHash": "sha256-SgsAYwDo2wWHUdZeNKKRRT402sRzQ/rLmzxH/wqMUPw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "f454cff5fe84adca9e8aa8d546d2c9879b789950", "type": "github" }, "original": { @@ -198,7 +199,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -243,11 +244,11 @@ ] }, "locked": { - "lastModified": 1702814335, - "narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=", + "lastModified": 1703527373, + "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4dba0bd01956170667458be7b45f68170a63651", + "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", "type": "github" }, "original": { @@ -259,11 +260,11 @@ }, "impermanence": { "locked": { - "lastModified": 1697303681, - "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", + "lastModified": 1703562375, + "narHash": "sha256-T46GgRVnSUo0DrCVAHreLNMgeCYmFvo469qj1Z6dYDQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", + "rev": "8d16ac97980b3641078dd7c11337bfaa77b45789", "type": "github" }, "original": { @@ -286,11 +287,11 @@ ] }, "locked": { - "lastModified": 1702776295, - "narHash": "sha256-4vIvw2O8ilFAC5Z8mzwdNdDnzIA0duWDHJ5jNj2N858=", + "lastModified": 1703553408, + "narHash": "sha256-7zHQFTbLBp5RqSvi8ZArbadz2nFlnMhgaLOqX+Ff3zg=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "ba869b9a7fb835197db4e7a87de2d28a80f4705e", + "rev": "3bbd34dc597db110b8af1ab4cee40d0b25295651", "type": "github" }, "original": { @@ -313,11 +314,11 @@ ] }, "locked": { - "lastModified": 1702776244, - "narHash": "sha256-kM4c4N1Six84GfLLV+nk+kq6bNH8OkEy5JHqg9IgqAE=", + "lastModified": 1703553395, + "narHash": "sha256-lbioI+/sipflPD0XmJOjYfCioPIg/3cRo87l4hp6i7s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "831450b20e2225b80e8453163f82eb495bee3b08", + "rev": "904561c550a38470b6093e431b961666838bc07e", "type": "github" }, "original": { @@ -329,11 +330,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1702453208, - "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", + "lastModified": 1703545041, + "narHash": "sha256-nvQA+k1rSszrf4kA4eK2i/SGbzoXyoKHzzyzq/Jca1w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", + "rev": "a15b6e525f5737a47b4ce28445c836996fb2ea8c", "type": "github" }, "original": { @@ -345,11 +346,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1703499205, + "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", "type": "github" }, "original": { @@ -361,11 +362,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1702847239, - "narHash": "sha256-Mfm4rHR2HbWNiu3LSx1vsRpDrAf7OJvxvKklcyFBajw=", + "lastModified": 1703593960, + "narHash": "sha256-iAhnnn3RHBfz11S0xfmvEjPdu7A2IrWTVxIy4cFrlPo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26e4bb6cc171ab9cae9cd80e50ea59e32e73c0f8", + "rev": "a2c4338855f665358aabd3a307d640d3ce6abd56", "type": "github" }, "original": { @@ -377,11 +378,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702846620, - "narHash": "sha256-45K8VhHgE8cSPUgm5ixOTtmplWGXJN4ozNvjmEVSYGc=", + "lastModified": 1703588687, + "narHash": "sha256-yj/AFxJjW/aE0lmHz1wlTk3jScZqVjQQEeBOnhyroRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50b80afb13c6bcf8cc4be7e1fbd7719a85c487cb", + "rev": "ad9ca03be8aaf8d6e458102e7d77370b7fe71ccf", "type": "github" }, "original": { @@ -404,11 +405,11 @@ ] }, "locked": { - "lastModified": 1702653568, - "narHash": "sha256-SwrNBw/1/oMURAa9/8MdvC4b3UYohoMAvSazeIt3hkg=", + "lastModified": 1703435563, + "narHash": "sha256-BDnoVc9Kvc9wo9lt8GC0kkqwLedP7lnBBdh1UHl4cPw=", "owner": "nix-community", "repo": "nixvim", - "rev": "b3fb1c4c8189bc873911da3f31d18082a0721fa9", + "rev": "c11158c73e9a488d803356127a54af8101fc0051", "type": "github" }, "original": { @@ -469,11 +470,11 @@ ] }, "locked": { - "lastModified": 1702456155, - "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", + "lastModified": 1703426812, + "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", + "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", "type": "github" }, "original": { @@ -559,6 +560,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xmonad-ng": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index cbc7324..04ce52b 100644 --- a/flake.nix +++ b/flake.nix @@ -228,7 +228,6 @@ owner = "edolstra"; repo = "flake-compat"; ref = "master"; - flake = false; }; }; diff --git a/packages/nixfiles.nix b/packages/nixfiles.nix index bfc869a..286214c 100644 --- a/packages/nixfiles.nix +++ b/packages/nixfiles.nix @@ -3,6 +3,7 @@ jq, lib, nix, + nvd, openssh, stdenv, symlinkJoin, @@ -18,6 +19,7 @@ git jq nix + nvd openssh ] ++ lib.optional stdenv.isLinux xdg-utils; @@ -110,6 +112,9 @@ export VERBOSE=1 exec nix shell -v ".#$attr" "$@" -c home-manager-generation ;; + diff) + exec nvd diff /run/current-system "$nixfiles/result" + ;; @*) # Assumes that hosts are configured in the OpenSSH configuration. host=''${cmd#@} |