diff --git a/LICENSE b/LICENSE index d449d3e..2324481 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) +Copyright (c) 2021 Denis Lehmann Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.org b/README.org index 71e274e..3543529 100644 --- a/README.org +++ b/README.org @@ -1,6 +1,6 @@ * rzr - #+begin_src text + #+begin_example _ _ _ /\ \ /\ \ /\ \ / \ \ / \ \ / \ \ @@ -12,7 +12,7 @@ / / /\ \ \ \ \ \__/\_\ / / /\ \ \ / / / \ \ \ \ \___\/ // / / \ \ \ \/_/ \_\/ \/___/_/ \/_/ \_\/ - #+end_src + #+end_example *rzr* is a simple command line frontend for [[https://openrazer.github.io/][OpenRazer]]. It allows to set static lighting profiles of Razer devices, based on configuration files. @@ -28,9 +28,7 @@ All you have to do to apply the profile is to execute the following command: - #+begin_src sh - rzr fps - #+end_src + : $ rzr fps The WASD keys get now lighted accordingly. @@ -55,25 +53,19 @@ This project is a [[https://nixos.wiki/wiki/Flakes][Nix flake]]. If you are running a recent version of the [[https://nixos.org/][Nix]] package manager and have flakes enabled, you can execute it with: - #+begin_src sh - nix run github:Deleh/rzr - #+end_src + : $ nix run github:Deleh/rzr On legacy systems you need to make sure the [[https://github.com/openrazer/openrazer/tree/master/pylib][Python libraries]] for OpenRazer are in your path, then clone this repository and execute: - #+begin_src sh - python setup.py install - #+end_src + : $ python setup.py install Or make sure the requirements in =requirements.txt= are fulfilled and call the program directly with: - #+begin_src sh - python bin/rzr - #+end_src + : $ python bin/rzr ** Usage - #+begin_src text + #+begin_example usage: rzr [-h] [-ld LIGHTMAP_DIRECTORY] [-pd PROFILE_DIRECTORY] [COMMAND] Set color profiles of your Razer devices. @@ -92,7 +84,7 @@ path to directory with lightmaps (default: ~/.config/rzr/lightmaps) -pd PROFILE_DIRECTORY, --profile-directory PROFILE_DIRECTORY path to directory with profiles (default: ~/.config/rzr/profiles) - #+end_src + #+end_example If no command is given and the profile =default= exists, it is applied. @@ -181,9 +173,7 @@ On the bottom of the /General/ section is a text field, labeled /launch options/. Insert the following command: - #+begin_src sh - rzr my_favourite_game & %command% && rzr || rzr - #+end_src + : rzr my_favourite_game & %command%; rzr The first command applies the profile =my_favourite_game= as usual. =&= ensures that the next command is called even if the first one failed. @@ -191,10 +181,7 @@ Steam then substitutes the =%command%= part with the binary of the game and runs it. - The =&&= waits until the first command exited correctly, speaking you quit the game. - If this is the case, the command =rzr= applies your =default= profile. - - In the case of a game crash, the =|| rzr= part makes sure your =default= profile gets applied anyway. + The =;= waits until the game exited and the =rzr= command finally applies your =default= profile. It is neccessary that *rzr* is installed correctly and available in your =$PATH=, otherwise Steam will not be able to call it. @@ -204,14 +191,10 @@ If this is the case and you still have problems, stop the daemon with the following command: - #+begin_example sh - systemctl --user stop openrazer-daemon.service - #+end_example + : $ systemctl --user stop openrazer-daemon.service Then run it manually and check the output: - #+begin_src sh - openrazer-daemon -Fv - #+end_src + : $ openrazer-daemon -Fv If it complains about a missing config file, put [[https://github.com/openrazer/openrazer/blob/master/daemon/resources/razer.conf][this]] file in the =~/.config/openrazer= directory and restart the daemon. diff --git a/bin/rzr b/bin/rzr index bf2d71e..c325064 100644 --- a/bin/rzr +++ b/bin/rzr @@ -213,7 +213,7 @@ def list_profiles(): print("No profiles available") -if __name__ == "__main__": +def main(): global device_manager, lightmap_directory, profile_directory @@ -295,3 +295,7 @@ if __name__ == "__main__": iterate_lights() elif args.command: apply_profile(args.command) + + +if __name__ == "__main__": + main() diff --git a/flake.lock b/flake.lock index c2212f4..c46589a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1619345332, - "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1619637108, - "narHash": "sha256-0wlyFJIooxYoA1vgUMeClLkz+OBLbFZZQmzJqyVC3rQ=", + "lastModified": 1642069818, + "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56d46af5d0a7746cf85351536238c1cb0f32a844", + "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b820025..d2c4c05 100644 --- a/flake.nix +++ b/flake.nix @@ -1,55 +1,41 @@ { - description = "A simple command line frontend for OpenRazer."; - + description = "A simple command line frontend for OpenRazer"; nixConfig.bash-prompt = "\[\\e[1m\\e[32mrzr-develop\\e[0m\]$ "; - inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in { - # Package - packages.rzr = - pkgs.python3Packages.buildPythonApplication rec { - name = "rzr"; src = self; - nativeBuildInputs = with pkgs; [ wrapGAppsHook ]; - propagatedBuildInputs = with pkgs; [ python3Packages.colour python3Packages.openrazer python3Packages.toml ]; - }; - defaultPackage = self.packages.${system}.rzr; # Development shell - devShell = pkgs.mkShell { - buildInputs = with pkgs; [ python3 - python3Packages.pip - python3Packages.virtualenv python3Packages.colour python3Packages.openrazer + python3Packages.pip + python3Packages.setuptools python3Packages.toml + python3Packages.virtualenv ]; - }; } ); diff --git a/setup.py b/setup.py index 6c3667d..5554b5f 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( scripts=["bin/rzr"], url="https://git.opaque.tech/denis/rzr", license="LICENSE", - description="A simple command line frontend for OpenRazer.", + description="A simple command line frontend for OpenRazer", long_description=open("README.org").read(), install_requires=["colour", "openrazer", "toml"], )