mirror of
https://forge.katzen.cafe/schrottkatze/nix-configs.git
synced 2024-11-05 15:16:23 +01:00
make evremap DRYer
This commit is contained in:
parent
d9c9e8877d
commit
995714ced3
|
@ -2,26 +2,7 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }: {
|
||||||
let
|
|
||||||
evremap = pkgs.rustPlatform.buildRustPackage {
|
|
||||||
pname = "evremap";
|
|
||||||
version = "0.1.0";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "wez";
|
|
||||||
repo = "evremap";
|
|
||||||
rev = "4480c4eda223b98899b0fbd926bc34f7bd0e1a18";
|
|
||||||
sha256 = "sha256-BxSrphgW1n465FX6bKVkq6O0XE2JqanfSYlsGwWUWkQ=";
|
|
||||||
};
|
|
||||||
cargoHash = "";
|
|
||||||
cargoLock.lockFile = ../../other/evremap.Cargo.lock;
|
|
||||||
postPatch = ''
|
|
||||||
cp ${../../other/evremap.Cargo.lock} Cargo.lock
|
|
||||||
'';
|
|
||||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
|
||||||
buildInputs = [ pkgs.libevdev ];
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
@ -77,13 +58,6 @@ in {
|
||||||
"/crypto_keyfile.bin" = null;
|
"/crypto_keyfile.bin" = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services = {
|
|
||||||
evremap = {
|
|
||||||
script = "${evremap}/bin/evremap remap ${../../other/remaps-catbook.toml}";
|
|
||||||
wantedBy = ["multi-user.target"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# nixpkgs = {
|
# nixpkgs = {
|
||||||
# overlays = [
|
# overlays = [
|
||||||
# (self: super: {
|
# (self: super: {
|
||||||
|
@ -136,6 +110,7 @@ in {
|
||||||
LC_TELEPHONE = "de_DE.UTF-8";
|
LC_TELEPHONE = "de_DE.UTF-8";
|
||||||
LC_TIME = "de_DE.UTF-8";
|
LC_TIME = "de_DE.UTF-8";
|
||||||
};
|
};
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
@ -1,23 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
let
|
|
||||||
evremap = pkgs.rustPlatform.buildRustPackage {
|
|
||||||
pname = "evremap";
|
|
||||||
version = "0.1.0";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "wez";
|
|
||||||
repo = "evremap";
|
|
||||||
rev = "4480c4eda223b98899b0fbd926bc34f7bd0e1a18";
|
|
||||||
sha256 = "sha256-BxSrphgW1n465FX6bKVkq6O0XE2JqanfSYlsGwWUWkQ=";
|
|
||||||
};
|
|
||||||
cargoHash = "";
|
|
||||||
cargoLock.lockFile = ../../other/evremap.Cargo.lock;
|
|
||||||
postPatch = ''
|
|
||||||
cp ${../../other/evremap.Cargo.lock} Cargo.lock
|
|
||||||
'';
|
|
||||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
|
||||||
buildInputs = [ pkgs.libevdev ];
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
trusted-substituters = [
|
trusted-substituters = [
|
||||||
"https://t2linux.cachix.org"
|
"https://t2linux.cachix.org"
|
||||||
|
@ -185,10 +166,6 @@ in {
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
evremap = {
|
|
||||||
script = "${evremap}/bin/evremap remap ${../../other/remaps.toml}";
|
|
||||||
wantedBy = ["multi-user.target"];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.logind.extraConfig = ''
|
services.logind.extraConfig = ''
|
||||||
|
|
|
@ -26,6 +26,7 @@ in with lib; {
|
||||||
./social.nix
|
./social.nix
|
||||||
./mail.nix
|
./mail.nix
|
||||||
./specific-hardware
|
./specific-hardware
|
||||||
|
./evremap.nix
|
||||||
./xmonad.nix
|
./xmonad.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
25
modules/desktop/evremap.nix
Normal file
25
modules/desktop/evremap.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ pkgs, config, ... }:
|
||||||
|
let
|
||||||
|
evremap = pkgs.rustPlatform.buildRustPackage {
|
||||||
|
pname = "evremap";
|
||||||
|
version = "0.1.0";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "wez";
|
||||||
|
repo = "evremap";
|
||||||
|
rev = "4480c4eda223b98899b0fbd926bc34f7bd0e1a18";
|
||||||
|
sha256 = "sha256-BxSrphgW1n465FX6bKVkq6O0XE2JqanfSYlsGwWUWkQ=";
|
||||||
|
};
|
||||||
|
cargoHash = "";
|
||||||
|
cargoLock.lockFile = ../../other/evremap.Cargo.lock;
|
||||||
|
postPatch = ''
|
||||||
|
cp ${../../other/evremap.Cargo.lock} Cargo.lock
|
||||||
|
'';
|
||||||
|
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||||
|
buildInputs = [ pkgs.libevdev ];
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
systemd.services.evremap = {
|
||||||
|
script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue