flake.lock

@@ -185,26 +185,6 @@
         "type": "github"
       }
     },
-    "nvim": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1698363600,
-        "narHash": "sha256-r71uS/uw3I9xJAnmlgaN0TC9aC/1m2L4iNhKjqBzAtQ=",
-        "ref": "refs/heads/master",
-        "rev": "9652f4cb75d799ee5a2511883d2fda60bea00141",
-        "revCount": 19,
-        "type": "git",
-        "url": "https://git.project-cloud.net/asmir/nvim_flake"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.project-cloud.net/asmir/nvim_flake"
-      }
-    },
     "peerix": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -232,7 +212,6 @@
         "home-manager": "home-manager",
         "nix-xilinx": "nix-xilinx",
         "nixpkgs": "nixpkgs",
-        "nvim": "nvim",
         "peerix": "peerix",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix",
@@ -293,11 +272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1698401726,
+        "lastModified": 1698350641,
-        "narHash": "sha256-kGMqxaNaNSbKJS/55KqqMvLj1xOBc8zCizs6I3xiCo0=",
+        "narHash": "sha256-Eh0tgCg7sMIp3Q0q8WH+lI03Ilw8ljyzDc74k16GiVQ=",
         "ref": "refs/heads/master",
-        "rev": "1e49032fbfec10b51c9f627aab286290ac15977c",
+        "rev": "ced545f644d2be67877b3b7a5798b11722a95cfd",
-        "revCount": 3,
+        "revCount": 1,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/swaysw"
       },

flake.nix

@@ -24,11 +24,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nvim = {
-      url = "git+https://git.project-cloud.net/asmir/nvim_flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -49,7 +44,6 @@
     home-manager,
     nixpkgs,
     nix-xilinx,
-    nvim,
     peerix,
     simple-nixos-mailserver,
     sops-nix,

home/home.nix

@@ -5,7 +5,9 @@
   inputs,
   ...
 }:
-with lib; {
+with lib; let
+  vimrc = import ./vimrc.nix {inherit pkgs vimUtils fetchFromGitHub;};
+in {
   imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
 
   home.stateVersion = "22.11";
@@ -170,6 +172,15 @@ with lib; {
       };
     };
 
+    neovim = {
+      enable = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      plugins = vimrc.plugins;
+      extraConfig = "";
+      extraPackages = vimrc.extraPackages;
+    };
+
     obs-studio = {
       enable = true;
       plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi];
@@ -180,6 +191,11 @@ with lib; {
     zsh.enable = true;
   };
 
+  xdg.configFile."nvim/init.lua" = {
+    source = ./vimrc.lua;
+    recursive = true;
+  };
+
   services = {
     lorri.enable = false;
     mako.enable = true;

home/home_packages.nix

@@ -82,24 +82,6 @@
       zeal-qt6
       zig
       zls
-
-      /* install here until nvim flake is fixed */
-      alejandra
-      ccls
-      gopls
-      luaformatter
-      nixd
-      pyright
-      rust-analyzer
-      sumneko-lua-language-server
-      svls
-      texlab
-      tree-sitter
-      verible
-      zls
     ]
-    ++ [
+    ++ [inputs.swaysw.packages.x86_64-linux.swaysw];
-      inputs.swaysw.packages.x86_64-linux.swaysw
-      inputs.nvim.packages.x86_64-linux.nvim
-    ];
 }

home/sway.nix

@@ -100,7 +100,7 @@
         "Alt+j" = "focus down";
         "Alt+k" = "focus up";
         "Alt+l" = "focus right";
-        "Alt+slash" = "exec swaysw";
+        "Alt+slash" = "exec lckdo /tmp/.sws_cli_lock footclient -a sws_cli -- sws_cli.sh";
         "Alt+Escape" = "workspace back_and_forth";
         "Alt+f" = "fullscreen enable";