From b57a13036a6836c46e63ea65e0075598370b9ebe Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Mon, 14 Apr 2025 14:14:02 +0100 Subject: [PATCH] cleanup and update --- flake.lock | 636 ++------------------------------- flake.nix | 5 - home/c/default.nix | 1 - hosts/hermes/configuration.nix | 2 +- overlays/default.nix | 1 - packages/default.nix | 1 - 6 files changed, 39 insertions(+), 607 deletions(-) diff --git a/flake.lock b/flake.lock index cca5e29..692f210 100644 --- a/flake.lock +++ b/flake.lock @@ -204,28 +204,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -291,11 +269,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1744224429, - "narHash": "sha256-ZkRLtzh3KCt0Ve2SYNbo5K6qG01I3aSiTlbrEgE2H08=", + "lastModified": 1744631258, + "narHash": "sha256-nTp6oMFtMaCSxO2b68M+rGOnwZadl6l3u1nBOQTPQVU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "706977dba99156d3bcb4a1f097653e8c1ac58cd4", + "rev": "9c0fd77a2592f26690beb9ad5cf7d92300ba7912", "type": "gitlab" }, "original": { @@ -353,52 +331,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1688025799, @@ -414,7 +346,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1733328505, @@ -475,68 +407,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_6": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, "locked": { "lastModified": 1698882062, "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", @@ -551,9 +421,9 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1741352980, @@ -569,7 +439,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "omnix", @@ -642,24 +512,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "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_4": { "inputs": { "systems": [ "stylix", @@ -697,68 +549,6 @@ } }, "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "neovim-nightly-overlay", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733665616, - "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "nixvim", - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_3": { "flake": false, "locked": { "lastModified": 1737465171, @@ -774,13 +564,13 @@ "type": "github" } }, - "git-hooks_4": { + "git-hooks_2": { "inputs": { "flake-compat": [ "stylix", "flake-compat" ], - "gitignore": "gitignore_5", + "gitignore": "gitignore_3", "nixpkgs": [ "stylix", "nixpkgs" @@ -823,52 +613,6 @@ } }, "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "neovim-nightly-overlay", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_4": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -889,7 +633,7 @@ "type": "github" } }, - "gitignore_5": { + "gitignore_3": { "inputs": { "nixpkgs": [ "stylix", @@ -928,29 +672,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": [ - "nixvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733333617, - "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -993,28 +714,6 @@ "type": "github" } }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "inspect": { "flake": false, "locked": { @@ -1032,36 +731,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -1104,46 +773,6 @@ "type": "github" } }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_4", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1733962285, - "narHash": "sha256-djpjqhPZkqfe1USsuu+eT4ZyGO+dVvAf3l4FUCZEb6Y=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "2025aef04baf723bfa4cb8225fc11a319a5681f1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1733924897, - "narHash": "sha256-Fxzl754uzyNebXW54LUliFliMbw30XG+bdb0AVtPSM0=", - "owner": "neovim", - "repo": "neovim", - "rev": "442d338cb50e4cf08c58cb82b6d33b6d5df9fb1b", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nil": { "inputs": { "flake-utils": [ @@ -1207,28 +836,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-systems-aarch64-darwin": { "locked": { "lastModified": 1680978170, @@ -1327,11 +934,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744168086, - "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -1342,18 +949,6 @@ } }, "nixpkgs-lib": { - "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" - } - }, - "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1698611440, @@ -1371,7 +966,7 @@ "type": "github" } }, - "nixpkgs-lib_3": { + "nixpkgs-lib_2": { "locked": { "lastModified": 1740877520, "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", @@ -1403,22 +998,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1733749988, - "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1711163522, "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", @@ -1434,7 +1013,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1743076231, "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", @@ -1450,7 +1029,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -1466,61 +1045,6 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_3", - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": [ - "unstable" - ], - "nixvim": "nixvim_2" - }, - "locked": { - "lastModified": 1734450520, - "narHash": "sha256-w+0iMuV8XSYqCLI7opcvvkKcm6XK7t9K4mA66p3PLEM=", - "owner": "callumio", - "repo": "nixvim", - "rev": "14d4b36db328f4f8a77e5c1c0397d07bb1ff0164", - "type": "github" - }, - "original": { - "owner": "callumio", - "repo": "nixvim", - "type": "github" - } - }, - "nixvim_2": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_5", - "flake-parts": [ - "nixvim", - "flake-parts" - ], - "git-hooks": "git-hooks_2", - "home-manager": "home-manager_3", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1733953545, - "narHash": "sha256-1UsUuIfq0ywIxmYBJdIi6tFFmpR/RtOBQVijARaaX68=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "c7b109f5af93f8e59148a1a4838f3472f8ae403d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "nsbm": { "inputs": { "flake-parts": [ @@ -1551,30 +1075,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", - "owner": "NuschtOS", - "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nvf": { "inputs": { "nixpkgs": [ @@ -1598,12 +1098,12 @@ }, "nvf_2": { "inputs": { - "flake-parts": "flake-parts_7", - "flake-utils": "flake-utils_3", + "flake-parts": "flake-parts_4", + "flake-utils": "flake-utils_2", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_4", - "systems": "systems_5" + "nixpkgs": "nixpkgs_3", + "systems": "systems_4" }, "locked": { "lastModified": 1743551988, @@ -1624,14 +1124,14 @@ "cachix-push": "cachix-push", "devour-flake": "devour-flake_2", "false": "false", - "flake-parts": "flake-parts_8", - "git-hooks": "git-hooks_3", + "flake-parts": "flake-parts_5", + "git-hooks": "git-hooks", "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" @@ -1657,7 +1157,7 @@ "flake-compat": [ "flake-compat" ], - "gitignore": "gitignore_4", + "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" ] @@ -1716,14 +1216,13 @@ "nish": "nish", "nixinate": "nixinate", "nixpkgs": "nixpkgs", - "nixvim": "nixvim", "nsbm": "nsbm", "nvf": "nvf", "omnix": "omnix", "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix", - "systems": "systems_7", - "treefmt-nix": "treefmt-nix_4", + "systems": "systems_6", + "treefmt-nix": "treefmt-nix_2", "unstable": "unstable" } }, @@ -1839,12 +1338,12 @@ }, "sbomnix": { "inputs": { - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_6", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", "flake-root": "flake-root", "nix-visualize": "nix-visualize", - "nixpkgs": "nixpkgs_3", - "treefmt-nix": "treefmt-nix_3", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix", "vulnix": "vulnix" }, "locked": { @@ -1868,9 +1367,9 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_4", - "git-hooks": "git-hooks_4", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -1878,7 +1377,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1988,21 +1487,6 @@ "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": { @@ -2054,50 +1538,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nsbm", @@ -2119,7 +1559,7 @@ "type": "github" } }, - "treefmt-nix_4": { + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -2156,11 +1596,11 @@ }, "unstable": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 90f5075..59f4500 100644 --- a/flake.nix +++ b/flake.nix @@ -100,10 +100,6 @@ url = "github:callumio/nvf"; inputs.nixpkgs.follows = "unstable"; }; - nixvim = { - url = "github:callumio/nixvim"; - inputs.nixpkgs.follows = "unstable"; - }; agenix = { url = "github:ryantm/agenix"; @@ -129,7 +125,6 @@ omnix = { url = "github:juspay/omnix"; inputs = { - treefmt-nix.follows = "treefmt-nix"; systems.follows = "systems"; }; }; diff --git a/home/c/default.nix b/home/c/default.nix index 1063c06..1ca5bcd 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -56,7 +56,6 @@ just wireshark nvf - #inputs.nixvim.packages."x86_64-linux".default # nixvim ]; home.stateVersion = "24.05"; diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix index d9e1e6f..11a3b76 100644 --- a/hosts/hermes/configuration.nix +++ b/hosts/hermes/configuration.nix @@ -26,7 +26,7 @@ openssh.authorizedKeys.keys = config.keys.c; packages = with pkgs; [ tree - nixvim + nvf ]; }; diff --git a/overlays/default.nix b/overlays/default.nix index 849a6ea..41d9c45 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,4 @@ {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..ad6f316 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -5,7 +5,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;};