diff --git a/flake.lock b/flake.lock index 3905217..cdd7f06 100644 --- a/flake.lock +++ b/flake.lock @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -285,17 +285,18 @@ }, "firefox-addons": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1744400795, - "narHash": "sha256-6kU2f0lPMJd9+yTwGMryM/Aa6CMPJYAOMY1xO5E6gaM=", + "lastModified": 1743810384, + "narHash": "sha256-RTUqlsNAtijWFtIpQumF5B5hEYLKzQWNjvNIIolzFAk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "12dc8c22e3b0ac99cefb274b825f85b003417ae7", + "rev": "69450e4ad56e5d186e344d6434697daa75e28951", "type": "gitlab" }, "original": { @@ -308,11 +309,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -552,24 +553,6 @@ } }, "flake-parts_7": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_8": { "inputs": { "nixpkgs-lib": [ "omnix", @@ -606,6 +589,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -623,27 +621,9 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -787,11 +767,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -979,11 +959,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1743808813, + "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", "type": "github" }, "original": { @@ -1067,7 +1047,7 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -1089,21 +1069,6 @@ "type": "github" } }, - "mnw": { - "locked": { - "lastModified": 1742255973, - "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", - "owner": "Gerg-L", - "repo": "mnw", - "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "mnw", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_3", @@ -1144,34 +1109,6 @@ "type": "github" } }, - "nil": { - "inputs": { - "flake-utils": [ - "nvf", - "nvf", - "flake-utils" - ], - "nixpkgs": [ - "nvf", - "nvf", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", - "owner": "oxalica", - "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nish": { "inputs": { "advisory-db": "advisory-db", @@ -1327,11 +1264,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { @@ -1371,21 +1308,6 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -1435,22 +1357,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1743076231, - "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6c5963357f3c1c840201eda129a99d455074db04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -1553,7 +1459,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1575,63 +1481,19 @@ "type": "github" } }, - "nvf": { - "inputs": { - "nixpkgs": [ - "unstable" - ], - "nvf": "nvf_2" - }, - "locked": { - "lastModified": 1744191266, - "narHash": "sha256-c8sBC1Kr67IVAUm4xjeNbm7BM+5Wyy2BqlJuUQssxEg=", - "owner": "callumio", - "repo": "nvf", - "rev": "502e30cfbd4582994efb75c8f68a8387046c8a94", - "type": "github" - }, - "original": { - "owner": "callumio", - "repo": "nvf", - "type": "github" - } - }, - "nvf_2": { - "inputs": { - "flake-parts": "flake-parts_7", - "flake-utils": "flake-utils_3", - "mnw": "mnw", - "nil": "nil", - "nixpkgs": "nixpkgs_4", - "systems": "systems_5" - }, - "locked": { - "lastModified": 1743551988, - "narHash": "sha256-tUfTPHXiVf0LxjbMqw0nDAtnLdKcL8Ha0LfrgTwcBb8=", - "owner": "notashelf", - "repo": "nvf", - "rev": "ae23c34be1e358f28b9cb54f304bcf4cb9ae28f8", - "type": "github" - }, - "original": { - "owner": "notashelf", - "repo": "nvf", - "type": "github" - } - }, "omnix": { "inputs": { "cachix-push": "cachix-push", "devour-flake": "devour-flake_2", "false": "false", - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_7", "git-hooks": "git-hooks_3", "inspect": "inspect", "nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin", "nix-systems-aarch64-linux": "nix-systems-aarch64-linux", "nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin", "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rust-flake": "rust-flake", "systems": [ "systems" @@ -1639,11 +1501,11 @@ "true": "true" }, "locked": { - "lastModified": 1743926309, - "narHash": "sha256-hXoaIE4/6Gs8l7TTHsrM7lufHT2raLnSjMxl24BC8bw=", + "lastModified": 1743017730, + "narHash": "sha256-P8vT5+uPTB9lqBTRXQG9RmuLF1FV7EZQ378IIoM1wnY=", "owner": "juspay", "repo": "omnix", - "rev": "507639d4e64e618d1e95546d074d056748f5ecfb", + "rev": "c376d26bb1108ba96d7f285ae69bb5ea7f3ba4bc", "type": "github" }, "original": { @@ -1718,11 +1580,10 @@ "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nsbm": "nsbm", - "nvf": "nvf", "omnix": "omnix", "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix", - "systems": "systems_7", + "systems": "systems_5", "treefmt-nix": "treefmt-nix_4", "unstable": "unstable" } @@ -1751,7 +1612,7 @@ "omnix", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1741121204, @@ -1793,29 +1654,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nvf", - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "omnix", @@ -1878,17 +1716,17 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1744152965, - "narHash": "sha256-LWUeN1+bH3k46fwtIv0bNgtmkqB0UduyX7T2i+230n0=", + "lastModified": 1741961698, + "narHash": "sha256-utsgC6H3ja6sLAXMd8//I2D7yjyScFqVDRX0wpbqPZo=", "owner": "danth", "repo": "stylix", - "rev": "8748db082ca15d32243c86e5d785d5dfc8a65719", + "rev": "9bfc74f330ead111e8ea354b2220a431b0cfaa26", "type": "github" }, "original": { @@ -1973,36 +1811,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -2040,11 +1848,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { @@ -2156,11 +1964,11 @@ }, "unstable": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 90f5075..c23a5b9 100644 --- a/flake.nix +++ b/flake.nix @@ -71,7 +71,7 @@ devShells.default = final.mkShell { meta.description = "Default dev shell"; inputsFrom = [config.pre-commit.devShell config.treefmt.build.devShell]; - packages = with final; [just git nvf cachix jq devour-flake om agenix deadnix]; + packages = with final; [just git nixvim cachix jq devour-flake om agenix deadnix]; }; apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs'.nixinate.packages self); @@ -96,10 +96,6 @@ flake = false; }; - nvf = { - url = "github:callumio/nvf"; - inputs.nixpkgs.follows = "unstable"; - }; nixvim = { url = "github:callumio/nixvim"; inputs.nixpkgs.follows = "unstable"; diff --git a/home/c/default.nix b/home/c/default.nix index 1063c06..caf53a6 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { imports = [./programs ./services]; programs.home-manager.enable = true; @@ -55,8 +59,7 @@ unzip just wireshark - nvf - #inputs.nixvim.packages."x86_64-linux".default # nixvim + inputs.nixvim.packages."x86_64-linux".default # nixvim ]; home.stateVersion = "24.05"; diff --git a/justfile b/justfile index 7378e8f..82bf5a4 100644 --- a/justfile +++ b/justfile @@ -14,7 +14,7 @@ deploy MACHINE: nix run .#deploy-{{MACHINE}} vim: - nix flake lock --update-input nvf + nix flake lock --update-input nixvim update: nix flake update diff --git a/overlays/default.nix b/overlays/default.nix index 849a6ea..16a563f 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,5 @@ {inputs, ...}: _final: prev: { nixvim = inputs.nixvim.packages.${prev.system}.default; - nvf = inputs.nvf.packages.${prev.system}.default; devour-flake = prev.callPackage inputs.devour-flake {}; agenix = inputs.agenix.packages.${prev.system}.default; } diff --git a/packages/default.nix b/packages/default.nix index bb99551..57b5e6c 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -6,7 +6,6 @@ tmux-sessionizer-cl = pkgs.callPackage ./tmux-sessionizer {}; om = inputs'.omnix.packages.default; nixvim = inputs'.nixvim.packages.default; - nvf = inputs'.nvf.packages.default; agenix = inputs'.agenix.packages.default; vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; devour-flake = pkgs.callPackage inputs.devour-flake {};