From 32720ae712f1b9c8c69a9f9df9ecd04643545b00 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Thu, 26 Feb 2026 12:13:24 +0100 Subject: [PATCH 01/16] Adding vicinae and various refactors --- flake.lock | 117 +++++++++++++++++----- flake.nix | 13 +-- modules/desktop/sway/default.nix | 1 + modules/desktop/system.nix | 3 +- modules/server/agraf/default.nix | 4 + modules/server/taf/default.nix | 6 +- users/lyes/desktop/home/desktops/sway.nix | 51 +++++++++- users/lyes/desktop/home/xdg.nix | 99 ++++++++++-------- users/lyes/desktop/packages.nix | 1 + users/lyes/home/default.nix | 21 ++-- 10 files changed, 225 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index b22336e..e875559 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1770681688, - "narHash": "sha256-bGVEgZMxmw9N+IKp5nG+2nyKFezdPWYDxyxXkYW+d2M=", + "lastModified": 1772008782, + "narHash": "sha256-cjfHydg0gwFatbISETt2HbCsBBQ7FmRFxlmEH+V/NGE=", "owner": "9001", "repo": "copyparty", - "rev": "e5d0a0572da507acfe774e0f86ad541f5daab97f", + "rev": "00ab7888d765e124ccd7c61792d264d598077d20", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1771881364, + "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1770654520, - "narHash": "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "6c4fdbe1ad198fac36c320fd45c5957324a80b8e", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1769872935, - "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", + "lastModified": 1771756436, + "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", + "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", "type": "github" }, "original": { @@ -335,11 +335,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1770631810, - "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -415,11 +415,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -476,6 +476,7 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "pin-factorio": "pin-factorio", + "vicinae-extensions": "vicinae-extensions", "zen-browser": "zen-browser" } }, @@ -509,6 +510,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_2" @@ -527,17 +543,64 @@ "type": "github" } }, + "vicinae": { + "inputs": { + "nixpkgs": [ + "vicinae-extensions", + "nixpkgs" + ], + "systems": [ + "vicinae-extensions", + "systems" + ] + }, + "locked": { + "lastModified": 1768856963, + "narHash": "sha256-u5bWDuwk6oieTnvm1YjNotcYK8iJSddH5+S68+X4TSc=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "934bc0ad47be6dbd6498a0dac655c4613fd0ab27", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "vicinae", + "type": "github" + } + }, + "vicinae-extensions": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3", + "vicinae": "vicinae" + }, + "locked": { + "lastModified": 1771358594, + "narHash": "sha256-KwNv+THKbNUey10q26NZPDMSzYTObRHaSDr81QP9CPY=", + "owner": "vicinaehq", + "repo": "extensions", + "rev": "cf30b80f619282d45b1748eb76e784a4f875bb01", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "extensions", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1770707140, - "narHash": "sha256-3ZRA2+o5p1+FKWx988WbwB1SQ2Mz5aL95zxhL5iD+O0=", + "lastModified": 1772005916, + "narHash": "sha256-aFYnT0gStcu1PVTh2Xzd0n8PIEKmqvTgrVkpv49qc6M=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "db14437f8667f7f09784e2a4e73c105bdc1c7023", + "rev": "044299e83752f78f9fc5d6a648f7f3dd84bb3b18", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ab9195c..c4742c4 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,11 @@ zen-browser.url = "github:0xc000022070/zen-browser-flake"; mozilla.url = "github:andersk/nixpkgs-mozilla/channel"; + vicinae-extensions = { + url = "github:vicinaehq/extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; copyparty = { @@ -40,7 +45,7 @@ pin-factorio.url = "github:NixOS/nixpkgs?rev=c5ae371f1a6a7fd27823bc500d9390b38c05fa55"; }; - outputs = { self, nixpkgs, mailserver, copyparty, deploy-rs, ... }@inputs: { + outputs = { self, nixpkgs, deploy-rs, ... }@inputs: { nixosConfigurations = { # Framework Computer piaf = nixpkgs.lib.nixosSystem { @@ -53,11 +58,7 @@ zora = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = inputs; - modules = [ - ./hosts/zora - mailserver.nixosModules.default - copyparty.nixosModules.default - ]; + modules = [ ./hosts/zora ]; }; # Desktop ISO diff --git a/modules/desktop/sway/default.nix b/modules/desktop/sway/default.nix index da15575..fd54555 100644 --- a/modules/desktop/sway/default.nix +++ b/modules/desktop/sway/default.nix @@ -39,6 +39,7 @@ in wofi wlogout slurp + vicinae ]; }; diff --git a/modules/desktop/system.nix b/modules/desktop/system.nix index 58b04be..7c1e2da 100644 --- a/modules/desktop/system.nix +++ b/modules/desktop/system.nix @@ -81,7 +81,8 @@ # virtualisation.virtualbox.host.enable = true; # virtualisation.virtualbox.host.enableExtensionPack = true; # users.extraGroups.vboxusers.members = [ "lyes" ]; - # virtualisation.waydroid.enable = true; + virtualisation.waydroid.enable = true; + virtualisation.waydroid.package = pkgs.waydroid-nftables; # Containers virtualisation.containers.enable = true; diff --git a/modules/server/agraf/default.nix b/modules/server/agraf/default.nix index 5772227..431cf65 100644 --- a/modules/server/agraf/default.nix +++ b/modules/server/agraf/default.nix @@ -1,6 +1,10 @@ { config, copyparty, ... }: { + imports = [ + copyparty.nixosModules.default + ]; + services.copyparty = { enable = true; diff --git a/modules/server/taf/default.nix b/modules/server/taf/default.nix index ca0c361..9a87808 100644 --- a/modules/server/taf/default.nix +++ b/modules/server/taf/default.nix @@ -1,6 +1,10 @@ -{ config, ... }: +{ config, mailserver, ... }: { + imports = [ + mailserver.nixosModules.default + ]; + mailserver = { enable = true; stateVersion = 3; diff --git a/users/lyes/desktop/home/desktops/sway.nix b/users/lyes/desktop/home/desktops/sway.nix index ba7a6cf..bd87fc8 100644 --- a/users/lyes/desktop/home/desktops/sway.nix +++ b/users/lyes/desktop/home/desktops/sway.nix @@ -23,7 +23,8 @@ in swaynag.enable = true; config = { startup = [ - { command = "poweralertd"; } + { command = "${pkgs.poweralertd}/bin/poweralertd"; } + # { command = "${pkgs.vicinae}/bin/vicinae server"; } { command = '' swayidle -w \ @@ -35,7 +36,7 @@ in ]; modifier = "Mod4"; - menu = "${pkgs.wofi}/bin/wofi --show drun"; + menu = "${pkgs.vicinae}/bin/vicinae toggle"; # Switch to ghostty ? terminal = "${pkgs.ghostty}/bin/ghostty"; @@ -610,6 +611,52 @@ in }; programs = { + vicinae = { + enable = true; + systemd = { + enable = true; + autoStart = true; + # environment = { + # USE_LAYER_SHELL = 1; + # }; + }; + # useLayerShell = false; + settings = { + close_on_focus_loss = false; + consider_preedit = true; + pop_to_root_on_close = true; + launcher_window.layer_shell.enabled = false; + theme = { + light = { + name = "rose-pine-moon"; + }; + dark = { + name = "rose-pine-moon"; + }; + }; + }; + extensions = + let + extsrc = pkgs.fetchFromGitHub { + owner = "vicinaehq"; + repo = "extensions"; + sha256 = "sha256-KwNv+THKbNUey10q26NZPDMSzYTObRHaSDr81QP9CPY="; + rev = "cf30b80f619282d45b1748eb76e784a4f875bb01"; + }; + in + lib.map + (ext: + config.lib.vicinae.mkExtension { + name = ext; + src = extsrc + "/extensions/" + ext; + } + ) + [ + "bluetooth" + "nix" + "power-profile" + ]; + }; wofi = { enable = true; settings = {}; diff --git a/users/lyes/desktop/home/xdg.nix b/users/lyes/desktop/home/xdg.nix index 735e8d9..6ce671c 100644 --- a/users/lyes/desktop/home/xdg.nix +++ b/users/lyes/desktop/home/xdg.nix @@ -35,53 +35,66 @@ "x-scheme-handler/sms" = "org.gnome.Shell.Extensions.GSConnect.desktop;"; "x-scheme-handler/tel" = "org.gnome.Shell.Extensions.GSConnect.desktop;"; }; - defaultApplications = { - "text/plain" = "org.gnome.TextEditor.desktop"; - "text/markdown" = "org.gnome.TextEditor.desktop"; - "text/json" = "org.gnome.TextEditor.desktop"; - "text/html" = "firefox.desktop"; - "text/xml" = "org.gnome.TextEditor.desktop"; - "image/avif" = "org.gnome.Loupe.desktop"; - "image/png" = "org.gnome.Loupe.desktop"; - "image/jpeg" = "org.gnome.Loupe.desktop"; - "image/svg+xml" = "org.gnome.Loupe.desktop"; - "image/gif" = "org.gnome.Loupe.desktop"; - "image/webp" = "org.gnome.Loupe.desktop"; - "audio/mpeg" = "mpv.desktop"; - "audio/aac" = "mpv.desktop"; - "audio/webm" = "mpv.desktop"; - "audio/ogg" = "mpv.desktop"; - "video/x-matroska" = "mpv.desktop"; - "video/mp4" = "mpv.desktop"; - "video/webm" = "mpv.desktop"; - "video/ogg" = "mpv.desktop"; + + defaultApplications = + let + web = "firefox.desktop"; + mail = "thunderbird.desktop"; + editor = "org.gnome.TextEditor.desktop"; + image = "org.gnome.Loupe.desktop"; + video = "mpv.desktop"; + audio = "mpv.desktop"; + office-writer = "writer.desktop"; + office-document = "impress.desktop"; + office-spreadsheet = "calc.desktop"; + in + { + "text/plain" = editor; + "text/markdown" = editor; + "text/json" = editor; + "text/html" = web; + "text/xml" = editor; + "image/avif" = image; + "image/png" = image; + "image/jpeg" = image; + "image/svg+xml" = image; + "image/gif" = image; + "image/webp" = image; + "audio/mpeg" = audio; + "audio/aac" = audio; + "audio/webm" = audio; + "audio/ogg" = audio; + "video/x-matroska" = video; + "video/mp4" = video; + "video/webm" = video; + "video/ogg" = video; "application/pdf" = "org.gnome.Papers.desktop"; - "application/msword" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.ms-powerpoint" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.ms-excel" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.openxmlformats-officedocument.presentationml.presentation" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.oasis.opendocument.text" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.oasis.opendocument.presentation" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.oasis.opendocument.spreadsheet" = "onlyoffice-desktopeditors.desktop"; + "application/msword" = office-writer; + "application/vnd.ms-powerpoint" = office-document; + "application/vnd.ms-excel" = office-spreadsheet; + "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = office-writer; + "application/vnd.openxmlformats-officedocument.presentationml.presentation" = office-document; + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = office-spreadsheet; + "application/vnd.oasis.opendocument.text" = office-writer; + "application/vnd.oasis.opendocument.presentation" = office-document; + "application/vnd.oasis.opendocument.spreadsheet" = office-spreadsheet; "application/epub+zip" = "com.github.johnfactotum.Foliate.desktop"; - "application/ogg" = "mpv.desktop"; - "application/xml" = "org.gnome.TextEditor.desktop"; - "application/xhtml+xml" = "firefox.desktop"; - "application/x-extension-htm" = "firefox.desktop"; - "application/x-extension-html" = "firefox.desktop"; - "application/x-extension-shtml" = "firefox.desktop"; - "application/x-extension-xhtml" = "firefox.desktop"; - "application/x-extension-xht" = "firefox.desktop"; + "application/ogg" = audio; + "application/xml" = editor; + "application/xhtml+xml" = web; + "application/x-extension-htm" = web; + "application/x-extension-html" = web; + "application/x-extension-shtml" = web; + "application/x-extension-xhtml" = web; + "application/x-extension-xht" = web; "application/x-bittorrent" = "de.haeckerfelix.Fragments.desktop"; - "message/rfc822" = "thunderbird.desktop"; - "x-scheme-handler/mailto" = "thunderbird.desktop"; - "x-scheme-handler/mid" = "thunderbird.desktop"; + "message/rfc822" = mail; + "x-scheme-handler/mailto" = mail; + "x-scheme-handler/mid" = mail; "x-scheme-handler/discord" = "vesktop.desktop"; - "x-scheme-handler/http" = "firefox.desktop"; - "x-scheme-handler/https" = "firefox.desktop"; - "x-scheme-handler/chrome" = "firefox.desktop"; + "x-scheme-handler/http" = web; + "x-scheme-handler/https" = web; + "x-scheme-handler/chrome" = web; }; }; }; diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index ebdf31d..437f6b0 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -169,6 +169,7 @@ in { packages = [ # Internet "net.waterfox.waterfox" + "io.freetubeapp.FreeTube" # Messaging "org.signal.Signal" diff --git a/users/lyes/home/default.nix b/users/lyes/home/default.nix index 1bdba1f..9e554bc 100644 --- a/users/lyes/home/default.nix +++ b/users/lyes/home/default.nix @@ -1,21 +1,20 @@ -{ home-manager, config, ... }: +{ home-manager, config, inputs, ... }: { - imports = - [ - home-manager.nixosModules.default - ]; + imports = [ + home-manager.nixosModules.default + ]; home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true; home-manager.backupFileExtension = "backup"; + home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.lyes = { ... }: { - imports = - [ - ./editors - ./shells - ./home.nix - ]; + imports = [ + ./editors + ./shells + ./home.nix + ]; home.username = "lyes"; home.homeDirectory = "/home/lyes"; From 169912a47b64f3b6f3321d10e484e8a314b186ca Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Fri, 6 Mar 2026 20:34:14 +0100 Subject: [PATCH 02/16] Fixing all warnings --- flake.lock | 72 ++++++++++++++-------------- hosts/piaf/hardware.nix | 20 ++++---- hosts/zora/reverse-proxy.nix | 2 +- modules/common/default.nix | 6 +-- modules/desktop/gaming/default.nix | 2 +- modules/desktop/networking.nix | 26 +++++----- modules/server/baba/default.nix | 5 +- modules/server/lanayru/default.nix | 2 + modules/server/link/client.nix | 11 +++-- modules/server/link/default.nix | 26 +++++----- modules/server/mogma/forwarding.nix | 6 ++- pkgs/KhinsiderDownloader/default.nix | 22 +++++++-- pkgs/default.nix | 2 +- users/lyes/desktop/default.nix | 5 ++ users/lyes/desktop/packages.nix | 9 ++-- 15 files changed, 124 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index e875559..558ebd3 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1772008782, - "narHash": "sha256-cjfHydg0gwFatbISETt2HbCsBBQ7FmRFxlmEH+V/NGE=", + "lastModified": 1772605780, + "narHash": "sha256-p7IzkFmB1kCtl16+bvLKP1hdP61EFQxj+VSKX2lOWgE=", "owner": "9001", "repo": "copyparty", - "rev": "00ab7888d765e124ccd7c61792d264d598077d20", + "rev": "00e821db231d143169236971b50b85b9c9edd298", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1771881364, - "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=", + "lastModified": 1772699110, + "narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=", "owner": "nix-community", "repo": "disko", - "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6", + "rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1769939035, - "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", + "lastModified": 1772665116, + "narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a8ca480175326551d6c4121498316261cbb5b260", + "rev": "39f53203a8458c330f61cc0759fe243f0ac0d198", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1771851181, - "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", + "lastModified": 1772807318, + "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", + "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1771756436, - "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770659507, - "narHash": "sha256-RVZno9CypFN3eHxfULKN1K7mb/Cq0HkznnWqnshxpWY=", + "lastModified": 1772763116, + "narHash": "sha256-5NUtdVWnEflm829QI0BIj2rDhI+pfagt+cxIARJEhi8=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "781e833633ebc0873d251772a74e4400a73f5d78", + "rev": "c04152fa90ba5079f4517aa24383245937e43ab8", "type": "gitlab" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770650459, - "narHash": "sha256-hGeOnueXorzwDD1V9ldZr+y+zad4SNyqMnQsa/mIlvI=", + "lastModified": 1772732342, + "narHash": "sha256-GcO/uW4b6lb0X8eIluact8YLA4uOgEjNh8pYsu7ozCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fff0554c67696d76a0cdd9cfe14403fbdbf1f378", + "rev": "d2acf504d602c98f5ec2518dacea4f35e5a4e50f", "type": "github" }, "original": { @@ -415,11 +415,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "vicinae": "vicinae" }, "locked": { - "lastModified": 1771358594, - "narHash": "sha256-KwNv+THKbNUey10q26NZPDMSzYTObRHaSDr81QP9CPY=", + "lastModified": 1772621016, + "narHash": "sha256-XwYTdsSBv3/ipe8Nsn/JwdQ+3P52vDXz4/bkHdLWyZw=", "owner": "vicinaehq", "repo": "extensions", - "rev": "cf30b80f619282d45b1748eb76e784a4f875bb01", + "rev": "09eb29ed953c3ae0fe7f782d56819f75b588e358", "type": "github" }, "original": { @@ -596,11 +596,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1772005916, - "narHash": "sha256-aFYnT0gStcu1PVTh2Xzd0n8PIEKmqvTgrVkpv49qc6M=", + "lastModified": 1772772172, + "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "044299e83752f78f9fc5d6a648f7f3dd84bb3b18", + "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3", "type": "github" }, "original": { diff --git a/hosts/piaf/hardware.nix b/hosts/piaf/hardware.nix index f5c507d..867e209 100644 --- a/hosts/piaf/hardware.nix +++ b/hosts/piaf/hardware.nix @@ -2,7 +2,7 @@ { # Kernel - boot.kernelPackages = pkgs.linuxPackages_6_18; + boot.kernelPackages = pkgs.linuxPackages_6_19; # Boot boot.loader.systemd-boot.enable = true; @@ -74,12 +74,12 @@ # Tweaking failing packages nixpkgs.overlays = [ (final: prev: { - dfu-programmer = prev.dfu-programmer.overrideAttrs (_: { env.NIX_CFLAGS_COMPILE = "-std=gnu17"; }); - # upower = prev.upower.overrideAttrs (_: { doCheck = false; }); - # gxml = prev.gxml.overrideAttrs (_: { doCheck = false; }); - # # orc = prev.orc.overrideAttrs (_: { doCheck = false; }); - # # gsl = prev.gsl.overrideAttrs (_: { doCheck = false; }); - # fprintd = prev.fprintd.overrideAttrs (super: { + # dfu-programmer = final.dfu-programmer.overrideAttrs (_: { env.NIX_CFLAGS_COMPILE = "-std=gnu17"; }); + # upower = final.upower.overrideAttrs (_: { doCheck = false; }); + # gxml = final.gxml.overrideAttrs (_: { doCheck = false; }); + # # orc = final.orc.overrideAttrs (_: { doCheck = false; }); + # # gsl = final.gsl.overrideAttrs (_: { doCheck = false; }); + # fprintd = final.fprintd.overrideAttrs (super: { # # doCheck = false; # # buildInputs = super.buildInputs or [ ] ++ (with pkgs; [ libpam-wrapper (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pycairo python-pkgs.dbus-python python-pkgs.python-dbusmock ])) ]); # mesonCheckFlags = [ @@ -87,7 +87,7 @@ # "--no-suite" "fprintd" # ]; # }); - # libsrtp = prev.libsrtp.overrideAttrs (_: { + # libsrtp = final.libsrtp.overrideAttrs (_: { # mesonFlags = [ # "-Dcrypto-library=openssl" # "-Dcrypto-library-kdf=disabled" @@ -95,8 +95,8 @@ # "-Dtests=disabled" # ]; # }); - # # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal prev.crypton (_: { doCheck = false; }); - # # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal prev.cryptonite (_: { doCheck = false; }); + # # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal final.crypton (_: { doCheck = false; }); + # # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal final.cryptonite (_: { doCheck = false; }); }) ]; # nixpkgs.config.packageOverrides = pkgs: { diff --git a/hosts/zora/reverse-proxy.nix b/hosts/zora/reverse-proxy.nix index 5c597fd..24ab15f 100644 --- a/hosts/zora/reverse-proxy.nix +++ b/hosts/zora/reverse-proxy.nix @@ -29,7 +29,7 @@ forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "https://${config.services.kanidm.serverSettings.bindaddress}"; + proxyPass = "https://${config.services.kanidm.server.settings.bindaddress}"; }; }; # 44301 diff --git a/modules/common/default.nix b/modules/common/default.nix index 8b1b197..099db7b 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -16,21 +16,21 @@ # Unstable (final: prev: { unstable = import nixpkgs-unstable { - system = prev.system; + system = final.stdenv.hostPlatform.system; }; }) # Stable (final: prev: { stable = import nixpkgs-stable { - system = prev.system; + system = final.stdenv.hostPlatform.system; }; }) # Pins (final: prev: { pin = { - factorio = import pin-factorio { system = prev.system; config.allowUnfree = true; }; + factorio = import pin-factorio { system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; }; }) ]; diff --git a/modules/desktop/gaming/default.nix b/modules/desktop/gaming/default.nix index 325989f..099677c 100644 --- a/modules/desktop/gaming/default.nix +++ b/modules/desktop/gaming/default.nix @@ -23,7 +23,7 @@ programs.gamemode.enable = true; environment.systemPackages = with pkgs; [ - wineWowPackages.waylandFull + wineWow64Packages.waylandFull mangohud protonup-ng ]; diff --git a/modules/desktop/networking.nix b/modules/desktop/networking.nix index 17479e8..c8c16b2 100644 --- a/modules/desktop/networking.nix +++ b/modules/desktop/networking.nix @@ -20,18 +20,20 @@ services.resolved = { enable = false; - dnssec = "true"; - domains = [ "~." ]; - fallbackDns = [ - "9.9.9.9" - "149.112.112.112" - "1.1.1.1" - "1.0.0.1" - "2620:fe::fe" - "2620:fe::9" - ]; - settings.Resolve = { - DNSOverTLS = true; + settings = { + Resolve = { + DNSOverTLS = true; + DNSSEC = true; + Domains = [ "~." ]; + FallbackDns = [ + "9.9.9.9" + "149.112.112.112" + "1.1.1.1" + "1.0.0.1" + "2620:fe::fe" + "2620:fe::9" + ]; + }; }; }; diff --git a/modules/server/baba/default.nix b/modules/server/baba/default.nix index 34a0220..eec8624 100644 --- a/modules/server/baba/default.nix +++ b/modules/server/baba/default.nix @@ -7,7 +7,7 @@ services.nextcloud = { enable = true; - package = pkgs.nextcloud32; + package = pkgs.nextcloud33; hostName = "cloud.lyes.eu"; https = true; configureRedis = true; @@ -15,7 +15,8 @@ extraAppsEnable = true; extraApps = { - inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music; + inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks dav_push repod gpoddersync phonetrack music; + # inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music; # gpoddersync = pkgs.fetchNextcloudApp { # hash = "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU="; # url = "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz"; diff --git a/modules/server/lanayru/default.nix b/modules/server/lanayru/default.nix index d12ce73..4195ee1 100644 --- a/modules/server/lanayru/default.nix +++ b/modules/server/lanayru/default.nix @@ -42,6 +42,8 @@ }; }; + networking.vpn-netns.encapsulatedServices.suwayomi-server.enable = true; + age.secrets = { suwayomi-pass = { file = ../../../secrets/zora/services/lanayru-pass.age; diff --git a/modules/server/link/client.nix b/modules/server/link/client.nix index 1b8ae2c..cdb6e32 100644 --- a/modules/server/link/client.nix +++ b/modules/server/link/client.nix @@ -2,12 +2,13 @@ { services.kanidm = { - package = pkgs.kanidmWithSecretProvisioning_1_8; + package = pkgs.kanidmWithSecretProvisioning_1_9; - enableClient = true; - - clientSettings = { - uri = "https://auth.lyes.eu"; + client = { + enable = true; + settings = { + uri = "https://auth.lyes.eu"; + }; }; }; } diff --git a/modules/server/link/default.nix b/modules/server/link/default.nix index a76f5e3..34844db 100644 --- a/modules/server/link/default.nix +++ b/modules/server/link/default.nix @@ -13,19 +13,21 @@ in services.kanidm = { # package = pkgs.kanidmWithSecretProvisioning_1_7; - enableServer = true; - serverSettings = { - bindaddress = "127.0.0.1:${port}"; - ldapbindaddress = "0.0.0.0:636"; - domain = hostname; - origin = "https://${hostname}"; - tls_chain = "/var/lib/acme/${hostname}/cert.pem"; - tls_key = "/var/lib/acme/${hostname}/key.pem"; + server = { + enable = true; + settings = { + bindaddress = "127.0.0.1:${port}"; + ldapbindaddress = "0.0.0.0:636"; + domain = hostname; + origin = "https://${hostname}"; + tls_chain = "/var/lib/acme/${hostname}/cert.pem"; + tls_key = "/var/lib/acme/${hostname}/key.pem"; - online_backup = { - path = "/var/data/backups/kanidm"; - schedule = "00 06 * * *"; - versions = 5; + online_backup = { + path = "/var/data/backups/kanidm"; + schedule = "00 06 * * *"; + versions = 5; + }; }; }; diff --git a/modules/server/mogma/forwarding.nix b/modules/server/mogma/forwarding.nix index 72431e4..c11ed32 100644 --- a/modules/server/mogma/forwarding.nix +++ b/modules/server/mogma/forwarding.nix @@ -32,6 +32,8 @@ let } forwardedServices; serviceList = lib.mapAttrsToList (name: _: name + ".service") forwardedServices; + encServicesList = lib.mapAttrsToList (name: _: name + ".service") cfg.encapsulatedServices; + in lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) { assertions = [ @@ -49,8 +51,8 @@ lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) { services.natpmpc-lease = { description = "Request VPN port forwarding leases."; - wantedBy = serviceList; - after = [ "wireguard.target" ]; + # wantedBy = serviceList; + after = [ "wireguard.target" ] ++ encServicesList; wants = [ "wireguard.target" ]; # preStart = "sleep 3"; diff --git a/pkgs/KhinsiderDownloader/default.nix b/pkgs/KhinsiderDownloader/default.nix index 85a011e..bcff559 100644 --- a/pkgs/KhinsiderDownloader/default.nix +++ b/pkgs/KhinsiderDownloader/default.nix @@ -3,8 +3,14 @@ fetchFromGitHub, cmake, curl, - qt6, - libxml2 + libxml2, + qtbase, + wrapQtAppsHook, + qtscxml, + qtquicktimeline, + qtquickeffectmaker, + qtnetworkauth, + qttools, }: stdenv.mkDerivation (final: { @@ -18,10 +24,20 @@ stdenv.mkDerivation (final: { hash = "sha256-hqoUkzPNxAIvC/7DL9YIMPmUZqAreqCbG8NKidVtSDM="; }; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ cmake curl - qt6.full + # qt6.env + qtscxml + # qtquick3d + # qtquick3dphysics + qtquicktimeline + qtquickeffectmaker + qtnetworkauth + qttools libxml2 + wrapQtAppsHook ]; }) diff --git a/pkgs/default.nix b/pkgs/default.nix index dc7caa9..27ffdef 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,6 +3,6 @@ { quadcastrgb = pkgs.callPackage ./quadcastrgb { }; ens-intel-unite = pkgs.callPackage ./ens-intel-unite { }; - KhinsiderDownloader = pkgs.callPackage ./KhinsiderDownloader { }; + KhinsiderDownloader = pkgs.qt6Packages.callPackage ./KhinsiderDownloader { }; amy-mono = pkgs.callPackage ./amy-mono { }; } diff --git a/users/lyes/desktop/default.nix b/users/lyes/desktop/default.nix index debffc7..516c93e 100644 --- a/users/lyes/desktop/default.nix +++ b/users/lyes/desktop/default.nix @@ -24,4 +24,9 @@ via ]; }; + + # Fixing launch issues with some desktops (sway...) + # systemd.user.extraConfig = '' + # DefaultEnvironment="PATH=/run/current-system/sw/bin" + # ''; } diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index 437f6b0..e5a20b6 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -61,7 +61,7 @@ in { helvum local.quadcastrgb euphonica - #local.KhinsiderDownloader + local.KhinsiderDownloader # Games heroic @@ -99,6 +99,7 @@ in { vscodium # zed-editor gcc + gnumake rustup python3 zola @@ -112,7 +113,7 @@ in { nodejs nil nixd - nixfmt-rfc-style + nixfmt protege # LogIA Course haskellPackages.Agda agdaPackages.standard-library @@ -197,13 +198,13 @@ in { nixpkgs.overlays = [ # Version pins (final: prev: { - # factorio = prev.factorio.overrideAttrs (super: { + # factorio = final.factorio.overrideAttrs (super: { # version = "2.0.42"; # # src.name = "factorio_alpha_x64-2.0.42.tar.xz"; # # src.sha256 = "1zq6wcqkmn9bzys27v0jlk9m9m1jhaai1mybdv8hz7p2si4l76n9"; # src = "/nix/store/b9y0dwgxa6hpddrd8nn0g2fizxl3xss7-factorio_alpha_x64-2.0.42.tar.xz"; # }); - # factorio = prev.factorio.overrideAttrs (super: { + # factorio = final.factorio.overrideAttrs (super: { # username = "ntlyes"; # token = ""; # src = From f287ac426aedab49ee9f42a1e3c39ba5242c4923 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Tue, 10 Mar 2026 02:24:08 +0100 Subject: [PATCH 03/16] Fixes to ptitgoron, adding cinny and updates --- flake.lock | 60 ++++++++--------- hosts/zora/networking.nix | 2 + hosts/zora/reverse-proxy.nix | 7 +- modules/server/biggoron/runner.nix | 3 + pkgs/cinny/cinny-desktop.nix | 102 +++++++++++++++++++++++++++++ pkgs/cinny/cinny-unwrapped.nix | 51 +++++++++++++++ pkgs/cinny/cinny.nix | 32 +++++++++ pkgs/default.nix | 5 +- users/lyes/desktop/packages.nix | 4 +- 9 files changed, 229 insertions(+), 37 deletions(-) create mode 100644 pkgs/cinny/cinny-desktop.nix create mode 100644 pkgs/cinny/cinny-unwrapped.nix create mode 100644 pkgs/cinny/cinny.nix diff --git a/flake.lock b/flake.lock index 558ebd3..e0ab42d 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1772605780, - "narHash": "sha256-p7IzkFmB1kCtl16+bvLKP1hdP61EFQxj+VSKX2lOWgE=", + "lastModified": 1773005383, + "narHash": "sha256-Nlln9sKJa1q5lYX4xXS34Lt1oREwgQbT59Aa37nBGkU=", "owner": "9001", "repo": "copyparty", - "rev": "00e821db231d143169236971b50b85b9c9edd298", + "rev": "266d6e0ae6a6eecac7bc863bd8f746d16686e61a", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1772699110, - "narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=", + "lastModified": 1773025010, + "narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=", "owner": "nix-community", "repo": "disko", - "rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee", + "rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1772665116, - "narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=", + "lastModified": 1772893680, + "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "39f53203a8458c330f61cc0759fe243f0ac0d198", + "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1772807318, - "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", + "lastModified": 1773093840, + "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=", "owner": "nix-community", "repo": "home-manager", - "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", + "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1772763116, - "narHash": "sha256-5NUtdVWnEflm829QI0BIj2rDhI+pfagt+cxIARJEhi8=", + "lastModified": 1773090017, + "narHash": "sha256-IEmBgsV6VGv1XI/h7QlQ2PvE4iWsixKB14mOidZqNxQ=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c04152fa90ba5079f4517aa24383245937e43ab8", + "rev": "12401730341ef15fb4fb532553308ea9ebf60fd4", "type": "gitlab" }, "original": { @@ -335,11 +335,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771969195, - "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", + "lastModified": 1772972630, + "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", + "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772732342, - "narHash": "sha256-GcO/uW4b6lb0X8eIluact8YLA4uOgEjNh8pYsu7ozCk=", + "lastModified": 1773046814, + "narHash": "sha256-3CEw64UyzEk5QjfbcXNIl4TfmIpa2oY+duuo6aiawcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2acf504d602c98f5ec2518dacea4f35e5a4e50f", + "rev": "0c6c0dd2469abaa216599bb19bbf77a328af6564", "type": "github" }, "original": { @@ -415,11 +415,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -596,11 +596,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1772772172, - "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=", + "lastModified": 1772945022, + "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3", + "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", "type": "github" }, "original": { diff --git a/hosts/zora/networking.nix b/hosts/zora/networking.nix index d787241..4c2815a 100644 --- a/hosts/zora/networking.nix +++ b/hosts/zora/networking.nix @@ -113,6 +113,8 @@ type filter hook input priority 0; policy drop; iifname lo accept + iifname incusbr0 accept + iifname podman* accept tcp dport 22 accept diff --git a/hosts/zora/reverse-proxy.nix b/hosts/zora/reverse-proxy.nix index 24ab15f..172bc9d 100644 --- a/hosts/zora/reverse-proxy.nix +++ b/hosts/zora/reverse-proxy.nix @@ -19,10 +19,9 @@ locations."/" = { root = "/var/data/www/lyes.eu/"; }; - # extraConfig = '' - # allow 82.67.15.247; - # deny all; - # ''; + extraConfig = '' + error_page 404 /404.html; + ''; }; # 44300 "auth.lyes.eu" = { diff --git a/modules/server/biggoron/runner.nix b/modules/server/biggoron/runner.nix index 4c8a5a8..c8d4d14 100644 --- a/modules/server/biggoron/runner.nix +++ b/modules/server/biggoron/runner.nix @@ -4,13 +4,16 @@ podman = { enable = true; dockerCompat = true; + dockerSocket.enable = true; defaultNetwork.settings.dns_enabled = true; + autoPrune.enable = true; }; }; networking.firewall.trustedInterfaces = [ "podman*" ]; + networking.firewall.interfaces."podman*".allowedUDPPorts = [ 53 ]; users.users.gitea-runner.isSystemUser = true; users.users.gitea-runner.group = "gitea-runner"; diff --git a/pkgs/cinny/cinny-desktop.nix b/pkgs/cinny/cinny-desktop.nix new file mode 100644 index 0000000..8434e97 --- /dev/null +++ b/pkgs/cinny/cinny-desktop.nix @@ -0,0 +1,102 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + cargo-tauri, + cinny, + desktop-file-utils, + wrapGAppsHook4, + makeBinaryWrapper, + pkg-config, + openssl, + glib-networking, + webkitgtk_4_1, + jq, + moreutils, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cinny-desktop"; + version = "4.10.6a"; + + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "cinnyapp"; + repo = "cinny-desktop"; + rev = "1e8d28faee9acef767a71ba7fe31243eb703a351"; + hash = "sha256-rPLz9kfm2cp1zKk7sKrybN8ooCduoM3w+xmn0pdXM8w="; + }; + + sourceRoot = "${finalAttrs.src.name}/src-tauri"; + + cargoHash = "sha256-28kaU/vChINQgrzplIF25s6MQ+S3LcrfqSQMziSAFJk="; + + postPatch = + let + cinny' = + assert lib.assertMsg ( + cinny.version == finalAttrs.version + ) "cinny.version (${cinny.version}) != cinny-desktop.version (${finalAttrs.version})"; + cinny.override { + conf = { + hashRouter.enabled = true; + }; + }; + in + '' + ${lib.getExe jq} \ + 'del(.app.windows) | del(.plugins.updater) | del(.bundle.createUpdaterArtifacts) | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand)' tauri.conf.json \ + | ${lib.getExe' moreutils "sponge"} tauri.conf.json + cat tauri.conf.json + ''; + + postInstall = + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/bin" + makeWrapper "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + desktop-file-edit \ + --set-comment "Yet another matrix client for desktop" \ + --set-key="Categories" --set-value="Network;InstantMessaging;" \ + $out/share/applications/Cinny.desktop + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set-default WEBKIT_DISABLE_DMABUF_RENDERER "1" + ) + ''; + + nativeBuildInputs = [ + cargo-tauri.hook + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + desktop-file-utils + pkg-config + wrapGAppsHook4 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeBinaryWrapper + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking + openssl + webkitgtk_4_1 + ]; + + meta = { + description = "Yet another matrix client for desktop"; + homepage = "https://github.com/cinnyapp/cinny-desktop"; + maintainers = with lib.maintainers; [ + qyriad + rebmit + ryand56 + ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "cinny"; + }; +}) diff --git a/pkgs/cinny/cinny-unwrapped.nix b/pkgs/cinny/cinny-unwrapped.nix new file mode 100644 index 0000000..1fa11b5 --- /dev/null +++ b/pkgs/cinny/cinny-unwrapped.nix @@ -0,0 +1,51 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs_22, +}: + +buildNpmPackage { + pname = "cinny-unwrapped"; + # Remember to update cinny-desktop when bumping this version. + version = "4.10.6a"; + + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "cinnyapp"; + repo = "cinny"; + # rev = "55e83065767645ed7cd510a6f4b5cf4733b000b4"; + tag = "v4.10.5"; + # hash = "sha256-2qxmlj4IK6twDh27R6qMJDmYSfsWoofVGuRHxSP72f0="; + hash = "sha256-Napy3AcsLRDZPcBh3oq1U30FNtvoNtob0+AZtZSvcbM="; + }; + + nodejs = nodejs_22; + + # npmDepsHash = "sha256-qyQ0SXkPSUES/tavKzPra0Q+ZnU9qHvkTC1JgAjL0o8="; + npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo="; + + # Skip rebuilding native modules since they're not needed for the web app + npmRebuildFlags = [ + "--ignore-scripts" + ]; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; + + meta = { + description = "Yet another Matrix client for the web"; + homepage = "https://cinny.in/"; + maintainers = with lib.maintainers; [ + abbe + rebmit + ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/cinny/cinny.nix b/pkgs/cinny/cinny.nix new file mode 100644 index 0000000..df49478 --- /dev/null +++ b/pkgs/cinny/cinny.nix @@ -0,0 +1,32 @@ +{ + cinny-unwrapped, + jq, + stdenvNoCC, + writeText, + conf ? { }, +}: +let + configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); +in +if (conf == { }) then + cinny-unwrapped +else + stdenvNoCC.mkDerivation { + pname = "cinny"; + inherit (cinny-unwrapped) version meta; + + dontUnpack = true; + + nativeBuildInputs = [ jq ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ln -s ${cinny-unwrapped}/* $out + rm $out/config.json + jq -s '.[0] * .[1]' "${cinny-unwrapped}/config.json" "${configOverrides}" > "$out/config.json" + + runHook postInstall + ''; + } diff --git a/pkgs/default.nix b/pkgs/default.nix index 27ffdef..4b260fc 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,8 +1,11 @@ { pkgs ? import { } }: -{ +rec { quadcastrgb = pkgs.callPackage ./quadcastrgb { }; ens-intel-unite = pkgs.callPackage ./ens-intel-unite { }; KhinsiderDownloader = pkgs.qt6Packages.callPackage ./KhinsiderDownloader { }; amy-mono = pkgs.callPackage ./amy-mono { }; + cinny = pkgs.callPackage ./cinny/cinny.nix { inherit cinny-unwrapped; }; + cinny-unwrapped = pkgs.callPackage ./cinny/cinny-unwrapped.nix { }; + cinny-desktop = pkgs.callPackage ./cinny/cinny-desktop.nix { inherit cinny; }; } diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index e5a20b6..f0c9f4b 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -37,7 +37,7 @@ in { element-desktop fractal zoom-us - # cinny-desktop + local.cinny-desktop # Image gimp @@ -58,7 +58,7 @@ in { # stremio # insecure dependency # Audio - helvum + crosspipe local.quadcastrgb euphonica local.KhinsiderDownloader From fba02c0c1996f250268fbe8f627e985168705951 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Fri, 13 Mar 2026 01:40:02 +0100 Subject: [PATCH 04/16] Update cinny --- pkgs/cinny/cinny-desktop.nix | 11 ++++++----- pkgs/cinny/cinny-unwrapped.nix | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/cinny/cinny-desktop.nix b/pkgs/cinny/cinny-desktop.nix index 8434e97..72b4399 100644 --- a/pkgs/cinny/cinny-desktop.nix +++ b/pkgs/cinny/cinny-desktop.nix @@ -18,19 +18,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cinny-desktop"; - version = "4.10.6a"; + version = "4.11.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; - rev = "1e8d28faee9acef767a71ba7fe31243eb703a351"; - hash = "sha256-rPLz9kfm2cp1zKk7sKrybN8ooCduoM3w+xmn0pdXM8w="; + tag = "v4.11.2"; + hash = "sha256-iH3OBpLM5JyFo5QLjHSvGMgl0xDP9hpfngW49hvjLMY="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - cargoHash = "sha256-28kaU/vChINQgrzplIF25s6MQ+S3LcrfqSQMziSAFJk="; + cargoHash = "sha256-g1xDdqmouHD+qr5OvO2PVjFKAy2AXiatuTrLfh/QxAE="; postPatch = let @@ -44,9 +44,10 @@ rustPlatform.buildRustPackage (finalAttrs: { }; }; in + # 'del(.app.windows) | del(.plugins.updater) | .bundle.createUpdaterArtifacts = false | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand)' tauri.conf.json \ '' ${lib.getExe jq} \ - 'del(.app.windows) | del(.plugins.updater) | del(.bundle.createUpdaterArtifacts) | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand)' tauri.conf.json \ + 'del(.plugins.tauri.updater) | .bundle.createUpdaterArtifacts = false | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand)' tauri.conf.json \ | ${lib.getExe' moreutils "sponge"} tauri.conf.json cat tauri.conf.json ''; diff --git a/pkgs/cinny/cinny-unwrapped.nix b/pkgs/cinny/cinny-unwrapped.nix index 1fa11b5..6d84a23 100644 --- a/pkgs/cinny/cinny-unwrapped.nix +++ b/pkgs/cinny/cinny-unwrapped.nix @@ -8,22 +8,23 @@ buildNpmPackage { pname = "cinny-unwrapped"; # Remember to update cinny-desktop when bumping this version. - version = "4.10.6a"; + version = "4.11.1"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; # rev = "55e83065767645ed7cd510a6f4b5cf4733b000b4"; - tag = "v4.10.5"; + tag = "v4.11.1"; # hash = "sha256-2qxmlj4IK6twDh27R6qMJDmYSfsWoofVGuRHxSP72f0="; - hash = "sha256-Napy3AcsLRDZPcBh3oq1U30FNtvoNtob0+AZtZSvcbM="; + hash = "sha256-dwI3zNey/ukF3t2fhH/ePf4o4iBDwZyLWMYebPgXmWU="; }; nodejs = nodejs_22; # npmDepsHash = "sha256-qyQ0SXkPSUES/tavKzPra0Q+ZnU9qHvkTC1JgAjL0o8="; - npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo="; + # npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo="; + npmDepsHash = "sha256-27WFjb08p09aJRi0S2PvYq3bivEuG5+z2QhFahTSj4Q="; # Skip rebuilding native modules since they're not needed for the web app npmRebuildFlags = [ From a1e1272ebb33cbceace541874b5d5b6f3f6d0c6a Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Mon, 16 Mar 2026 15:54:29 +0100 Subject: [PATCH 05/16] Adding a minecraft server --- hosts/zora/default.nix | 1 + modules/server/README.md | 1 + modules/server/midona/default.nix | 77 +++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 modules/server/midona/default.nix diff --git a/hosts/zora/default.nix b/hosts/zora/default.nix index 6d3d543..beac76d 100644 --- a/hosts/zora/default.nix +++ b/hosts/zora/default.nix @@ -26,6 +26,7 @@ ../../modules/server/link ../../modules/server/maistro ../../modules/server/mikau + ../../modules/server/midona ../../modules/server/nayru ../../modules/server/taf ../../modules/server/tetra diff --git a/modules/server/README.md b/modules/server/README.md index f9df551..20e23fd 100644 --- a/modules/server/README.md +++ b/modules/server/README.md @@ -8,6 +8,7 @@ - `link` : Kanidm (`auth.lyes.eu`) - `maistro` : Incus - `mikau` : Jellyfin (`media.lyes.eu`) +- `midona` : Gate Minecraft Server Proxy - `mogma` : VPN NetNS Configuration - `nayru` : Komga/Manga (`manga.lyes.eu`) - `taf` : Mail (`taf.lyes.eu`/`mail.lyes.eu`) diff --git a/modules/server/midona/default.nix b/modules/server/midona/default.nix new file mode 100644 index 0000000..5e66478 --- /dev/null +++ b/modules/server/midona/default.nix @@ -0,0 +1,77 @@ +{ lib, pkgs, ... }: + +let + config = lib.toFile "config.yml" '' + config: + lite: + enabled: true + routes: + - host: stepson.minecraft.minish.link + backend: 10.0.100.80:25565 + ''; +in +{ + environment.systemPackages = with pkgs; [ gate ]; + + systemd.services.gate = { + description = "Gate Minecraft Proxy"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.gate}/bin/gate --config ${config}"; + Restart = "always"; + + # StandardInput = "socket"; + # StandardOutput = "journal"; + # StandardError = "journal"; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = "0077"; + }; + }; + + services.nginx.streamConfig = '' + server { + listen 24454; + proxy_pass 10.0.100.80:24454; + } + server { + listen 24454 udp; + proxy_pass 10.0.100.80:24454; + } + ''; + + networking.firewall = { + allowedTCPPorts = [ + 25565 + 24454 # Simple Voice Chat stepson + ]; + allowedUDPPorts = [ + 25565 + 24454 # Simple Voice Chat stepson + ]; + }; +} From 58003570a350d13520a945ef771c69c97898267c Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Sat, 21 Mar 2026 19:18:43 +0100 Subject: [PATCH 06/16] Adding syncplay --- modules/desktop/networking.nix | 6 ------ modules/server/README.md | 1 + modules/server/facteur/default.nix | 17 +++++++++++++++++ secrets.nix | 1 + secrets/zora/services/facteur-pass.age | 7 +++++++ 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 modules/server/facteur/default.nix create mode 100644 secrets/zora/services/facteur-pass.age diff --git a/modules/desktop/networking.nix b/modules/desktop/networking.nix index c8c16b2..17eeed3 100644 --- a/modules/desktop/networking.nix +++ b/modules/desktop/networking.nix @@ -53,12 +53,6 @@ # Network services #services.openssh.enable = true; - #services.syncplay = { - # enable = true; - # port = 8998; - # extraArgs = [ "--password pouicbarilstepson123cassoulet" ]; - #}; - # Bluetooth hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; diff --git a/modules/server/README.md b/modules/server/README.md index 20e23fd..6981be1 100644 --- a/modules/server/README.md +++ b/modules/server/README.md @@ -1,6 +1,7 @@ - `agraf` : Copyparty (`files.lyes.eu`) - `baba` : Nextcloud (`cloud.lyes.eu`) - `biggoron` : Forgejo (`git.lyes.eu`) +- `facteur` : Syncplay - `giovanni` : Vaultwarden (`vault.lyes.eu`) - `kaepora` : PostgreSQL - `kalif` : Factorio (`factorio.lyes.eu`) diff --git a/modules/server/facteur/default.nix b/modules/server/facteur/default.nix new file mode 100644 index 0000000..9c65bf4 --- /dev/null +++ b/modules/server/facteur/default.nix @@ -0,0 +1,17 @@ +{ config, ... }: + +{ + services.syncplay = { + enable = true; + port = 8998; + passwordFile = config.age.secrets.facteur-pass.path; + }; + + age.secrets = { + facteur-pass = { + file = ../../../secrets/zora/services/facteur-pass.age; + owner = "syncplay"; + group = "syncplay"; + }; + }; +} diff --git a/secrets.nix b/secrets.nix index be69f5d..eae3319 100644 --- a/secrets.nix +++ b/secrets.nix @@ -27,4 +27,5 @@ in "secrets/zora/services/lanayru-pass.age".publicKeys = all; "secrets/zora/services/agraf-root-pass.age".publicKeys = all; "secrets/zora/services/agraf-lyes-pass.age".publicKeys = all; + "secrets/zora/services/facteur-pass.age".publicKeys = all; } diff --git a/secrets/zora/services/facteur-pass.age b/secrets/zora/services/facteur-pass.age new file mode 100644 index 0000000..ae8cb66 --- /dev/null +++ b/secrets/zora/services/facteur-pass.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 whuRpQ SjgklfrTXj3TptfA1MxYkbjcWkFNTNwvpHoto0YfEnY +/MhJDiLIqHjUKU8jEe9NPTR/29YYij8E6u6t9/Mj1VM +-> ssh-ed25519 TFqgIg qXDuQIj9gq/hO07+6KBkCKVTd3L6eomSMetxXfVu1yc +RWpVvmkM5hN9yHO4JlPWsTvl8sDG0DOA1y5DGcTlTa0 +--- UwLsYqcbzfvzL2SoevAhhG2K1JA3XlHTVeF73nEU21c +÷ÑKÒ¶d¯IT«[îöWFäu×f¹Èê:¶Lp‡Äl8Š€6©X© \ No newline at end of file From a10a6db8e0d40d4447793fe16c9541c00a716159 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Sat, 21 Mar 2026 19:19:29 +0100 Subject: [PATCH 07/16] Activating syncplay --- hosts/zora/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/zora/default.nix b/hosts/zora/default.nix index beac76d..26cb0ce 100644 --- a/hosts/zora/default.nix +++ b/hosts/zora/default.nix @@ -20,6 +20,7 @@ ../../modules/server/baba ../../modules/server/biggoron ../../modules/server/biggoron/runner.nix + ../../modules/server/facteur ../../modules/server/giovanni ../../modules/server/kalif ../../modules/server/lanayru From 9c244751cba45cadf6fa12b03f327ff7b8861569 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Wed, 25 Mar 2026 10:33:38 +0100 Subject: [PATCH 08/16] Updates --- flake.lock | 78 ++++++++++++------------ modules/server/facteur/default.nix | 7 +-- users/lyes/desktop/home/apps/ghostty.nix | 2 +- users/lyes/desktop/packages.nix | 1 + 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index e0ab42d..17075e2 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1773005383, - "narHash": "sha256-Nlln9sKJa1q5lYX4xXS34Lt1oREwgQbT59Aa37nBGkU=", + "lastModified": 1774411715, + "narHash": "sha256-mceIHtVMXpLAfr1W0VK9ceTBX5yKu4gGWpVbThWTsAA=", "owner": "9001", "repo": "copyparty", - "rev": "266d6e0ae6a6eecac7bc863bd8f746d16686e61a", + "rev": "26e663d111e39ca96c63702ad27a05b6736607cf", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1773025010, - "narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1774104215, + "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1773093840, - "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=", + "lastModified": 1774379316, + "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86", + "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1773090017, - "narHash": "sha256-IEmBgsV6VGv1XI/h7QlQ2PvE4iWsixKB14mOidZqNxQ=", + "lastModified": 1774392971, + "narHash": "sha256-/4+En99Qf63O0syn78Z9zrm70e50tdSYQCURTDNtyQ4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "12401730341ef15fb4fb532553308ea9ebf60fd4", + "rev": "07e82e06d87e048b94280a16bd29e827f6583869", "type": "gitlab" }, "original": { @@ -335,11 +335,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1772972630, - "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=", + "lastModified": 1774422943, + "narHash": "sha256-o1xgNumjljdBBfOrcQX95hhKGFOJQYNZqpF3EfaScMk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72", + "rev": "632e4bfc21c01e5be900d0d8255a5368a5d6082f", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773046814, - "narHash": "sha256-3CEw64UyzEk5QjfbcXNIl4TfmIpa2oY+duuo6aiawcU=", + "lastModified": 1774192288, + "narHash": "sha256-vHqcv1WQvmR4hRz0/dUqlA8LjIHtZvWtWrzIX3YTxzQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c6c0dd2469abaa216599bb19bbf77a328af6564", + "rev": "2cb1420c66c8e634314ce0abf70680208177f5b4", "type": "github" }, "original": { @@ -415,11 +415,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1773389992, + "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "vicinae": "vicinae" }, "locked": { - "lastModified": 1772621016, - "narHash": "sha256-XwYTdsSBv3/ipe8Nsn/JwdQ+3P52vDXz4/bkHdLWyZw=", + "lastModified": 1774351406, + "narHash": "sha256-/h3M/j/VwMks9g1IABnV9LP6zBIiVtxmTIO5BT0ESks=", "owner": "vicinaehq", "repo": "extensions", - "rev": "09eb29ed953c3ae0fe7f782d56819f75b588e358", + "rev": "337b6ddea28bcbb58bc9fcc859d866e5117ba10a", "type": "github" }, "original": { @@ -596,11 +596,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1772945022, - "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", + "lastModified": 1774352774, + "narHash": "sha256-gibUM0pSnLxEeuFrYA8T1oEaixk+fjQpqXbYaxcEX/4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", + "rev": "a0f3d47dbd8f8618a1920d5a5ca09b7993415895", "type": "github" }, "original": { diff --git a/modules/server/facteur/default.nix b/modules/server/facteur/default.nix index 9c65bf4..322e6fd 100644 --- a/modules/server/facteur/default.nix +++ b/modules/server/facteur/default.nix @@ -1,17 +1,16 @@ -{ config, ... }: +{ config, pkgs, ... }: { services.syncplay = { enable = true; - port = 8998; + package = pkgs.syncplay-nogui; passwordFile = config.age.secrets.facteur-pass.path; }; age.secrets = { facteur-pass = { file = ../../../secrets/zora/services/facteur-pass.age; - owner = "syncplay"; - group = "syncplay"; + mode = "444"; }; }; } diff --git a/users/lyes/desktop/home/apps/ghostty.nix b/users/lyes/desktop/home/apps/ghostty.nix index a68467d..6f9233e 100644 --- a/users/lyes/desktop/home/apps/ghostty.nix +++ b/users/lyes/desktop/home/apps/ghostty.nix @@ -20,7 +20,7 @@ shell-integration-features = [ "sudo" "ssh-env" - "ssh-terminfo" + # "ssh-terminfo" ]; # keybind = [ diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index f0c9f4b..49c6f37 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -67,6 +67,7 @@ in { heroic cemu prismlauncher + cubiomes-viewer # vvvvvv ryubing dolphin-emu From 631c9ca2ccec62bbf275660b1a8dd5b200f6fcd9 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Wed, 25 Mar 2026 10:37:11 +0100 Subject: [PATCH 09/16] Go back to mainline firefox --- flake.lock | 17 ----------------- flake.nix | 2 +- modules/desktop/system.nix | 7 +++---- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 17075e2..f24eb65 100644 --- a/flake.lock +++ b/flake.lock @@ -301,22 +301,6 @@ "type": "gitlab" } }, - "mozilla": { - "locked": { - "lastModified": 1750265908, - "narHash": "sha256-ZGo9BPm0L6kkuke6Bp5rb1XwF5Qv3/+a3mowsr0fcU4=", - "owner": "andersk", - "repo": "nixpkgs-mozilla", - "rev": "174a36cd95c9bed0dcbcc8a51f16d0cc8be490f3", - "type": "github" - }, - "original": { - "owner": "andersk", - "ref": "channel", - "repo": "nixpkgs-mozilla", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1767983141, @@ -469,7 +453,6 @@ "disko": "disko", "home-manager": "home-manager_2", "mailserver": "mailserver", - "mozilla": "mozilla", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", diff --git a/flake.nix b/flake.nix index c4742c4..83d5a0b 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-flatpak.url = "github:gmodena/nix-flatpak/latest"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; - mozilla.url = "github:andersk/nixpkgs-mozilla/channel"; + # mozilla.url = "github:andersk/nixpkgs-mozilla/channel"; vicinae-extensions = { url = "github:vicinaehq/extensions"; diff --git a/modules/desktop/system.nix b/modules/desktop/system.nix index 7c1e2da..508d75b 100644 --- a/modules/desktop/system.nix +++ b/modules/desktop/system.nix @@ -1,4 +1,4 @@ -{ pkgs, mozilla, ... }: +{ pkgs, ... }: { # Boot @@ -58,8 +58,9 @@ # package = pkgs.firefox-beta; # Doesn't work ? # languagePacks = [ "fr" "en-US" ]; + # package = pkgs.latest.firefox-nightly-bin; }; - nixpkgs.overlays = [ mozilla.overlays.firefox ]; + # nixpkgs.overlays = [ mozilla.overlays.firefox ]; # let # # Change this to a rev sha to pin # moz-rev = "master"; @@ -72,8 +73,6 @@ # nightlyOverlay # ]; - programs.firefox.package = pkgs.latest.firefox-nightly-bin; - xdg.portal.enable = true; # Virtualisation From 75d93e113eb8f948d77e5e47b0064efd3eef6ec3 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Wed, 25 Mar 2026 11:35:37 +0100 Subject: [PATCH 10/16] Add mattermost --- users/lyes/desktop/home/xdg.nix | 1 + users/lyes/desktop/packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/users/lyes/desktop/home/xdg.nix b/users/lyes/desktop/home/xdg.nix index 6ce671c..8567c3d 100644 --- a/users/lyes/desktop/home/xdg.nix +++ b/users/lyes/desktop/home/xdg.nix @@ -6,6 +6,7 @@ userDirs = { enable = true; createDirectories = true; + setSessionVariables = true; desktop = "${config.home.homeDirectory}/Bureau"; documents = "${config.home.homeDirectory}/Documents"; download = "${config.home.homeDirectory}/Téléchargements"; diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index 49c6f37..d7f4799 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -38,6 +38,7 @@ in { fractal zoom-us local.cinny-desktop + mattermost-desktop # Image gimp From b457b9973d2de36c217eb99fb9fb3e03ea40892e Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Wed, 1 Apr 2026 14:52:17 +0200 Subject: [PATCH 11/16] Adding archipelago --- flake.lock | 36 ++++++++++++++++----------------- users/lyes/desktop/packages.nix | 1 + 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index f24eb65..f2c769a 100644 --- a/flake.lock +++ b/flake.lock @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1774379316, - "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=", + "lastModified": 1774738535, + "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7", + "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1774392971, - "narHash": "sha256-/4+En99Qf63O0syn78Z9zrm70e50tdSYQCURTDNtyQ4=", + "lastModified": 1774459974, + "narHash": "sha256-kBurUjRtZ3L9w/hKqEU/7uE3E71/jkeVp4gbzkarg8Q=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "07e82e06d87e048b94280a16bd29e827f6583869", + "rev": "0e176193a249023ac48494dcfe879ee64b23a30d", "type": "gitlab" }, "original": { @@ -319,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774422943, - "narHash": "sha256-o1xgNumjljdBBfOrcQX95hhKGFOJQYNZqpF3EfaScMk=", + "lastModified": 1774777275, + "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "632e4bfc21c01e5be900d0d8255a5368a5d6082f", + "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1774352774, - "narHash": "sha256-gibUM0pSnLxEeuFrYA8T1oEaixk+fjQpqXbYaxcEX/4=", + "lastModified": 1774708879, + "narHash": "sha256-rTYvYkQL69/YkZB+MRA/IaX1qJ1lPx5KXoQS2/9+7Mw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a0f3d47dbd8f8618a1920d5a5ca09b7993415895", + "rev": "d01d23c798cceef42307d5789bfbce70515e8800", "type": "github" }, "original": { diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index d7f4799..89f7aba 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -77,6 +77,7 @@ in { # suyu pin.factorio.factorio sgt-puzzles + archipelago # Reading # calibre From 6036ca99b249f80038b3971725265b9902cb588d Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Fri, 3 Apr 2026 16:32:10 +0200 Subject: [PATCH 12/16] Adding helix extension support --- flake.lock | 197 +++++++++++++++--------------- flake.nix | 6 +- modules/common/default.nix | 9 +- users/lyes/home/editors/helix.nix | 3 +- 4 files changed, 106 insertions(+), 109 deletions(-) diff --git a/flake.lock b/flake.lock index f2c769a..977b4b3 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1774411715, - "narHash": "sha256-mceIHtVMXpLAfr1W0VK9ceTBX5yKu4gGWpVbThWTsAA=", + "lastModified": 1774983731, + "narHash": "sha256-ZJGManY8rA/7+AZIxiW0CEMW9x8megcoh1xZ/oXq/aY=", "owner": "9001", "repo": "copyparty", - "rev": "26e663d111e39ca96c63702ad27a05b6736607cf", + "rev": "198f631ac80adc33a8f072d598ff0cd1aa2b5abd", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1774959120, + "narHash": "sha256-Pzk6UbueeWy9WFiDY6iA1aHid+2AMzkS6gg2x2cSkz4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "c06f90f1eb6569bdaf6a4a10cb7e66db4454ac2a", "type": "github" }, "original": { @@ -217,6 +217,26 @@ "type": "github" } }, + "helix-ext": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1774804218, + "narHash": "sha256-5h6eicp0+qzgiDrWc0mlTiX+jvcx8d54Fp922uQ2p0k=", + "owner": "mattwparas", + "repo": "helix", + "rev": "912d8d8b97da21de9b44b4e24a476e193e7cc44d", + "type": "github" + }, + "original": { + "owner": "mattwparas", + "ref": "steel-event-system", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -245,11 +265,11 @@ ] }, "locked": { - "lastModified": 1774738535, - "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=", + "lastModified": 1775047159, + "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", "owner": "nix-community", "repo": "home-manager", - "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a", + "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", "type": "github" }, "original": { @@ -267,11 +287,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -285,14 +305,14 @@ "blobs": "blobs", "flake-compat": "flake-compat_2", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1774459974, - "narHash": "sha256-kBurUjRtZ3L9w/hKqEU/7uE3E71/jkeVp4gbzkarg8Q=", + "lastModified": 1774999302, + "narHash": "sha256-KJfDmGLMVO8Hr4TrTwOAQpOykLLOSgk9dxkaf2dHzFU=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "0e176193a249023ac48494dcfe879ee64b23a30d", + "rev": "493f0ff8a7571cc4ddd190babfa447489f41c752", "type": "gitlab" }, "original": { @@ -319,11 +339,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774777275, - "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=", + "lastModified": 1774933469, + "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd", + "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", "type": "github" }, "original": { @@ -367,11 +387,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -383,11 +403,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774192288, - "narHash": "sha256-vHqcv1WQvmR4hRz0/dUqlA8LjIHtZvWtWrzIX3YTxzQ=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1774935083, + "narHash": "sha256-Mh6bLcYAcENBAZk3RoMPMFCGGMZmfaGMERE4siZOgP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2cb1420c66c8e634314ce0abf70680208177f5b4", + "rev": "2f4fd5e1abf9bac8c1d22750c701a7a5e6b524c6", "type": "github" }, "original": { @@ -397,13 +433,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -413,13 +449,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -451,18 +487,39 @@ "copyparty": "copyparty", "deploy-rs": "deploy-rs", "disko": "disko", + "helix-ext": "helix-ext", "home-manager": "home-manager_2", "mailserver": "mailserver", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "pin-factorio": "pin-factorio", - "vicinae-extensions": "vicinae-extensions", "zen-browser": "zen-browser" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "helix-ext", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770952264, + "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -493,21 +550,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_2" @@ -526,64 +568,17 @@ "type": "github" } }, - "vicinae": { - "inputs": { - "nixpkgs": [ - "vicinae-extensions", - "nixpkgs" - ], - "systems": [ - "vicinae-extensions", - "systems" - ] - }, - "locked": { - "lastModified": 1768856963, - "narHash": "sha256-u5bWDuwk6oieTnvm1YjNotcYK8iJSddH5+S68+X4TSc=", - "owner": "vicinaehq", - "repo": "vicinae", - "rev": "934bc0ad47be6dbd6498a0dac655c4613fd0ab27", - "type": "github" - }, - "original": { - "owner": "vicinaehq", - "repo": "vicinae", - "type": "github" - } - }, - "vicinae-extensions": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_3", - "vicinae": "vicinae" - }, - "locked": { - "lastModified": 1774351406, - "narHash": "sha256-/h3M/j/VwMks9g1IABnV9LP6zBIiVtxmTIO5BT0ESks=", - "owner": "vicinaehq", - "repo": "extensions", - "rev": "337b6ddea28bcbb58bc9fcc859d866e5117ba10a", - "type": "github" - }, - "original": { - "owner": "vicinaehq", - "repo": "extensions", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1774708879, - "narHash": "sha256-rTYvYkQL69/YkZB+MRA/IaX1qJ1lPx5KXoQS2/9+7Mw=", + "lastModified": 1775021133, + "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d01d23c798cceef42307d5789bfbce70515e8800", + "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 83d5a0b..b7ee3af 100644 --- a/flake.nix +++ b/flake.nix @@ -15,11 +15,7 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/latest"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; # mozilla.url = "github:andersk/nixpkgs-mozilla/channel"; - - vicinae-extensions = { - url = "github:vicinaehq/extensions"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + helix-ext.url = "github:mattwparas/helix/steel-event-system"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; diff --git a/modules/common/default.nix b/modules/common/default.nix index 099db7b..60ab484 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -1,4 +1,4 @@ -{ nixpkgs-unstable, nixpkgs-stable, pin-factorio, ... }: +{ nixpkgs-unstable, nixpkgs-stable, pin-factorio, helix-ext, ... }: { imports = @@ -7,8 +7,8 @@ ./system.nix ]; - # Import local packages nixpkgs.overlays = [ + # Import local packages (final: prev: { local = import ../../pkgs { pkgs = final; }; }) @@ -33,6 +33,11 @@ factorio = import pin-factorio { system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; }; }) + + # Helix + (final: prev: { + helix-with-extensions = helix-ext.packages."x86_64-linux".helix; + }) ]; nixpkgs.config = { diff --git a/users/lyes/home/editors/helix.nix b/users/lyes/home/editors/helix.nix index e9fe010..35a17d1 100644 --- a/users/lyes/home/editors/helix.nix +++ b/users/lyes/home/editors/helix.nix @@ -1,8 +1,9 @@ -{ ... }: +{ pkgs, ... }: { programs.helix = { enable = true; + package = pkgs.helix-with-extensions; defaultEditor = true; settings = { From 1db440bd1d373a9cc1b3a4379128d040378c3af3 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Fri, 3 Apr 2026 21:07:26 +0200 Subject: [PATCH 13/16] Adding minish.link --- hosts/zora/reverse-proxy.nix | 18 +++++++++++++++++- modules/server/baba/default.nix | 4 ++-- modules/server/mogma/forwarding.nix | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/hosts/zora/reverse-proxy.nix b/hosts/zora/reverse-proxy.nix index 172bc9d..915b2ea 100644 --- a/hosts/zora/reverse-proxy.nix +++ b/hosts/zora/reverse-proxy.nix @@ -12,10 +12,26 @@ recommendedTlsSettings = true; virtualHosts = { - "lyes.eu" = { + "minish.link" = { + serverAliases = [ + "www.minish.link" + "minish.fr" + "www.minish.fr" + ]; default = true; forceSSL = true; enableACME = true; + locations."/" = { + root = "/var/data/www/minish.link/"; + }; + extraConfig = '' + error_page 404 /404.html; + ''; + }; + "lyes.eu" = { + serverAliases = [ "www.lyes.eu" ]; + forceSSL = true; + enableACME = true; locations."/" = { root = "/var/data/www/lyes.eu/"; }; diff --git a/modules/server/baba/default.nix b/modules/server/baba/default.nix index eec8624..01f7c34 100644 --- a/modules/server/baba/default.nix +++ b/modules/server/baba/default.nix @@ -15,8 +15,8 @@ extraAppsEnable = true; extraApps = { - inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks dav_push repod gpoddersync phonetrack music; - # inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music; + # inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks dav_push repod gpoddersync phonetrack music; + inherit (config.services.nextcloud.package.packages.apps) mail calendar contacts cospend user_oidc notes richdocuments tasks news dav_push repod gpoddersync phonetrack music; # gpoddersync = pkgs.fetchNextcloudApp { # hash = "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU="; # url = "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz"; diff --git a/modules/server/mogma/forwarding.nix b/modules/server/mogma/forwarding.nix index c11ed32..55ef3b4 100644 --- a/modules/server/mogma/forwarding.nix +++ b/modules/server/mogma/forwarding.nix @@ -53,9 +53,9 @@ lib.mkIf (forwardedServices != { } && cfg.portForwarding.enable) { # wantedBy = serviceList; after = [ "wireguard.target" ] ++ encServicesList; - wants = [ "wireguard.target" ]; + wants = [ "wireguard.target" ] ++ encServicesList; - # preStart = "sleep 3"; + preStart = "sleep 3"; path = with pkgs; [ libnatpmp From c48870c14c5cb2f6e04bce0585096ed62c9606f0 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Sat, 4 Apr 2026 20:23:42 +0200 Subject: [PATCH 14/16] Part 1 of lyes.eu -> minish.link migration --- hosts/zora/reverse-proxy.nix | 13 +++++++------ modules/server/README.md | 4 ++-- modules/server/agraf/default.nix | 2 +- modules/server/link/client.nix | 2 +- modules/server/link/default.nix | 2 +- secrets/zora/services/nayru-conf.age | Bin 1044 -> 1048 bytes 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hosts/zora/reverse-proxy.nix b/hosts/zora/reverse-proxy.nix index 915b2ea..9b6abae 100644 --- a/hosts/zora/reverse-proxy.nix +++ b/hosts/zora/reverse-proxy.nix @@ -40,7 +40,8 @@ ''; }; # 44300 - "auth.lyes.eu" = { + "auth.minish.link" = { + serverAliases = [ "auth.lyes.eu" ]; forceSSL = true; enableACME = true; locations."/" = { @@ -57,7 +58,7 @@ }; }; # 44302 - "manga.lyes.eu" = { + "manga.minish.link" = { forceSSL = true; enableACME = true; locations."/" = { @@ -66,7 +67,7 @@ }; }; # 44312 - "dl.manga.lyes.eu" = { + "dl.manga.minish.link" = { forceSSL = true; enableACME = true; locations."/".proxyPass = "http://${config.networking.vpn-netns.vethIP}:${toString config.services.suwayomi-server.settings.server.port}"; @@ -81,7 +82,7 @@ locations."/".proxyPass = "http://localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}"; }; # 8096 - "media.lyes.eu" = { + "media.minish.link" = { forceSSL = true; enableACME = true; locations = { @@ -101,7 +102,7 @@ }; }; # 44304 - "torrent.lyes.eu" = { + "torrent.minish.link" = { forceSSL = true; enableACME = true; locations."/" = { @@ -109,7 +110,7 @@ }; }; # 44305 - "files.lyes.eu" = { + "files.minish.link" = { forceSSL = true; enableACME = true; locations."/" = { diff --git a/modules/server/README.md b/modules/server/README.md index 6981be1..87e7bbc 100644 --- a/modules/server/README.md +++ b/modules/server/README.md @@ -6,9 +6,9 @@ - `kaepora` : PostgreSQL - `kalif` : Factorio (`factorio.lyes.eu`) - `lanayru` : Suwayomi (`dl.manga.lyes.eu`) -- `link` : Kanidm (`auth.lyes.eu`) +- `link` : Kanidm (`auth.minish.link`) - `maistro` : Incus -- `mikau` : Jellyfin (`media.lyes.eu`) +- `mikau` : Jellyfin (`media.minish.link`) - `midona` : Gate Minecraft Server Proxy - `mogma` : VPN NetNS Configuration - `nayru` : Komga/Manga (`manga.lyes.eu`) diff --git a/modules/server/agraf/default.nix b/modules/server/agraf/default.nix index 431cf65..f98e966 100644 --- a/modules/server/agraf/default.nix +++ b/modules/server/agraf/default.nix @@ -24,7 +24,7 @@ # General options ed = true; # See hidden files (starting with a dot) name = "zora"; # Server name - name-url = "https://files.lyes.eu"; # Server URL + name-url = "https://files.minish.link"; # Server URL j = 4; # Max jobs (CPU usage) # Network options diff --git a/modules/server/link/client.nix b/modules/server/link/client.nix index cdb6e32..166b992 100644 --- a/modules/server/link/client.nix +++ b/modules/server/link/client.nix @@ -7,7 +7,7 @@ client = { enable = true; settings = { - uri = "https://auth.lyes.eu"; + uri = "https://auth.minish.link"; }; }; }; diff --git a/modules/server/link/default.nix b/modules/server/link/default.nix index 34844db..a9c3f40 100644 --- a/modules/server/link/default.nix +++ b/modules/server/link/default.nix @@ -1,7 +1,7 @@ { config, ... }: let - hostname = "auth.${config.networking.domain}"; + hostname = "auth.minish.link"; port = "44300"; in { diff --git a/secrets/zora/services/nayru-conf.age b/secrets/zora/services/nayru-conf.age index ac1b95083dfbffab07e7f60c5eb3c682688df48d..b15eed98f403fbc9ead0bb9d04f01fb64ae1c8d3 100644 GIT binary patch delta 1018 zcmbQjF@s}*PJKp1a&B&rqh&;Jq?bvcg}!HHrcYpAetNJ+SZQLGduD-tuzNsMs<&%! zAXk!pR(XbHh(}&{aduFiqi429YJi(twqtpfWpYTRNkwsnVL-Tlg+;1IB$uw8LUD11 zZfc5=si~o*LWo;ox@WqAr-8edZ*ql~ey)>&b4r1;PraLQX>PHprMpSFZ%J8JrcYpC zKu)5+Z(3L~S7v3Tk$H$&Vr8C-tC?A(pSMe~wnth{xQDxwQ+Z*ye_*a#k+zAezngn8 zm#(g^LZ)^}mRE9#r-^Y|TDVC`s!vXlOG#3Ax^q}Wh-s>)zH4HVyQNEcu7{;Bm+g1& z`3Adm!t0mc+xGlW`#kmQp0{$MvPB)&_C%c8-^F3Y%>F(&W^%ChDeshN3_OSbolY^H z=f8Qf%FPptLY}vsJ=|hf$JEisifwCk<~mQkaPRFSw-ry0&nmF`{d0bTNqzhUZ|#X2)*kxoUnWp@ zH+oHt$Dx^O7ZSTwELME{@+tcM-P>JNvl?Z29JiLqw^sg*ZRxu!Z5+Zp=jI*JiF}_L%o0YN$LvM-*c1|G3@dGb;v&Zv#h7&oFw79(t4~0$8334R?fdx zRQCGZl;-L8*7CodeTTKktww3D_2R`g3}PogKT=+Mu+ZY<&bO~V{lEJEX6)wrBeov| z>&?0>JnnC^Yi{~EyK=^wg?EKE=y>Taw_9;|-Y2t*ell`?57%)UT+8!;C-ei<|BIx|21EG`6Bpbs|&-`zrIltnLxv7Et)rDajm&<#U$H|Z%AX&SSF>97~;+8g_6m5pfiS@fSMX+w+?w+F&eEy=^K}Vi$Z<~`A2FLz--fmC7_;hkP z!_^m0i)}q*m-}!|+VGN9@f+KZmFp*aD}TIyFyp4(rM$blOs9J3{+YoqI3vF0z3;`N zU3Hh_{&&0#7r9?0zDmRNW^dy(P2DV((+0CW+x};U{H%Cg?X+R>tr(jmrYkbJ`)AHN bc;H>Z#(7`AH5C;|nq=D6oS&03fNMmS zFIPsSi%*1hsGCK8v13?Knn78Vk$YlRPL5epg-J+Jg-VXhhad7kwvg+O1O!Bc73E{VP2(=pGk3XSW$(asj-t` zd5DW^j+1*NmuFFBVTM6yka@XBVpK|%hg-Qh`*J?+O z4+6PDcJ=q$Q>%1~t0#pq)cA&6HEC%T%{pW8R_y)VTN{fm)mc_dpU1DMyF>bggxA)O z`u|@=|B4aiRh=PcJk@61NAWTd(50Kk%e#E3z8R z^Uo_SPgHr7bBVvHGva+v%-0tJW>0r?q^mM4KH_?!zq70ULsDIZELY}?MZp0rPsA3a zR5u=+ZT4Wh$l)(XO3Z&-iVLzvRUEpyP5Jv)OKILCp*t?l*u$HtGTrv(q-*c_T4qVM z&ryxrx*@@{T~TM=`PNzcZuS0M-B^=0b=I4n1l@19emyeRO`7>lTPrncb*Yc%A=hta zs+$>K`8oaAVLTQ2altrn>dQL$Zs#7v+BYwm9O;zmxZl=G*-o? z2AcWx>?*KhiaSuB=+8#@%P}rey{Co@XT#l=t7Ad{g|c5c0{vre9=eaL#EHGh8Leh16T z!WRpiJd1?60(?CR-?wo%un7lt&E6$x9d^BAK3@~(!L-)ci_N;s3@RcM_gm{18mpTf znH=J9?7{Mq{;yT){|Z0&&;PRcxK(``*G7J+i{H$WoEJ_zP|APk#MPPoN&@pvIP27y zUwQn#Q$?#IJoo48h@=L8zRJ!e^Ck)F9^>)7`|L;DmNv%{iUV()z*9OC%m|BeJ*U)xg(R8yK7}1N$e_pslu@> zWP+HMcWp`76VWZ!eA0Z6r3|Ztv);vji$1aO Date: Sun, 5 Apr 2026 11:53:03 +0200 Subject: [PATCH 15/16] Vault migration --- hosts/zora/reverse-proxy.nix | 2 +- secrets/zora/services/giovanni-env.age | Bin 2288 -> 2318 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/zora/reverse-proxy.nix b/hosts/zora/reverse-proxy.nix index 9b6abae..3b28054 100644 --- a/hosts/zora/reverse-proxy.nix +++ b/hosts/zora/reverse-proxy.nix @@ -49,7 +49,7 @@ }; }; # 44301 - "vault.lyes.eu" = { + "vault.minish.link" = { forceSSL = true; enableACME = true; locations."/" = { diff --git a/secrets/zora/services/giovanni-env.age b/secrets/zora/services/giovanni-env.age index 08171f707aa8bd3fc8913879504c43a370a044ff..bec072a7aa31ba9204f8d895d1a0eba29e07ec91 100644 GIT binary patch delta 2298 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 From f068d7491670b96c38ff1dde1165025eee4085e1 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Sun, 5 Apr 2026 12:33:55 +0200 Subject: [PATCH 16/16] Git migration --- hosts/zora/reverse-proxy.nix | 2 +- modules/server/biggoron/default.nix | 2 +- modules/server/biggoron/runner.nix | 36 ++++++++++++++++------------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/hosts/zora/reverse-proxy.nix b/hosts/zora/reverse-proxy.nix index 3b28054..87a960f 100644 --- a/hosts/zora/reverse-proxy.nix +++ b/hosts/zora/reverse-proxy.nix @@ -73,7 +73,7 @@ locations."/".proxyPass = "http://${config.networking.vpn-netns.vethIP}:${toString config.services.suwayomi-server.settings.server.port}"; }; # 44303 - "git.lyes.eu" = { + "git.minish.link" = { forceSSL = true; enableACME = true; extraConfig = '' diff --git a/modules/server/biggoron/default.nix b/modules/server/biggoron/default.nix index 905bb47..88ad6d3 100644 --- a/modules/server/biggoron/default.nix +++ b/modules/server/biggoron/default.nix @@ -37,7 +37,7 @@ in settings = { server = { - DOMAIN = "git.lyes.eu"; + DOMAIN = "git.minish.link"; # You need to specify this to remove the port from URLs in the web UI. ROOT_URL = "https://${srv.DOMAIN}/"; HTTP_PORT = 44303; diff --git a/modules/server/biggoron/runner.nix b/modules/server/biggoron/runner.nix index c8d4d14..72a8282 100644 --- a/modules/server/biggoron/runner.nix +++ b/modules/server/biggoron/runner.nix @@ -21,25 +21,29 @@ services.gitea-actions-runner = { package = pkgs.forgejo-runner; - instances.default = { - enable = true; - name = "ptigoron"; - url = "https://git.lyes.eu"; - # Obtaining the path to the runner token file may differ - # tokenFile should be in format TOKEN=, since it's EnvironmentFile for systemd - tokenFile = config.age.secrets.ptigoron-token.path; - labels = [ - "fedora-rawhide:docker://quay.io/fedora/fedora:rawhide" - "fedora-latest:docker://quay.io/fedora/fedora:latest" - "ubuntu-rolling:docker://ubuntu:rolling" - "ubuntu-latest:docker://ubuntu:latest" - "nixos-latest:docker://nixos/nix" - ## optionally provide native execution on the host: - # "native:host" - ]; + instances = { + ptigoron = { + enable = true; + name = "ptigoron"; + url = "https://git.minish.link"; + # Obtaining the path to the runner token file may differ + # tokenFile should be in format TOKEN=, since it's EnvironmentFile for systemd + tokenFile = config.age.secrets.ptigoron-token.path; + labels = [ + "fedora-rawhide:docker://quay.io/fedora/fedora:rawhide" + "fedora-latest:docker://quay.io/fedora/fedora:latest" + "ubuntu-rolling:docker://ubuntu:rolling" + "ubuntu-latest:docker://ubuntu:latest" + "nixos-latest:docker://nixos/nix" + ## optionally provide native execution on the host: + # "native:host" + ]; + }; }; }; + systemd.services.gitea-runner-ptigoron.after = [ "forgejo.service" ]; + age.secrets.ptigoron-token = { file = ../../../secrets/zora/services/ptigoron-token.age; owner = "gitea-runner";