From 750b790aaedd91168479e928717974c255a0bcd4 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Wed, 17 Jan 2024 10:17:22 -0500 Subject: [PATCH] [add] nvim markdown preview and update --- README.md | 4 ++-- home.nix | 8 +++++++- nvim/default.nix | 26 ++------------------------ 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index dd631df..63fda08 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ ```bash # Update System Channels -sudo nix-channel --add https://nixos.org/channels/nixpkgs-23.05-darwin nixpkgs +sudo nix-channel --add https://nixos.org/channels/nixpkgs-23.11-darwin nixpkgs sudo nix-channel --update # Update Home Manager -nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager +nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager nix-channel --update # Build Home Manager diff --git a/home.nix b/home.nix index 43cf4a2..54c7862 100644 --- a/home.nix +++ b/home.nix @@ -20,7 +20,7 @@ in # Home Manager Config home.username = "evanreichard"; home.homeDirectory = "/Users/evanreichard"; - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; programs.home-manager.enable = true; # Global Packages @@ -46,6 +46,12 @@ in programs.jq.enable = true; programs.pandoc.enable = true; + # Enable Flakes & Commands + nix = { + package = pkgs.nix; + extraOptions = ''experimental-features = nix-command flakes''; + }; + # SQLite Configuration home.file.".sqliterc".text = '' .headers on diff --git a/nvim/default.nix b/nvim/default.nix index 1c2d9a4..29f51e9 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -11,7 +11,6 @@ in withPython3 = true; plugins = with pkgs.vimPlugins; [ - # ------------------ # --- Completion --- # ------------------ @@ -33,6 +32,7 @@ in comment-nvim # Code Comments diffview-nvim # Diff View leap-nvim # Quick Movement + markdown-preview-nvim # Markdown Preview neo-tree-nvim # File Explorer null-ls-nvim # Formatters numb-nvim # Peek / Jump to Lines @@ -61,7 +61,7 @@ in # ----- Silicon ---- # ------------------ ( - pkgs.vimUtils.buildVimPluginFrom2Nix { + pkgs.vimUtils.buildVimPlugin { pname = "silicon.lua"; version = "2022-12-03"; src = pkgs.fetchFromGitHub { @@ -73,28 +73,9 @@ in meta.homepage = "https://github.com/mhanberg/silicon.lua/"; } ) - - # ------------------ - # ------ Duck ------ - # ------------------ - # ( - # pkgs.vimUtils.buildVimPluginFrom2Nix { - # pname = "duck.nvim"; - # version = "2022-12-06"; - # src = pkgs.fetchFromGitHub { - # owner = "tamton-aquib"; - # repo = "duck.nvim"; - # rev = "b1a3b4e52eec886bf4ce5ed692a2162d504d9632"; - # sha256 = "0clc9s175mjzrkcjmwhl60fycdxgn24wkhcggaw1gsfspnlizr8z"; - # }; - # meta.homepage = "https://github.com/tamton-aquib/duck.nvim/"; - # } - # ) - ]; extraPackages = with pkgs; [ - # Telescope Dependencies ripgrep fd @@ -116,7 +97,6 @@ in # Silicon silicon - ]; extraConfig = ":luafile ~/.config/nvim/lua/init.lua"; @@ -124,7 +104,6 @@ in xdg.configFile = { - # Copy Configuration nvim = { source = ./config; @@ -141,6 +120,5 @@ in } return nix_vars ''; - }; }