Move common.nix into modules/default.nix

3 files changed, 80 insertions, 93 deletions

diff --git a/common.nix b/common.nix
deleted file mode 100644
index 10948e9..0000000
--- a/common.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  pkgs,
-  lib,
-  inputs,
-  config,
-  ...
-}:
-{
-  imports = [
-    ./modules
-  ];
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-  nixpkgs = {
-    config = {
-      permittedInsecurePackages = [
-        "olm-3.2.16"
-      ];
-      allowUnfree = true;
-    };
-  };
-  time.timeZone = "Europe/Amsterdam"; # Set timezone
-
-  sops.defaultSopsFile = ./secrets/secrets.yaml;
-  sops.age.sshKeyPaths = [ "/etc/ssh_host_ed25519_key" ];
-  sops.age.keyFile = "/var/lib/sops-nix/key.txt";
-  sops.age.generateKey = true;
-
-  systemd.oomd = {
-    enable = true;
-    enableUserSlices = true;
-    enableSystemSlice = true;
-    enableRootSlice = true;
-    settings.OOM = {
-      SwapUsedLimit = "50%";
-      DefaultMemoryPressureLimit = "50%";
-      DefaultMemoryPressureDurationSec = 20;
-
-    };
-  };
-
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 30d";
-  };
-  systemd.services.nix-daemon.serviceConfig = {
-    MemoryAccounting = true;
-    MemoryMax = "90%";
-    OOMScoreAdjust = 500;
-  };
-
-  environment.systemPackages = with pkgs; [
-    htop
-    btop
-    nmap
-    dig
-    ripgrep
-    unzip
-    sshfs
-    ranger
-    file
-    lm_sensors
-
-    # Needed for getting credentials
-    age
-    sops
-
-    bashInteractive
-    coreutils
-    utillinux
-    iproute2
-    iputils
-    pciutils
-    usbutils
-    vim
-    tmux
-  ];
-
-  networking.hosts = {
-    "0.0.0.0" = [ "apresolve.spotify.com" ];
-  };
-  # This option defines the first version of NixOS you have installed on this particular machine,
-  # DO NOT CHANGE UNLESS USING NIXOS-INSTALL
-  system.stateVersion = "24.11"; # Did you read the comment?
-}
diff --git a/flake.nix b/flake.nix
index 973b4b3..c5fbc22 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
           };
           system = "x86_64-linux";
           modules = [
-            ./common.nix
+            ./modules
             ./hosts/apocalypse
             ./users/wilkuu.nix
             inputs.home-manager.nixosModules.default
@@ -50,7 +50,7 @@
           };
           system = "x86_64-linux";
           modules = [
-            ./common.nix
+            ./modules
             ./hosts/full-iso
             ./users/live-user.nix
             inputs.home-manager.nixosModules.default
@@ -63,7 +63,7 @@
           };
           system = "x86_64-linux";
           modules = [
-            ./common.nix
+            ./modules
             ./hosts/test_vm
             ./users/live-user.nix
             inputs.home-manager.nixosModules.default
@@ -76,7 +76,7 @@
           };
           system = "x86_64-linux"; 
           modules = [
-            ./common.nix 
+            ./modules 
             ./hosts/test_vm 
             ./users/live-user.nix
             ({lib, ...}: {
diff --git a/modules/default.nix b/modules/default.nix
index 5bbfa3c..f51dc9d 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -14,4 +14,80 @@
     ./remote-builder.nix
   ];
 
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+  nixpkgs = {
+    config = {
+      permittedInsecurePackages = [
+        "olm-3.2.16"
+      ];
+      allowUnfree = true;
+    };
+  };
+  time.timeZone = "Europe/Amsterdam"; # Set timezone
+
+  sops.defaultSopsFile = ./secrets/secrets.yaml;
+  sops.age.sshKeyPaths = [ "/etc/ssh_host_ed25519_key" ];
+  sops.age.keyFile = "/var/lib/sops-nix/key.txt";
+  sops.age.generateKey = true;
+
+  systemd.oomd = {
+    enable = true;
+    enableUserSlices = true;
+    enableSystemSlice = true;
+    enableRootSlice = true;
+    settings.OOM = {
+      SwapUsedLimit = "50%";
+      DefaultMemoryPressureLimit = "50%";
+      DefaultMemoryPressureDurationSec = 20;
+
+    };
+  };
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 30d";
+  };
+  systemd.services.nix-daemon.serviceConfig = {
+    MemoryAccounting = true;
+    MemoryMax = "90%";
+    OOMScoreAdjust = 500;
+  };
+
+  environment.systemPackages = with pkgs; [
+    htop
+    btop
+    nmap
+    dig
+    ripgrep
+    unzip
+    sshfs
+    ranger
+    file
+    lm_sensors
+
+    # Needed for getting credentials
+    age
+    sops
+
+    bashInteractive
+    coreutils
+    utillinux
+    iproute2
+    iputils
+    pciutils
+    usbutils
+    vim
+    tmux
+  ];
+
+  networking.hosts = {
+    "0.0.0.0" = [ "apresolve.spotify.com" ];
+  };
+  # This option defines the first version of NixOS you have installed on this particular machine,
+  # DO NOT CHANGE UNLESS USING NIXOS-INSTALL
+  system.stateVersion = "24.11"; # Did you read the comment?
 }