From 6f148e48fa04837b6b0a92adb97c1a77e43ee994 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 13 Nov 2023 15:00:59 +0000
Subject: [PATCH] Re-add anyrun/kidex

---
 flake.lock                       | 43 +++++++++++++++++++++++++++++
 flake.nix                        | 12 ++++++--
 home/hyprland/anyrun/default.nix |  2 +-
 home/hyprland/anyrun/kidex.nix   | 47 --------------------------------
 home/hyprland/default.nix        |  8 +++++-
 5 files changed, 61 insertions(+), 51 deletions(-)
 delete mode 100644 home/hyprland/anyrun/kidex.nix

diff --git a/flake.lock b/flake.lock
index 67670f89..2f890e2f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "anyrun": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696926085,
+        "narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=",
+        "owner": "Kirottu",
+        "repo": "anyrun",
+        "rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Kirottu",
+        "repo": "anyrun",
+        "type": "github"
+      }
+    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -146,6 +167,27 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "anyrun",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696343447,
+        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -263,6 +305,7 @@
     },
     "root": {
       "inputs": {
+        "anyrun": "anyrun",
         "home-manager": "home-manager",
         "kmonad": "kmonad",
         "nix-index-database": "nix-index-database",
diff --git a/flake.nix b/flake.nix
index e1d8e898..22bfaf66 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,10 +19,18 @@
       url = "github:kmonad/kmonad?dir=nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    anyrun = {
+      url = "github:Kirottu/anyrun";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # watershot = {
+    #   url = "github:Kirottu/watershot";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
   };
 
   outputs = { self, nixpkgs, home-manager, nix-index-database, stylix, kmonad
-    , ... }@inputs:
+    , anyrun, ... }@inputs:
     let
       default = {
         hostName = "Atlas";
@@ -51,7 +59,7 @@
         }:
         let
           specialArgs = { inherit hostName user; };
-          extraSpecialArgs = specialArgs;
+          extraSpecialArgs = specialArgs // { inherit anyrun; };
         in nixpkgs.lib.nixosSystem {
           inherit system specialArgs;
           modules = [
diff --git a/home/hyprland/anyrun/default.nix b/home/hyprland/anyrun/default.nix
index d67b2df0..bd3d0aa7 100644
--- a/home/hyprland/anyrun/default.nix
+++ b/home/hyprland/anyrun/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, anyrun, ... }: {
-  imports = [ anyrun.homeManagerModules.default ./kidex.nix ];
+  imports = [ anyrun.homeManagerModules.default ];
   home.packages = with pkgs; [
     rink
     (pkgs.callPackage ./pkgs/kidex/default.nix { })
diff --git a/home/hyprland/anyrun/kidex.nix b/home/hyprland/anyrun/kidex.nix
deleted file mode 100644
index 00bfcbf9..00000000
--- a/home/hyprland/anyrun/kidex.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = [ (pkgs.callPackage ./pkgs/kidex/default.nix { }) ];
-  xdg.configFile."kidex.ron".text = ''
-    Config(
-      ignored: [".git*"], // A list of patterns to be ignored in all directories
-      directories: [
-        WatchDir(
-          path: "${config.xdg.userDirs.documents}", // The root folder to be indexed
-          recurse: true, // Recursively index and watch all subfolders
-          ignored: [], // Ignore patterns specifically for this directory
-        ),
-        WatchDir(
-          path: "${config.xdg.userDirs.desktop}", // The root folder to be indexed
-          recurse: true, // Recursively index and watch all subfolders
-          ignored: [], // Ignore patterns specifically for this directory
-        ),
-        WatchDir(
-          path: "${config.xdg.userDirs.download}", // The root folder to be indexed
-          recurse: true, // Recursively index and watch all subfolders
-          ignored: [], // Ignore patterns specifically for this directory
-        ),
-        WatchDir(
-          path: "${config.xdg.userDirs.music}", // The root folder to be indexed
-          recurse: true, // Recursively index and watch all subfolders
-          ignored: [], // Ignore patterns specifically for this directory
-        ),
-        WatchDir(
-          path: "${config.xdg.userDirs.pictures}", // The root folder to be indexed
-          recurse: true, // Recursively index and watch all subfolders
-          ignored: [], // Ignore patterns specifically for this directory
-        ),
-        WatchDir(
-          path: "${config.xdg.userDirs.templates}", // The root folder to be indexed
-          recurse: true, // Recursively index and watch all subfolders
-          ignored: [], // Ignore patterns specifically for this directory
-        ),
-        WatchDir(
-          path: "${config.xdg.userDirs.videos}", // The root folder to be indexed
-          recurse: true, // Recursively index and watch all subfolders
-          ignored: [], // Ignore patterns specifically for this directory
-        ),
-      ],
-    )
-  '';
-}
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 93cc0409..caa24f97 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,7 +1,13 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
+  imports = [
+    ./waybar/default.nix
+    ./anyrun/default.nix
+    ./rofi/default.nix
+    ./gtk.nix
+    ./mako.nix
+  ];
   services = {
     avizo.enable = true;
     syncthing.enable = true;