diff --git a/flake.lock b/flake.lock index e9fc0b9..ef1be21 100644 --- a/flake.lock +++ b/flake.lock @@ -337,27 +337,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -378,24 +357,6 @@ "type": "github" } }, - "flake-utils": { - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -513,42 +474,6 @@ "type": "github" } }, - "neovim-nightly": { - "inputs": { - "flake-parts": "flake-parts_2", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1783123404, - "narHash": "sha256-BBsmLKFfNbudBSDM1ydfiidz6IVtE/mtxzg+ymmKSrI=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "98d7df41f23ac6acb631104ddba2ab5587e74abc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1783120669, - "narHash": "sha256-TmGkWeHBGg/QzbkUpWtVZOziUNiLy07nixIVcdrLdbM=", - "owner": "neovim", - "repo": "neovim", - "rev": "b5fd22e771aa01f3057d449fcde1d1a9e9c45dae", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "niri-flake": { "inputs": { "niri-stable": "niri-stable", @@ -615,7 +540,7 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1783104700, @@ -655,33 +580,9 @@ "type": "github" } }, - "nix4nvchad": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "nvchad-starter": [ - "nvchad-starter" - ] - }, - "locked": { - "lastModified": 1782181777, - "narHash": "sha256-l6Jy/ImzYOx9paTKhrWaPJ2w8oxVoRUe56iTaEKd2Qc=", - "owner": "nix-community", - "repo": "nix4nvchad", - "rev": "875fd6c5a8c417d3b0a80297b3753bb3ff5a2093", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix4nvchad", - "type": "github" - } - }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1782562157, @@ -774,19 +675,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1782467914, - "narHash": "sha256-inDx/w70OSJoJPqtKh0BrzAsbZZhpya7YgS43jHnhwg=", - "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1022855.e73de5be04e0/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -851,22 +739,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1782948114, - "narHash": "sha256-AXmz9ho4Lud5CsbrZsuSVwpQZ4o5FgZ1chxBn5cJ8+0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e92285f211dad236540fd617d7e30e0b99bc0e1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1783089885, "narHash": "sha256-02ary8OtZROV9b1sqlNaU2NEhzA706qmTBfX8Alvyk0=", @@ -882,7 +754,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -895,7 +767,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1782959384, "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", @@ -911,7 +783,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1782959384, "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", @@ -927,6 +799,19 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1782467914, + "narHash": "sha256-inDx/w70OSJoJPqtKh0BrzAsbZZhpya7YgS43jHnhwg=", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1022855.e73de5be04e0/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -955,7 +840,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -974,8 +859,8 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_9" + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1783174895, @@ -1016,22 +901,6 @@ "type": "github" } }, - "nvchad-starter": { - "flake": false, - "locked": { - "lastModified": 1762537390, - "narHash": "sha256-Y6UCxZkTMCxnteIRtuvl49ceQNSu+EIH2PbjOGvvp/I=", - "owner": "ulic-youthlic", - "repo": "nvchad-starter", - "rev": "b713ab7064a8aac684e724f82a253e753754d396", - "type": "github" - }, - "original": { - "owner": "ulic-youthlic", - "repo": "nvchad-starter", - "type": "github" - } - }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -1065,18 +934,15 @@ "helix": "helix", "home-manager": "home-manager", "lanzaboote": "lanzaboote", - "neovim-nightly": "neovim-nightly", "niri-flake": "niri-flake", "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-doom": "nix-doom", - "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-patch-rqbit-bump": "nixpkgs-patch-rqbit-bump", "nixpkgs-patcher": "nixpkgs-patcher", "noctalia": "noctalia", "nur": "nur", - "nvchad-starter": "nvchad-starter", "sops-nix": "sops-nix", "spacemacs": "spacemacs", "spicetify-nix": "spicetify-nix", @@ -1165,8 +1031,8 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_10", - "systems": "systems_5" + "nixpkgs": "nixpkgs_9", + "systems": "systems_4" }, "locked": { "lastModified": 1782898510, @@ -1197,7 +1063,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_6", + "systems": "systems_5", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -1248,21 +1114,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1277,7 +1128,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1292,7 +1143,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1395,7 +1246,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1780220602, diff --git a/flake.nix b/flake.nix index d6f01ff..4d39e3e 100644 --- a/flake.nix +++ b/flake.nix @@ -173,27 +173,6 @@ repo = "NUR"; }; - neovim-nightly = { - type = "github"; - owner = "nix-community"; - repo = "neovim-nightly-overlay"; - }; - nvchad-starter = { - type = "github"; - owner = "ulic-youthlic"; - repo = "nvchad-starter"; - flake = false; - }; - nix4nvchad = { - type = "github"; - owner = "nix-community"; - repo = "nix4nvchad"; - inputs = { - nixpkgs.follows = "nixpkgs"; - nvchad-starter.follows = "nvchad-starter"; - }; - }; - lanzaboote = { type = "github"; owner = "nix-community"; diff --git a/flake/perSystem.nix b/flake/perSystem.nix index 4976ec9..bea40bf 100644 --- a/flake/perSystem.nix +++ b/flake/perSystem.nix @@ -44,7 +44,6 @@ inputsScope = lib.makeScope pkgs.newScope (self: { inherit inputs rootPath; srcs = self.callPackage (rootPath + "/_sources/generated.nix") {}; - neovim_git = inputs'.neovim-nightly.packages.default; }); in inputsScope.overrideScope ( diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index 93eac6b..6682307 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -54,7 +54,6 @@ zen-browser.enable = true; openssh.enable = true; helix.enable = true; - nvchad.enable = true; # spacemacs.enable = true; radicle.enable = true; }; diff --git a/home/david/modules/programs/nvchad.nix b/home/david/modules/programs/nvchad.nix deleted file mode 100644 index 17175d4..0000000 --- a/home/david/modules/programs/nvchad.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.david.programs.nvchad; -in { - options = { - david.programs.nvchad = { - enable = lib.mkEnableOption "nvchad"; - }; - }; - config = lib.mkIf cfg.enable { - programs.nvchad = { - enable = true; - extraPackages = with pkgs; [ - editor-runtime - - pkg-config - ]; - neovim = pkgs.neovim-nightly; - backup = true; - }; - }; -} diff --git a/home/modules/default.nix b/home/modules/default.nix index 454df38..4b50957 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -6,7 +6,6 @@ imports = (with inputs; [ sops-nix.homeManagerModules.sops - nix4nvchad.homeManagerModule noctalia.homeModules.default zen-browser.homeModules.twilight spicetify-nix.homeManagerModules.spicetify diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 31753bc..baa0fad 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -114,7 +114,6 @@ juicity waypipe iperf3 - neovim-nightly doom-emacs neovide prismlauncher diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 92a094b..6d043ba 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -12,7 +12,6 @@ in ./helix.nix ./zulip.nix ./nautilus.nix - ./neovim-nightly.nix ./vim.nix ./prismlauncher.nix diff --git a/overlays/modifications/neovim-nightly.nix b/overlays/modifications/neovim-nightly.nix deleted file mode 100644 index 2d18971..0000000 --- a/overlays/modifications/neovim-nightly.nix +++ /dev/null @@ -1,5 +0,0 @@ -{inputs, ...}: _final: prev: let - inherit (prev.stdenv.hostPlatform) system; -in { - neovim-nightly = inputs.neovim-nightly.packages.${system}.neovim; -}