From 33f4838d5ca10c2eea3592086815dda2cde165bd Mon Sep 17 00:00:00 2001 From: Tristan Date: Sat, 28 Mar 2026 16:11:30 +0000 Subject: [PATCH 1/5] zenix: add bs-manager and grayjay --- home/default.nix | 1 - home/desktop/hyprland/default.nix | 2 +- home/programs/gamer.nix | 2 +- home/programs/graphical.nix | 2 +- home/programs/pcmanfm.nix | 9 --------- home/programs/qutebrowser.nix | 4 ---- 6 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 home/programs/pcmanfm.nix diff --git a/home/default.nix b/home/default.nix index b68866f..ad89225 100644 --- a/home/default.nix +++ b/home/default.nix @@ -16,7 +16,6 @@ home.homeDirectory = "/home/${config.home.username}"; xdg.userDirs.enable = true; - xdg.mimeApps.enable = true; manual.html.enable = true; diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 53ec0b2..59e6860 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -16,7 +16,7 @@ in { xdg.portal = { enable = true; configPackages = [pkgs.hyprland]; - extraPortals = [pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr]; + extraPortals = [pkgs.xdg-desktop-portal-gtk]; }; wayland.windowManager.hyprland = { diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix index 99e8627..2974811 100644 --- a/home/programs/gamer.nix +++ b/home/programs/gamer.nix @@ -11,7 +11,7 @@ gamescope gamemode mangohud - # BeatSaberModManager - out of date: https://github.com/NixOS/nixpkgs/pull/339370 + bs-manager protontricks protonup-qt oversteer diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 2fbbb1e..90cc2bf 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -32,6 +32,7 @@ inputs.zen-browser.packages.x86_64-linux.default brave + grayjay ]; programs.obs-studio = { @@ -54,5 +55,4 @@ "file:///$HOME/Downloads" ]; }; - } diff --git a/home/programs/pcmanfm.nix b/home/programs/pcmanfm.nix deleted file mode 100644 index 51e6620..0000000 --- a/home/programs/pcmanfm.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - pcmanfm - ]; - - xdg.mimeApps.defaultApplications = { - "inode/directory" = "pcmanfm.desktop"; - }; -} diff --git a/home/programs/qutebrowser.nix b/home/programs/qutebrowser.nix index a097dab..1a947a4 100644 --- a/home/programs/qutebrowser.nix +++ b/home/programs/qutebrowser.nix @@ -1,9 +1,5 @@ { home.sessionVariables.BROWSER = "qutebrowser"; - xdg.mimeApps.defaultApplications = { - "application/xhtml+xml" = "org.qutebrowser.qutebrowser.desktop"; - "text/html" = "org.qutebrowser.qutebrowser.desktop"; - }; programs.qutebrowser = { enable = true; searchEngines = { From a87bb2f9db1eb5012d6ffc2033c799820b60f438 Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 22 Apr 2026 17:52:20 +0100 Subject: [PATCH 2/5] zenix: update --- flake.lock | 72 ++++++++++++++++++------------------- home/programs/gamer.nix | 2 +- home/programs/graphical.nix | 2 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index c2f91f5..ab57fac 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1772633058, - "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767232402, - "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=", + "lastModified": 1773185476, + "narHash": "sha256-COuJkFg669oalmEN3T61gD3gM9SfUsiGvDS9pCOphZY=", "owner": "musnix", "repo": "musnix", - "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e", + "rev": "739e2a1f94c87d5f4c8b880a12480185cf0d7620", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1772884214, - "narHash": "sha256-nl1U1E9Kk9ZmxWdqcwBuFaljxknbrwq8/bY+utQSajk=", + "lastModified": 1776856212, + "narHash": "sha256-+ctOPF22mhj1CxUuZ8Qog1O4p3Cl8l8sFpUKqcb0RKA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3fc5b3670ef77356173ca5f1fa5015e01204bc33", + "rev": "a27f4b9943c2cf48bfcf83f147522741f28cb512", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1772873827, - "narHash": "sha256-T1igKylw0ZX8+yws4dWbkrSc+hZ1bmsM+Tjs4lxMYgo=", + "lastModified": 1776853441, + "narHash": "sha256-mSxfoEs7DiDhMCBzprI/1K7UXzMISuGq0b7T06LVJXE=", "owner": "YaLTeR", "repo": "niri", - "rev": "8f75d171b6017ed34043b1255ec4ffc374bf6ab0", + "rev": "74d2b18603366b98ec9045ecf4a632422f472365", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1776560675, + "narHash": "sha256-p68udKWWh7+V4ZPpcMDq0gTHWNZJnr4JPI+kHPPE40o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "e07580dae39738e46609eaab8b154de2488133ce", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1776560675, + "narHash": "sha256-p68udKWWh7+V4ZPpcMDq0gTHWNZJnr4JPI+kHPPE40o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "e07580dae39738e46609eaab8b154de2488133ce", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772542754, - "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1772944399, - "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=", + "lastModified": 1776771786, + "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0", + "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771788390, - "narHash": "sha256-RzBpBwn93GWxLjacTte+ngwwg0L/BVOg4G/sSIeK3Rw=", + "lastModified": 1775935110, + "narHash": "sha256-twTHKUFXjNNsaAvX0KoaIClt+923jXDRbfCd9PC/f0o=", "owner": "danth", "repo": "stylix", - "rev": "ebb238f14d6f930068be4718472da3105fd5d3bf", + "rev": "14f248ad1a7668e7858c6d9163608c208b7daf02", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1772429643, - "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=", + "lastModified": 1773622265, + "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2", + "rev": "a879e5e0896a326adc79c474bf457b8b99011027", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1772685307, - "narHash": "sha256-5xthZHeqwBeXNhnRIlxnCuaZLky0SZ6vQsxtd+eqhTU=", + "lastModified": 1775710180, + "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "dc92d88524ee83308795bc90f6a9f1d965265aaa", + "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a", "type": "github" }, "original": { diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix index 2974811..1d58030 100644 --- a/home/programs/gamer.nix +++ b/home/programs/gamer.nix @@ -2,7 +2,7 @@ home.packages = with pkgs; [ # Games airshipper - luanti + # luanti superTuxKart xonotic diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 90cc2bf..709739e 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -32,7 +32,7 @@ inputs.zen-browser.packages.x86_64-linux.default brave - grayjay + # grayjay ]; programs.obs-studio = { From d0cf50ccdbf419564a965f8594d0ffb4c982cbc9 Mon Sep 17 00:00:00 2001 From: Tristan Date: Sun, 24 May 2026 13:25:02 +0100 Subject: [PATCH 3/5] zenix: remove monado --- flake.nix | 12 ++++++++++++ home/programs/xr.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1857f36..019255e 100644 --- a/flake.nix +++ b/flake.nix @@ -54,11 +54,23 @@ ./nixos/programs/personal.nix ./nixos/services/musnix.nix ./nixos/workstation.nix + # { + # services.monado = { + # enable = true; + # forceDefaultRuntime = true; + # highPriority = true; + # }; + # systemd.user.services.monado.environment = { + # STEAMVR_LH_ENABLE = "true"; + # # XRT_COMPOSITOR_SCALE_PERCENTAGE = "200"; + # }; + # } ]; home-modules = [ ./home/programs/graphical.nix ./home/programs/gamer.nix ./home/programs/personal/. + # ./home/programs/xr.nix ]; }; diff --git a/home/programs/xr.nix b/home/programs/xr.nix index 15414d7..f919e32 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -7,7 +7,7 @@ openxr-loader opencomposite ]; - services.monado.enable = true; + # services.monado.enable = true; systemd.user.services.monado.environment = { STEAMVR_LH_ENABLE = "true"; XRT_COMPOSITOR_SCALE_PERCENTAGE = "200"; From 5d19a2d3039add846e0a5f43baec3b22c422c839 Mon Sep 17 00:00:00 2001 From: Tristan Date: Sat, 30 May 2026 15:57:40 +0100 Subject: [PATCH 4/5] zenix: update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index ab57fac..0e7d2f9 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1779506708, + "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773185476, - "narHash": "sha256-COuJkFg669oalmEN3T61gD3gM9SfUsiGvDS9pCOphZY=", + "lastModified": 1777848538, + "narHash": "sha256-Dj51C0NWsglqRrCpdmMr2nFiYacFOid1Tor4H9yG2HY=", "owner": "musnix", "repo": "musnix", - "rev": "739e2a1f94c87d5f4c8b880a12480185cf0d7620", + "rev": "8548782f0d1d0928daa3fffde8a008f72219a3f3", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776856212, - "narHash": "sha256-+ctOPF22mhj1CxUuZ8Qog1O4p3Cl8l8sFpUKqcb0RKA=", + "lastModified": 1779622619, + "narHash": "sha256-CoyW4Uy3DEpI252S6vTV6/UeQ+6wsIHvi94ggC1Ev/E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a27f4b9943c2cf48bfcf83f147522741f28cb512", + "rev": "f9e8b871f11137d4b9e15296ea134522dc7a7cb4", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776853441, - "narHash": "sha256-mSxfoEs7DiDhMCBzprI/1K7UXzMISuGq0b7T06LVJXE=", + "lastModified": 1779374863, + "narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", "owner": "YaLTeR", "repo": "niri", - "rev": "74d2b18603366b98ec9045ecf4a632422f472365", + "rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1776560675, - "narHash": "sha256-p68udKWWh7+V4ZPpcMDq0gTHWNZJnr4JPI+kHPPE40o=", + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e07580dae39738e46609eaab8b154de2488133ce", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776560675, - "narHash": "sha256-p68udKWWh7+V4ZPpcMDq0gTHWNZJnr4JPI+kHPPE40o=", + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e07580dae39738e46609eaab8b154de2488133ce", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1776771786, - "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775935110, - "narHash": "sha256-twTHKUFXjNNsaAvX0KoaIClt+923jXDRbfCd9PC/f0o=", + "lastModified": 1778680496, + "narHash": "sha256-tUq1WASV0dHLv3j18log8V6Esq0NYkXuzNH2EHsstcg=", "owner": "danth", "repo": "stylix", - "rev": "14f248ad1a7668e7858c6d9163608c208b7daf02", + "rev": "fc5bec2e44678eeaa221d566d447a0257a884737", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1773622265, - "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", + "lastModified": 1779591853, + "narHash": "sha256-osTG6d7BfV5CchHjETh3jcmZwDYrHpNcpAIyh1KyIs0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a879e5e0896a326adc79c474bf457b8b99011027", + "rev": "3273a0fccd71da21c6362c74f3b1d1c0a89ff3ba", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1775710180, - "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=", + "lastModified": 1778822459, + "narHash": "sha256-hJlFMK7Es783KU/mhLEGC+xim/EqBMVdbsWgthquo6Y=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a", + "rev": "90d4d395e2be09b2d314816dadd34660528c4ee4", "type": "github" }, "original": { From 86ea18a5521af024f20e6b5792de010f6585cfda Mon Sep 17 00:00:00 2001 From: Tristan Date: Sat, 30 May 2026 17:21:47 +0100 Subject: [PATCH 5/5] alpine: fix loki and nextcloud --- nixos/services/loki.nix | 2 +- nixos/services/nextcloud.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/services/loki.nix b/nixos/services/loki.nix index 67afff0..83e520e 100644 --- a/nixos/services/loki.nix +++ b/nixos/services/loki.nix @@ -82,7 +82,7 @@ in { endpoint { url = "http://localhost:3100/loki/api/v1/push" } - max_streams = 64 + max_streams = 128 } ''; diff --git a/nixos/services/nextcloud.nix b/nixos/services/nextcloud.nix index 1aaf9c8..8012ee1 100644 --- a/nixos/services/nextcloud.nix +++ b/nixos/services/nextcloud.nix @@ -84,6 +84,7 @@ in { deck news recognize + oidc_login ; # inherit (pkgs.nextcloud33.packages.apps) oidc_login; };