From 23cb1166c9df930d7b973620afd73cd475d69678 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:31:27 +0300 Subject: [PATCH] formatting --- hosts/nixos/artemis/configuration.nix | 45 ++++++++++++++++++--------- modules/nixos/services/forgejo.nix | 23 ++++++++------ modules/nixos/services/glance.nix | 23 ++++++++------ 3 files changed, 57 insertions(+), 34 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 058cf2f..ccc4c87 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -1,4 +1,10 @@ -{config, lib, pkgs, ...}: { +{ + config, + lib, + pkgs, + ... +}: +{ imports = [ (import "${mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) ]; @@ -27,20 +33,31 @@ # Remove unwanted GNOME applications environment.gnome.excludePackages = with pkgs; [ - baobab # disk usage analyzer - cheese # photo booth - eog # image viewer - epiphany # web browser + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser simple-scan # document scanner - totem # video player - yelp # help viewer - evince # document viewer + totem # video player + yelp # help viewer + evince # document viewer file-roller # archive manager - geary # email client - seahorse # password manager - gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts - gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-screenshot - gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections + geary # email client + seahorse # password manager + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + gnome-screenshot + gnome-system-monitor + gnome-weather + gnome-disk-utility + pkgs.gnome-connections ]; # Minimal essential packages @@ -56,4 +73,4 @@ ]; system.stateVersion = "25.11"; -} \ No newline at end of file +} diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index bb6ba38..550f267 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -35,18 +35,21 @@ }; }) - (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable) { - services.cloudflared.tunnels = { - "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { - default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; - ingress = { - "${config.services.forgejo.settings.server.DOMAIN}" = { - service = "http://localhost:3000"; + (lib.mkIf + (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable) + { + services.cloudflared.tunnels = { + "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; + ingress = { + "${config.services.forgejo.settings.server.DOMAIN}" = { + service = "http://localhost:3000"; + }; }; }; }; - }; - }) + } + ) ]; } diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index f2d4209..dec1780 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -164,18 +164,21 @@ }; networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ]; }) - (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable) { - services.cloudflared.tunnels = { - "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { - default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; - ingress = { - "home.osbm.dev" = { - service = "http://localhost:${toString config.services.glance.settings.server.port}"; + (lib.mkIf + (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable) + { + services.cloudflared.tunnels = { + "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; + ingress = { + "home.osbm.dev" = { + service = "http://localhost:${toString config.services.glance.settings.server.port}"; + }; }; }; }; - }; - }) + } + ) ]; }