From 490fac55f26ceebff85bafd29db119a40ab31613 Mon Sep 17 00:00:00 2001 From: Kate Temkin Date: Sun, 26 Jan 2025 14:42:14 +0100 Subject: [PATCH] updates & make bandcamp + mopidy work --- flake.lock | 68 +++++++++--------- flake.nix | 3 +- nixos/configs/gui/niri.nix | 15 ++++ nixos/configs/music-server/bandcamp.cfg.age | Bin 0 -> 768 bytes .../default.nix} | 13 +++- nixos/hosts/trailblazer/default.nix | 10 +++ nixos/packages/gui.pkgs.nix | 5 +- packages/notion-app/default.nix | 8 +-- secrets.nix | 24 +++++++ xonsh/rc.xsh | 4 +- 10 files changed, 105 insertions(+), 45 deletions(-) create mode 100644 nixos/configs/music-server/bandcamp.cfg.age rename nixos/configs/{music-server.nix => music-server/default.nix} (71%) create mode 100644 secrets.nix diff --git a/flake.lock b/flake.lock index 158180e..d3ff274 100644 --- a/flake.lock +++ b/flake.lock @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1737085297, - "narHash": "sha256-0gpgsX7hCauT6pblVg+hrDnt83lPoYzq/2BqqyvU8Tc=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "09414c7e2def24a5c52e588017b8524bcb68972a", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -482,11 +482,11 @@ ] }, "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "lastModified": 1737704314, + "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=", "owner": "nix-community", "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", + "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7", "type": "github" }, "original": { @@ -526,11 +526,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737086202, - "narHash": "sha256-33tcNERQt1R7tr/W7pvQj8R6NJktyTOKMIfY16RHLK8=", + "lastModified": 1737739244, + "narHash": "sha256-D0hxQ9BkIV6J9c6uoEFt667LMhl2LvX6ptHUWK6VP8I=", "ref": "refs/heads/main", - "rev": "0d14c2b67a407825e3427bf079b31de069d9653a", - "revCount": 16626, + "rev": "523bd9dce89c29cda3b50f78911d534556775f5f", + "revCount": 16683, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -569,11 +569,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737109534, - "narHash": "sha256-ONWusynmMvogEBeCTeZewIDmY4kZYxgv9D/TSL5kH70=", + "lastModified": 1737746480, + "narHash": "sha256-Lccg6b+Sz6TSDj4BpLZhugauwDa/CyCjF7E6W3VvYa0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ce46857ea5bcd4e40040d46c6f495fa387fb812a", + "rev": "afeb7877090d50d02c1ecab3159b328b85a44868", "type": "github" }, "original": { @@ -602,11 +602,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737102881, - "narHash": "sha256-5Lyjc7NduC+5t/Ypuj8DwjfJmdxetzELj6noRNBY8fQ=", + "lastModified": 1737697331, + "narHash": "sha256-9k77pFW2ANx8bZc+RcF6YP9McFZsUCWWY+XwBX0P3/Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "b4add625b2ffdad3e003b3e437891daacf53a12f", + "rev": "748d90b443b9f20134020c21760b5b6c2c42a7de", "type": "github" }, "original": { @@ -698,11 +698,11 @@ }, "nix-hardware": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -757,11 +757,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -851,11 +851,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -914,11 +914,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { @@ -930,11 +930,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736993991, - "narHash": "sha256-kPDt3QgeIsct9f375LIGmSoZKl7Z4AVzXX+9U0VV5PI=", + "lastModified": 1737657729, + "narHash": "sha256-TIDR1zKoP2uaqRot/LnarugfAC9U7geycjbJqA1naVM=", "owner": "danth", "repo": "stylix", - "rev": "a88c4d264a4379b7fe5a9e75ed51bea96f8dd407", + "rev": "e594886eb0951a0a0c28ffa333a9df6fb13857a1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 80b01dc..ed6ebcf 100644 --- a/flake.nix +++ b/flake.nix @@ -131,6 +131,7 @@ ./nixos/services/tailscale.nix + agenix.nixosModules.default home-manager.nixosModules.home-manager ]; @@ -165,8 +166,8 @@ ./nixos/configs/gui ./nixos/configs/flatpak.nix + ./nixos/configs/music-server ./nixos/configs/fonts-linux.nix - ./nixos/configs/music-server.nix ./nixos/overlays/fixup-signal ./nixos/overlays/fixup-imhex.nix diff --git a/nixos/configs/gui/niri.nix b/nixos/configs/gui/niri.nix index cf12c47..3291aef 100644 --- a/nixos/configs/gui/niri.nix +++ b/nixos/configs/gui/niri.nix @@ -184,6 +184,21 @@ in default-column-width = { }; } + # Make anki flashcard windows modal floats. + { + matches = [{ + app-id = "^anki$"; + title = "Add"; + }]; + + open-floating = true; + default-floating-position = { + x = 0; + y = 0; + relative-to = "top-right"; + }; + } + # Talon windows should show over other ones. { matches = [ { app-id = "talon"; } ]; diff --git a/nixos/configs/music-server/bandcamp.cfg.age b/nixos/configs/music-server/bandcamp.cfg.age new file mode 100644 index 0000000000000000000000000000000000000000..f5eb008153ac7a0e1544996d975172b61046327c GIT binary patch literal 768 zcmY+-OKZ~r007_}RHWiTRPf-TyXc{GO`2x~#WZP~q-mREY17tc+O%oXv`N~ed0Z6K zT?7Tei&Id<>m~|2Ife&86a)oDCy3%{GVpbffvEGiKk$8u)=74T?NMmEx;31!Mp|kD z#*)Y4<8d$9QPT(lX5uiEZ8U}W2$Dr`f{p;nE0K|<6yZkBkBEw_cUE zDso2k^colpjb0x{h;+pkwp?H^wzSPF;VKQsA-z6`^r#e>$1$gakjN}tL`iobS`0-s z0H-Q6%Y3Y5n8gBb)R`VpvUN^jFsvoAu&WOoy;_iqKnYcO%*5^Hc*{jamS$~UDO~qj zfX*~zZWK_8SW6MbPNEN|&1OPo!yHqS23c&Au%y_SbA3C}cIpxWV>)Lj2B-0ZP;e#L zEKcfW6!D~J=tnlfY`J8b5CkDkc>Rd0p}vo)Qmxnat5%>7hi=r(HD)tTG>d>@A^^2c zqyVj0hK5F(Bli3jY1=7RHNys8=+?Rw*2g7ptku~>hRDT|98)($g>Xy%*-U&uzc;Yx>ja^`-S451y^8@_T~E z2l97L0;G2M!}nlmKlCa4`R^Wn8q;n*dH;>=bS}P}LEmi9cgv@)e9S+*bGh{P$4XW^ ivG)7K#-F1z=8NO6zx<9rJx85+H#L7Q6e