tmp: Move modules/nixos to services/ for shared and hosts/ahmed for private

17 files changed, 15 insertions, 62 deletions

diff --git a/flake.nix b/flake.nix
index 588bf98..daa98d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,9 +47,6 @@
     darwinModules =
       builtins.attrValues (import ./modules/darwin).general
       ++ builtins.attrValues (import ./modules/darwin).personal;
-    nixosModules =
-      builtins.attrValues (import ./modules/nixos).general
-      ++ builtins.attrValues (import ./modules/nixos).personal;
 
     # This is a function that generates an attribute by calling a function
     # you pass to it, with each system as an argument. `systems` lists all
@@ -91,8 +88,7 @@
             ./hosts/ahmed/configuration.nix
             ./hosts/common.nix
             ./home
-          ]
-          ++ nixosModules;
+          ] ++ builtins.attrValues (import ./services);
       };
     };
 
@@ -112,7 +108,7 @@
 
     # We export the generally applicable modules.
     darwinModules = (import ./modules/darwin).geneal;
-    nixosModules = (import ./modules/nixos).general;
     homeModules = import ./modules/home-manager;
+    nixosModules = import ./services;
   };
 }
diff --git a/modules/nixos/cloudflare-proxy/default.nix b/hosts/ahmed/cloudflare-proxy/default.nix
index 657722d..657722d 100644
--- a/modules/nixos/cloudflare-proxy/default.nix
+++ b/hosts/ahmed/cloudflare-proxy/default.nix
diff --git a/hosts/ahmed/configuration.nix b/hosts/ahmed/configuration.nix
index 02ef997..12f4f10 100644
--- a/hosts/ahmed/configuration.nix
+++ b/hosts/ahmed/configuration.nix
@@ -8,6 +8,15 @@
 }: {
   imports = [
     ./hardware-configuration.nix
+
+    ./cloudflare-proxy
+    ./disable-screen
+    ./duksebot
+    ./forsvarsarper
+    ./git.linus.onl
+    ./hellohtml.linus.onl
+    ./linus.onl
+    ./nofitications.linus.onl
     ./ssh
   ];
 
diff --git a/modules/nixos/disable-screen/default.nix b/hosts/ahmed/disable-screen/default.nix
index 638437a..638437a 100644
--- a/modules/nixos/disable-screen/default.nix
+++ b/hosts/ahmed/disable-screen/default.nix
diff --git a/modules/nixos/duksebot/default.nix b/hosts/ahmed/duksebot/default.nix
index 4c10cd8..4c10cd8 100644
--- a/modules/nixos/duksebot/default.nix
+++ b/hosts/ahmed/duksebot/default.nix
diff --git a/modules/nixos/forsvarsarper/default.nix b/hosts/ahmed/forsvarsarper/default.nix
index 7052f04..7052f04 100644
--- a/modules/nixos/forsvarsarper/default.nix
+++ b/hosts/ahmed/forsvarsarper/default.nix
diff --git a/modules/nixos/forsvarsarper/script.py b/hosts/ahmed/forsvarsarper/script.py
index 7f12508..7f12508 100644
--- a/modules/nixos/forsvarsarper/script.py
+++ b/hosts/ahmed/forsvarsarper/script.py
diff --git a/modules/nixos/git.linus.onl/about.html b/hosts/ahmed/git.linus.onl/about.html
index 2d18ca4..2d18ca4 100644
--- a/modules/nixos/git.linus.onl/about.html
+++ b/hosts/ahmed/git.linus.onl/about.html
diff --git a/modules/nixos/git.linus.onl/default.nix b/hosts/ahmed/git.linus.onl/default.nix
index 88e4f6f..88e4f6f 100644
--- a/modules/nixos/git.linus.onl/default.nix
+++ b/hosts/ahmed/git.linus.onl/default.nix
diff --git a/modules/nixos/hellohtml.linus.onl/default.nix b/hosts/ahmed/hellohtml.linus.onl/default.nix
index feb56ba..feb56ba 100644
--- a/modules/nixos/hellohtml.linus.onl/default.nix
+++ b/hosts/ahmed/hellohtml.linus.onl/default.nix
diff --git a/modules/nixos/linus.onl/default.nix b/hosts/ahmed/linus.onl/default.nix
index 52703fe..52703fe 100644
--- a/modules/nixos/linus.onl/default.nix
+++ b/hosts/ahmed/linus.onl/default.nix
diff --git a/modules/nixos/nofitications.linus.onl/default.nix b/hosts/ahmed/nofitications.linus.onl/default.nix
index c050ef4..c050ef4 100644
--- a/modules/nixos/nofitications.linus.onl/default.nix
+++ b/hosts/ahmed/nofitications.linus.onl/default.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index 1393627..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  # These components are
-  general = {
-    on-demand-minecraft = import ./on-demand-minecraft;
-    cloudflare-proxy = import ./cloudflare-proxy;
-    disable-screen = import ./disable-screen;
-    hellohtml = import ./hellohtml;
-  };
-
-  personal = {
-    duksebot = import ./duksebot;
-    graphics = import ./graphics;
-    "linus.onl" = import ./linus.onl;
-    "notifications.linus.onl" = import ./nofitications.linus.onl;
-    "git.linus.onl" = import ./git.linus.onl;
-    "hellohtml.linus.onl" = import ./hellohtml.linus.onl;
-    forsvarsarper = import ./forsvarsarper;
-  };
-}
diff --git a/modules/nixos/graphics/default.nix b/modules/nixos/graphics/default.nix
deleted file mode 100644
index f54d043..0000000
--- a/modules/nixos/graphics/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# This module configures a basic graphical environment. I use this sometimes for
-# ahmed when muhammed is being repaired.
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-
-  cfg = config.modules.graphics;
-in {
-  options.modules.graphics.enable = mkEnableOption "basic graphical environment";
-
-  config = mkIf cfg.enable {
-    services.xserver.enable = true;
-
-    # Match console keyboard layout but swap capslock and escape.
-    # TODO: Create a custom keymap with esc/capslock swap so console can use it.
-    services.xserver.layout = config.console.keyMap;
-    services.xserver.xkbOptions = "caps:swapescape";
-
-    # Enable touchpad support.
-    services.xserver.libinput.enable = true;
-
-    services.xserver.windowManager.dwm.enable = true;
-
-    # Enable sound.
-    sound.enable = true;
-    hardware.pulseaudio.enable = true;
-
-    environment.systemPackages = with pkgs; [
-      st # suckless terminal - dwm is pretty sucky without this
-      dmenu # application launcher
-    ];
-  };
-}
diff --git a/services/default.nix b/services/default.nix
new file mode 100644
index 0000000..b813155
--- /dev/null
+++ b/services/default.nix
@@ -0,0 +1,4 @@
+{
+  on-demand-minecraft = import ./on-demand-minecraft;
+  hellohtml = import ./hellohtml;
+}
diff --git a/modules/nixos/hellohtml/default.nix b/services/hellohtml/default.nix
index cc15779..cc15779 100644
--- a/modules/nixos/hellohtml/default.nix
+++ b/services/hellohtml/default.nix
diff --git a/modules/nixos/on-demand-minecraft/default.nix b/services/on-demand-minecraft/default.nix
index 3ccbec9..3ccbec9 100644
--- a/modules/nixos/on-demand-minecraft/default.nix
+++ b/services/on-demand-minecraft/default.nix