From 1018c9f85f816a34b04a8efe557bb21367e4f6de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Sun, 7 Aug 2022 22:44:21 -0300
Subject: [PATCH] create scripts folder

---
 flake.nix                              | 8 +++-----
 bmenu.nix => scripts/bmenu.nix         | 2 +-
 scripts/default.nix                    | 6 ++++++
 diffr.nix => scripts/diffr.nix         | 0
 kak-pager.nix => scripts/kak-pager.nix | 0
 terminal.nix => scripts/terminal.nix   | 0
 switch                                 | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)
 rename bmenu.nix => scripts/bmenu.nix (96%)
 create mode 100644 scripts/default.nix
 rename diffr.nix => scripts/diffr.nix (100%)
 rename kak-pager.nix => scripts/kak-pager.nix (100%)
 rename terminal.nix => scripts/terminal.nix (100%)

diff --git a/flake.nix b/flake.nix
index 62177df..dee66ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,11 +41,8 @@
             overlay-unstable
             nur.overlay
             (_: old-pkgs: {
+              uservars = import ./user/variables.nix;
               dhist = dhist.packages.${system}.dhist;
-              bmenu = import ./bmenu.nix { inherit config pkgs lib; };
-              _diffr = import ./diffr.nix { inherit config pkgs lib; };
-              kak-pager = import ./kak-pager.nix { inherit config pkgs lib; };
-              terminal = import ./terminal.nix { inherit config pkgs lib; };
               alacritty = (old-pkgs.alacritty.overrideAttrs
                 (old-alacritty: rec {
                   src = alacritty-sixel;
@@ -59,10 +56,11 @@
               ranger = (old-pkgs.ranger.overridePythonAttrs (old-ranger: rec {
                 src = ranger-sixel;
                 checkInputs = [ ];
-                propagatedBuildInputs = with pkgs.python3Packages;
+                propagatedBuildInputs = with old-pkgs.python3Packages;
                   old-ranger.propagatedBuildInputs ++ [ astroid pylint pytest ];
               }));
             })
+            (import ./scripts { inherit config pkgs lib; })
           ];
         })
         home-manager.nixosModules.home-manager
diff --git a/bmenu.nix b/scripts/bmenu.nix
similarity index 96%
rename from bmenu.nix
rename to scripts/bmenu.nix
index 02e306f..56d7394 100644
--- a/bmenu.nix
+++ b/scripts/bmenu.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-let inherit (import ./user/variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in pkgs.writeScriptBin "bmenu" ''
   #!${pkgs.fish}/bin/fish
 
diff --git a/scripts/default.nix b/scripts/default.nix
new file mode 100644
index 0000000..cddb796
--- /dev/null
+++ b/scripts/default.nix
@@ -0,0 +1,6 @@
+{ config, lib, ... }: (_: pkgs: {
+  bmenu = import ./bmenu.nix { inherit config pkgs lib; };
+  _diffr = import ./diffr.nix { inherit config pkgs lib; };
+  kak-pager = import ./kak-pager.nix { inherit config pkgs lib; };
+  terminal = import ./terminal.nix { inherit config pkgs lib; };
+})
diff --git a/diffr.nix b/scripts/diffr.nix
similarity index 100%
rename from diffr.nix
rename to scripts/diffr.nix
diff --git a/kak-pager.nix b/scripts/kak-pager.nix
similarity index 100%
rename from kak-pager.nix
rename to scripts/kak-pager.nix
diff --git a/terminal.nix b/scripts/terminal.nix
similarity index 100%
rename from terminal.nix
rename to scripts/terminal.nix
diff --git a/switch b/switch
index a8a385a..31f4d37 100755
--- a/switch
+++ b/switch
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-sudo nixos-rebuild switch --flake .#
\ No newline at end of file
+sudo nixos-rebuild switch --flake .# $@