From f61d2eedefa8e5e4c0c4fdbb794bdca23f1e902f Mon Sep 17 00:00:00 2001 From: kity Date: Mon, 23 Dec 2024 14:39:18 +0100 Subject: [PATCH 1/9] started refactoring --- hosts/sisyphe/configuration.nix | 4 ++-- .../sisyphe/features}/authentik.nix | 0 .../sisyphe/features}/backups-repos.nix | 0 .../server => hosts/sisyphe/features}/backups.nix | 1 - .../server => hosts/sisyphe/features}/caddy.nix | 0 .../sisyphe/features}/containers/4get.nix | 0 .../features}/containers/crafty-controller.nix | 0 .../sisyphe/features}/containers/default.nix | 0 .../sisyphe/features}/containers/flaresolverr.nix | 0 .../sisyphe/features}/containers/freshrss.nix | 0 .../sisyphe/features}/containers/sonarr.nix | 0 .../sisyphe/features}/databases/default.nix | 0 .../server => hosts/sisyphe/features}/default.nix | 0 .../server => hosts/sisyphe/features}/fail2ban.nix | 0 .../sisyphe/features}/multimedia/arr-suite.nix | 0 .../sisyphe/features}/multimedia/calibre-web.nix | 0 .../sisyphe/features}/multimedia/default.nix | 0 .../sisyphe/features}/multimedia/jellyfin.nix | 0 .../sisyphe/features}/multimedia/slskd.nix | 0 .../sisyphe/features}/multimedia/transmission.nix | 0 .../sisyphe/features}/prometheus.nix | 0 .../sisyphe/features}/samba-shares.nix | 14 +++++++++----- .../sisyphe/features}/services/akkoma.nix | 0 .../sisyphe/features}/services/default.nix | 0 .../sisyphe/features}/services/forgejo-smtp.nix | 0 .../sisyphe/features}/services/forgejo.nix | 0 .../sisyphe/features}/services/freshrss.nix | 0 .../sisyphe/features}/services/grafana.nix | 0 .../features}/services/homelab-dashboard.nix | 0 .../sisyphe/features}/services/irc-server.nix | 0 .../features}/services/nextcloud-network.nix | 0 .../sisyphe/features}/services/nextcloud.nix | 0 .../sisyphe/features}/services/synapse-matrix.nix | 0 .../sisyphe/features}/services/uptime-kuma.nix | 0 .../sisyphe/features}/tailscale.nix | 0 hosts/sisyphe/server-configuration.nix | 3 +-- 36 files changed, 12 insertions(+), 10 deletions(-) rename {features/server => hosts/sisyphe/features}/authentik.nix (100%) rename {features/server => hosts/sisyphe/features}/backups-repos.nix (100%) rename {features/server => hosts/sisyphe/features}/backups.nix (98%) rename {features/server => hosts/sisyphe/features}/caddy.nix (100%) rename {features/server => hosts/sisyphe/features}/containers/4get.nix (100%) rename {features/server => hosts/sisyphe/features}/containers/crafty-controller.nix (100%) rename {features/server => hosts/sisyphe/features}/containers/default.nix (100%) rename {features/server => hosts/sisyphe/features}/containers/flaresolverr.nix (100%) rename {features/server => hosts/sisyphe/features}/containers/freshrss.nix (100%) rename {features/server => hosts/sisyphe/features}/containers/sonarr.nix (100%) rename {features/server => hosts/sisyphe/features}/databases/default.nix (100%) rename {features/server => hosts/sisyphe/features}/default.nix (100%) rename {features/server => hosts/sisyphe/features}/fail2ban.nix (100%) rename {features/server => hosts/sisyphe/features}/multimedia/arr-suite.nix (100%) rename {features/server => hosts/sisyphe/features}/multimedia/calibre-web.nix (100%) rename {features/server => hosts/sisyphe/features}/multimedia/default.nix (100%) rename {features/server => hosts/sisyphe/features}/multimedia/jellyfin.nix (100%) rename {features/server => hosts/sisyphe/features}/multimedia/slskd.nix (100%) rename {features/server => hosts/sisyphe/features}/multimedia/transmission.nix (100%) rename {features/server => hosts/sisyphe/features}/prometheus.nix (100%) rename {features/server => hosts/sisyphe/features}/samba-shares.nix (81%) rename {features/server => hosts/sisyphe/features}/services/akkoma.nix (100%) rename {features/server => hosts/sisyphe/features}/services/default.nix (100%) rename {features/server => hosts/sisyphe/features}/services/forgejo-smtp.nix (100%) rename {features/server => hosts/sisyphe/features}/services/forgejo.nix (100%) rename {features/server => hosts/sisyphe/features}/services/freshrss.nix (100%) rename {features/server => hosts/sisyphe/features}/services/grafana.nix (100%) rename {features/server => hosts/sisyphe/features}/services/homelab-dashboard.nix (100%) rename {features/server => hosts/sisyphe/features}/services/irc-server.nix (100%) rename {features/server => hosts/sisyphe/features}/services/nextcloud-network.nix (100%) rename {features/server => hosts/sisyphe/features}/services/nextcloud.nix (100%) rename {features/server => hosts/sisyphe/features}/services/synapse-matrix.nix (100%) rename {features/server => hosts/sisyphe/features}/services/uptime-kuma.nix (100%) rename {features/server => hosts/sisyphe/features}/tailscale.nix (100%) diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index d6c77df..174f043 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -9,8 +9,8 @@ imports = [ ./hardware-configuration.nix ./server-configuration.nix - ../../features/server/default.nix - ../../features/shared/ssh.nix + ./features/server/default.nix + ./features/shared/ssh.nix ]; # Use the GRUB 2 boot loader. diff --git a/features/server/authentik.nix b/hosts/sisyphe/features/authentik.nix similarity index 100% rename from features/server/authentik.nix rename to hosts/sisyphe/features/authentik.nix diff --git a/features/server/backups-repos.nix b/hosts/sisyphe/features/backups-repos.nix similarity index 100% rename from features/server/backups-repos.nix rename to hosts/sisyphe/features/backups-repos.nix diff --git a/features/server/backups.nix b/hosts/sisyphe/features/backups.nix similarity index 98% rename from features/server/backups.nix rename to hosts/sisyphe/features/backups.nix index ad0407a..990b06b 100644 --- a/features/server/backups.nix +++ b/hosts/sisyphe/features/backups.nix @@ -79,7 +79,6 @@ ]; postgresql_databases = [ { name = "nextcloud"; } - { name = "matrix-synapse"; } ]; exclude_patterns = [ "/home/*/.cache" ]; encryption_passcommand = "${pkgs.coreutils}/bin/cat /run/secrets/borgRemoteServerPassword"; diff --git a/features/server/caddy.nix b/hosts/sisyphe/features/caddy.nix similarity index 100% rename from features/server/caddy.nix rename to hosts/sisyphe/features/caddy.nix diff --git a/features/server/containers/4get.nix b/hosts/sisyphe/features/containers/4get.nix similarity index 100% rename from features/server/containers/4get.nix rename to hosts/sisyphe/features/containers/4get.nix diff --git a/features/server/containers/crafty-controller.nix b/hosts/sisyphe/features/containers/crafty-controller.nix similarity index 100% rename from features/server/containers/crafty-controller.nix rename to hosts/sisyphe/features/containers/crafty-controller.nix diff --git a/features/server/containers/default.nix b/hosts/sisyphe/features/containers/default.nix similarity index 100% rename from features/server/containers/default.nix rename to hosts/sisyphe/features/containers/default.nix diff --git a/features/server/containers/flaresolverr.nix b/hosts/sisyphe/features/containers/flaresolverr.nix similarity index 100% rename from features/server/containers/flaresolverr.nix rename to hosts/sisyphe/features/containers/flaresolverr.nix diff --git a/features/server/containers/freshrss.nix b/hosts/sisyphe/features/containers/freshrss.nix similarity index 100% rename from features/server/containers/freshrss.nix rename to hosts/sisyphe/features/containers/freshrss.nix diff --git a/features/server/containers/sonarr.nix b/hosts/sisyphe/features/containers/sonarr.nix similarity index 100% rename from features/server/containers/sonarr.nix rename to hosts/sisyphe/features/containers/sonarr.nix diff --git a/features/server/databases/default.nix b/hosts/sisyphe/features/databases/default.nix similarity index 100% rename from features/server/databases/default.nix rename to hosts/sisyphe/features/databases/default.nix diff --git a/features/server/default.nix b/hosts/sisyphe/features/default.nix similarity index 100% rename from features/server/default.nix rename to hosts/sisyphe/features/default.nix diff --git a/features/server/fail2ban.nix b/hosts/sisyphe/features/fail2ban.nix similarity index 100% rename from features/server/fail2ban.nix rename to hosts/sisyphe/features/fail2ban.nix diff --git a/features/server/multimedia/arr-suite.nix b/hosts/sisyphe/features/multimedia/arr-suite.nix similarity index 100% rename from features/server/multimedia/arr-suite.nix rename to hosts/sisyphe/features/multimedia/arr-suite.nix diff --git a/features/server/multimedia/calibre-web.nix b/hosts/sisyphe/features/multimedia/calibre-web.nix similarity index 100% rename from features/server/multimedia/calibre-web.nix rename to hosts/sisyphe/features/multimedia/calibre-web.nix diff --git a/features/server/multimedia/default.nix b/hosts/sisyphe/features/multimedia/default.nix similarity index 100% rename from features/server/multimedia/default.nix rename to hosts/sisyphe/features/multimedia/default.nix diff --git a/features/server/multimedia/jellyfin.nix b/hosts/sisyphe/features/multimedia/jellyfin.nix similarity index 100% rename from features/server/multimedia/jellyfin.nix rename to hosts/sisyphe/features/multimedia/jellyfin.nix diff --git a/features/server/multimedia/slskd.nix b/hosts/sisyphe/features/multimedia/slskd.nix similarity index 100% rename from features/server/multimedia/slskd.nix rename to hosts/sisyphe/features/multimedia/slskd.nix diff --git a/features/server/multimedia/transmission.nix b/hosts/sisyphe/features/multimedia/transmission.nix similarity index 100% rename from features/server/multimedia/transmission.nix rename to hosts/sisyphe/features/multimedia/transmission.nix diff --git a/features/server/prometheus.nix b/hosts/sisyphe/features/prometheus.nix similarity index 100% rename from features/server/prometheus.nix rename to hosts/sisyphe/features/prometheus.nix diff --git a/features/server/samba-shares.nix b/hosts/sisyphe/features/samba-shares.nix similarity index 81% rename from features/server/samba-shares.nix rename to hosts/sisyphe/features/samba-shares.nix index cc8fa9b..1405e4d 100644 --- a/features/server/samba-shares.nix +++ b/hosts/sisyphe/features/samba-shares.nix @@ -1,6 +1,4 @@ { config, lib, ... }: -with lib; -# TODO: add access to series and TV folders. let cfg = config.samba; in @@ -31,20 +29,20 @@ in browseable = "yes"; "read only" = "no"; "create mask" = "0644"; - "directory mask" = "0755"; + "directory mask" = "0655"; }; ebooks = { path = "${cfg.dir}/Ebooks"; browseable = "yes"; "read only" = "no"; "create mask" = "0644"; - "directory mask" = "0755"; + "directory mask" = "0655"; }; movies = { path = "${cfg.dir}/Films"; browseable = "yes"; "create mask" = "0644"; - "directory mask" = "0755"; + "directory mask" = "0655"; "read only" = "no"; }; shows = { @@ -54,6 +52,12 @@ in "directory mask" = "0755"; browseable = "yes"; }; + torrents = { + path = "${cfg.dir}/Torrents"; + "read only" = "yes"; + "create mask" = "644"; + browseable = "yes"; + }; }; }; }; diff --git a/features/server/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix similarity index 100% rename from features/server/services/akkoma.nix rename to hosts/sisyphe/features/services/akkoma.nix diff --git a/features/server/services/default.nix b/hosts/sisyphe/features/services/default.nix similarity index 100% rename from features/server/services/default.nix rename to hosts/sisyphe/features/services/default.nix diff --git a/features/server/services/forgejo-smtp.nix b/hosts/sisyphe/features/services/forgejo-smtp.nix similarity index 100% rename from features/server/services/forgejo-smtp.nix rename to hosts/sisyphe/features/services/forgejo-smtp.nix diff --git a/features/server/services/forgejo.nix b/hosts/sisyphe/features/services/forgejo.nix similarity index 100% rename from features/server/services/forgejo.nix rename to hosts/sisyphe/features/services/forgejo.nix diff --git a/features/server/services/freshrss.nix b/hosts/sisyphe/features/services/freshrss.nix similarity index 100% rename from features/server/services/freshrss.nix rename to hosts/sisyphe/features/services/freshrss.nix diff --git a/features/server/services/grafana.nix b/hosts/sisyphe/features/services/grafana.nix similarity index 100% rename from features/server/services/grafana.nix rename to hosts/sisyphe/features/services/grafana.nix diff --git a/features/server/services/homelab-dashboard.nix b/hosts/sisyphe/features/services/homelab-dashboard.nix similarity index 100% rename from features/server/services/homelab-dashboard.nix rename to hosts/sisyphe/features/services/homelab-dashboard.nix diff --git a/features/server/services/irc-server.nix b/hosts/sisyphe/features/services/irc-server.nix similarity index 100% rename from features/server/services/irc-server.nix rename to hosts/sisyphe/features/services/irc-server.nix diff --git a/features/server/services/nextcloud-network.nix b/hosts/sisyphe/features/services/nextcloud-network.nix similarity index 100% rename from features/server/services/nextcloud-network.nix rename to hosts/sisyphe/features/services/nextcloud-network.nix diff --git a/features/server/services/nextcloud.nix b/hosts/sisyphe/features/services/nextcloud.nix similarity index 100% rename from features/server/services/nextcloud.nix rename to hosts/sisyphe/features/services/nextcloud.nix diff --git a/features/server/services/synapse-matrix.nix b/hosts/sisyphe/features/services/synapse-matrix.nix similarity index 100% rename from features/server/services/synapse-matrix.nix rename to hosts/sisyphe/features/services/synapse-matrix.nix diff --git a/features/server/services/uptime-kuma.nix b/hosts/sisyphe/features/services/uptime-kuma.nix similarity index 100% rename from features/server/services/uptime-kuma.nix rename to hosts/sisyphe/features/services/uptime-kuma.nix diff --git a/features/server/tailscale.nix b/hosts/sisyphe/features/tailscale.nix similarity index 100% rename from features/server/tailscale.nix rename to hosts/sisyphe/features/tailscale.nix diff --git a/hosts/sisyphe/server-configuration.nix b/hosts/sisyphe/server-configuration.nix index 8140f1f..f038092 100644 --- a/hosts/sisyphe/server-configuration.nix +++ b/hosts/sisyphe/server-configuration.nix @@ -38,8 +38,7 @@ in allowedTCPPorts = [ 22 # ssh 80 # http - 8008 # matrix-synapse - 8448 # matrix-synapse + 443 # ssh ]; allowedUDPPorts = [ ]; }; From c87c2ce302618469b2f094f0862c1276339e9a1f Mon Sep 17 00:00:00 2001 From: kity Date: Mon, 23 Dec 2024 14:53:11 +0100 Subject: [PATCH 2/9] more transmission settings --- hosts/sisyphe/features/multimedia/transmission.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/sisyphe/features/multimedia/transmission.nix b/hosts/sisyphe/features/multimedia/transmission.nix index 13e6e44..39fc992 100644 --- a/hosts/sisyphe/features/multimedia/transmission.nix +++ b/hosts/sisyphe/features/multimedia/transmission.nix @@ -31,12 +31,16 @@ in openFirewall = true; openRPCPort = true; credentialsFile = config.sops.secrets.transmission.path; + webHome = pkgs.flood-for-transmission; settings = { rpc-bind-address = "0.0.0.0"; rpc-whitelist-enabled = false; rpc-authentication-required = true; download-dir = "${cfg.directory}/Torrents"; ratio-limit-enabled = true; + alt-speed-time-enabled = true; + alt-speed-time-begin = "480"; + alt-speed-time-end = "1320"; }; }; From 2d3ce1d4823f52f322b8268f5064be3a5e45c211 Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 23 Dec 2024 14:57:01 +0100 Subject: [PATCH 3/9] znc --- hosts/dionysos/features/znc-infos.nix | 37 ++++++++++----------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/hosts/dionysos/features/znc-infos.nix b/hosts/dionysos/features/znc-infos.nix index f75cf4c..97d97c4 100644 --- a/hosts/dionysos/features/znc-infos.nix +++ b/hosts/dionysos/features/znc-infos.nix @@ -1,24 +1,13 @@ -{config, ...}: { - services.znc.config.User."computemadness_" = { - Admin = true; - Nick = "computemadness_"; - AltNick = "kumputemadness_"; - LoadModule = [ "chanserver" "controlpanel" ]; - Network = { - libera = { - Server = "irc.libera.chat +6697"; - LoadModule = "simple_away"; - Chan = { - "#nixos" = {Detached = false;}; - }; - }; - koshkairc = { - Server = "irc.koshka.love +6697"; - Chan = { - "#" = {Detached = false;}; - "#speakez" = {Detached = false;}; - }; - }; - }; - }; -} +U2FsdGVkX1/KBXWMpf1DqMWCTOr3Ao7hJ9RPX9WEeGdi5pwsUZu50275uByg/fku +dStEPuVPKHU35mVvLMi938hIAjHb0Vqt3MKjMxwhp0SgbxevnVpWK79AUMzkaNel +mMGYTMrarL/aRDvlw+l2TiH2/4Pq0DsL/4oMgXQSE6xh9G4jSzmMRV9AEKcs8mSK +SW+WDg8lLeKi8Y/c7KVx6ZP6TVLpDX4xRToxy9SbyNpSads4cZJLGnLALRYdJl46 +PQKmV2xOnKLAYTN36yzrbZZBXtvURUFKObyhGKVLwdDwfarxG7fi/PAH9A7FIE8B +xIUU6mPUHy0FdQ/vUh4NeJounTr9i4wmhfJo/aRXB/HlmZA5/zihZwcIv9/GM3gM +B+nud++PfTVB3M1LXMyCyBOEWqcyADdxSeN4LwdBMAsrufs2gB/gdv3JNhqqJdXa +E2sEq4OXW/A+1w2ADUZ1l490s7RpQSxWv0JHXgRsm91TIdT6YpNpq8AMHEfLSxE5 +SSX7Yynh1dqgYqzWqFkHIzZ2UYlzrCyCRVLX2Jwcyf6L9Qa62SGhKj5Yml4p7zga +U2U5Y96GPvKD+WzxliCVxmLSkH1mrnCk4oI5OgEcQzUVLmgfyrDTH+FT6l1IgpFn +3k7BbuiZtqB9i8pOGf2mluj7+Fi7ppZserh6wwDtrPoGllls8CtbpmOagNwnxzVE +kZ9IKUbYs0Sy7kMbZD0Ss03zeuBCWHSbikDJ0bg+p9IjtpYcoorLccIztnjmZkDn +H1cj342muViFyWe8jfpVD1wYzkiscvg3H1CzeI+aQ58= From ae8cb73c4d6dfabc7a2f280a768e11edba2b8c57 Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 23 Dec 2024 15:09:05 +0100 Subject: [PATCH 4/9] updated lockfile --- flake.lock | 133 +++++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index afef1df..93b90e8 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1730444665, - "narHash": "sha256-i3FxeHjsHw4AePx3AWVVywy92EEobx/ZER4ignWxNrE=", + "lastModified": 1731092955, + "narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "b3b4f2253d43af3311b3d3fc86973fc3e9559c33", + "rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -277,14 +277,15 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730088025, - "narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=", + "lastModified": 1734942015, + "narHash": "sha256-7qj3Hk2NMiWdBNk3E3T6GdHkMDUCWK0kz10P9Jl6z58=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "f35afbe60a4ff71fd65fec3839fc38943f961951", + "rev": "38f1d0177de284cb54045b3e888d66cd4710ce5a", "type": "github" }, "original": { @@ -296,11 +297,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", + "lastModified": 1734887107, + "narHash": "sha256-h5U1/by2ikiPBUPCTbWAMALCy+DTkjt6Fs8nepY44/4=", "owner": "neovim", "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", + "rev": "665a0e85c4788cb2847e270c333c0aee306f07ad", "type": "github" }, "original": { @@ -316,11 +317,11 @@ ] }, "locked": { - "lastModified": 1730448474, - "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -363,11 +364,11 @@ }, "nixlib": { "locked": { - "lastModified": 1729386149, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -384,11 +385,11 @@ ] }, "locked": { - "lastModified": 1729472750, - "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "type": "github" }, "original": { @@ -399,11 +400,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "4989a246d7a390a859852baddb1013f825435cee", "type": "github" }, "original": { @@ -413,29 +414,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1734835170, + "narHash": "sha256-JG6n9tQET7ZLjvwjH9BdYE6pES/Alcduxv2FDXliuBM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "6df924734e1b626efd70925545de844b1c25246f", "type": "github" }, "original": { @@ -447,11 +432,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729951556, - "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "type": "github" }, "original": { @@ -494,15 +479,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -525,6 +509,27 @@ "repo": "default-linux", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", From eb92a3dd46203927edbc835d114ec2a680a65228 Mon Sep 17 00:00:00 2001 From: kity Date: Mon, 23 Dec 2024 15:11:56 +0100 Subject: [PATCH 5/9] fixing config file path --- hosts/sisyphe/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index 174f043..884eae5 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -9,8 +9,8 @@ imports = [ ./hardware-configuration.nix ./server-configuration.nix - ./features/server/default.nix - ./features/shared/ssh.nix + ./features/default.nix + ../../features/shared/ssh.nix ]; # Use the GRUB 2 boot loader. From 2341c36c03b8d635ecbebe21d1014d208654af18 Mon Sep 17 00:00:00 2001 From: kity Date: Mon, 23 Dec 2024 15:17:28 +0100 Subject: [PATCH 6/9] fixed file encryption --- .gitattributes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 42cfb7a..bf94dc5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ #pattern filter=crypt diff=crypt merge=crypt -features/server/services/forgejo-smtp.nix filter=crypt diff=crypt -features/server/services/nextcloud-network.nix filter=crypt diff=crypt -features/server/backups-repos.nix filter=crypt diff=crypt +hosts/sisyphe/features/services/forgejo-smtp.nix filter=crypt diff=crypt +hosts/sisyphe/features/services/nextcloud-network.nix filter=crypt diff=crypt +hosts/sisyphe/features/backups-repos.nix filter=crypt diff=crypt hosts/dionysos/features/znc-infos.nix filter=crypt diff=crypt From 66f7f1a39b8bde805d003577ac06317f5f2e1425 Mon Sep 17 00:00:00 2001 From: kity Date: Mon, 23 Dec 2024 15:18:57 +0100 Subject: [PATCH 7/9] fixed file syntax --- hosts/sisyphe/features/services/forgejo.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/sisyphe/features/services/forgejo.nix b/hosts/sisyphe/features/services/forgejo.nix index 30aa92b..cfb51a6 100644 --- a/hosts/sisyphe/features/services/forgejo.nix +++ b/hosts/sisyphe/features/services/forgejo.nix @@ -58,8 +58,6 @@ }; }; - }; - systemd.services.forgejo.preStart = '' create="${lib.getExe config.services.forgejo.package} admin user create" $create --admin --email "`cat ${config.sops.secrets.forgejoInitialMail.path}`" --username you --password "`cat ${config.sops.secrets.forgejoInitialPassword.path}`" &>/dev/null || true From de714df3af60254636df988077ca5426de5dbfe0 Mon Sep 17 00:00:00 2001 From: kity Date: Mon, 23 Dec 2024 15:19:58 +0100 Subject: [PATCH 8/9] added missing import --- hosts/sisyphe/features/samba-shares.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/sisyphe/features/samba-shares.nix b/hosts/sisyphe/features/samba-shares.nix index 1405e4d..7490f9f 100644 --- a/hosts/sisyphe/features/samba-shares.nix +++ b/hosts/sisyphe/features/samba-shares.nix @@ -1,4 +1,5 @@ { config, lib, ... }: +with lib; let cfg = config.samba; in From 0e83769e9d7f7dcd32c0d45eb83e96f210176ca6 Mon Sep 17 00:00:00 2001 From: kity Date: Mon, 23 Dec 2024 15:20:46 +0100 Subject: [PATCH 9/9] missing import again --- hosts/sisyphe/features/multimedia/transmission.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/sisyphe/features/multimedia/transmission.nix b/hosts/sisyphe/features/multimedia/transmission.nix index 39fc992..13b9e3d 100644 --- a/hosts/sisyphe/features/multimedia/transmission.nix +++ b/hosts/sisyphe/features/multimedia/transmission.nix @@ -2,6 +2,7 @@ config, secrets, lib, + pkgs, ... }: with lib;