From 601f6b3373d9ebf2a2683d880f7a84e2717e3bcf Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 5 Apr 2023 18:00:00 +0100
Subject: [PATCH] fix: fix customVim overlay in NixOS
---
home-manager/modules/common.nix | 14 +++++++-------
system/nixos/nixedo/configuration.nix | 8 +++++---
system/shared/overlays.nix | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index fb4dfa7a..39869a32 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -17,13 +17,13 @@ in {
vimAlias = true;
plugins = with pkgs; [
-# customVim.tabline-vim
-# customVim.vim-astro
-# customVim.vim-caser
-# customVim.vim-heritage
-# customVim.vim-just
-# customVim.vim-textobj-xmlattr
-# customVim.vim-visual-star-search
+ customVim.tabline-vim
+ customVim.vim-astro
+ customVim.vim-caser
+ customVim.vim-heritage
+ customVim.vim-just
+ customVim.vim-textobj-xmlattr
+ customVim.vim-visual-star-search
vimPlugins.comment-nvim
vimPlugins.dial-nvim
diff --git a/system/nixos/nixedo/configuration.nix b/system/nixos/nixedo/configuration.nix
index c63a96ca..7dea4c94 100644
--- a/system/nixos/nixedo/configuration.nix
+++ b/system/nixos/nixedo/configuration.nix
@@ -4,7 +4,12 @@
{ config, pkgs, ... }:
+let
+ nixpkgs = import ../../shared/nixpkgs.nix { };
+in
{
+ nixpkgs = nixpkgs;
+
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
];
@@ -93,9 +98,6 @@
packages = with pkgs; [ firefox ];
};
- # Allow unfree packages
- nixpkgs.config.allowUnfree = true;
-
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs;
diff --git a/system/shared/overlays.nix b/system/shared/overlays.nix
index 1095d1dc..ad7b96f7 100644
--- a/system/shared/overlays.nix
+++ b/system/shared/overlays.nix
@@ -26,7 +26,7 @@ self: super: {
owner = "NoahTheDuke";
repo = "vim-just";
rev = "838c9096d4c5d64d1000a6442a358746324c2123";
- sha256 = "51b8PxyKqBdeIvmmZyF2hpMBjkyrlZDdTB1opr5JZ7Y=";
+ sha256 = "DSC47z2wOEXvo2kGO5JtmR3hyHPiYXrkX7MgtagV5h4=";
};
};