From f17af995a283ca66a9b5a4f20e69c0b922107211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Mon, 8 Apr 2024 18:53:37 +0200
Subject: [PATCH] neovim config

---
 apps/neovim.nix        | 11 ++++++
 home.nix               | 86 +++++++++++++++++++++---------------------
 zion/configuration.nix |  2 -
 3 files changed, 55 insertions(+), 44 deletions(-)
 create mode 100644 apps/neovim.nix

diff --git a/apps/neovim.nix b/apps/neovim.nix
new file mode 100644
index 0000000..876ea75
--- /dev/null
+++ b/apps/neovim.nix
@@ -0,0 +1,11 @@
+{ unstable, ... }: {
+  programs.neovim = {
+    enable = true;
+
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+
+    defaultEditor = true;
+  };
+}
diff --git a/home.nix b/home.nix
index 91449d4..96d5714 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, pkgs-unstable, ... }:
 let
   myAliases = {
     ".." = "cd ..";
@@ -53,45 +53,57 @@ in {
   # release notes.
   home.stateVersion = "23.11"; # Please read the comment before changing.
 
+  imports = [
+    ./apps/neovim.nix
+  ];
+
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = with pkgs; [
-    # zsh stuff
-    zsh
-    zsh-autosuggestions
-    zsh-powerlevel10k
-    thefuck
+  home.packages = 
+    (with pkgs; [
+      # zsh stuff
+      zsh
+      zsh-autosuggestions
+      zsh-powerlevel10k
+      thefuck
 
-    # graphics
-    tuxpaint
-    krita    
+      # graphics
+      tuxpaint
+      krita    
 
-    # tools
-    kitty
-    rofi 
-    git
-    eza
-    yt-dlp
-    ffmpeg
-    texliveFull
+      # tools
+      kitty
+      rofi 
+      git
+      eza
+      yt-dlp
+      ffmpeg
+      texliveFull
 
-    # media
-    spotify
-    vlc
-    mpv
-    obs-studio
+      # media
+      spotify
+      vlc
+      mpv
+      obs-studio
 
-    # desktop
-    firefox
-    discord
-    telegram-desktop
+      # desktop
+      firefox
+      discord
+      telegram-desktop
     
-    # gaming
-    prismlauncher
-    steam     
+      # gaming
+      prismlauncher
+      steam     
 
-    # custom
-  ];
+      # custom
+    ])
+
+    ++
+
+    (with pkgs-unstable; [
+      # I need fresssh stuff
+      neovim
+    ]);
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
@@ -112,16 +124,6 @@ in {
      EDITOR = "nvim";
   };
 
-  #programs.neovim = {
-  #  enable = true;
-  #
-  #  viAlias = true;
-  #  vimAlias = true;
-  #  vimdiffAlias = true;
-  #
-  #  defaultEditor = true;
-  # };
-
   programs.bash = {
     enable = true;
     shellAliases = myAliases;
diff --git a/zion/configuration.nix b/zion/configuration.nix
index 7e27150..3d0f279 100644
--- a/zion/configuration.nix
+++ b/zion/configuration.nix
@@ -163,8 +163,6 @@
     ++
    
     (with pkgs-unstable; [
-      neovim
-      
       cmake
       gcc
       clang