From 2fc26aef2ca8cf3540ffee89787aff737d3ddfe0 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 1 Feb 2020 21:05:55 -0500
Subject: [PATCH] Move rofi scripts to bin/rofi

---
 Makefile                                       | 5 ++++-
 {config/rofi/bin => bin/rofi}/rofi-appmenu     | 0
 {config/rofi/bin => bin/rofi}/rofi-browsermenu | 0
 {config/rofi/bin => bin/rofi}/rofi-filemenu    | 0
 {config/rofi/bin => bin/rofi}/rofi-passmenu    | 0
 {config/rofi/bin => bin/rofi}/rofi-windowmenu  | 0
 default.nix                                    | 1 +
 modules/desktop/apps/rofi.nix                  | 2 +-
 8 files changed, 6 insertions(+), 2 deletions(-)
 rename {config/rofi/bin => bin/rofi}/rofi-appmenu (100%)
 rename {config/rofi/bin => bin/rofi}/rofi-browsermenu (100%)
 rename {config/rofi/bin => bin/rofi}/rofi-filemenu (100%)
 rename {config/rofi/bin => bin/rofi}/rofi-passmenu (100%)
 rename {config/rofi/bin => bin/rofi}/rofi-windowmenu (100%)

diff --git a/Makefile b/Makefile
index 2ad4dcdf..6bd6c4ac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 NIXOS_VERSION := 19.09
 NIXOS_PREFIX  := $(PREFIX)/etc/nixos
 COMMAND       := test
-FLAGS         := -I "config=$$(pwd)/config" -I "modules=$$(pwd)/modules" $(FLAGS)
+FLAGS         := -I "config=$$(pwd)/config" \
+				 -I "modules=$$(pwd)/modules" \
+				 -I "bin=$$(pwd)/bin" \
+				 $(FLAGS)
 
 # The real Labowski
 all: channels
diff --git a/config/rofi/bin/rofi-appmenu b/bin/rofi/rofi-appmenu
similarity index 100%
rename from config/rofi/bin/rofi-appmenu
rename to bin/rofi/rofi-appmenu
diff --git a/config/rofi/bin/rofi-browsermenu b/bin/rofi/rofi-browsermenu
similarity index 100%
rename from config/rofi/bin/rofi-browsermenu
rename to bin/rofi/rofi-browsermenu
diff --git a/config/rofi/bin/rofi-filemenu b/bin/rofi/rofi-filemenu
similarity index 100%
rename from config/rofi/bin/rofi-filemenu
rename to bin/rofi/rofi-filemenu
diff --git a/config/rofi/bin/rofi-passmenu b/bin/rofi/rofi-passmenu
similarity index 100%
rename from config/rofi/bin/rofi-passmenu
rename to bin/rofi/rofi-passmenu
diff --git a/config/rofi/bin/rofi-windowmenu b/bin/rofi/rofi-windowmenu
similarity index 100%
rename from config/rofi/bin/rofi-windowmenu
rename to bin/rofi/rofi-windowmenu
diff --git a/default.nix b/default.nix
index e7a788bd..37aff8c3 100644
--- a/default.nix
+++ b/default.nix
@@ -14,6 +14,7 @@ device:
   nix.autoOptimiseStore = true;
   nix.nixPath = options.nix.nixPath.default ++ [
     # So we can use absolute import paths
+    "bin=/etc/dotfiles/bin"
     "config=/etc/dotfiles/config"
     "modules=/etc/dotfiles/modules"
   ];
diff --git a/modules/desktop/apps/rofi.nix b/modules/desktop/apps/rofi.nix
index d7fe469a..43addf0b 100644
--- a/modules/desktop/apps/rofi.nix
+++ b/modules/desktop/apps/rofi.nix
@@ -2,7 +2,7 @@
 
 {
   my = {
-    env.PATH = [ <config/rofi/bin> ];
+    env.PATH = [ <bin/rofi> ];
     # link recursively so other modules can link files in its folder
     home.xdg.configFile."rofi" = {
       source = <config/rofi>;