fix(gnupg): disable-ccid breaks yubikey
This commit is contained in:
Patrick 2024-10-20 14:44:32 +02:00
parent b59ba06ced
commit fb9143ea5f
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
21 changed files with 93 additions and 350 deletions

View file

@ -9,7 +9,6 @@
{ {
imports = [ imports = [
../../modules-hm/impermanence.nix ../../modules-hm/impermanence.nix
../../modules-hm/images.nix
]; ];
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;

View file

@ -4,7 +4,10 @@
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
allowed-users = [ "@wheel" ]; allowed-users = [ "@wheel" ];
trusted-users = [ "root" ]; trusted-users = [
"root"
"@wheel"
];
system-features = [ system-features = [
"recursive-nix" "recursive-nix"
"repl-flake" "repl-flake"

View file

@ -37,11 +37,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1727102360, "lastModified": 1729172588,
"narHash": "sha256-ZDqf33OAsr46TlP7TXbxmEf48xenYA3iSLs9441fYbQ=", "narHash": "sha256-BLAyMpW3onKZ0tOfXRY26baJL9fZ/OogccFWO0uNyuw=",
"owner": "oddlama", "owner": "oddlama",
"repo": "agenix-rekey", "repo": "agenix-rekey",
"rev": "62da71e7eadf6b9b52e831d2e516937c30a5f712", "rev": "0488a23f882df0de8107e46da88177bd038ab4d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -306,11 +306,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728334376, "lastModified": 1729281548,
"narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -724,11 +724,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728092656, "lastModified": 1729104314,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -892,11 +892,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728337164, "lastModified": 1729321331,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -913,11 +913,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728337164, "lastModified": 1729260213,
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -949,11 +949,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1727649413, "lastModified": 1729068498,
"narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=", "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "d0b38e550039a72aff896ee65b0918e975e6d48e", "rev": "e337457502571b23e449bf42153d7faa10c0a562",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -995,11 +995,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1728216729, "lastModified": 1728821524,
"narHash": "sha256-HsisE2yMld0LckvQ3v/00bXFg11E5Q2XI8taPUewDPA=", "narHash": "sha256-Tc4g0n0WxGLLUJYJwrhSE3/l05xUcREEx9y+R4Gi4RA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "6c4cf448d33ce86bcc06c6d50bcecc33666105ee", "rev": "8921856c37862428741a29cfd4c98c4893ca407d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1032,11 +1032,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1728349983, "lastModified": 1728779945,
"narHash": "sha256-VRQm46/W29z87IeITfvxIrS6LUEItgDtEDzqVX59q0E=", "narHash": "sha256-RFKyZygnUbJlWq1uBn4JvEEcQKZW3AFBL3bQoywECPI=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "470537e671d743f40812b9c071a4130eabdb3deb", "rev": "4d81c4115ef832880561f243efec21f06d2a8b7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1053,11 +1053,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728385805, "lastModified": 1728901530,
"narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1074,11 +1074,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1727953523, "lastModified": 1728593025,
"narHash": "sha256-cT8fN56OHCqTajmj2JwDL5uhTIEFvVSnBRvypXfZ9f4=", "narHash": "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "7ae693d28c5922533ce86f348ddb6709a2beffbf", "rev": "a3307ac4b38b6dae769f771c877a6f2c236ee238",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1116,11 +1116,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728263287, "lastModified": 1728790083,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1152,11 +1152,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1728176478, "lastModified": 1728781282,
"narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1197,11 +1197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728308313, "lastModified": 1729127034,
"narHash": "sha256-GThSJ4OcPOOtf8j8ge7ik4141BHVbBALu0N7Ju+Nw18=", "narHash": "sha256-42AMGl+dh4I2wGgICSeDI1mqYaDEJhwqquHJ1vA0QiQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "71f9c8bcc87f15dba12515e94e40de243b5db103", "rev": "dd28a0806e7124fe392c33c9ccaa12f21970401f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1212,11 +1212,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728269138, "lastModified": 1729333370,
"narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1276,11 +1276,11 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1728176478, "lastModified": 1728781282,
"narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "rev": "16340f605f4e8e5cf07fd74dcbe692eee2d4f51b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1395,11 +1395,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728373025, "lastModified": 1729330084,
"narHash": "sha256-5iEV1QH5A74HbTvSR+yrPttqwf6gzlL76JQiXB+P/Q4=", "narHash": "sha256-3lGZyrHLmCSXcFEv1th04j/+2CUMzNDvQdbqXHMBqfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "0a5e8f7bd281e879e9a5fe614d27162261c544d9", "rev": "349ce1dcf7ce051dccb7432f950203117f5995f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1410,11 +1410,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1728241625, "lastModified": 1729256560,
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1471,11 +1471,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1728485062, "lastModified": 1729332380,
"narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=", "narHash": "sha256-ePzkpRV4zYR9cO1o5HrYuZRmoEthsPgNP0cvRGlHSro=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135", "rev": "e3239b4d328efaaf090892fbca71a1008dbc5a59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1493,11 +1493,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728423244, "lastModified": 1728905062,
"narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1631,11 +1631,11 @@
"nixpkgs-stable": "nixpkgs-stable_5" "nixpkgs-stable": "nixpkgs-stable_5"
}, },
"locked": { "locked": {
"lastModified": 1728092656, "lastModified": 1729104314,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1722,11 +1722,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728447442, "lastModified": 1729311378,
"narHash": "sha256-4KRBf3doA1OKSQcXc5eQu1NHFdno0SSZI/Xmj4zy1iU=", "narHash": "sha256-EJieGv/hQr3EIo5hEvYHjvi8dMZc8fdT1nXrq6I0Ob0=",
"owner": "Gerg-l", "owner": "Gerg-l",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "85ca2b370f962f81973443adb31f2e3559eda1dd", "rev": "3dd5c8c33ee1b8d20d855e9fa425361719931b04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2025,11 +2025,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727984844, "lastModified": 1729242555,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,7 +1,6 @@
{ {
inputs, inputs,
lib, lib,
pkgs,
... ...
}: }:
{ {
@ -29,8 +28,6 @@
../../config/optional/xserver.nix ../../config/optional/xserver.nix
../../config/optional/zfs.nix ../../config/optional/zfs.nix
../../modules-hm/streamdeck.nix
./net.nix ./net.nix
./fs.nix ./fs.nix
@ -79,6 +76,5 @@
#nixpkgs.config.cudaSupport = true; #nixpkgs.config.cudaSupport = true;
environment.systemPackages = [ pkgs.streamcontroller ]; programs.streamcontroller.enable = true;
services.udev.packages = [ pkgs.streamcontroller ];
} }

View file

@ -1,63 +0,0 @@
{ lib, config, ... }:
let
inherit (lib)
mkEnableOption
mkMerge
attrNames
flip
filterAttrs
mkIf
mkOption
types
removeSuffix
hasPrefix
mapAttrs'
listToAttrs
;
in
{
home-manager.sharedModules = [
{
options.images = {
enable = mkEnableOption "Enable images";
images = mkOption {
type = types.attrsOf types.path;
readOnly = true;
default = flip mapAttrs' (filterAttrs (n: _: hasPrefix "images-" n) config.age.secrets) (
name: value: {
inherit (value) name;
value = value.path;
}
);
};
};
}
];
imports = [
(
{ config, ... }:
{
age.secrets = mkMerge (
flip map (attrNames config.home-manager.users) (
user:
mkIf config.home-manager.users.${user}.images.enable (
listToAttrs (
flip map (attrNames (filterAttrs (_: type: type == "regular") (builtins.readDir ../secrets/img)))
(file: {
name = "images-${user}-${file}";
value = {
name = removeSuffix ".age" file;
rekeyFile = ../secrets/img/${file};
owner = user;
group = user;
};
})
)
)
)
);
}
)
];
}

View file

@ -1,59 +0,0 @@
{ lib, pkgs, ... }:
let
inherit (lib)
types
mkEnableOption
mkPackageOption
mkOption
mkIf
;
settingsFormat = pkgs.formats.json { };
in
{
home-manager.sharedModules = [
(
{ config, ... }:
let
cfg = settingsFormat.generate "config.json" {
streamdeck_ui_version = 2;
state = config.programs.streamdeck-ui.settings;
};
preStart = pkgs.writeShellScript "streamdeck-setup-config" ''
${pkgs.coreutils}/bin/cp "${cfg}" "$XDG_RUNTIME_DIR/streamdeck/config.json"
'';
in
{
options.programs.streamdeck-ui = {
enable = mkEnableOption "streamdeck-ui";
package = mkPackageOption pkgs "streamdeck-ui" { };
settings = mkOption {
default = { };
type = types.submodule { freeformType = settingsFormat.type; };
description = "Configuration per streamdeck";
};
};
config = mkIf config.programs.streamdeck-ui.enable {
systemd.user = {
services = {
streamdeck = {
Unit = {
Description = "start streamdeck-ui";
# For some reason this depends on X or wayland running
ConditionEnvironment = [ "DISPLAY" ];
};
Service = {
Type = "exec";
ExecStart = "${pkgs.streamdeck-ui}/bin/streamdeck --no-ui";
ExecStartPre = preStart;
Environment = ''STREAMDECK_UI_CONFIG=%t/streamdeck/config.json'';
RuntimeDirectory = "streamdeck";
};
Install.WantedBy = [ "graphical-session.target" ];
};
};
};
};
}
)
];
}

View file

@ -10,27 +10,23 @@ _inputs: [
minion = prev.callPackage ./minion.nix { }; minion = prev.callPackage ./minion.nix { };
mongodb-bin = prev.callPackage ./mongodb-bin.nix { }; mongodb-bin = prev.callPackage ./mongodb-bin.nix { };
awakened-poe-trade = prev.callPackage ./awakened-poe-trade.nix { }; awakened-poe-trade = prev.callPackage ./awakened-poe-trade.nix { };
neovim-clean = prev.neovim-unwrapped.overrideAttrs neovim-clean = prev.neovim-unwrapped.overrideAttrs (
(_neovimFinal: neovimPrev: { _neovimFinal: neovimPrev: {
nativeBuildInputs = (neovimPrev.nativeBuildInputs or [ ]) nativeBuildInputs = (neovimPrev.nativeBuildInputs or [ ]) ++ [ prev.makeWrapper ];
++ [ prev.makeWrapper ]; postInstall =
postInstall = (neovimPrev.postInstall or "") + '' (neovimPrev.postInstall or "")
wrapProgram $out/bin/nvim --add-flags "--clean" + ''
''; wrapProgram $out/bin/nvim --add-flags "--clean"
}); '';
}
);
path-of-building = prev.path-of-building.overrideAttrs (old: { path-of-building = prev.path-of-building.overrideAttrs (old: {
postFixup = (old.postFixup or "") + '' postFixup =
wrapProgram $out/bin/pobfrontend \ (old.postFixup or "")
--set QT_QPA_PLATFORM xcb + ''
''; wrapProgram $out/bin/pobfrontend \
--set QT_QPA_PLATFORM xcb
'';
}); });
#pythonPackagesExtension = prev.pythonPackagesExtension ++ [
# (_pythonFinal: pythonPrev: {
# usb-monitor =
# pythonPrev.callPackage
# "${inputs.nixkgs-streamcontroller}/pkgs/development/python-modules/usb-monitor/default.nix"
# { };
# })
#];
}) })
] ]

