From c9a91817112b7bcf116896f220459538ae50c8b3 Mon Sep 17 00:00:00 2001 From: marduk Date: Tue, 3 Sep 2024 17:21:16 -0400 Subject: [PATCH 1/5] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b44c226..5056778 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697009197, - "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { From d00db86b24ffa4e5b48bb4bdba6a0996ab6c703d Mon Sep 17 00:00:00 2001 From: marduk Date: Tue, 3 Sep 2024 17:21:39 -0400 Subject: [PATCH 2/5] flake: set formatter to nixfmt-rfc-style --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 38fdc4a..608c5e3 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,8 @@ pkgs = nixpkgs.legacyPackages.${system}; name = "razer-laptop-control"; in { + formatter = pkgs.nixfmt-rfc-style; + packages.default = pkgs.rustPlatform.buildRustPackage { pname = name; version = "0.2.0"; From cfa5c507984633110c893a7bb334aa52c18e5deb Mon Sep 17 00:00:00 2001 From: marduk Date: Tue, 3 Sep 2024 17:21:51 -0400 Subject: [PATCH 3/5] flake: fmt --- flake.nix | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 608c5e3..e7bbb4d 100644 --- a/flake.nix +++ b/flake.nix @@ -6,24 +6,31 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; - outputs = inputs @ { - self, - nixpkgs, - flake-utils, - }: + outputs = + inputs@{ + self, + nixpkgs, + flake-utils, + }: flake-utils.lib.eachDefaultSystem ( - system: let + system: + let pkgs = nixpkgs.legacyPackages.${system}; name = "razer-laptop-control"; - in { + in + { formatter = pkgs.nixfmt-rfc-style; packages.default = pkgs.rustPlatform.buildRustPackage { pname = name; version = "0.2.0"; - nativeBuildInputs = with pkgs; [pkg-config]; - buildInputs = with pkgs; [dbus.dev hidapi systemd]; + nativeBuildInputs = with pkgs; [ pkg-config ]; + buildInputs = with pkgs; [ + dbus.dev + hidapi + systemd + ]; src = ./razer_control_gui; @@ -45,15 +52,18 @@ } ) // { - nixosModules.default = { - config, - lib, - pkgs, - ... - }: - with lib; let + nixosModules.default = + { + config, + lib, + pkgs, + ... + }: + with lib; + let cfg = config.services.razer-laptop-control; - in { + in + { options.services.razer-laptop-control = { enable = mkEnableOption "Enables razer-laptop-control"; package = mkOption { @@ -64,8 +74,8 @@ config = mkIf cfg.enable { services.upower.enable = true; - environment.systemPackages = [cfg.package]; - services.udev.packages = [cfg.package]; + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; systemd.user.services."razerdaemon" = { description = "Razer laptop control daemon"; @@ -74,7 +84,7 @@ ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p %h/.local/share/razercontrol"; ExecStart = "${cfg.package}/libexec/daemon"; }; - wantedBy = ["default.target"]; + wantedBy = [ "default.target" ]; }; }; }; From 609b0b1aa867a5d7ad8cd40846a9a393f064936d Mon Sep 17 00:00:00 2001 From: marduk Date: Tue, 3 Sep 2024 17:25:08 -0400 Subject: [PATCH 4/5] flake: add new build dependencies --- flake.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index e7bbb4d..934d502 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,9 @@ dbus.dev hidapi systemd + glib + pango + gtk3 ]; src = ./razer_control_gui; From 31a10971e48675b75c63822301262cfe104a1601 Mon Sep 17 00:00:00 2001 From: marduk Date: Tue, 3 Sep 2024 23:54:20 -0400 Subject: [PATCH 5/5] flake: create .desktop entry for razer-settings --- flake.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/flake.nix b/flake.nix index 934d502..42f4a9e 100644 --- a/flake.nix +++ b/flake.nix @@ -41,11 +41,30 @@ substituteInPlace src/device.rs --replace '/usr/share/razercontrol/laptops.json' '${./razer_control_gui/data/devices/laptops.json}' ''; + postBuild = + let + app = "razer-settings"; + path = "$out/share/applications/${app}.desktop"; + in + '' + # Install .desktop file + mkdir -p $out/share/applications + cat > ${path} <