refactor(treewide)

nixos/modules/base/default.nix

@@ -1,23 +1,11 @@
-{ lib, ... }:
-
 {
   imports = [
-    ./shell
     ./boot
-    ./nix
     ./displayManager
     ./networking
-    ./locale.nix
-    ./virtualization
+    ./nix
     ./security
-    ./services
-    ./host
+    ./shell
+    ./locale.nix
   ];
-
-
-  options.ooknet = {
-    virtualisation = {
-      enable = lib.mkEnableOption "Enable virtualisation module";
-    };
-  };
 }

nixos/modules/base/services/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [ 
-  ./system76Scheduler.nix
-  ./dbus.nix
-  ./gnome.nix
-  ./gvfs.nix
-  ];
-}

nixos/modules/default.nix

@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./base
+    ./gaming
+    ./host
+    ./programs
+    ./services
+  ];
+}

nixos/modules/gaming/default.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./steam.nix
+    ./gamemode.nix
+    ./gamescope.nix
+    ./openPorts.nix
+  ];
+}

nixos/modules/gaming/gamemode.nix

@@ -0,0 +1,24 @@
+{ lib, config, pkgs, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.gaming.gamemode;
+in
+
+{
+  config = mkIf cfg.enable {
+    programs.gamemode = {
+      enable = true;
+      settings = {
+        general = {
+          renice = 15;
+          softrealtime = "auto";
+        };
+        custom = {
+          start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
+          end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
+        };
+      };
+    };
+  };
+}

nixos/modules/gaming/gamescope.nix

@@ -0,0 +1,16 @@
+{ lib, config, pkgs, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.gaming.gamescope;
+in
+
+{
+  config = mkIf cfg.enable {
+    hardware.opengl.extraPackages = [ pkgs.gamescope ];
+    programs.gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
+  };
+}

nixos/modules/gaming/openPorts.nix

@@ -0,0 +1,22 @@
+{ lib, config, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.gaming.openPorts;
+in
+
+{
+  config = mkIf cfg.enable {
+    networking.firewall = {
+      allowedTCPPorts = [ 3074 ];
+      allowedUDPPorts = [
+        88
+        500
+        3074
+        2075
+        3544
+        4500
+      ];
+    };
+  };
+}

nixos/modules/gaming/steam.nix

@@ -0,0 +1,35 @@
+{ lib, config, pkgs, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.gaming.steam;
+  steamFix = pkgs.steam.override {
+    extraPkgs = pkgs: with pkgs; [
+      xorg.libXcursor
+      xorg.libXi
+      xorg.libXinerama
+      xorg.libXScrnSaver
+      libpng
+      libpulseaudio
+      libvorbis
+      stdenv.cc.cc.lib
+      libkrb5
+      keyutils
+      mangohud
+      winetricks
+      protontricks
+      gtk3
+      gtk3-x11
+    ];
+  };
+in
+
+{
+  config = mkIf cfg.enable {
+    programs.steam = {
+      enable = true;
+      package = steamFix;
+      extraCompatPackages = [ pkgs.proton-ge-bin.steamcompattool ];
+    };
+  };
+}

nixos/modules/host/default.nix

@@ -2,8 +2,6 @@
   imports = [
     ./admin.nix
     ./name.nix
-    ./type.nix
-    ./role.nix
     ./hardware
   ];
 }

nixos/modules/host/hardware/default.nix

@@ -4,6 +4,5 @@
     ./gpu
     ./features
     ./common.nix
-    ./monitors.nix
   ];
 }

nixos/modules/programs/1password.nix

@@ -2,16 +2,17 @@
 
 let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  admin = config.ooknet.host.admin;
+  cfg = config.ooknet.programs._1password;
 in
 
 {
-  config = mkIf (host.type != "phone") {
+  config = mkIf cfg.enable {
     programs = {
       _1password.enable = true;
       _1password-gui = {
         enable = true;
-        polkitPolicyOwners = [ "${host.admin.name}" ];
+        polkitPolicyOwners = [ "${admin.name}" ];
       };
     };
   };

nixos/modules/programs/dconf.nix

@@ -0,0 +1,12 @@
+{ lib, config, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.programs.dconf;
+in
+
+{
+  config = mkIf cfg.enable {
+    programs.dconf.enable = true;
+  };
+}

nixos/modules/programs/kdeconnect.nix

@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.programs.kdeconnect;
+in
+
+{
+  config = mkIf cfg.enable {
+    programs.kdeconnect = {
+      enable = true;
+    };
+  };
+}

nixos/modules/roles/gaming/default.nix

@@ -1,69 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-let
-  inherit (lib) mkIf;
-  inherit (builtins) elem;
-  steamFix = pkgs.steam.override {
-    extraPkgs = pkgs: with pkgs; [
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXinerama
-      xorg.libXScrnSaver
-      libpng
-      libpulseaudio
-      libvorbis
-      stdenv.cc.cc.lib
-      libkrb5
-      keyutils
-      mangohud
-      winetricks
-      protontricks
-      gtk3
-      gtk3-x11
-    ];
-  };
-  host = config.ooknet.host;
-in
-
-{
-  config = mkIf (elem "gaming" host.function) {
-    hardware.opengl.extraPackages = [ pkgs.gamescope ];
-    services.flatpak.enable = true;
-    programs = {
-      steam = {
-        enable = true;
-        package = steamFix;
-        extraCompatPackages = [ pkgs.proton-ge-bin.steamcompattool ];
-      };
-      gamescope = {
-        enable = true;
-        capSysNice = true;
-      };
-      gamemode = {
-        enable = true;
-        settings = {
-          general = {
-            renice = 15;
-            softrealtime = "auto";
-          };
-           custom = {
-            start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
-            end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
-          };
-        };
-      };
-    };
-    networking.firewall = {
-      allowedTCPPorts = [ 3074 ];
-      allowedUDPPorts = [
-        88
-        500
-        3074
-        2075
-        3544
-        4500
-      ];
-    };
-  };
-}
-

nixos/modules/roles/media-server/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./services
-  ];
-}

nixos/modules/roles/media-server/services/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./nixarr.nix
-  ];
-}

