Compare commits

..

No commits in common. "b1b8726545fd61797cf178d0f1906e088ece2d4d" and "fdfd7ac458f9f280b8d01a7ea9075f70e1f3c934" have entirely different histories.

10 changed files with 151 additions and 74 deletions

144
flake.lock generated
View file

@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1747575206,
"narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
"lastModified": 1745630506,
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
"owner": "ryantm",
"repo": "agenix",
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
"rev": "96e078c646b711aee04b82ba01aefbff87004ded",
"type": "github"
},
"original": {
@ -33,11 +33,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1747587191,
"narHash": "sha256-JswxXCzaDmX/mY5uYJQjntvORumrHQctJ+a1N1wj5EI=",
"lastModified": 1738524606,
"narHash": "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "8eb49a2f178d093b2d54cdcc1eb60a70c1ab1054",
"rev": "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e",
"type": "github"
},
"original": {
@ -163,11 +163,11 @@
]
},
"locked": {
"lastModified": 1747820204,
"narHash": "sha256-oY/mH8K1LOd+YbO58sw9ORtOdTxy3rR9lvTzOJKVUtA=",
"lastModified": 1747365160,
"narHash": "sha256-4ZVr0x+ry6ybym/VhVYACj0HlJo44YxAaPGOxiS88Hg=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "e2676937faf868111dcea6a4a9cf4b6549907c9d",
"rev": "8817b00b0011750381d0d44bb94d61087349b6ba",
"type": "github"
},
"original": {
@ -284,6 +284,7 @@
"inputs": {
"nixpkgs-lib": [
"stylix",
"nur",
"nixpkgs"
]
},
@ -373,6 +374,27 @@
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -440,16 +462,16 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1744584021,
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
"lastModified": 1732369855,
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "48.1",
"ref": "47.2",
"repo": "gnome-shell",
"type": "github"
}
@ -482,11 +504,11 @@
]
},
"locked": {
"lastModified": 1747834438,
"narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
"lastModified": 1747374689,
"narHash": "sha256-JT/aBZqmK1LbExzwT9cPkvxKc0IC4i6tZKOPjsSWFbI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
"rev": "d2263ce5f4c251c0f7608330e8fdb7d1f01f0667",
"type": "github"
},
"original": {
@ -504,11 +526,11 @@
]
},
"locked": {
"lastModified": 1747763032,
"narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=",
"lastModified": 1747279714,
"narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "29dda415f5b2178278283856c6f9f7b48a2a4353",
"rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
"type": "github"
},
"original": {
@ -526,11 +548,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1747773921,
"narHash": "sha256-pB9OG3xmNmfRdTxKWUMQKtVKJseALpNydpXePox/3vU=",
"lastModified": 1747347117,
"narHash": "sha256-wsPOuwczt+kJ4vuf3mm6uMv4wnfWP/RNV5Cp/P5nqQw=",
"ref": "refs/heads/main",
"rev": "4f433a6186be057ae821708a535e265776a92219",
"revCount": 17932,
"rev": "3f355b8fd1ffbe670d756bcf976a38cbe80bb77b",
"revCount": 17891,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -569,11 +591,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1747842926,
"narHash": "sha256-1DUbdZgI1uLNF8L7cw5QC50npHmC0v0hdVkjK2ezj00=",
"lastModified": 1747304844,
"narHash": "sha256-aLS9HqdtAtioT2JJSWQ7cgWKozBmCtxzYWIEZb1RzkA=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "dda83db99c3c6ca2c047183db19533ab6a34ce15",
"rev": "b8326b5bfb204d7b57802a218de1ebbb743bf8dc",
"type": "github"
},
"original": {
@ -602,11 +624,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1747837522,
"narHash": "sha256-6zDhnqL7PTK+w/58ZdLZ3+M8fl/zRbvILAIboC/nMMU=",
"lastModified": 1747289333,
"narHash": "sha256-S2xNTAo0e87rK+sNDQCxOsBKtQEBAAVwgkzdpnWoQC0=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "2415346caaa4121ed202b8e376fb40b2a44eb61f",
"rev": "46a8f81160708d05e9609c318cce64e3e5ac2538",
"type": "github"
},
"original": {
@ -698,11 +720,11 @@
},
"nix-hardware": {
"locked": {
"lastModified": 1747723695,
"narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=",
"lastModified": 1747129300,
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282",
"rev": "e81fd167b33121269149c57806599045fd33eeed",
"type": "github"
},
"original": {
@ -757,11 +779,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1747723695,
"narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=",
"lastModified": 1747129300,
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282",
"rev": "e81fd167b33121269149c57806599045fd33eeed",
"type": "github"
},
"original": {
@ -851,11 +873,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1747676747,
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
"lastModified": 1747209494,
"narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
"rev": "5d736263df906c5da72ab0f372427814de2f52f8",
"type": "github"
},
"original": {
@ -914,11 +936,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1747744144,
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
"lastModified": 1747179050,
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"type": "github"
},
"original": {
@ -930,11 +952,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1747744144,
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
"lastModified": 1747179050,
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"type": "github"
},
"original": {
@ -961,10 +983,10 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1747179050,
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"path": "/nix/store/x9wnkly3k1gkq580m90jjn32q9f05q2v-source",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"path": "/nix/store/2ab9ljvsgkmn3zizflwf61207a23q6q1-source",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"type": "path"
},
"original": {
@ -1028,10 +1050,7 @@
},
"nur": {
"inputs": {
"flake-parts": [
"stylix",
"flake-parts"
],
"flake-parts": "flake-parts_2",
"nixpkgs": [
"stylix",
"nixpkgs"
@ -1154,7 +1173,7 @@
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_5",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
@ -1170,11 +1189,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1747847674,
"narHash": "sha256-XYVaUKQrda7WOSonewDtpvm8tENIcwWrErobUYMTMoc=",
"lastModified": 1747365543,
"narHash": "sha256-r5HRe9CRFe6qvy7KLkTX9WySTqkNmvlobTR8g5AHLHA=",
"owner": "danth",
"repo": "stylix",
"rev": "4ce349da56e075f7e3456b48731cbbf5ae8b1eb8",
"rev": "7566bc015064ed3eb50b436f2225ddab06132beb",
"type": "github"
},
"original": {
@ -1315,16 +1334,17 @@
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1735730497,
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
"lastModified": 1716423189,
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github"
}
},
@ -1403,11 +1423,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1747402859,
"narHash": "sha256-vSDNpKLIotBihDwiwUyyvpX923uqvAhWFeSe5EBO5E4=",
"lastModified": 1742416103,
"narHash": "sha256-y0dToPU2BQNlKBcUTZsLuVj9mc0iNitHGl8MA1jn/v4=",
"owner": "liff",
"repo": "waveforms-flake",
"rev": "95f88467e16f451fa306fbf33d9f1bac28b2d4ef",
"rev": "946e095a995c8501a2e365a8d518465142869ee0",
"type": "github"
},
"original": {

View file

@ -170,7 +170,7 @@
./nixos/overlays/fixup-nheko
./nixos/overlays/fixup-signal
./nixos/overlays/fixup-imhex.nix
#./nixos/overlays/customize-gajim
./nixos/overlays/customize-gajim
./nixos/overlays/sddm-no-vnc.nix
./nixos/overlays/fixup-armcord.nix
./nixos/overlays/jd-gui-wayland.nix

View file

@ -5,11 +5,7 @@
#
{ pkgs, config, ... }:
{
#age.secrets.bandcamp.file = ./bandcamp.cfg.age;
age.secrets.subsonic = {
file = ./subsonic.cfg.age;
owner = "deprekated";
};
age.secrets.bandcamp.file = ./bandcamp.cfg.age;
home-manager.users.deprekated =
{ pkgs, ... }:
@ -22,12 +18,25 @@
extensionPackages = with pkgs; [
mopidy-iris
mopidy-mpd
mopidy-subidy
mopidy-tidal
(mopidy-bandcamp.overrideAttrs (prev: {
patches = [ ./001-fix-mopidy-bandcamp.patch ];
}))
];
settings = {
# Tidal for streaming more-commercial music.
tidal = {
enabled = true;
quality = "LOSSLESS";
};
};
# Probvide our bandcamp authentication as an extra config file.
extraConfigFiles = [
config.age.secrets.subsonic.path
config.age.secrets.bandcamp.path
];
};

View file

@ -16,7 +16,7 @@
# Generic system settings.
#
time.timeZone = "Europe/Amsterdam";
i18n.defaultLocale = "nl_NL.UTF-8";
i18n.defaultLocale = "nl_NL.utf8";
# Allow use of e.g. 'nix search' and flakes.
nix.settings.experimental-features = [

View file

@ -63,6 +63,7 @@ with pkgs;
cyberchef
dasel
delta
deprekages.age-plugin-yubikey
deprekages.avbroot
deprekages.mergiraf
difftastic
@ -158,7 +159,7 @@ with pkgs;
# Development.
colmena
(rustup.overrideAttrs { doCheck = false; })
rustup
clang
clang-tools
flatbuffers

View file

@ -100,7 +100,6 @@ with pkgs;
kicad
obsidian
onboard
supersonic
# Development.
jetbrains.rust-rover

View file

@ -0,0 +1,48 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, pcsclite
, PCSC ? null
, Foundation ? null
, IOKit ? null
}:
rustPlatform.buildRustPackage rec {
pname = "age-plugin-yubikey";
version = "0.5.0";
src = fetchFromGitHub {
owner = "str4d";
repo = "age-plugin-yubikey";
rev = "ca1cd587ff289ee1b9d8f72120e5a2acfb9560ae";
hash = "sha256-9ghnPe83K+qixaFKCdM2FCPoENTNJnZA+OmmpD0E5LE=";
};
cargoHash = "sha256-WddBZG+K6mbI35XF32BltinXkmkwpcRd8CZOB1PTwM8=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
]
++ lib.optional stdenv.isLinux pcsclite
++ lib.optionals stdenv.isDarwin [
IOKit
Foundation
PCSC
];
meta = with lib; {
description = "YubiKey plugin for age";
mainProgram = "age-plugin-yubikey";
homepage = "https://github.com/str4d/age-plugin-yubikey";
changelog = "https://github.com/str4d/age-plugin-yubikey/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ kranzes vtuan10 ];
};
}

View file

@ -56,6 +56,7 @@ flake-utils.lib.eachDefaultSystem (
wsl-gpg-forward = callPackage ./windows/gpg-forward.nix { };
oxfs = callPackage ./oxfs.nix { };
pcsclite = callPackage ./pcsclite.nix { };
age-plugin-yubikey = callPackage ./age-plugin-yubikey.nix { inherit pcsclite; };
humanfx = callPackage ./humanfx { };
clipboard-sync = callPackage ./clipboard-sync.nix { };
vsmartcard = callPackage ./vsmartcard.nix { };

View file

@ -21,5 +21,4 @@ let
in
{
"nixos/configs/music-server/bandcamp.cfg.age".publicKeys = all-machine-pubkeys;
"nixos/configs/music-server/subsonic.cfg.age".publicKeys = all-machine-pubkeys;
}