diff --git a/flake.lock b/flake.lock index 43ae981..84519ec 100644 --- a/flake.lock +++ b/flake.lock @@ -569,11 +569,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index b0daeeb..35fd1e6 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -19,7 +19,6 @@ social.enable = true; mail.enable = true; gaming.enable = true; - evremap.enable = true; }; terminal.enable = true; }; diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 2bc7bcf..0fcf53a 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -37,8 +37,8 @@ cloud.enable = true; social.enable = true; gaming.enable = true; + ios-compat.enable = true; mail.enable = true; - evremap.enable = false; }; terminal.enable = true; }; diff --git a/modules/desktop/evremap.nix b/modules/desktop/evremap.nix index 98e8380..dc9be06 100644 --- a/modules/desktop/evremap.nix +++ b/modules/desktop/evremap.nix @@ -1,6 +1,5 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, ... }: let - cfg = config.jade.desktop.evremap; evremap = pkgs.rustPlatform.buildRustPackage { pname = "evremap"; version = "0.1.0"; @@ -18,17 +17,12 @@ let nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libevdev ]; }; -in with lib; { - options.jade.desktop.evremap = { - enable = mkEnableOption "Enable evremap"; - }; - config = mkIf cfg.enable { - systemd.services.evremap = { - script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}"; - wantedBy = [ "multi-user.target" ]; - unitConfig = { - Restart = "on-failure"; - }; +in { + systemd.services.evremap = { + script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}"; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + Restart = "on-failure"; }; }; }