View file

@ -2,7 +2,7 @@
stdenvNoCC, stdenvNoCC,
lib, lib,
fetchzip, fetchzip,
openjdk11, openjdk17,
makeDesktopItem, makeDesktopItem,
javaPackages, javaPackages,
gsettings-desktop-schemas, gsettings-desktop-schemas,
@ -10,8 +10,8 @@
}: }:
let let
openjfx = javaPackages.openjfx11.override { withWebKit = true; }; openjfx = javaPackages.openjfx17.override { withWebKit = true; };
jdk = openjdk11.override ( jdk = openjdk17.override (
prev: prev:
prev prev
// { // {

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -8,7 +8,7 @@
programs.gpg = { programs.gpg = {
enable = true; enable = true;
scdaemonSettings.disable-ccid = true; #scdaemonSettings.disable-ccid = true;
settings = { settings = {
# https://github.com/drduh/config/blob/master/gpg.conf # https://github.com/drduh/config/blob/master/gpg.conf
# https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html # https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html

View file

@ -48,7 +48,6 @@
zls.enable = true; zls.enable = true;
pyright.enable = true; pyright.enable = true;
texlab.enable = true; texlab.enable = true;
ocamllsp.enable = true;
java_language_server.enable = true; java_language_server.enable = true;
nil_ls = { nil_ls = {
enable = true; enable = true;

View file

@ -84,7 +84,6 @@ lib.optionalAttrs (!minimal) {
++ { ++ {
"desktopnix" = [ "desktopnix" = [
../common/graphical/Xorg ../common/graphical/Xorg
./streamdeck.nix
../common/programs/obs.nix ../common/programs/obs.nix
../common/graphical/wayland ../common/graphical/wayland
./smb.nix ./smb.nix

View file

@ -17,6 +17,8 @@
".config/streamcontroller" ".config/streamcontroller"
".local/share/streamcontroller" ".local/share/streamcontroller"
#TODO: remove once merged
".var/app/com.core447.StreamController/"
# for netflix # for netflix
".config/google-chrome" ".config/google-chrome"

View file

@ -5,7 +5,6 @@
... ...
}: }:
{ {
images.enable = true;
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
nextcloud-client nextcloud-client

View file

@ -1,128 +0,0 @@
{ config, ... }:
{
programs.streamdeck-ui = {
#enable = true;
settings = {
# Device ID
"AL31H1B01852" = {
# fuck you streamdeck?
# why no distinction between settings and state????
rotation = 0;
buttons = {
# Page number
"0" = {
# button number
"5" = {
state = 0;
states = {
"0" = {
# keyInput to press
keys = "ctrl+F7";
# Text shown on button
#text = "mute";
icon = config.images.images."mic.png";
# Text position
text_vertical_align = "middle-bottom";
background_color = "#7289DA";
};
};
};
"0" = {
state = 0;
states = {
"0" = {
keys = "ctrl+F9";
icon = config.images.images."wallpaper.png";
background_color = "#7289DA";
};
};
};
"6" = {
state = 0;
states = {
"0" = {
keys = "ctrl+F8";
icon = config.images.images."heads.png";
background_color = "#7289DA";
};
};
};
"14" = {
state = 0;
states = {
"0" = {
keys = "cmd+F12";
icon = config.images.images."screenshot.png";
text_vertical_align = "middle";
background_color = config.lib.stylix.colors.withHashtag.base09;
};
};
};
"9" = {
state = 0;
states = {
"0" = {
keys = "cmd+F11";
icon = config.images.images."screenshot.png";
text = "SAVE";
text_vertical_align = "middle";
font = "${config.stylix.fonts.serif.package}/share/fonts/truetype/DejaVuSerif.ttf";
background_color = config.lib.stylix.colors.withHashtag.base09;
};
};
};
"4" = {
state = 0;
states = {
"0" = {
keys = "cmd+F10";
icon = config.images.images."screenshot.png";
text = "QR";
text_vertical_align = "middle";
background_color = config.lib.stylix.colors.withHashtag.base09;
};
};
};
"3" = {
state = 0;
states = {
"0" = {
keys = "cmd+F9";
icon = config.images.images."screenshot.png";
text = "OCR";
text_vertical_align = "middle";
background_color = config.lib.stylix.colors.withHashtag.base09;
};
};
};
"13" = {
state = 0;
states = {
"0" = {
icon = config.images.images."player.png";
switch_page = 2;
};
};
};
};
"1" = {
"0" = {
state = 0;
states = {
"0" = {
icon = config.images.images."back.png";
switch_page = 1;
background_color = config.lib.stylix.colors.withHashtag.base0C;
};
};
};
};
};
page = 0; # The startup page
brightness = 99; # brighness value between 0 and 99
display_timeout = 0; # dimmer timeout in seconds
brightness_dimmed = 99; # dimmed brighness
};
};
};
}