From 3dcf1840af6595862dd94576ffbfe0ad9e2b6964 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 24 Apr 2025 18:29:33 +0200 Subject: [PATCH] remove nixvim --- flake.lock | 128 ----------------------------------- flake.nix | 5 -- modules/default.nix | 5 -- modules/neovim/default.nix | 26 ------- nixos-modules/default.nix | 2 - systems/omoikane/default.nix | 1 - 6 files changed, 167 deletions(-) delete mode 100644 modules/default.nix delete mode 100644 modules/neovim/default.nix diff --git a/flake.lock b/flake.lock index be2bc2b..1e23999 100644 --- a/flake.lock +++ b/flake.lock @@ -215,27 +215,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -254,24 +233,6 @@ "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -308,34 +269,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.7", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "nuschtos", @@ -530,56 +463,11 @@ "type": "indirect" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch" - }, - "locked": { - "lastModified": 1745496969, - "narHash": "sha256-04ZWtuPFXc/aRklrWs9FY+Gcb9Ct5lmv84Livgafd84=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "62ecd39b40bf8a61fa428d026bb7061e1350f456", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "nuschtos": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", - "owner": "NuschtOS", - "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ - "nixvim", "nixpkgs" ] }, @@ -608,7 +496,6 @@ "nixos-facter-modules": "nixos-facter-modules_2", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixvim": "nixvim", "nuschtos": "nuschtos", "snm": "snm", "sops-nix": "sops-nix_2", @@ -734,21 +621,6 @@ "type": "github" } }, - "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 91c947e..ff46d99 100644 --- a/flake.nix +++ b/flake.nix @@ -32,10 +32,6 @@ url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nuschtos = { url = "github:NuschtOS/search"; inputs.nixpkgs.follows = "nixpkgs"; @@ -66,7 +62,6 @@ pkgs' = system: nixpkgs.legacyPackages.${system}; in { - modules.default = import ./modules; nixosModules.default = import ./nixos-modules; homeManagerModules.default = import ./home-modules; nixosConfigurations = import ./systems { inherit self inputs nixpkgs; }; diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index 1dde18d..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - imports = [ ./neovim ]; -} diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix deleted file mode 100644 index 14092a8..0000000 --- a/modules/neovim/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, lib, ... }: - -let - cfg = config.jopejoe1.neovim; -in -{ - options.jopejoe1.neovim = { - enable = lib.mkEnableOption "Enable neovim"; - }; - - config = lib.mkIf cfg.enable { - programs.nixvim = { - enable = true; - viAlias = true; - vimAlias = true; - colorschemes.catppuccin = { - enable = true; - settings.flavour = "frappe"; - }; - plugins = { - treesitter.enable = true; - direnv.enable = true; - }; - }; - }; -} diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index 477ced8..082a848 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -25,8 +25,6 @@ self.inputs.disko.nixosModules.disko self.inputs.home-manager.nixosModules.home-manager self.inputs.sops-nix.nixosModules.sops - self.inputs.nixvim.nixosModules.nixvim self.inputs.nixos-facter-modules.nixosModules.facter - self.outputs.modules.default ]; } diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index 6799410..809509f 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -47,7 +47,6 @@ enable = true; layout = "us"; }; - neovim.enable = true; user = { jopejoe1.enable = true; root.enable = true;