feat(integrations): new activitywatch integration

home.nix

@@ -1,10 +1,10 @@
 {self}: {
   config,
+  osConfig,
   lib,
   pkgs,
   ...
 }: let
-  neovim = self.packages.${pkgs.system}.default;
   cfg = config.neovim;
 in
   with lib; {
@@ -15,7 +15,7 @@ in
       };
       package = mkOption {
         type = with types; package;
-        default = neovim;
+        default = self.packages.${pkgs.system}.default;
       };
       vimdiffAlias = mkOption {
         type = with types; bool;
@@ -28,7 +28,6 @@ in
     };
     config = mkIf cfg.enable {
       home.sessionVariables = {EDITOR = "nvim";};
-
       home.packages = [cfg.package];
 
       programs.bash.shellAliases = mkIf cfg.vimdiffAlias {vimdiff = "nvim -d";};

lua/dot013/plugins/init.lua

@@ -3,6 +3,7 @@ return {
 	{ import = "dot013.plugins.debugger" },
 	{ import = "dot013.plugins.formatting" },
 	{ import = "dot013.plugins.ide" },
+	{ import = "dot013.plugins.integrations" },
 	{ import = "dot013.plugins.lsp" },
 	{ import = "dot013.plugins.navigation" },
 	{ import = "dot013.plugins.treesitter" },

lua/dot013/plugins/integrations.lua

@@ -0,0 +1,13 @@
+return {
+	{
+		"aw-watcher.nvim",
+		after = function()
+			require("aw_watcher").setup({
+				aw_server = {
+					host = "100.69.8.56",
+					port = 5600,
+				}
+			})
+		end
+	}
+}

nixos.nix

@@ -4,7 +4,6 @@
   pkgs,
   ...
 }: let
-  neovim = self.packages.${pkgs.system}.default;
   cfg = config.neovim;
 in
   with lib; {
@@ -15,7 +14,8 @@ in
       };
       package = mkOption {
         type = with types; package;
-        default = neovim;
+        default = self.packages.${pkgs.system}.default;
+        readOnly = true;
       };
       defaultEditor = mkOption {
         type = with types; bool;
@@ -24,7 +24,6 @@ in
     };
     config = mkIf cfg.enable {
       environment.variables = {EDITOR = "nvim";};
-
       environment.systemPackages = [cfg.package];
 
       # Disable NixOS's Neovim

package.nix

@@ -2,32 +2,32 @@
   pkgs,
   lib,
   neovim ? pkgs.neovim,
+  blink-cmp ? pkgs.vimPlugins.blink-cmp,
   ripgrep ? pkgs.ripgrep,
   mdfmt ? null,
   go-grip ? null,
   yazi ? pkgs.yazi,
   ...
-} @ args: let
-  start = with pkgs.vimPlugins; [
-    (
-      if args ? blink-cmp
-      then args.blink-cmp
-      else blink-cmp
-    )
-    catppuccin-nvim
-    indent-blankline-nvim
-    lze
-    nvim-lspconfig
-    nvim-treesitter.withAllGrammars
-    nvim-treesitter-textobjects
-    nvim-treesitter-textsubjects
+}: let
+  start =
+    (with pkgs.vimPlugins; [
+      catppuccin-nvim
+      indent-blankline-nvim
+      lze
+      nvim-lspconfig
+      nvim-treesitter.withAllGrammars
+      nvim-treesitter-textobjects
+      nvim-treesitter-textsubjects
 
-    ((pkgs.vimUtils.buildVimPlugin {
-        name = "dot013.nvim";
-        src = ./.;
-      })
-      .overrideAttrs {doCheck = false;})
-  ];
+      ((pkgs.vimUtils.buildVimPlugin {
+          name = "dot013.nvim";
+          src = ./.;
+        })
+        .overrideAttrs {doCheck = false;})
+    ])
+    ++ [
+      blink-cmp
+    ];
   opt = with pkgs.vimPlugins; [
     auto-save-nvim
     auto-session
@@ -56,6 +56,15 @@
     tmux-nvim
     vim-sleuth
 
+    (pkgs.vimUtils.buildVimPlugin {
+      pname = "aw-watcher.nvim";
+      version = "master";
+      src = fetchGit {
+        url = "https://github.com/lowitea/aw-watcher.nvim";
+        rev = "be7b03748f59b6602502baf08e7f7736cc7279a5";
+      };
+    })
+
     (pkgs.vimUtils.buildVimPlugin {
       pname = "nvim-emmet";
       version = "v0.4.4";