From a2f710c263723ccdcae8c82b88f0c8a16bf47fb0 Mon Sep 17 00:00:00 2001
From: Denis Lehmann <denis@opaque.tech>
Date: Wed, 21 Apr 2021 12:27:33 +0200
Subject: [PATCH] flake works

---
 bin/rzr   |  3 ++-
 flake.nix | 32 ++++++++++++++++++++++++--------
 shell.nix | 39 ---------------------------------------
 3 files changed, 26 insertions(+), 48 deletions(-)
 delete mode 100644 shell.nix

diff --git a/bin/rzr b/bin/rzr
index 93b1520..40a708a 100644
--- a/bin/rzr
+++ b/bin/rzr
@@ -178,4 +178,5 @@ if __name__ == "__main__":
         print("profile '{}' applied".format(args.profile))
 
     else:
-        parser.error("either set a profile or --iterate")
+        print("either set a profile or the --iterate flag")
+        exit(1)
diff --git a/flake.nix b/flake.nix
index 82f04de..8151e88 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,18 +18,21 @@
 
           packages.rzr =
 
-            pkgs.python3Packages.buildPythonApplication {
+            pkgs.python3Packages.buildPythonApplication rec {
 
               name = "rzr";
               src = self;
 
-              buildPhase = ''
-              '';
-              installPhase = ''
-                ls -l
-                exit 1
-              '';
-
+              nativeBuildInputs = with pkgs; [
+                wrapGAppsHook
+              ];
+              
+              propagatedBuildInputs = with pkgs; [
+                python3Packages.colour
+                python3Packages.openrazer
+                python3Packages.toml
+              ];
+              
             };
 
           defaultPackage = self.packages.${system}.rzr;
@@ -39,7 +42,20 @@
           devShell = pkgs.mkShell {
             buildInputs = with pkgs; [
               python3
+              python3Packages.pip
+              python3Packages.virtualenv
+              python3Packages.colour
+              python3Packages.openrazer
+              python3Packages.toml
             ];
+            shellHook = ''
+              if [ ! -d .venv ]; then
+                python -m venv .venv
+              fi
+              source .venv/bin/activate
+              pip install --upgrade pip
+              pip install -r requirements.txt
+            '';
           };
 
         }
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index c790e10..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    python3
-    python3Packages.virtualenv
-    python3Packages.colour
-    python3Packages.openrazer
-    python3Packages.toml
-  ];
-  shellHook = ''
-    function log_header {
-      echo -ne "==> \e[32m\e[1m$1\e[0m\n"
-    }
-    function log_subheader {
-      echo -ne "--> \e[33m\e[1m$1\e[0m\n"
-    }
-    function log {
-      echo -ne "    $1\n"
-    }
-
-    echo ""
-    log_header "python_environment"
-    if [ ! -d .venv ]; then
-      python -m venv .venv
-    fi
-    source .venv/bin/activate
-    log_subheader "upgrading pip"
-    pip install --upgrade pip
-    echo ""
-    if [ -s requirements.txt ]; then
-      log_subheader "found requirements.txt, installing packages"
-      pip install -r requirements.txt
-      echo ""
-    fi
-    log_header "package versions"
-    log "$(python --version)"
-    log "$(pip --version)"
-  '';
-}