summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hosts/ahmed/configuration.nix12
-rw-r--r--hosts/ahmed/graphics.nix4
-rw-r--r--hosts/ahmed/linus.onl.nix4
-rw-r--r--hosts/ahmed/notifications.linus.onl.nix4
-rw-r--r--modules/darwin/still-awake/default.nix4
-rw-r--r--modules/nixos/cloudflare-proxy/default.nix4
-rw-r--r--modules/nixos/duksebot/default.nix4
-rw-r--r--modules/nixos/on-demand-minecraft/default.nix4
8 files changed, 20 insertions, 20 deletions
diff --git a/hosts/ahmed/configuration.nix b/hosts/ahmed/configuration.nix
index 402c3ab..2fb6d2e 100644
--- a/hosts/ahmed/configuration.nix
+++ b/hosts/ahmed/configuration.nix
@@ -39,7 +39,7 @@
};
# Set up Minecraft server.
- my.services.on-demand-minecraft = {
+ services.on-demand-minecraft = {
enable = true;
eula = true;
package = pkgs.papermc;
@@ -47,15 +47,15 @@
};
# Set up dukse server. Det er satme hårdt at være overduksepåmindelsesansvarlig.
- my.services.duksebot.enable = true;
+ services.duksebot.enable = true;
# Virtual hosts.
services.nginx.enable = true;
- my.modules."linus.onl" = {
+ modules."linus.onl" = {
enable = true;
useACME = true;
};
- my.modules."notifications.linus.onl" = {
+ modules."notifications.linus.onl" = {
enable = true;
useACME = true;
};
@@ -78,10 +78,10 @@
networking.firewall.allowedTCPPorts = [ 80 443 ];
# We are running behind CF proxy.
- my.modules.cloudflare-proxy.enable = true;
+ modules.cloudflare-proxy.enable = true;
# Use as main driver temporarily.
- # my.modules.graphics.enable = true;
+ # modules.graphics.enable = true;
disable-screen = {
enable = true;
diff --git a/hosts/ahmed/graphics.nix b/hosts/ahmed/graphics.nix
index e2b7a86..be7c9c9 100644
--- a/hosts/ahmed/graphics.nix
+++ b/hosts/ahmed/graphics.nix
@@ -6,10 +6,10 @@
let
inherit (lib) mkEnableOption mkIf;
- cfg = config.my.modules.graphics;
+ cfg = config.modules.graphics;
in
{
- options.my.modules.graphics.enable = mkEnableOption "basic graphical environment";
+ options.modules.graphics.enable = mkEnableOption "basic graphical environment";
config = mkIf cfg.enable {
services.xserver.enable = true;
diff --git a/hosts/ahmed/linus.onl.nix b/hosts/ahmed/linus.onl.nix
index 617865c..a8e4190 100644
--- a/hosts/ahmed/linus.onl.nix
+++ b/hosts/ahmed/linus.onl.nix
@@ -5,10 +5,10 @@ let
domain = "linus.onl";
- cfg = config.my.modules."${domain}";
+ cfg = config.modules."${domain}";
in
{
- options.my.modules."${domain}" = {
+ options.modules."${domain}" = {
enable = mkEnableOption "${domain} static site";
useACME = mkEnableOption "built-in HTTPS stuff";
diff --git a/hosts/ahmed/notifications.linus.onl.nix b/hosts/ahmed/notifications.linus.onl.nix
index 443853f..ba57489 100644
--- a/hosts/ahmed/notifications.linus.onl.nix
+++ b/hosts/ahmed/notifications.linus.onl.nix
@@ -8,10 +8,10 @@ let
# TODO: Make option internal-port.
internal-port = 13082;
- cfg = config.my.modules."notifications.linus.onl";
+ cfg = config.modules."notifications.linus.onl";
in
{
- options.my.modules."notifications.linus.onl" = {
+ options.modules."notifications.linus.onl" = {
enable = mkEnableOption "notifications.linus.onl static site";
useACME = mkEnableOption "built-in HTTPS stuff";
diff --git a/modules/darwin/still-awake/default.nix b/modules/darwin/still-awake/default.nix
index 9221359..605c9ce 100644
--- a/modules/darwin/still-awake/default.nix
+++ b/modules/darwin/still-awake/default.nix
@@ -3,10 +3,10 @@
let
inherit (lib) mkIf mkEnableOption;
- cfg = config.my.services.still-awake;
+ cfg = config.services.still-awake;
in
{
- options.my.services.still-awake.enable = mkEnableOption "still-awake launchd job";
+ options.services.still-awake.enable = mkEnableOption "still-awake launchd job";
config = mkIf cfg.enable {
launchd.agents."still-awake" =
diff --git a/modules/nixos/cloudflare-proxy/default.nix b/modules/nixos/cloudflare-proxy/default.nix
index 73d8893..87d3857 100644
--- a/modules/nixos/cloudflare-proxy/default.nix
+++ b/modules/nixos/cloudflare-proxy/default.nix
@@ -6,10 +6,10 @@
let
inherit (lib) mkEnableOption mkIf;
- cfg = config.my.modules.cloudflare-proxy;
+ cfg = config.modules.cloudflare-proxy;
in
{
- options.my.modules.cloudflare-proxy.enable = mkEnableOption "Cloudflare proxy IP extraction for NGINX";
+ options.modules.cloudflare-proxy.enable = mkEnableOption "Cloudflare proxy IP extraction for NGINX";
config = mkIf cfg.enable {
# Teach NGINX how to extract the proxied IP from proxied requests.
diff --git a/modules/nixos/duksebot/default.nix b/modules/nixos/duksebot/default.nix
index c1dc5cf..139bdfb 100644
--- a/modules/nixos/duksebot/default.nix
+++ b/modules/nixos/duksebot/default.nix
@@ -6,10 +6,10 @@
let
inherit (lib) mkIf mkOption mkEnableOption types;
- cfg = config.my.services.duksebot;
+ cfg = config.services.duksebot;
in
{
- options.my.services.duksebot = {
+ options.services.duksebot = {
enable = mkEnableOption "duksebot daily reminder";
package = mkOption {
diff --git a/modules/nixos/on-demand-minecraft/default.nix b/modules/nixos/on-demand-minecraft/default.nix
index 541a624..65d51c4 100644
--- a/modules/nixos/on-demand-minecraft/default.nix
+++ b/modules/nixos/on-demand-minecraft/default.nix
@@ -6,10 +6,10 @@
let
inherit (lib) mkIf mkOption mkEnableOption types;
- cfg = config.my.services.on-demand-minecraft;
+ cfg = config.services.on-demand-minecraft;
in
{
- options.my.services.on-demand-minecraft = {
+ options.services.on-demand-minecraft = {
enable = mkEnableOption "local minecraft server";
eula = mkOption {