summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/core/default.nix2
-rw-r--r--modules/core/sops.nix (renamed from modules/core/security/sops.nix)2
-rw-r--r--modules/desktop/default.nix1
-rw-r--r--modules/desktop/security/apparmor.nix (renamed from modules/core/security/apparmor.nix)0
-rw-r--r--modules/desktop/security/audit.nix (renamed from modules/core/security/audit.nix)0
-rw-r--r--modules/desktop/security/default.nix (renamed from modules/core/security/default.nix)1
-rw-r--r--modules/desktop/security/doas.nix (renamed from modules/core/security/doas.nix)0
-rw-r--r--modules/desktop/security/kernel.nix (renamed from modules/core/security/kernel.nix)0
-rw-r--r--modules/desktop/security/pam.nix (renamed from modules/core/security/pam.nix)0
-rw-r--r--modules/desktop/security/pki.nix (renamed from modules/core/security/pki.nix)0
-rw-r--r--modules/desktop/security/polkit.nix (renamed from modules/core/security/polkit.nix)0
-rw-r--r--modules/desktop/security/sudo.nix (renamed from modules/core/security/sudo.nix)0
-rw-r--r--modules/server/default.nix2
13 files changed, 4 insertions, 4 deletions
diff --git a/modules/core/default.nix b/modules/core/default.nix
index f44e8ff..06eab1d 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -2,6 +2,6 @@
imports = [
./networking
./nix
- ./security
+ ./sops.nix
];
}
diff --git a/modules/core/security/sops.nix b/modules/core/sops.nix
index c98a533..c1c9d13 100644
--- a/modules/core/security/sops.nix
+++ b/modules/core/sops.nix
@@ -6,7 +6,7 @@
sops = {
gnupg.sshKeyPaths = [ ];
- secrets.tailscale_authentication_key.sopsFile = ../../../secrets/hosts.yaml;
+ secrets.tailscale_authentication_key.sopsFile = ../../secrets/hosts.yaml;
age = {
sshKeyPaths = [ ];
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index e9e2a80..7491d8a 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -3,6 +3,7 @@
imports = [
./hardware
./networking
+ ./security
./software
./variables
./virtualisation
diff --git a/modules/core/security/apparmor.nix b/modules/desktop/security/apparmor.nix
index 170838c..170838c 100644
--- a/modules/core/security/apparmor.nix
+++ b/modules/desktop/security/apparmor.nix
diff --git a/modules/core/security/audit.nix b/modules/desktop/security/audit.nix
index 9922213..9922213 100644
--- a/modules/core/security/audit.nix
+++ b/modules/desktop/security/audit.nix
diff --git a/modules/core/security/default.nix b/modules/desktop/security/default.nix
index a71b590..7a571a9 100644
--- a/modules/core/security/default.nix
+++ b/modules/desktop/security/default.nix
@@ -8,7 +8,6 @@
./pam.nix
./pki.nix
./polkit.nix
- ./sops.nix
./sudo.nix
];
diff --git a/modules/core/security/doas.nix b/modules/desktop/security/doas.nix
index af717ca..af717ca 100644
--- a/modules/core/security/doas.nix
+++ b/modules/desktop/security/doas.nix
diff --git a/modules/core/security/kernel.nix b/modules/desktop/security/kernel.nix
index 62b2f28..62b2f28 100644
--- a/modules/core/security/kernel.nix
+++ b/modules/desktop/security/kernel.nix
diff --git a/modules/core/security/pam.nix b/modules/desktop/security/pam.nix
index b7eb426..b7eb426 100644
--- a/modules/core/security/pam.nix
+++ b/modules/desktop/security/pam.nix
diff --git a/modules/core/security/pki.nix b/modules/desktop/security/pki.nix
index b804fc5..b804fc5 100644
--- a/modules/core/security/pki.nix
+++ b/modules/desktop/security/pki.nix
diff --git a/modules/core/security/polkit.nix b/modules/desktop/security/polkit.nix
index 786d1a0..786d1a0 100644
--- a/modules/core/security/polkit.nix
+++ b/modules/desktop/security/polkit.nix
diff --git a/modules/core/security/sudo.nix b/modules/desktop/security/sudo.nix
index 6623b71..6623b71 100644
--- a/modules/core/security/sudo.nix
+++ b/modules/desktop/security/sudo.nix
diff --git a/modules/server/default.nix b/modules/server/default.nix
index c5df823..4667be4 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -2,7 +2,7 @@
{
imports = [
../core/networking/tailscale.nix
- ../core/security/sops.nix
+ ../core/sops.nix
../core/nix
./networking
./sops.nix