repomaa/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix yubikey and gtrackmap

Browse Source
This commit is contained in:
Joakim Repomaa
2025-02-09 22:11:42 +02:00
parent a17b0b46b5
commit 7aad5b5bf0
11 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
custom-pkgs/crystal/default.nix
View File

@@ -1 +1 @@
{ util, ... }: util.package { util, ... }: util.package { }

2
custom-pkgs/fb-client/default.nix
View File

@@ -1 +1 @@
{ util, ... }: util.package { util, ... }: util.package { }

2
custom-pkgs/flameshot/default.nix
View File

@@ -1 +1 @@
{ util, ... }: util.package { util, ... }: util.package { }

2
custom-pkgs/otp/default.nix
View File

@@ -1 +1 @@
{ util, ... }: util.package { util, inputs, ... }: util.package { inherit inputs; }

5
custom-pkgs/otp/package.nix
View File

@@ -1,6 +1,7 @@
{ pkgs }: { pkgs, inputs }:
let let
ykman = "${pkgs.yubikey-manager}/bin/ykman"; yubikey-manager = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.yubikey-manager;
ykman = "${yubikey-manager}/bin/ykman";
sk = "${pkgs.skim}/bin/sk"; sk = "${pkgs.skim}/bin/sk";
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy"; wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
in in

2
custom-pkgs/util.nix
View File

@@ -12,5 +12,5 @@ dir:
}; };
}; };
package = final: prev: { "${dir}" = final.callPackage ./${dir}/package.nix { pkgs = prev; }; }; package = attrs: final: prev: { "${dir}" = final.callPackage ./${dir}/package.nix (attrs // { pkgs = prev; }); };
} }

2
custom-pkgs/wl-copy-both/default.nix
View File

@@ -1 +1 @@
{ util, ... }: util.package { util, ... }: util.package { }

10
home/common/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, inputs, ... }:
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
imports = [ ../gnome ../custom-programs ./neovim ]; imports = [ ../gnome ../custom-programs ./neovim ];
@@ -15,8 +15,8 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
htop htop
gnupg gnupg
yubioath-flutter inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.yubioath-flutter
yubikey-manager inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.yubikey-manager
gcc gcc
sqlite sqlite
nerdfonts nerdfonts
@@ -412,10 +412,6 @@
pinentryPackage = pinentry-gnome3; pinentryPackage = pinentry-gnome3;
}; };
programs.gpg.scdaemonSettings = {
disable-ccid = true;
};
xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = lib.strings.concatLines [ xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = lib.strings.concatLines [
(builtins.readFile "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop") (builtins.readFile "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop")
"X-GNOME-Autostart-enabled=false" "X-GNOME-Autostart-enabled=false"

6
hosts/freun.dev/default.nix
View File

@@ -1,12 +1,8 @@
{ inputs, ... }: { ... }:
let
inherit (inputs) gtrackmap;
in
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./configuration.nix ./configuration.nix
./services.nix ./services.nix
gtrackmap.nixosModules.default
]; ];
} }

11
hosts/radish/hardware.nix
View File

@@ -1,17 +1,14 @@
{ pkgs, inputs, lib, config, ... }: { pkgs, inputs, lib, config, ... }:
let
pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
in
{ {
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
services.pcscd = {
enable = true;
plugins = [
pkgs.ccid
];
};
services.udev.packages = [ services.udev.packages = [
pkgs.zsa-udev-rules pkgs.zsa-udev-rules
pkgs.yubikey-personalization pkgsUnstable.yubikey-personalization
inputs.ksoloti-pr.legacyPackages.${pkgs.system}.ksoloti inputs.ksoloti-pr.legacyPackages.${pkgs.system}.ksoloti
]; ];
services.usbmuxd = { services.usbmuxd = {

8
modules/services/gtrackmap.nix
View File

@@ -1,9 +1,13 @@
{ lib, config, ... }: { lib, config, inputs, ... }:
let let
cfg = config.modules.services.gtrackmap; cfg = config.modules.services.gtrackmap;
fqdn = "${cfg.subdomain}.${config.networking.domain}"; fqdn = "${cfg.subdomain}.${config.networking.domain}";
in in
{ {
imports = [
inputs.gtrackmap.nixosModules.default
];
options.modules.services.gtrackmap = { options.modules.services.gtrackmap = {
enable = lib.mkEnableOption "Enable GTrackmap"; enable = lib.mkEnableOption "Enable GTrackmap";
subdomain = lib.mkOption { subdomain = lib.mkOption {
@@ -15,7 +19,7 @@ in
}; };
}; };
config = { config = lib.mkIf cfg.enable {
services.gtrackmap = { services.gtrackmap = {
enable = true; enable = true;
inherit (cfg) port; inherit (cfg) port;