flake.lock

@@ -283,17 +283,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1710598928,
-        "narHash": "sha256-GlWNtPxMzNzEuR9lVpzUZ7Kw1rVEQqWdE+VH7xmOoPU=",
+        "lastModified": 1710595214,
+        "narHash": "sha256-mjOOCO3F9gTd/+FIZMXuSYydBTtYqBcWDPkopCpXJh8=",
         "ref": "refs/heads/master",
-        "rev": "3f9559992a9a67f632ab0e32590c826968cc9712",
-        "revCount": 25,
+        "rev": "a9bc0c8a7aca1a8f1c184d3c3a649d3f85fb3bc0",
+        "revCount": 23,
         "type": "git",
-        "url": "https://git.project-cloud.net/asmir/nvim_flake"
+        "url": "file://file:/home/akill/proj/nvim_flake/"
       },
       "original": {
         "type": "git",
-        "url": "https://git.project-cloud.net/asmir/nvim_flake"
+        "url": "file://file:/home/akill/proj/nvim_flake/"
       }
     },
     "peerix": {

flake.nix

@@ -25,7 +25,7 @@
     };
 
     nvim = {
-      url = "git+https://git.project-cloud.net/asmir/nvim_flake";
+      url = "git+file:/home/akill/proj/nvim_flake/";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

magpie/configuration.nix

@@ -4,8 +4,6 @@
   lib,
   project-cloud,
   goatcounter,
-  nvim,
-  system,
   ...
 }: {
   imports = [];
@@ -13,8 +11,6 @@
   nix.optimise.automatic = true;
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
-  nixpkgs.overlays = [ nvim.overlays.${system}.overlay ];
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 2;
@@ -34,15 +30,14 @@
   ];
 
   environment.systemPackages = with pkgs; [
+    alejandra
     curl
     fd
     file
     fzf
     fzy
     git
-    goatcounter.packages.aarch64-linux.goatcounter
     htop-vim
-    nvim
     pciutils
     tig
     tmux
@@ -50,9 +45,15 @@
     usbutils
     wget
     zip
+    goatcounter.packages.aarch64-linux.goatcounter
   ];
 
   programs.mosh.enable = true;
+  programs.neovim = {
+    enable = true;
+    vimAlias = true;
+    viAlias = true;
+  };
 
   mailserver = {
     enable = true;