summaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorMartin Fischer <martin@push-f.com>2025-05-11 10:32:56 +0200
committerMartin Fischer <martin@push-f.com>2025-06-14 14:29:24 +0200
commitc64de1af3152bb26300ba4ba99c0dd7cf7a268d8 (patch)
tree334f0d9fe1626617518cb3115fe488a5c9edce84 /nixos
parent68b0599788401c271c0133138fb073210d1f008b (diff)
tweak(workstation): add config for XPPen tabletHEADmaster
I'm removing nixpkgs-overlays from nix.nixPath because overlays seem to work fine without it (with just nixpkgs.overlays). And keeping it would have required me to adapt the path because `nix-shell -p` was failing with "The overlays argument to nixpkgs must be a list" due to the new pkgs param.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/profiles/common/nixpkgs/overlays.nix13
-rw-r--r--nixos/profiles/common/sanix.nix3
2 files changed, 13 insertions, 3 deletions
diff --git a/nixos/profiles/common/nixpkgs/overlays.nix b/nixos/profiles/common/nixpkgs/overlays.nix
index 613338f..7bad946 100644
--- a/nixos/profiles/common/nixpkgs/overlays.nix
+++ b/nixos/profiles/common/nixpkgs/overlays.nix
@@ -1,4 +1,15 @@
# https://nixos.org/manual/nixpkgs/stable/#sec-overlays-definition
+{ pkgs, ... }:
[
-
+ (final: prev: {
+ sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
+ patches = old.patches ++ [
+ # https://github.com/swaywm/sway/pull/8761
+ (pkgs.fetchpatch {
+ url = "https://github.com/swaywm/sway/commit/af7c6ec7b1daeeec67dd17e27fb75f1f1c347327.patch";
+ hash = "sha256-DxN/3IdswZ6q/ksBVr+wgwGe7ScJeg8gFHYQdQAueww=";
+ })
+ ];
+ });
+ })
]
diff --git a/nixos/profiles/common/sanix.nix b/nixos/profiles/common/sanix.nix
index a20db24..626aa73 100644
--- a/nixos/profiles/common/sanix.nix
+++ b/nixos/profiles/common/sanix.nix
@@ -2,14 +2,13 @@
# Use the Nixpkgs config and overlays from the local files for this NixOS build
nixpkgs = {
config = import ./nixpkgs/config.nix;
- overlays = import ./nixpkgs/overlays.nix;
+ overlays = import ./nixpkgs/overlays.nix { inherit pkgs; };
};
# Makes commands default to the same Nixpkgs, config, overlays and NixOS configuration
nix.nixPath = [
"nixpkgs=${pkgs.path}"
"nixos-config=${toString <nixos-config>}"
- "nixpkgs-overlays=${toString ./nixpkgs/overlays.nix}"
];
environment.variables.NIXPKGS_CONFIG = lib.mkForce (toString ./nixpkgs/config.nix);