From ed32d2548b7bc36c57c50d524cf5c291ccdb9925 Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Sun, 1 Dec 2024 06:37:15 -0600 Subject: [PATCH] jsfw testing commit #1 -- should squash testing your config on main? great idea! --- boxes/copernicus/default.nix | 1 + boxes/copernicus/jsfw.json | 13 +++++++++++++ builds/jsfw.nix | 26 ++++++++++++++++++++++++++ lappy/builds/default.nix | 1 + lappy/configuration.nix | 8 ++++++-- lappy/jsfw.json | 10 ++++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 boxes/copernicus/jsfw.json create mode 100644 builds/jsfw.nix create mode 100644 lappy/jsfw.json diff --git a/boxes/copernicus/default.nix b/boxes/copernicus/default.nix index 27df979..9ca9c90 100644 --- a/boxes/copernicus/default.nix +++ b/boxes/copernicus/default.nix @@ -50,6 +50,7 @@ input-leap (pkgs.callPackage ../../builds/archutils.nix {}) + (pkgs.callPackage ../../builds/jsfw.nix {}) (pkgs.callPackage ../../builds/sssg.nix {}) ]; diff --git a/boxes/copernicus/jsfw.json b/boxes/copernicus/jsfw.json new file mode 100644 index 0000000..daee382 --- /dev/null +++ b/boxes/copernicus/jsfw.json @@ -0,0 +1,13 @@ +{ + "slots": [ + { + "controllers": [ + { + "tag": ["keyboard"], + "vendor": "dead", + "product": "beef" + } + ] + } + ] +} diff --git a/builds/jsfw.nix b/builds/jsfw.nix new file mode 100644 index 0000000..428be77 --- /dev/null +++ b/builds/jsfw.nix @@ -0,0 +1,26 @@ +{ stdenv +, lib +, pkgs +, fetchgit +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "jsfw"; + version = "1.00"; + + src = fetchgit { + url = "https://github.com/viandoxdev/jsfw"; + hash = "sha256-/aQGz0/aYM0fA+TUVXC9bYKV8AJVU+hTR6Srvmqn0Nk="; + }; + + buildPhase = '' + make jsfw + ''; + + installPhase = '' + mkdir -p $out/bin + + cp jsfw $out/bin/jsfw + ''; +} diff --git a/lappy/builds/default.nix b/lappy/builds/default.nix index 61fd71e..ffcfaa3 100644 --- a/lappy/builds/default.nix +++ b/lappy/builds/default.nix @@ -5,5 +5,6 @@ (callPackage ./utils.nix {}) (callPackage ./dwm.nix {}) (callPackage ./sssg.nix {}) + (callPackage ../../builds/jsfw.nix {}) ]; } diff --git a/lappy/configuration.nix b/lappy/configuration.nix index d2ebad5..bd8e417 100644 --- a/lappy/configuration.nix +++ b/lappy/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ @@ -32,7 +32,7 @@ users.users.usr = { isNormalUser = true; description = "usr"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "input" ]; packages = with pkgs; []; }; @@ -92,5 +92,9 @@ powerManagement.powertop.enable = true; + # make sshd a `systemctl start sshd` command away + services.openssh.enable = true; + systemd.services.sshd.wantedBy = lib.mkForce []; + system.stateVersion = "24.05"; } diff --git a/lappy/jsfw.json b/lappy/jsfw.json new file mode 100644 index 0000000..1761be4 --- /dev/null +++ b/lappy/jsfw.json @@ -0,0 +1,10 @@ +{ + "controllers": [ + { + "tag": "keyboard", + "filter": { + "name": "AT Translated Set 2 Keyboard" + } + } + ] +}