From a545953c2dcb970f11fa79b98bbd50c2da7edb21 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Wed, 17 Jan 2024 23:03:48 +1300
Subject: [PATCH] add: more system modules

---
 system/base/auto-upgrade.nix     | 31 -------------------------------
 system/base/default.nix          | 18 ------------------
 system/base/pipewire.nix         | 11 -----------
 system/profiles/base/default.nix | 15 +++++++++++++--
 system/user/ooks/default.nix     | 22 ----------------------
 5 files changed, 13 insertions(+), 84 deletions(-)
 delete mode 100644 system/base/auto-upgrade.nix
 delete mode 100644 system/base/default.nix
 delete mode 100644 system/base/pipewire.nix
 delete mode 100644 system/user/ooks/default.nix

diff --git a/system/base/auto-upgrade.nix b/system/base/auto-upgrade.nix
deleted file mode 100644
index 05bd6a9..0000000
--- a/system/base/auto-upgrade.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, inputs, pkgs, lib, ... }:
-
-let
-  inherit (config.networking) hostName;
-  isClean = inputs.self ? rev;
-in
-{
-  system.autoUpgrade = {
-    enable = isClean;
-    dates = "hourly";
-    flags = [
-      "--refresh"
-    ];
-    flake = "github:ooks-io/nix#${hostName};
-  };
-
-# Only run if current config (self) is older than the new one.
-
-  systemd.services.nixos-upgrade = lib.mkIf config.system.autoUpgrade.enable {
-    serviceConfig.ExecCondition = lib.getExe (
-      pkgs.writeShellScriptBin "check-date" ''
-        lastModified() {
-          nix flake metadata "$1" --refresh --json | ${lib.getExe pkgs.jq} '.lastModified'
-        }
-        test "$(lastModified "${config.system.autoUpgrade.flake}")"  -gt "$(lastModified "self")"
-      ''
-    );
-  };
-}
-
-
diff --git a/system/base/default.nix b/system/base/default.nix
deleted file mode 100644
index faa1d84..0000000
--- a/system/base/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ inputs, outputs, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-    ./nix.nix
-    ./fish.nix
-    ./locale.nix
-    ./security.nix
-    ./systemdboot.nix
-    ./pipewire.nix
-  # ./auto-upgrade.nix # still needs some work
-    ];
-
-  home-manager.extraSpecialArgs = { inherit inputs outputs; };
-    
-  #hardware.enableRedistibutableFirmware = true;
-  environment.enableAllTerminfo = true;
-
-  }
diff --git a/system/base/pipewire.nix b/system/base/pipewire.nix
deleted file mode 100644
index e35a788..0000000
--- a/system/base/pipewire.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  security.rtkit.enable = true;
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-}
diff --git a/system/profiles/base/default.nix b/system/profiles/base/default.nix
index 212f861..4ca9c18 100644
--- a/system/profiles/base/default.nix
+++ b/system/profiles/base/default.nix
@@ -1,17 +1,28 @@
-{ lib, config, ... }:
+{ inputs, outputs, lib, config, pkgs, ... }:
 
 let
   cfg = config.systemProfile.base;
 in
 
 {
+
+  imports = [
+    ../modules
+    inputs.home-manager.nixosModules.home-manager
+  ];
+  
   config = lib.mkIf cfg.enable {
+    environment.systemPackages = [pkgs.git];
+    environment.enableAllTerminfo = true;
     systemModules = {
       security.enable = true;
       nixOptions.enable = true;
       pipewire.enable = true;
       networking.enable = true;
       locale.enable = true;
-    }
+    };
+
+    home-manager.extraSpecialArgs = { inherit inputs outputs; };
+    hardware.enableAllFirmware = true;
   }; 
 }
diff --git a/system/user/ooks/default.nix b/system/user/ooks/default.nix
deleted file mode 100644
index 8018fbf..0000000
--- a/system/user/ooks/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, config, ... }:
-let ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in
-{
-  users.users.ooks = {
-    isNormalUser = true;
-    extraGroups = [
-    "wheel"
-    "video"
-    "audio"
-    ] ++ ifTheyExist [
-    "git"
-    "network"
-    "libvirtd"
-    "deluge"
-    ];
-
-  packages = [ pkgs.home-manager ];
-  };
-
-  home-manager.users.ooks = import ../../../../home/user/ooks/${config.networking.hostName};
-}