formatting
This commit is contained in:
parent
e4743a30e7
commit
23cb1166c9
3 changed files with 57 additions and 34 deletions
|
|
@ -1,4 +1,10 @@
|
||||||
{config, lib, pkgs, ...}: {
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(import "${mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; })
|
(import "${mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; })
|
||||||
];
|
];
|
||||||
|
|
@ -27,20 +33,31 @@
|
||||||
|
|
||||||
# Remove unwanted GNOME applications
|
# Remove unwanted GNOME applications
|
||||||
environment.gnome.excludePackages = with pkgs; [
|
environment.gnome.excludePackages = with pkgs; [
|
||||||
baobab # disk usage analyzer
|
baobab # disk usage analyzer
|
||||||
cheese # photo booth
|
cheese # photo booth
|
||||||
eog # image viewer
|
eog # image viewer
|
||||||
epiphany # web browser
|
epiphany # web browser
|
||||||
simple-scan # document scanner
|
simple-scan # document scanner
|
||||||
totem # video player
|
totem # video player
|
||||||
yelp # help viewer
|
yelp # help viewer
|
||||||
evince # document viewer
|
evince # document viewer
|
||||||
file-roller # archive manager
|
file-roller # archive manager
|
||||||
geary # email client
|
geary # email client
|
||||||
seahorse # password manager
|
seahorse # password manager
|
||||||
gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts
|
gnome-calculator
|
||||||
gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-screenshot
|
gnome-calendar
|
||||||
gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections
|
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
|
# Minimal essential packages
|
||||||
|
|
@ -56,4 +73,4 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
system.stateVersion = "25.11";
|
system.stateVersion = "25.11";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,18 +35,21 @@
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable) {
|
(lib.mkIf
|
||||||
services.cloudflared.tunnels = {
|
(config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable)
|
||||||
"eb9052aa-9867-482f-80e3-97a7d7e2ef04" = {
|
{
|
||||||
default = "http_status:404";
|
services.cloudflared.tunnels = {
|
||||||
credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json";
|
"eb9052aa-9867-482f-80e3-97a7d7e2ef04" = {
|
||||||
ingress = {
|
default = "http_status:404";
|
||||||
"${config.services.forgejo.settings.server.DOMAIN}" = {
|
credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json";
|
||||||
service = "http://localhost:3000";
|
ingress = {
|
||||||
|
"${config.services.forgejo.settings.server.DOMAIN}" = {
|
||||||
|
service = "http://localhost:3000";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
})
|
)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -164,18 +164,21 @@
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ];
|
networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ];
|
||||||
})
|
})
|
||||||
(lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable) {
|
(lib.mkIf
|
||||||
services.cloudflared.tunnels = {
|
(config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable)
|
||||||
"91b13f9b-81be-46e1-bca0-db2640bf2d0a" = {
|
{
|
||||||
default = "http_status:404";
|
services.cloudflared.tunnels = {
|
||||||
credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json";
|
"91b13f9b-81be-46e1-bca0-db2640bf2d0a" = {
|
||||||
ingress = {
|
default = "http_status:404";
|
||||||
"home.osbm.dev" = {
|
credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json";
|
||||||
service = "http://localhost:${toString config.services.glance.settings.server.port}";
|
ingress = {
|
||||||
|
"home.osbm.dev" = {
|
||||||
|
service = "http://localhost:${toString config.services.glance.settings.server.port}";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
})
|
)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue