From a54dc4b767d675e171fcc0d20298295748e0ab18 Mon Sep 17 00:00:00 2001
From: Miran Bastaja <miran.bastaja04@gmail.com>
Date: Wed, 6 Dec 2023 13:40:54 +0100
Subject: Move and rename nix-config module

The old location for it was wrong as the module does not define a nixos
module but rather just sets some options in existing modules. A new name
was chosen so it would be more abstract and thus cover more use cases.
---
 share/nixos-modules/nix-config.nix | 19 -------------------
 share/system/common.nix            | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 share/nixos-modules/nix-config.nix
 create mode 100644 share/system/common.nix

(limited to 'share')

diff --git a/share/nixos-modules/nix-config.nix b/share/nixos-modules/nix-config.nix
deleted file mode 100644
index 8000871..0000000
--- a/share/nixos-modules/nix-config.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ inputs, ... }: {
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-    auto-optimise-store = true;
-
-    extra-substituters = [
-      "https://hyprland.cachix.org"
-      "https://nix-community.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-  nixpkgs.overlays = [
-    inputs.hyprland.overlays.default
-    inputs.emacs-overlay.overlays.default
-  ];
-}
diff --git a/share/system/common.nix b/share/system/common.nix
new file mode 100644
index 0000000..909b801
--- /dev/null
+++ b/share/system/common.nix
@@ -0,0 +1,21 @@
+# Common system settings shared across every machine
+# Used mostly for adding substituters and such
+{ inputs, ... }: {
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+    auto-optimise-store = true;
+
+    extra-substituters = [
+      "https://hyprland.cachix.org"
+      "https://nix-community.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+  nixpkgs.overlays = [
+    inputs.hyprland.overlays.default
+    inputs.emacs-overlay.overlays.default
+  ];
+}
-- 
cgit v1.3.1