From fc1fa7b2b86be0f7a31575bd7fcb9811b7e0a0c5 Mon Sep 17 00:00:00 2001
From: Johannes Hendrik Gerard van der Weide <hertog@fsfe.org>
Date: Fri, 9 Feb 2024 14:11:32 +0100
Subject: [PATCH] NixVim :thumbsup:

---
 System/gnome.nix        |  4 ++--
 Users/Hertog/neovim.nix |  6 +++---
 Users/Hertog/zsh.nix    |  2 ++
 flake.lock              | 37 ++++++++++++++++++++++++++++++++++++-
 flake.nix               |  5 ++++-
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/System/gnome.nix b/System/gnome.nix
index ecc98ec..99b180c 100644
--- a/System/gnome.nix
+++ b/System/gnome.nix
@@ -4,8 +4,8 @@
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;
-    layout = "nl";
-    xkbVariant = "us";
+    xkb.variant = "us";
+    xkb.layout = "nl";
     libinput.enable = true;
     displayManager.gdm.enable = true;
     desktopManager = {
diff --git a/Users/Hertog/neovim.nix b/Users/Hertog/neovim.nix
index 952c9b9..cde9a95 100644
--- a/Users/Hertog/neovim.nix
+++ b/Users/Hertog/neovim.nix
@@ -2,9 +2,9 @@
 
 {
   programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    vimAlias = true;
+    enable = false;
+    defaultEditor = false;
+    vimAlias = false;
     coc = {
       enable = true;
     };
diff --git a/Users/Hertog/zsh.nix b/Users/Hertog/zsh.nix
index 84196eb..1aa59e3 100644
--- a/Users/Hertog/zsh.nix
+++ b/Users/Hertog/zsh.nix
@@ -11,6 +11,8 @@
       ll = "ls -l";
       please = "sudo";
       update = "sudo nixos-rebuild switch --flake /etc/nixos/#laptop";
+      vim = "nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";
+      vimUpdate = "nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";
     };
     plugins = [
       {
diff --git a/flake.lock b/flake.lock
index 57d5639..c241b3a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,6 +21,24 @@
         "type": "github"
       }
     },
+    "iceshrimp": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1707094376,
+        "narHash": "sha256-qkXIsdaJNNzinxi4AAUvPwbXnpMv96JyZqFHNAz9Ev8=",
+        "ref": "refs/heads/dev",
+        "rev": "73e013fa7a25459a2bbe19afbb69d839304f6b97",
+        "revCount": 31,
+        "type": "git",
+        "url": "https://iceshrimp.dev/iceshrimp/packaging"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://iceshrimp.dev/iceshrimp/packaging"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1702453208,
@@ -38,6 +56,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1700108881,
+        "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1706913249,
         "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
@@ -55,8 +89,9 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "iceshrimp": "iceshrimp",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index d121016..864236d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,12 +7,15 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    iceshrimp = {
+      url = "git+https://iceshrimp.dev/iceshrimp/packaging";
+    };
     nixos-hardware = {
       url = "github:NixOS/nixos-hardware/master";
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }@inputs: 
+  outputs = { self, nixpkgs, home-manager, iceshrimp, nixos-hardware, ... }@inputs: 
   let
     system = "x86_64-linux";
     currentSystem = system;