nixos/modules/roles/media-server/services/nixarr.nix

@@ -1,25 +0,0 @@
-{ config, inputs, ... }:
-
-let
-  admin = config.ooknet.host.admin;
-in
-  
-{
-  imports = [ inputs.nixarr.nixosModules.default ];
-  nixarr = {
-    enable = true;
-    mediaDir = "/jellyfin";
-    stateDir = "/var/lib/nixarr";
-    mediaUsers = ["${admin.name}"];
-
-    jellyfin.enable = true;
-    sonarr.enable = true;
-    radarr.enable = true;
-    prowlarr.enable = true;
-    transmission.enable = true;
-  };
-  fileSystems."/jellyfin" = {
-    device = "/dev/disk/by-label/jellyfin";
-    fsType = "btrfs";
-  };
-}

nixos/modules/roles/workstation/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./programs
-  ];
-}

nixos/modules/roles/workstation/programs/dconf.nix

@@ -1,13 +0,0 @@
-{ lib, config, ... }:
-
-let
-  inherit (lib) mkIf;
-  inherit (builtins) elem;
-  host = config.ooknet.host;
-in
-
-{
-  config = mkIf (elem "workstation" host.function){
-    programs.dconf.enable = true;
-  };
-}

nixos/modules/roles/workstation/programs/kdeconnect.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  programs.kdeconnect = {
-    enable = true;
-  };
-}

nixos/modules/services/dbus.nix

@@ -2,12 +2,11 @@
 
 let
   inherit (lib) mkIf;
-  inherit (lib.lists) any elem;
-  hasFunction = f: elem f config.ooknet.host.function;
+  cfg = config.ooknet.services.dbus;
 in
 
 {
-  config = mkIf (any hasFunction ["workstation" "gaming"]) {
+  config = mkIf cfg.enable {
     services.dbus = {
       enable = true;
       packages = with pkgs; [ dconf gcr udisks2 ];

nixos/modules/services/default.nix

@@ -0,0 +1,10 @@
+{
+  imports = [ 
+    ./system76Scheduler.nix
+    ./dbus.nix
+    ./gnome.nix
+    ./gvfs.nix
+    # ./nixarr.nix
+    ./flatpak.nix
+  ];
+}

nixos/modules/services/flatpak.nix

@@ -0,0 +1,12 @@
+{ lib, config, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.services.flatpak;
+in
+
+{
+  config = mkIf cfg.enable {
+    services.flatpak.enable = true;
+  };
+}

nixos/modules/services/gnome.nix

@@ -2,11 +2,11 @@
 
 let
   inherit (lib) mkIf;
-  host = config.ooknet.host; 
+  cfg = config.ooknet.services.gnomeServices; 
 in
 
 {
-  config = mkIf (host.type != "phone" && host.type != "server") {
+  config = mkIf cfg.enable {
     services = {
       gnome = {
         glib-networking.enable = true;

nixos/modules/services/gvfs.nix

@@ -2,11 +2,11 @@
 
 let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  cfg = config.ooknet.services.gvfs;
 in
 
 {
-  config = mkIf ( host.type != "phone") {
+  config = mkIf cfg.enable {
     services.gvfs.enable = true;
   };
 }

nixos/modules/services/nixarr.nix

@@ -0,0 +1,29 @@
+{ config, inputs, lib, ... }:
+
+let
+  inherit (lib) mkIf;
+  admin = config.ooknet.host.admin;
+  cfg = config.ooknet.services.nixarr;
+in
+  
+{
+  imports = [ inputs.nixarr.nixosModules.default ];
+  config = mkIf cfg.enable {
+    nixarr = {
+      enable = true;
+      mediaDir = "/jellyfin";
+      stateDir = "/var/lib/nixarr";
+      mediaUsers = ["${admin.name}"];
+
+      jellyfin.enable = true;
+      sonarr.enable = true;
+      radarr.enable = true;
+      prowlarr.enable = true;
+      transmission.enable = true;
+    };
+    fileSystems."/jellyfin" = {
+      device = "/dev/disk/by-label/jellyfin";
+      fsType = "btrfs";
+    };
+  };
+}

nixos/modules/services/system76Scheduler.nix

@@ -2,12 +2,11 @@
 
 let
   inherit (lib) mkIf;
-  host = config.ooknet.host;
+  cfg = config.ooknet.services.system76Scheduler;
 in
 
 {
-  config = mkIf (host.type != "phone") {
-
+  config = mkIf cfg.enable {
     services.system76-scheduler = {
       enable = true;
     };