From ac1da8fb1c885bc35cd9bce2ca796b01567af979 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Wed, 29 Nov 2023 19:10:51 -0600
Subject: [PATCH] Use packaged lunarvim

---
 flake.lock | 17 -----------------
 flake.nix  |  1 -
 home.nix   |  6 ++----
 init.lua   |  0
 nvim.nix   | 49 +++----------------------------------------------
 5 files changed, 5 insertions(+), 68 deletions(-)
 delete mode 100644 init.lua

diff --git a/flake.lock b/flake.lock
index eead4a7..a4022dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,22 +37,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1701068326,
-        "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "obs-scene-switcher": {
       "inputs": {
         "nixpkgs": [
@@ -97,7 +81,6 @@
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "obs-scene-switcher": "obs-scene-switcher",
         "obs-streamfx": "obs-streamfx"
       }
diff --git a/flake.nix b/flake.nix
index 7b15cff..79ba5d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,6 @@
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home.nix b/home.nix
index 46d85a4..e63876a 100644
--- a/home.nix
+++ b/home.nix
@@ -1,9 +1,6 @@
-{ config, pkgs, system, nixpkgs-unstable, obs-scene-switcher, obs-streamfx, ... }:
+{ config, pkgs, system, obs-scene-switcher, obs-streamfx, ... }:
 
 let
-  unstable = import nixpkgs-unstable {
-    inherit system;
-  };
   setIcon = ''
 #!/usr/bin/env bash
 
@@ -50,6 +47,7 @@ in
     prismlauncher
     shticker-book-unwritten
     tdesktop
+    vesktop
     vlc
     wireshark
 
diff --git a/init.lua b/init.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/nvim.nix b/nvim.nix
index e02eef1..5c03691 100644
--- a/nvim.nix
+++ b/nvim.nix
@@ -1,61 +1,18 @@
-{ nixpkgs-unstable, system, ... }:
+{ pkgs, ... }:
 
-let
-  unstable = import nixpkgs-unstable {
-    inherit system;
-  };
-in
 {
-  home.packages = with unstable; [
+  home.packages = with pkgs; [
     code-minimap
     fd
     gcc
     gnumake
+    lunarvim
     nodejs
     python310Full
     python310Packages.pynvim
     ripgrep
     tree-sitter
     wl-clipboard
-    (wrapNeovim neovim-unwrapped {
-      viAlias = true;
-      vimAlias = true;
-      withNodeJs = true;
-      withPython3 = true;
-      extraPython3Packages = (ps: [ps.pynvim]);
-      withRuby = true;
-      configure = {
-        customRc = "source .${./init.lua}";
-        packages.myVimPackage = {
-          start = with vimPlugins; [
-            base16-vim
-            cmp_luasnip
-            cmp-nvim-lsp
-            cmp-path
-            comment-nvim
-            indent-blankline-nvim
-            lir-nvim
-            lualine-nvim
-            luasnip
-            minimap-vim
-            nvim-autopairs
-            nvim-base16
-            nvim-cmp
-            nvim-lspconfig
-            nvim-lsputils
-            nvim-treesitter.withAllGrammars
-            nvim-ts-context-commentstring
-            plenary-nvim
-            popup-nvim
-            rust-tools-nvim
-            telescope-fzf-native-nvim
-            telescope-nvim
-            telescope-lsp-handlers-nvim
-            toggleterm-nvim
-          ];
-        };
-      };
-    })
     xclip
   ];
 }