diff --git a/.github/README.md b/.github/README.md index 35d79ca..06f1f98 100644 --- a/.github/README.md +++ b/.github/README.md @@ -109,7 +109,7 @@
Click here for a summary of my infrastructure -topology +topology ### Programs diff --git a/SwarselSystems.org b/SwarselSystems.org index 26fcf60..7fb59b1 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -1736,8 +1736,8 @@ A short overview over each input and what it does: nixpkgs-stable25_11.url = "github:NixOS/nixpkgs/nixos-25.11"; home-manager = { - # url = "github:nix-community/home-manager"; - url = "github:Swarsel/home-manager/main"; + url = "github:nix-community/home-manager"; + # url = "github:Swarsel/home-manager/main"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database = { @@ -2662,7 +2662,8 @@ Another note concerning [[https://flake.parts/][flake-parts]]: ender3 = mkDevice "Ender 3" { info = "SKR V1.3, TMC2209 (Dual), TFT35"; - image = "${self}/files/topology-images/ender3.png"; + deviceIcon = "${self}/files/topology-images/ender3.png"; + icon = "${self}/files/topology-images/raspi.png"; interfaces.eth1 = { }; services = { octoprint = { @@ -2703,11 +2704,11 @@ Another note concerning [[https://flake.parts/][flake-parts]]: services = { ollama = { name = "Ollama"; - icon = "${self}/files/topology-images/ollama.png"; + icon = "services.ollama"; }; openwebui = { name = "Open WebUI"; - icon = "${self}/files/topology-images/openwebui.png"; + icon = "services.open-webui"; }; comfyui = { name = "Comfy UI"; @@ -6207,7 +6208,7 @@ This machine mainly acts as my proxy server to stand before my local machines. }; restic.targets = { SwarselMoonside = { - repository = config.repo.secrets.local.resticRepoState; + repository = config.repo.secrets.local.resticRepo; paths = [ "/persist/opt/minecraft" ]; @@ -11347,22 +11348,7 @@ This is a collection of packages that are useful for server-type hosts that do n services = { # add a user with sudo smbpasswd -a samba = { - # package = pkgs.samba4Full; package = pkgs.samba4; - # extraConfig = '' - # workgroup = WORKGROUP - # server role = standalone server - # dns proxy = no - - # pam password change = yes - # map to guest = bad user - # create mask = 0664 - # force create mode = 0664 - # directory mask = 0775 - # force directory mode = 0775 - # follow symlinks = yes - # ''; - enable = true; openFirewall = true; settings.Eternor = { @@ -12727,11 +12713,7 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin sops.secrets.kavita-token = { inherit sopsFile; owner = serviceUser; }; # networking.firewall.allowedTCPPorts = [ servicePort ]; - topology.self.services.${serviceName} = { - name = "Kavita"; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; + topology.self.services.${serviceName}.info = "https://${serviceDomain}"; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }]; @@ -13149,9 +13131,8 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin ]; topology.self.services.${serviceName} = { - name = lib.toUpper serviceName; info = "http://localhost:${builtins.toString servicePort}"; - icon = "${self}/files/topology-images/${serviceName}.png"; + icon = lib.mkForce "${self}/files/topology-images/mpd.png"; }; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { @@ -13160,13 +13141,14 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin services.${serviceName} = { enable = true; - musicDirectory = "/storage/Music"; + openFirewall = true; + settings = { + music_directory = "/storage/Music"; + bind_to_address = "any"; + port = servicePort; + }; user = serviceUser; group = serviceGroup; - network = { - port = servicePort; - listenAddress = "any"; - }; credentials = [ { passwordFile = config.sops.secrets.mpd-pw.path; @@ -13234,13 +13216,6 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin options.swarselmodules.server.${serviceName} = lib.mkEnableOption "enable ${serviceName} on server"; config = lib.mkIf config.swarselmodules.server.${serviceName} { - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - }; - services = { ${serviceName} = { enable = true; @@ -13388,19 +13363,13 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin # networking.firewall.allowedTCPPorts = [ servicePort federationPort ]; - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - } // (lib.listToAttrs (map + topology.self.services = lib.listToAttrs (map (service: lib.nameValuePair "mautrix-${service}" { name = "mautrix-${service}"; icon = "${self}/files/topology-images/mautrix.png"; }) - [ "whatsapp" "signal" "telegram" ])); + [ "whatsapp" "signal" "telegram" ]); systemd = { timers."restart-bridges" = { @@ -14463,8 +14432,7 @@ Note: you still need to run =restic- init= once on the host to get the buc { lib, pkgs, config, ... }: let inherit (config.swarselsystems) sopsFile; - - targets = config.swarselsystems.server.restic.targets; + inherit (config.swarselsystems.server.restic) targets; in { options.swarselmodules.server.restic = lib.mkEnableOption "enable restic backups on server"; @@ -15296,7 +15264,7 @@ FreshRSS claims to support HTTP header auth, but at least it does not work with }; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { - directories = [{ directory = "/var/lib/private/${serviceName}"; }]; + directories = [{ directory = "/var/lib/private/anki-sync-server"; }]; }; services.anki-sync-server = { @@ -16164,7 +16132,7 @@ kanidm person credential create-reset-token postgresUser = config.systemd.services.postgresql.serviceConfig.User; # postgres postgresPort = config.services.postgresql.settings.port; # 5432 - containerRev = "sha256:96693e41a6eb2aae44f96033a090378270f024ddf4e6095edf8d57674f21095d"; + containerRev = "sha256:bb8ad2b6891441d8ec5c3169b684b71574f3bb3e9afb345bad2f91d833d60340"; inherit (config.swarselsystems) sopsFile; in @@ -16834,7 +16802,7 @@ Deployment notes: - finally, disable new user registration in web ui #+begin_src nix-ts :tangle modules/nixos/server/slink.nix -{ self, lib, config, dns, globals, confLib, ... }: +{ lib, config, dns, globals, confLib, ... }: let inherit (confLib.gen { name = "slink"; port = 3000; dir = "/var/lib/slink"; }) servicePort serviceName serviceDomain serviceDir serviceAddress proxyAddress4 proxyAddress6; inherit (confLib.static) isHome isProxied webProxy homeWebProxy dnsServer homeProxyIf webProxyIf homeServiceAddress nginxAccessRules; @@ -16893,7 +16861,7 @@ in topology.self.services.${serviceName} = { name = lib.swarselsystems.toCapitalized serviceName; info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/shlink.png"; + icon = "services.not-available"; }; globals = { @@ -17081,13 +17049,6 @@ in directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }]; }; - systemd.services.homebox = { - environment = { - TMPDIR = "/var/lib/homebox/.tmp"; - HOME = "/var/lib/homebox"; - }; - }; - services.${serviceName} = { enable = true; package = pkgs.bisect.homebox; @@ -19085,7 +19046,7 @@ This has some state: ]; dhcp.enabled = false; }; - filtering.rewrites = map + filtering.rewrites = (map (domain: { inherit domain; # FIXME: change to homeWebProxy once that is setup @@ -19093,7 +19054,13 @@ This has some state: # answer = globals.hosts.${webProxy}.wanAddress4; enabled = true; }) - homeDomains; + homeDomains) ++ [ + { + domain = "smb.${globals.domains.main}"; + answer = globals.networks.home-lan.vlans.services.hosts.storage.ipv4; + enabled = true; + } + ]; filters = [ { name = "AdGuard DNS filter"; @@ -25118,57 +25085,61 @@ When setting up a new machine: #+end_src #+begin_src nix-ts :tangle modules/home/common/gpg-agent.nix - { self, lib, config, pkgs, ... }: - let - inherit (config.swarselsystems) mainUser homeDir; - in - { - options.swarselmodules.gpgagent = lib.mkEnableOption "gpg agent settings"; - config = lib.mkIf config.swarselmodules.gpgagent { - services.gpg-agent = { - enable = true; - verbose = true; - enableZshIntegration = true; - enableScDaemon = true; - enableSshSupport = true; - enableExtraSocket = true; - pinentry.package = pkgs.wayprompt; - pinentry.program = "pinentry-wayprompt"; - # pinentry.package = pkgs.pinentry.gtk2; - defaultCacheTtl = 600; - maxCacheTtl = 7200; - extraConfig = '' - allow-loopback-pinentry - allow-emacs-pinentry - ''; - sshKeys = [ - "4BE7925262289B476DBBC17B76FD3810215AE097" - ]; - }; - - programs.gpg = { - enable = true; - publicKeys = [ - { - source = "${self}/secrets/public/gpg/gpg-public-key-0x76FD3810215AE097.asc"; - trust = 5; - } - ]; - }; - - # assure correct permissions - systemd.user.tmpfiles.settings."30-gpgagent".rules = { - "${homeDir}/.gnupg" = { - d = { - group = "users"; - user = mainUser; - mode = "0700"; + { self, lib, config, pkgs, ... }: + let + inherit (config.swarselsystems) mainUser homeDir; + in + { + options.swarselmodules.gpgagent = lib.mkEnableOption "gpg agent settings"; + config = lib.mkIf config.swarselmodules.gpgagent { + services.gpg-agent = { + enable = true; + verbose = true; + enableZshIntegration = true; + enableScDaemon = true; + enableSshSupport = true; + enableExtraSocket = true; + pinentry.package = pkgs.wayprompt; + pinentry.program = "pinentry-wayprompt"; + # pinentry.package = pkgs.pinentry.gtk2; + defaultCacheTtl = 600; + maxCacheTtl = 7200; + extraConfig = '' + allow-loopback-pinentry + allow-emacs-pinentry + ''; + sshKeys = [ + "4BE7925262289B476DBBC17B76FD3810215AE097" + ]; }; - }; - }; - }; - } + programs.gpg = { + enable = true; + publicKeys = [ + { + source = "${self}/secrets/public/gpg/gpg-public-key-0x76FD3810215AE097.asc"; + trust = 5; + } + ]; + }; + + systemd.user.tmpfiles.rules = [ + "d ${homeDir}/.gnupg 0700 ${mainUser} users - -" + ]; + + # assure correct permissions + # systemd.user.tmpfiles.settings."30-gpgagent".rules = { + # "${homeDir}/.gnupg" = { + # d = { + # group = "users"; + # user = mainUser; + # mode = "0700"; + # }; + # }; + # }; + }; + + } #+end_src **** gammastep @@ -37573,7 +37544,7 @@ Here lies defined the readme for GitHub and Forgejo:
Click here for a summary of my infrastructure - topology + topology ### Programs diff --git a/files/topology-images/DELL-C2665dnf.png b/files/topology-images/DELL-C2665dnf.png index 798595a..aeb3c33 100644 Binary files a/files/topology-images/DELL-C2665dnf.png and b/files/topology-images/DELL-C2665dnf.png differ diff --git a/files/topology-images/TL-SG1005D.png b/files/topology-images/TL-SG1005D.png index c06f063..2c1b087 100644 Binary files a/files/topology-images/TL-SG1005D.png and b/files/topology-images/TL-SG1005D.png differ diff --git a/files/topology-images/TL-SG108.png b/files/topology-images/TL-SG108.png index 3088ba8..b44ff23 100644 Binary files a/files/topology-images/TL-SG108.png and b/files/topology-images/TL-SG108.png differ diff --git a/files/topology-images/ankisync.png b/files/topology-images/ankisync.png index 3a4432c..7a04a66 100644 Binary files a/files/topology-images/ankisync.png and b/files/topology-images/ankisync.png differ diff --git a/files/topology-images/comfyui.png b/files/topology-images/comfyui.png index 88f1191..7261308 100644 Binary files a/files/topology-images/comfyui.png and b/files/topology-images/comfyui.png differ diff --git a/files/topology-images/croc.png b/files/topology-images/croc.png index 1024fe0..ef233de 100644 Binary files a/files/topology-images/croc.png and b/files/topology-images/croc.png differ diff --git a/files/topology-images/dgxos.png b/files/topology-images/dgxos.png index d593fc3..888913c 100644 Binary files a/files/topology-images/dgxos.png and b/files/topology-images/dgxos.png differ diff --git a/files/topology-images/dovecot.png b/files/topology-images/dovecot.png index 16e35fa..a5b0c46 100644 Binary files a/files/topology-images/dovecot.png and b/files/topology-images/dovecot.png differ diff --git a/files/topology-images/ender3.png b/files/topology-images/ender3.png index cff711a..5dc154b 100644 Binary files a/files/topology-images/ender3.png and b/files/topology-images/ender3.png differ diff --git a/files/topology-images/ender3_.png b/files/topology-images/ender3_.png deleted file mode 100644 index cff711a..0000000 Binary files a/files/topology-images/ender3_.png and /dev/null differ diff --git a/files/topology-images/firefly-iii.png b/files/topology-images/firefly-iii.png index de09e5e..499dd6e 100644 Binary files a/files/topology-images/firefly-iii.png and b/files/topology-images/firefly-iii.png differ diff --git a/files/topology-images/firezone.png b/files/topology-images/firezone.png index fbbbf67..c250fb3 100644 Binary files a/files/topology-images/firezone.png and b/files/topology-images/firezone.png differ diff --git a/files/topology-images/freshrss.png b/files/topology-images/freshrss.png index d1a7511..64f0ec2 100644 Binary files a/files/topology-images/freshrss.png and b/files/topology-images/freshrss.png differ diff --git a/files/topology-images/garage.png b/files/topology-images/garage.png index 50306cf..99122ed 100644 Binary files a/files/topology-images/garage.png and b/files/topology-images/garage.png differ diff --git a/files/topology-images/home-manager.png b/files/topology-images/home-manager.png index 8ff9258..e473fd9 100644 Binary files a/files/topology-images/home-manager.png and b/files/topology-images/home-manager.png differ diff --git a/files/topology-images/homebox.png b/files/topology-images/homebox.png index c4728f9..b10934b 100644 Binary files a/files/topology-images/homebox.png and b/files/topology-images/homebox.png differ diff --git a/files/topology-images/huawei.png b/files/topology-images/huawei.png index 20fd367..d579a73 100644 Binary files a/files/topology-images/huawei.png and b/files/topology-images/huawei.png differ diff --git a/files/topology-images/hunsn.png b/files/topology-images/hunsn.png index d011117..4b6c464 100644 Binary files a/files/topology-images/hunsn.png and b/files/topology-images/hunsn.png differ diff --git a/files/topology-images/kavita.png b/files/topology-images/kavita.png deleted file mode 100644 index dc1cd45..0000000 Binary files a/files/topology-images/kavita.png and /dev/null differ diff --git a/files/topology-images/kea.png b/files/topology-images/kea.png index 9e68bcd..e8571a8 100644 Binary files a/files/topology-images/kea.png and b/files/topology-images/kea.png differ diff --git a/files/topology-images/mac.png b/files/topology-images/mac.png index 6c82ebc..9832b0e 100644 Binary files a/files/topology-images/mac.png and b/files/topology-images/mac.png differ diff --git a/files/topology-images/matrix.png b/files/topology-images/matrix.png deleted file mode 100644 index b20366d..0000000 Binary files a/files/topology-images/matrix.png and /dev/null differ diff --git a/files/topology-images/mautrix.png b/files/topology-images/mautrix.png index a68f624..fdb3d77 100644 Binary files a/files/topology-images/mautrix.png and b/files/topology-images/mautrix.png differ diff --git a/files/topology-images/microbin.png b/files/topology-images/microbin.png index da0c331..22dbd24 100644 Binary files a/files/topology-images/microbin.png and b/files/topology-images/microbin.png differ diff --git a/files/topology-images/minecraft.png b/files/topology-images/minecraft.png index a9690b9..74e03c6 100644 Binary files a/files/topology-images/minecraft.png and b/files/topology-images/minecraft.png differ diff --git a/files/topology-images/mpd.png b/files/topology-images/mpd.png index d8b6d96..6be7e4c 100644 Binary files a/files/topology-images/mpd.png and b/files/topology-images/mpd.png differ diff --git a/files/topology-images/nintendo-switch.png b/files/topology-images/nintendo-switch.png index b42d542..ace0e3a 100644 Binary files a/files/topology-images/nintendo-switch.png and b/files/topology-images/nintendo-switch.png differ diff --git a/files/topology-images/nsd.png b/files/topology-images/nsd.png index 4a76c8f..553a8d1 100644 Binary files a/files/topology-images/nsd.png and b/files/topology-images/nsd.png differ diff --git a/files/topology-images/octoprint.png b/files/topology-images/octoprint.png index a8ce6fb..29d75b1 100644 Binary files a/files/topology-images/octoprint.png and b/files/topology-images/octoprint.png differ diff --git a/files/topology-images/ollama.png b/files/topology-images/ollama.png index 8c2d452..33dfbb9 100644 Binary files a/files/topology-images/ollama.png and b/files/topology-images/ollama.png differ diff --git a/files/topology-images/openwebui.png b/files/topology-images/openwebui.png index a158087..477adeb 100644 Binary files a/files/topology-images/openwebui.png and b/files/topology-images/openwebui.png differ diff --git a/files/topology-images/pc.png b/files/topology-images/pc.png index b8fa044..9216357 100644 Binary files a/files/topology-images/pc.png and b/files/topology-images/pc.png differ diff --git a/files/topology-images/phone.png b/files/topology-images/phone.png index bde15e7..9519d53 100644 Binary files a/files/topology-images/phone.png and b/files/topology-images/phone.png differ diff --git a/files/topology-images/postfix.png b/files/topology-images/postfix.png index c809b0f..3faad71 100644 Binary files a/files/topology-images/postfix.png and b/files/topology-images/postfix.png differ diff --git a/files/topology-images/postgresql.png b/files/topology-images/postgresql.png deleted file mode 100644 index d7843b5..0000000 Binary files a/files/topology-images/postgresql.png and /dev/null differ diff --git a/files/topology-images/ps4.png b/files/topology-images/ps4.png index 2054540..caff4c5 100644 Binary files a/files/topology-images/ps4.png and b/files/topology-images/ps4.png differ diff --git a/files/topology-images/raspi.png b/files/topology-images/raspi.png new file mode 100644 index 0000000..e165f23 Binary files /dev/null and b/files/topology-images/raspi.png differ diff --git a/files/topology-images/readarr.png b/files/topology-images/readarr.png index 2ce0639..22fdabc 100644 Binary files a/files/topology-images/readarr.png and b/files/topology-images/readarr.png differ diff --git a/files/topology-images/roundcube.png b/files/topology-images/roundcube.png index 014dc92..0f6d83b 100644 Binary files a/files/topology-images/roundcube.png and b/files/topology-images/roundcube.png differ diff --git a/files/topology-images/rspamd.png b/files/topology-images/rspamd.png index 8bf4c12..7c9c12c 100644 Binary files a/files/topology-images/rspamd.png and b/files/topology-images/rspamd.png differ diff --git a/files/topology-images/shlink.png b/files/topology-images/shlink.png index e3df864..8b75b23 100644 Binary files a/files/topology-images/shlink.png and b/files/topology-images/shlink.png differ diff --git a/files/topology-images/tp_link_tl-sg108e.jpg b/files/topology-images/tp_link_tl-sg108e.jpg index ea8826c..19ee29d 100644 Binary files a/files/topology-images/tp_link_tl-sg108e.jpg and b/files/topology-images/tp_link_tl-sg108e.jpg differ diff --git a/files/topology-images/windows.png b/files/topology-images/windows.png index c16d05f..b879ccf 100644 Binary files a/files/topology-images/windows.png and b/files/topology-images/windows.png differ diff --git a/files/topology-images/zflip6.png b/files/topology-images/zflip6.png index 5e2b59f..9ec40e0 100644 Binary files a/files/topology-images/zflip6.png and b/files/topology-images/zflip6.png differ diff --git a/files/topology/topology.png b/files/topology/topology.png index d95587f..55f6d0b 100644 Binary files a/files/topology/topology.png and b/files/topology/topology.png differ diff --git a/files/topology/topology_small.png b/files/topology/topology_small.png index e96fc81..12977b8 100644 Binary files a/files/topology/topology_small.png and b/files/topology/topology_small.png differ diff --git a/flake.lock b/flake.lock index b264af1..0e44f31 100644 --- a/flake.lock +++ b/flake.lock @@ -21,28 +21,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "crane": { "locked": { - "lastModified": 1763938834, - "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=", + "lastModified": 1767744144, + "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=", "owner": "ipetkov", "repo": "crane", - "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2", + "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e", "type": "github" }, "original": { @@ -116,8 +116,8 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_7", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixos-extra-modules", "nixt", @@ -143,11 +143,11 @@ }, "crane_3": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1765739568, + "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762521437, - "narHash": "sha256-RXN+lcx4DEn3ZS+LqEJSUu/HH+dwGvy0syN7hTo/Chg=", + "lastModified": 1768818222, + "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", "owner": "numtide", "repo": "devshell", - "rev": "07bacc9531f5f4df6657c0a02a806443685f384a", + "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", "type": "github" }, "original": { @@ -196,27 +196,6 @@ } }, "devshell_2": { - "inputs": { - "nixpkgs": [ - "nix-topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764011051, - "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=", - "owner": "numtide", - "repo": "devshell", - "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_3": { "inputs": { "nixpkgs": [ "nixos-extra-modules", @@ -237,7 +216,7 @@ "type": "github" } }, - "devshell_4": { + "devshell_3": { "inputs": { "flake-utils": [ "nixos-extra-modules", @@ -271,11 +250,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", + "lastModified": 1768923567, + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", "owner": "nix-community", "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", "type": "github" }, "original": { @@ -322,11 +301,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759510210, - "narHash": "sha256-rR3BuhcSyQ3bQ0rS14I53O7gWzlPEs15skl1TWx+TeI=", + "lastModified": 1768143854, + "narHash": "sha256-E5/kyPz4zAZn/lZdvqlF83jMgCWNxmqYjjWuadngCbk=", "owner": "kirelagin", "repo": "dns.nix", - "rev": "f3cb11f642d4fa6224e2b1ddfd2c3ba42e9ffea2", + "rev": "a97cf4156e9f044fe4bed5be531061000dfabb07", "type": "github" }, "original": { @@ -358,7 +337,7 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -378,11 +357,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -394,15 +373,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -426,11 +405,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -458,11 +437,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -474,15 +453,15 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -503,32 +482,16 @@ "type": "github" } }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -541,6 +504,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, "locked": { "lastModified": 1738453229, "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", @@ -555,9 +536,9 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { "lastModified": 1719994518, @@ -572,7 +553,7 @@ "type": "indirect" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nur", @@ -593,7 +574,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -601,11 +582,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -614,9 +595,9 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { "lastModified": 1759362264, @@ -684,42 +665,6 @@ } }, "flake-utils_4": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -734,7 +679,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -749,9 +694,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_6": { "inputs": { - "systems": "systems_10" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -789,18 +734,18 @@ "simple-nixos-mailserver", "flake-compat" ], - "gitignore": "gitignore_5", + "gitignore": "gitignore_4", "nixpkgs": [ "simple-nixos-mailserver", "nixpkgs" ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -834,7 +779,7 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "nix-topology", + "nixos-extra-modules", "pre-commit-hooks", "nixpkgs" ] @@ -856,7 +801,6 @@ "gitignore_3": { "inputs": { "nixpkgs": [ - "nixos-extra-modules", "pre-commit-hooks", "nixpkgs" ] @@ -876,27 +820,6 @@ } }, "gitignore_4": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_5": { "inputs": { "nixpkgs": [ "simple-nixos-mailserver", @@ -922,11 +845,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -968,21 +891,41 @@ ] }, "locked": { - "lastModified": 1762257324, - "narHash": "sha256-05SxDx82j23zd1/EMDFZTPYFgvzxviBiByUBVs+860w=", - "owner": "Swarsel", + "lastModified": 1769102673, + "narHash": "sha256-/qvRFjn1s3bIJdSKG6IpaE6ML3j9anQKUqGhmt4Qe+E=", + "owner": "nix-community", "repo": "home-manager", - "rev": "d27fabec395885790e7ab666c72522e18e534117", + "rev": "b0491fe55680bd19be8e74847969dad9d7784658", "type": "github" }, "original": { - "owner": "Swarsel", - "ref": "main", + "owner": "nix-community", "repo": "home-manager", "type": "github" } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "impermanence", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "nix-on-droid", @@ -1027,12 +970,16 @@ } }, "impermanence": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_6" + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1768941735, + "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", "type": "github" }, "original": { @@ -1067,16 +1014,16 @@ "lanzaboote": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit": "pre-commit", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763975256, - "narHash": "sha256-IhdDL+0YwlLz5Ty0EnAxWN/btemN9FxcQbYs/V/8jvs=", + "lastModified": 1768307256, + "narHash": "sha256-3yDvlAqWa0Vk3B9hFRJJrSs1xc+FwVQFLtu//VrTR4c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6803b15c4ab9df2dcc478254b4adb55524746ac7", + "rev": "7e031eb535a494582f4fc58735b5aecba7b57058", "type": "github" }, "original": { @@ -1087,16 +1034,15 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "spectrum": "spectrum" }, "locked": { - "lastModified": 1763928900, - "narHash": "sha256-4+5LVMFWSUppY5yvFFdV+T8Lc/rgSYEGx38/9Y20+EI=", + "lastModified": 1768682386, + "narHash": "sha256-mKrMf7eG9TM2AM3pTuhIiCGmZ/JwDegCQH3ThVqcTuc=", "owner": "astro", "repo": "microvm.nix", - "rev": "e3e222005b29a78f85128573f3c6f09a11270c91", + "rev": "f469c1dfede623bbbf1ac605f6359316fd4002ef", "type": "github" }, "original": { @@ -1170,17 +1116,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763995371, - "narHash": "sha256-Cbekq2OAWevdTayYMO7SCf05aGHPZ236MTyCkKyYZOs=", + "lastModified": 1769095293, + "narHash": "sha256-GPlRdJ7LVLyabpJ2tDA9Bj5em9wi3mKXeedIDl7+LWs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c4fb0f9d13fadf1b3c33e693509d8cdcbbd7d08e", + "rev": "180bdbbc91c89f540a52d2b31c8c08116c53b91f", "type": "github" }, "original": { @@ -1209,11 +1155,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763990232, - "narHash": "sha256-RdtlZ+nufSwEgNsF0yuTOO2eGpn87Qm9b3tRQPsibH4=", + "lastModified": 1768678265, + "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", "owner": "YaLTeR", "repo": "niri", - "rev": "45b45ac29d654c0e6759ab996c69dfde40053536", + "rev": "d7184a04b904e07113f4623610775ae78d32394c", "type": "github" }, "original": { @@ -1241,14 +1187,14 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1763505477, - "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", + "lastModified": 1768764703, + "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", + "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b", "type": "github" }, "original": { @@ -1304,11 +1250,11 @@ ] }, "locked": { - "lastModified": 1763870992, - "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -1320,15 +1266,15 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1763776632, - "narHash": "sha256-mvumw4Djwi6BgMKVKw5cpNt8a80+h/LvPy2AHOtzBzE=", + "lastModified": 1768962252, + "narHash": "sha256-HyWOOHcySV8rl36gs4+n0sxPinxpwWOgwXibfFPYeZ0=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "e6d3b589d9f1f869e68142f44654e59fcb47390c", + "rev": "433cf697394104123e1fd02fa689534ac1733bfa", "type": "github" }, "original": { @@ -1339,9 +1285,9 @@ }, "nix-on-droid": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nixpkgs-docs": "nixpkgs-docs", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", "nmd": "nmd_2" @@ -1363,17 +1309,15 @@ }, "nix-topology": { "inputs": { - "devshell": "devshell_2", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_12", - "pre-commit-hooks": "pre-commit-hooks" + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1767198021, - "narHash": "sha256-O/7ZAy0OczYEy7zl+EegeekvRqb3JPh0btyBKtRvbVw=", + "lastModified": 1769018862, + "narHash": "sha256-x3eMpPQhZwEDunyaUos084Hx41XwYTi2uHY4Yc4YNlk=", "owner": "oddlama", "repo": "nix-topology", - "rev": "0c052d902678b592b957eac2c250e4030fe70ebc", + "rev": "a15cac71d3399a4c2d1a3482ae62040a3a0aa07f", "type": "github" }, "original": { @@ -1419,8 +1363,8 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_13" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1762090880, @@ -1453,11 +1397,11 @@ }, "nixos-extra-modules": { "inputs": { - "devshell": "devshell_3", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_14", + "devshell": "devshell_2", + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_15", "nixt": "nixt", - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { "lastModified": 1767971910, @@ -1477,14 +1421,14 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -1495,11 +1439,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1769086393, + "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", "type": "github" }, "original": { @@ -1532,7 +1476,7 @@ "nixos-nftables-firewall": { "inputs": { "dependencyDagOfSubmodule": "dependencyDagOfSubmodule", - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1715521768, @@ -1584,11 +1528,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763934636, - "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", + "lastModified": 1762156382, + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { @@ -1600,11 +1544,11 @@ }, "nixpkgs-bisect": { "locked": { - "lastModified": 1768161245, - "narHash": "sha256-fSidazKIcZElti/a1SOmIwSXw6hXR2GLO/2XmkXgtX4=", + "lastModified": 1769118918, + "narHash": "sha256-E/Iiwy+mYmcPd66hB8JK8xN5tObwYcsvbGMJbkmdDVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2a6c7729bbe95f5770ccd4d15a38e5037984b04", + "rev": "30644e68c5586a6ea8399eb93919ee805384889b", "type": "github" }, "original": { @@ -1616,11 +1560,11 @@ }, "nixpkgs-dev": { "locked": { - "lastModified": 1767131767, - "narHash": "sha256-APHjXWyLmNKFNXoVU7Z82L8zUeSpR1/owKFryitWSsg=", + "lastModified": 1768915681, + "narHash": "sha256-/eIZP//Ey3HLNlZj8ucVXnzv+qO8RkGvUHWmFL58PzY=", "owner": "Swarsel", "repo": "nixpkgs", - "rev": "449fa265ea9c67c1ea9b1c3d8121959e2ce348d3", + "rev": "5f51dc7790416d9122723da3b4843ba8b49955d4", "type": "github" }, "original": { @@ -1681,11 +1625,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -1695,6 +1639,21 @@ } }, "nixpkgs-lib_2": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_3": { "locked": { "lastModified": 1738452942, "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", @@ -1706,7 +1665,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, - "nixpkgs-lib_3": { + "nixpkgs-lib_4": { "locked": { "lastModified": 1719876945, "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", @@ -1718,7 +1677,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, - "nixpkgs-lib_4": { + "nixpkgs-lib_5": { "locked": { "lastModified": 1754788789, "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", @@ -1783,11 +1742,11 @@ }, "nixpkgs-stable25_05": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -1799,11 +1758,11 @@ }, "nixpkgs-stable25_11": { "locked": { - "lastModified": 1767047869, - "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", + "lastModified": 1768940263, + "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", + "rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03", "type": "github" }, "original": { @@ -1815,27 +1774,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1768940263, + "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1767047869, - "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", + "lastModified": 1768940263, + "narHash": "sha256-sJERJIYTKPFXkoz/gBaBtRKke82h4DkX3BBSsKbfbvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", + "rev": "3ceaaa8bc963ced4d830e06ea2d0863b6490ff03", "type": "github" }, "original": { @@ -1846,6 +1805,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1748929857, "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", @@ -1861,13 +1836,13 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { - "lastModified": 1764086288, - "narHash": "sha256-S223/Mc4Ax75PfWySz8b44jjAnz36jUk4U+XiCfMy9I=", + "lastModified": 1708172716, + "narHash": "sha256-3M94oln0b61m3dUmLyECCA9hYAHXZEszM4saE3CmQO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c4fd5c5627b75a9aa111ccd2ac4f86906f32af2a", + "rev": "5d874ac46894c896119bce68e758e9e80bdb28f1", "type": "github" }, "original": { @@ -1876,7 +1851,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1766651565, "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", @@ -1892,7 +1867,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1746378225, "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", @@ -1907,7 +1882,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1737885589, "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", @@ -1923,7 +1898,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1677063315, "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", @@ -1939,13 +1914,13 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { - "lastModified": 1763934636, - "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", + "lastModified": 1736657626, + "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", + "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", "type": "github" }, "original": { @@ -1955,7 +1930,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1692638711, "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", @@ -1971,13 +1946,13 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -1987,7 +1962,23 @@ "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_2": { + "locked": { + "lastModified": 1768661221, + "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3327b113f2ef698d380df83fbccefad7e83d7769", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_20": { "locked": { "lastModified": 1720957393, "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", @@ -2003,29 +1994,13 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_21": { "locked": { - "lastModified": 1763934636, - "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_20": { - "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -2035,13 +2010,13 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { - "lastModified": 1763934636, - "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { @@ -2051,13 +2026,13 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { - "lastModified": 1763553727, - "narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=", + "lastModified": 1764374374, + "narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "094318ea16502a7a81ce90dd3638697020f030a2", + "rev": "6a49303095abc094ee77dc243a9e351b642e8e75", "type": "github" }, "original": { @@ -2067,13 +2042,13 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_24": { "locked": { - "lastModified": 1764445028, - "narHash": "sha256-ik6H/0Zl+qHYDKTXFPpzuVHSZE+uvVz2XQuQd1IVXzo=", + "lastModified": 1768569498, + "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a09378c0108815dbf3961a0e085936f4146ec415", + "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", "type": "github" }, "original": { @@ -2083,29 +2058,13 @@ "type": "github" } }, - "nixpkgs_24": { - "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_25": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -2117,11 +2076,27 @@ }, "nixpkgs_26": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_27": { + "locked": { + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { @@ -2131,13 +2106,13 @@ "type": "github" } }, - "nixpkgs_27": { + "nixpkgs_28": { "locked": { - "lastModified": 1761236834, - "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -2147,13 +2122,13 @@ "type": "github" } }, - "nixpkgs_28": { + "nixpkgs_29": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -2163,13 +2138,28 @@ "type": "github" } }, - "nixpkgs_29": { + "nixpkgs_3": { "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", + "lastModified": 1616989418, + "narHash": "sha256-LcOn5wHR/1JwClfY/Ai/b+pSRY+d23QtIPQHwPAyHHI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", + "rev": "9d8e05e088ad91b7c62886a2175f38bfa443db2c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_30": { + "locked": { + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": { @@ -2179,28 +2169,13 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1764086288, - "narHash": "sha256-S223/Mc4Ax75PfWySz8b44jjAnz36jUk4U+XiCfMy9I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c4fd5c5627b75a9aa111ccd2ac4f86906f32af2a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_4": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -2228,15 +2203,15 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", - "owner": "NixOS", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -2244,15 +2219,15 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "nixos", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -2260,11 +2235,27 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -2274,25 +2265,9 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1763934636, - "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixt": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixos-extra-modules", "nixpkgs" @@ -2385,8 +2360,8 @@ }, "nswitch-rcm-nix": { "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_19" + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1721304043, @@ -2404,15 +2379,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_20" + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_21" }, "locked": { - "lastModified": 1763996502, - "narHash": "sha256-pJGdiniI2GntAsMSLBo8sNmb61XJ7Jl9vLayMl57qUo=", + "lastModified": 1769114635, + "narHash": "sha256-LM7aq6rEr/rvXWQ89MNfEwoFt974y5OocD1IYQWs3vE=", "owner": "nix-community", "repo": "NUR", - "rev": "dad4410a04874ea636c9ebae579b74342f04ea20", + "rev": "fe05842430f4d853371dcdb159f840327bc72df0", "type": "github" }, "original": { @@ -2433,11 +2408,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -2570,11 +2545,11 @@ ] }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -2585,31 +2560,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_5", "gitignore": "gitignore_2", - "nixpkgs": [ - "nix-topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_6", - "gitignore": "gitignore_3", "nixpkgs": [ "nixos-extra-modules", "nixpkgs" @@ -2629,18 +2581,18 @@ "type": "github" } }, - "pre-commit-hooks_3": { + "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_7", - "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_21" + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_3", + "nixpkgs": "nixpkgs_22" }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "type": "github" }, "original": { @@ -2674,7 +2626,7 @@ "nixos-hardware": "nixos-hardware", "nixos-images": "nixos-images", "nixos-nftables-firewall": "nixos-nftables-firewall", - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_19", "nixpkgs-bisect": "nixpkgs-bisect", "nixpkgs-dev": "nixpkgs-dev", "nixpkgs-kernel": "nixpkgs-kernel", @@ -2685,14 +2637,14 @@ "nixpkgs-stable25_11": "nixpkgs-stable25_11", "nswitch-rcm-nix": "nswitch-rcm-nix", "nur": "nur", - "pre-commit-hooks": "pre-commit-hooks_3", + "pre-commit-hooks": "pre-commit-hooks_2", "simple-nixos-mailserver": "simple-nixos-mailserver", "smallpkgs": "smallpkgs", "sops": "sops", "spicetify-nix": "spicetify-nix", "stylix": "stylix", "swarsel-nix": "swarsel-nix", - "systems": "systems_8", + "systems": "systems_6", "topologyPrivate": "topologyPrivate", "treefmt-nix": "treefmt-nix", "vbc-nix": "vbc-nix", @@ -2724,11 +2676,11 @@ ] }, "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", + "lastModified": 1768272338, + "narHash": "sha256-Tg/kL8eKMpZtceDvBDQYU8zowgpr7ucFRnpP/AtfuRM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", + "rev": "03dda130a8701b08b0347fcaf850a190c53a3c1e", "type": "github" }, "original": { @@ -2778,11 +2730,11 @@ ] }, "locked": { - "lastModified": 1754880555, - "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", + "lastModified": 1765939271, + "narHash": "sha256-7F/d+ZrTYyOxnBZcleQZjOOEWc1IMXR/CLLRLLsVtHo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", + "rev": "8028944c1339469124639da276d403d8ab7929a8", "type": "github" }, "original": { @@ -2810,16 +2762,16 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_23" }, "locked": { - "lastModified": 1763564778, - "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", + "lastModified": 1766321686, + "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", + "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3", "type": "gitlab" }, "original": { @@ -2848,14 +2800,14 @@ }, "sops": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_24" }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1768863606, + "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", "type": "github" }, "original": { @@ -2882,15 +2834,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_24", - "systems": "systems_5" + "nixpkgs": "nixpkgs_25", + "systems": "systems_3" }, "locked": { - "lastModified": 1763985453, - "narHash": "sha256-vUqODgLIjeyHN7DP8dVx7oH9yB/L8qcxpN//4EmMQcM=", + "lastModified": 1768656845, + "narHash": "sha256-xNlXMyn7yc3Z/NOsz4NchO7gWFwsoCvtJ26pys4s2/M=", "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "89cd40c646ec5b12e5c20c0e18f082e7629d4819", + "rev": "8bd7e49d5ac62756bee6e4b02221fb96bfc3c99a", "type": "github" }, "original": { @@ -2908,9 +2860,9 @@ "blank" ], "blank": "blank", - "devshell": "devshell_4", + "devshell": "devshell_3", "dmerge": "dmerge", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "incl": "incl", "makes": [ "nixos-extra-modules", @@ -2984,11 +2936,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_25", + "nixpkgs": "nixpkgs_26", "nur": "nur_2", - "systems": "systems_6", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -2996,11 +2948,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763845141, - "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", + "lastModified": 1768744881, + "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "owner": "danth", "repo": "stylix", - "rev": "adc650610085adbe130b9860d5bdb869f96050af", + "rev": "06684f00cfbee14da96fd4307b966884de272d3a", "type": "github" }, "original": { @@ -3011,9 +2963,9 @@ }, "swarsel-nix": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_26", - "systems": "systems_7" + "flake-parts": "flake-parts_7", + "nixpkgs": "nixpkgs_27", + "systems": "systems_5" }, "locked": { "lastModified": 1760190732, @@ -3045,21 +2997,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -3137,16 +3074,16 @@ }, "systems_7": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -3165,21 +3102,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -3216,11 +3138,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -3232,11 +3154,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -3248,11 +3170,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -3274,14 +3196,14 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_27" + "nixpkgs": "nixpkgs_28" }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1768158989, + "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", "type": "github" }, "original": { @@ -3292,8 +3214,8 @@ }, "vbc-nix": { "inputs": { - "nixpkgs": "nixpkgs_28", - "systems": "systems_9" + "nixpkgs": "nixpkgs_29", + "systems": "systems_7" }, "locked": { "lastModified": 1742477270, @@ -3330,11 +3252,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1763704521, - "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", + "lastModified": 1768765571, + "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", + "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", "type": "github" }, "original": { @@ -3369,16 +3291,16 @@ "zjstatus": { "inputs": { "crane": "crane_3", - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_29", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_30", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1761162625, - "narHash": "sha256-cJD5RccT5aFwLFiId8PW91z39MpoQZIymj+qZEJ5jTE=", + "lastModified": 1766016463, + "narHash": "sha256-aWp608krMtk5I+c3GXyuHkb6ugah40cBI0R52fNqMiI=", "owner": "dj95", "repo": "zjstatus", - "rev": "a4bb655af8f49fe53de7fefca54348de21ecbbb2", + "rev": "9a4b88fdceee8eb2b8c28111c53e94254d61c994", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 29a5883..de15f43 100644 --- a/flake.nix +++ b/flake.nix @@ -36,8 +36,8 @@ nixpkgs-stable25_11.url = "github:NixOS/nixpkgs/nixos-25.11"; home-manager = { - # url = "github:nix-community/home-manager"; - url = "github:Swarsel/home-manager/main"; + url = "github:nix-community/home-manager"; + # url = "github:Swarsel/home-manager/main"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database = { diff --git a/hosts/nixos/aarch64-linux/moonside/default.nix b/hosts/nixos/aarch64-linux/moonside/default.nix index 09d244b..2a7c61b 100644 --- a/hosts/nixos/aarch64-linux/moonside/default.nix +++ b/hosts/nixos/aarch64-linux/moonside/default.nix @@ -84,7 +84,7 @@ in }; restic.targets = { SwarselMoonside = { - repository = config.repo.secrets.local.resticRepoState; + repository = config.repo.secrets.local.resticRepo; paths = [ "/persist/opt/minecraft" ]; diff --git a/modules/home/common/gpg-agent.nix b/modules/home/common/gpg-agent.nix index 49f30d4..7a052bf 100644 --- a/modules/home/common/gpg-agent.nix +++ b/modules/home/common/gpg-agent.nix @@ -36,16 +36,20 @@ in ]; }; + systemd.user.tmpfiles.rules = [ + "d ${homeDir}/.gnupg 0700 ${mainUser} users - -" + ]; + # assure correct permissions - systemd.user.tmpfiles.settings."30-gpgagent".rules = { - "${homeDir}/.gnupg" = { - d = { - group = "users"; - user = mainUser; - mode = "0700"; - }; - }; - }; + # systemd.user.tmpfiles.settings."30-gpgagent".rules = { + # "${homeDir}/.gnupg" = { + # d = { + # group = "users"; + # user = mainUser; + # mode = "0700"; + # }; + # }; + # }; }; } diff --git a/modules/nixos/server/adguardhome.nix b/modules/nixos/server/adguardhome.nix index 3312db8..cca7f31 100644 --- a/modules/nixos/server/adguardhome.nix +++ b/modules/nixos/server/adguardhome.nix @@ -59,7 +59,7 @@ in ]; dhcp.enabled = false; }; - filtering.rewrites = map + filtering.rewrites = (map (domain: { inherit domain; # FIXME: change to homeWebProxy once that is setup @@ -67,7 +67,13 @@ in # answer = globals.hosts.${webProxy}.wanAddress4; enabled = true; }) - homeDomains; + homeDomains) ++ [ + { + domain = "smb.${globals.domains.main}"; + answer = globals.networks.home-lan.vlans.services.hosts.storage.ipv4; + enabled = true; + } + ]; filters = [ { name = "AdGuard DNS filter"; diff --git a/modules/nixos/server/ankisync.nix b/modules/nixos/server/ankisync.nix index 3585ec4..a1b483b 100644 --- a/modules/nixos/server/ankisync.nix +++ b/modules/nixos/server/ankisync.nix @@ -37,7 +37,7 @@ in }; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { - directories = [{ directory = "/var/lib/private/${serviceName}"; }]; + directories = [{ directory = "/var/lib/private/anki-sync-server"; }]; }; services.anki-sync-server = { diff --git a/modules/nixos/server/homebox.nix b/modules/nixos/server/homebox.nix index b076405..46f19c4 100644 --- a/modules/nixos/server/homebox.nix +++ b/modules/nixos/server/homebox.nix @@ -41,13 +41,6 @@ in directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }]; }; - systemd.services.homebox = { - environment = { - TMPDIR = "/var/lib/homebox/.tmp"; - HOME = "/var/lib/homebox"; - }; - }; - services.${serviceName} = { enable = true; package = pkgs.bisect.homebox; diff --git a/modules/nixos/server/kavita.nix b/modules/nixos/server/kavita.nix index 2e59d4f..b058077 100644 --- a/modules/nixos/server/kavita.nix +++ b/modules/nixos/server/kavita.nix @@ -23,11 +23,7 @@ in sops.secrets.kavita-token = { inherit sopsFile; owner = serviceUser; }; # networking.firewall.allowedTCPPorts = [ servicePort ]; - topology.self.services.${serviceName} = { - name = "Kavita"; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; + topology.self.services.${serviceName}.info = "https://${serviceDomain}"; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }]; diff --git a/modules/nixos/server/koillection.nix b/modules/nixos/server/koillection.nix index 7adf1db..0149036 100644 --- a/modules/nixos/server/koillection.nix +++ b/modules/nixos/server/koillection.nix @@ -6,7 +6,7 @@ let postgresUser = config.systemd.services.postgresql.serviceConfig.User; # postgres postgresPort = config.services.postgresql.settings.port; # 5432 - containerRev = "sha256:96693e41a6eb2aae44f96033a090378270f024ddf4e6095edf8d57674f21095d"; + containerRev = "sha256:bb8ad2b6891441d8ec5c3169b684b71574f3bb3e9afb345bad2f91d833d60340"; inherit (config.swarselsystems) sopsFile; in diff --git a/modules/nixos/server/matrix.nix b/modules/nixos/server/matrix.nix index 9835376..908cd8e 100644 --- a/modules/nixos/server/matrix.nix +++ b/modules/nixos/server/matrix.nix @@ -63,19 +63,13 @@ in # networking.firewall.allowedTCPPorts = [ servicePort federationPort ]; - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - } // (lib.listToAttrs (map + topology.self.services = lib.listToAttrs (map (service: lib.nameValuePair "mautrix-${service}" { name = "mautrix-${service}"; icon = "${self}/files/topology-images/mautrix.png"; }) - [ "whatsapp" "signal" "telegram" ])); + [ "whatsapp" "signal" "telegram" ]); systemd = { timers."restart-bridges" = { diff --git a/modules/nixos/server/mpd.nix b/modules/nixos/server/mpd.nix index 807135d..8339d46 100644 --- a/modules/nixos/server/mpd.nix +++ b/modules/nixos/server/mpd.nix @@ -31,9 +31,8 @@ in ]; topology.self.services.${serviceName} = { - name = lib.toUpper serviceName; info = "http://localhost:${builtins.toString servicePort}"; - icon = "${self}/files/topology-images/${serviceName}.png"; + icon = lib.mkForce "${self}/files/topology-images/mpd.png"; }; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { @@ -42,13 +41,14 @@ in services.${serviceName} = { enable = true; - musicDirectory = "/storage/Music"; + openFirewall = true; + settings = { + music_directory = "/storage/Music"; + bind_to_address = "any"; + port = servicePort; + }; user = serviceUser; group = serviceGroup; - network = { - port = servicePort; - listenAddress = "any"; - }; credentials = [ { passwordFile = config.sops.secrets.mpd-pw.path; diff --git a/modules/nixos/server/nfs.nix b/modules/nixos/server/nfs.nix index cff9b09..d5afd43 100644 --- a/modules/nixos/server/nfs.nix +++ b/modules/nixos/server/nfs.nix @@ -19,22 +19,7 @@ in services = { # add a user with sudo smbpasswd -a samba = { - # package = pkgs.samba4Full; package = pkgs.samba4; - # extraConfig = '' - # workgroup = WORKGROUP - # server role = standalone server - # dns proxy = no - - # pam password change = yes - # map to guest = bad user - # create mask = 0664 - # force create mode = 0664 - # directory mask = 0775 - # force directory mode = 0775 - # follow symlinks = yes - # ''; - enable = true; openFirewall = true; settings.Eternor = { diff --git a/modules/nixos/server/postgresql.nix b/modules/nixos/server/postgresql.nix index 4cf3554..0a4f9f9 100644 --- a/modules/nixos/server/postgresql.nix +++ b/modules/nixos/server/postgresql.nix @@ -8,13 +8,6 @@ in options.swarselmodules.server.${serviceName} = lib.mkEnableOption "enable ${serviceName} on server"; config = lib.mkIf config.swarselmodules.server.${serviceName} { - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - }; - services = { ${serviceName} = { enable = true; diff --git a/modules/nixos/server/restic.nix b/modules/nixos/server/restic.nix index e56cd59..9c6c7d7 100644 --- a/modules/nixos/server/restic.nix +++ b/modules/nixos/server/restic.nix @@ -1,8 +1,7 @@ { lib, pkgs, config, ... }: let inherit (config.swarselsystems) sopsFile; - - targets = config.swarselsystems.server.restic.targets; + inherit (config.swarselsystems.server.restic) targets; in { options.swarselmodules.server.restic = lib.mkEnableOption "enable restic backups on server"; diff --git a/modules/nixos/server/slink.nix b/modules/nixos/server/slink.nix index 398f099..8f0309f 100644 --- a/modules/nixos/server/slink.nix +++ b/modules/nixos/server/slink.nix @@ -1,4 +1,4 @@ -{ self, lib, config, dns, globals, confLib, ... }: +{ lib, config, dns, globals, confLib, ... }: let inherit (confLib.gen { name = "slink"; port = 3000; dir = "/var/lib/slink"; }) servicePort serviceName serviceDomain serviceDir serviceAddress proxyAddress4 proxyAddress6; inherit (confLib.static) isHome isProxied webProxy homeWebProxy dnsServer homeProxyIf webProxyIf homeServiceAddress nginxAccessRules; @@ -57,7 +57,7 @@ in topology.self.services.${serviceName} = { name = lib.swarselsystems.toCapitalized serviceName; info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/shlink.png"; + icon = "services.not-available"; }; globals = { diff --git a/nix/topology.nix b/nix/topology.nix index 0196de2..7e80e3d 100644 --- a/nix/topology.nix +++ b/nix/topology.nix @@ -192,7 +192,8 @@ ender3 = mkDevice "Ender 3" { info = "SKR V1.3, TMC2209 (Dual), TFT35"; - image = "${self}/files/topology-images/ender3.png"; + deviceIcon = "${self}/files/topology-images/ender3.png"; + icon = "${self}/files/topology-images/raspi.png"; interfaces.eth1 = { }; services = { octoprint = { @@ -233,11 +234,11 @@ services = { ollama = { name = "Ollama"; - icon = "${self}/files/topology-images/ollama.png"; + icon = "services.ollama"; }; openwebui = { name = "Open WebUI"; - icon = "${self}/files/topology-images/openwebui.png"; + icon = "services.open-webui"; }; comfyui = { name = "Comfy UI";