From 1c100a1a571e4b992d3194af989eb18942d0b5bd Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Thu, 9 Nov 2023 12:42:54 -0500
Subject: [PATCH] Added qmk
---
config/common.nix | 14 ++++++++++++++
pkgs/dev/default.nix | 1 +
pkgs/dev/python/default.nix | 1 -
pkgs/dev/qmk/config.nix | 4 ++++
pkgs/dev/qmk/default.nix | 10 ++++++++++
5 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 pkgs/dev/qmk/config.nix
create mode 100644 pkgs/dev/qmk/default.nix
diff --git a/config/common.nix b/config/common.nix
index e650768..ff4bb96 100644
--- a/config/common.nix
+++ b/config/common.nix
@@ -1306,6 +1306,20 @@
};
};
};
+ qmk = lib.mkOption {
+ type = lib.types.submodule {
+ options = {
+ enabled = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ example = true;
+ description = ''
+ Whether or not qmk has been installed.
+ '';
+ };
+ };
+ };
+ };
nikola = lib.mkOption {
type = lib.types.submodule {
options = {
diff --git a/pkgs/dev/default.nix b/pkgs/dev/default.nix
index 5b2f2a5..c716221 100644
--- a/pkgs/dev/default.nix
+++ b/pkgs/dev/default.nix
@@ -14,5 +14,6 @@
./gcc
./nikola
./vercel
+ ./qmk
];
}
diff --git a/pkgs/dev/python/default.nix b/pkgs/dev/python/default.nix
index 15df3df..852fb10 100644
--- a/pkgs/dev/python/default.nix
+++ b/pkgs/dev/python/default.nix
@@ -8,7 +8,6 @@
environment.systemPackages = with pkgs; [
(python310.withPackages (p: with p; [
# other python packages
- qmk
]))
#system packages for python
diff --git a/pkgs/dev/qmk/config.nix b/pkgs/dev/qmk/config.nix
new file mode 100644
index 0000000..09a6f10
--- /dev/null
+++ b/pkgs/dev/qmk/config.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+ config.provides.dev.qmk.enabled = true;
+}
diff --git a/pkgs/dev/qmk/default.nix b/pkgs/dev/qmk/default.nix
new file mode 100644
index 0000000..84fcd94
--- /dev/null
+++ b/pkgs/dev/qmk/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+ imports = [
+ ../common.nix
+ ./config.nix
+ ];
+
+ environment.systemPackages = with pkgs; [
+ qmk
+ ];
+}
--
GitLab