Merge pull request #43 from lehmanator/reorganization

Reorganization
Lehmanator · Feb 23, 2024 · 3cd946e · 3cd946e
2 parents 4629e5b + 8005f99
commit 3cd946e
Show file tree

Hide file tree

Showing 817 changed files with 719 additions and 815 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -23,15 +23,15 @@ creation_rules:
   # Decrypt with all host keys (user keys optional)
   # - <type>/profiles/**/secrets.yaml
   # - <type>/secrets/**/*.yaml
-  - path_regex: (common|darwin|droid|nixos|robotnix|wsl)/profiles/([^/]+/)+secrets\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: profiles/(common|darwin|droid|nixos|robotnix|wsl)/([^/]+/)+secrets\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-host-fw-ssh-ed25519
           - *age-host-wyse-ssh-ed25519
           #- *age-host-fajita-ssh-ed25519
           - *age-user-sam-ssh-ed25519
           - *age-backup
-  - path_regex: (common|darwin|droid|nixos|robotnix|wsl)/secrets/([^/]+/)*[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: secrets/(common|darwin|droid|nixos|robotnix|wsl)/([^/]+/)*[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-host-fw-ssh-ed25519
@@ -41,7 +41,7 @@ creation_rules:
           - *age-backup
 
   # --- Host Secrets: Per-Host ---------------------------------------
-  - path_regex: nixos/hosts/fw/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: hosts/fw/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-host-fw-ssh-ed25519
@@ -51,14 +51,14 @@ creation_rules:
         #- *age-host-fw-ssh-ed25519
         #- *gpg-host-fw-ssh-rsa
         #- *gpg-user-sam-primary
-  - path_regex: nixos/hosts/wyse/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: hosts/wyse/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-host-wyse-ssh-ed25519
           #- *age-host-fw-ssh-ed25519
           - *age-user-sam-ssh-ed25519
           - *age-backup
-  - path_regex: nixos/hosts/[^/]+/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: hosts/[^/]+/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-host-fw-ssh-ed25519
@@ -74,14 +74,14 @@ creation_rules:
   # Decrypt with all user keys
   # - hm/profiles/**/secrets.yaml
   # - hm/secrets/**/*.yaml
-  - path_regex: hm/profiles/([^/]+/)+secrets\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: profiles/hm/([^/]+/)+secrets\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-user-sam-ssh-ed25519
           #- *age-user-sammy-ssh-ed25519
           #- *age-user-guest-ssh-ed25519
           - *age-backup
-  - path_regex: hm/secrets/([^/]+/)*[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: users/secrets/([^/]+/)*[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-user-sam-ssh-ed25519
@@ -90,7 +90,7 @@ creation_rules:
           - *age-backup
 
   # --- User Secrets: Per-User ---------------------------------------
-  - path_regex: hm/users/sam/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: users/sam/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-host-fw-ssh-ed25519
@@ -100,7 +100,7 @@ creation_rules:
         #- *age-host-fw-ssh-ed25519
         #- *gpg-host-fw-ssh-rsa
         #- *gpg-user-sam-primary
-  - path_regex: hm/users/[^/]+/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
+  - path_regex: users/[^/]+/secrets/[^/]+\.(ya?ml|json|env|ini|bin|key|privkey|luks|lukskey)$
     key_groups:
       - age:
           - *age-host-fw-ssh-ed25519

diff --git a/common/lib/compat/default.nix b/common/lib/compat/default.nix
diff --git a/common/profiles/nix/features/recursive-nix.nix b/common/profiles/nix/features/recursive-nix.nix
diff --git a/common/profiles/nix/utils/manix.nix b/common/profiles/nix/utils/manix.nix
diff --git a/darwin/profiles/modules/nixvim.nix b/darwin/profiles/modules/nixvim.nix
diff --git a/flake.nix b/flake.nix
@@ -89,17 +89,13 @@
               };
             };
             #// specialArgs;
-            modules = [./nixos/hosts/${host}] ++ modules;
+            modules = [./hosts/${host}] ++ modules;
           };
       in {
-        overlays = import ./nixos/overlays;
+        overlays = import ./overlays/nixos;
         nixosConfigurations = {
           fw = mkSystem {host = "fw";};
           wyse = mkSystem {host = "wyse";};
-          #installer = nixos.lib.nixosSystem {
-          #  specialArgs = { inherit inputs; user = "sam"; };
-          #  modules = [ ./profiles/nixos/installer ];
-          #};
           fajita = nixos.lib.nixosSystem {
             system = "aarch64-linux";
             specialArgs = {
@@ -116,7 +112,7 @@
               (import "${inputs.mobile-nixos}/lib/configuration.nix" {
                 device = "oneplus-fajita";
               })
-              ./nixos/hosts/fajita
+              ./hosts/fajita
               inputs.nixpkgs-gnome-mobile.nixosModules.gnome-mobile
             ];
           };
@@ -136,43 +132,43 @@
               (import "${inputs.mobile-nixos}/lib/configuration.nix" {
                 device = "oneplus-fajita";
               })
-              ./nixos/hosts/fajita/minimal.nix
+              ./hosts/fajita/minimal.nix
               inputs.nixpkgs-gnome-mobile.nixosModules.gnome-mobile
             ];
           };
         };
         #homeConfigurations = {
         #  sam = inputs.home.lib.homeManagerConfiguration {
         #    #pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        #    modules = [ ./hm/users/sam ];
+        #    modules = [ ./users/sam ];
         #    extraSpecialArgs = { inherit inputs; user = "sam"; };
         #  };
         #  guest = inputs.home.lib.homeManagerConfiguration {
         #    pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        #    #modules = [./hm/users/default];
+        #    #modules = [./users/default];
         #    extraSpecialArgs = { inherit inputs; user = "guest"; };
         #  };
         #};
 
         #pops = {
         #  nixosModules = inputs.omnibus.pops.nixosModules.addLoadExtender {
-        #    load = {src = ./nixos/modules;};
+        #    load = {src = ./modules/nixos;};
         #  };
         #  nixosProfiles = inputs.omnibus.pops.nixosProfiles.addLoadExtender {
         #    load = {
-        #      src = ./nixos/profiles;
+        #      src = ./profiles/nixos;
         #      inputs = {inherit inputs;};
         #    };
         #  };
         #  homeModules = inputs.omnibus.pops.homeProfiles.addLoadExtender {
         #    load = {
-        #      src = ./hm/modules;
+        #      src = ./modules/nixos;
         #      inputs = {inherit inputs;};
         #    };
         #  };
         #  homeProfiles = inputs.omnibus.pops.homeProfiles.addLoadExtender {
         #    load = {
-        #      src = ./hm/profiles;
+        #      src = ./profiles/hm;
         #      inputs = {inherit inputs;};
         #    };
         #  };

diff --git a/hm/profiles/modules/sops.nix b/hm/profiles/modules/sops.nix
diff --git a/hm/profiles/neovim.nix b/hm/profiles/neovim.nix
diff --git a/nixos/hosts/fajita/README.md → hosts/fajita/README.md b/nixos/hosts/fajita/README.md → hosts/fajita/README.md
diff --git a/nixos/hosts/fajita/configuration.nix → hosts/fajita/configuration.nix b/nixos/hosts/fajita/configuration.nix → hosts/fajita/configuration.nix
@@ -113,9 +113,6 @@ in
 
 
 
-
-
-
 #boot.kernelPatches = [
 #  {
 #    name = "fix-oneplus-fajita-screen";

diff --git a/nixos/hosts/fajita/default.nix → hosts/fajita/default.nix b/nixos/hosts/fajita/default.nix → hosts/fajita/default.nix
diff --git a/nixos/hosts/fajita/minimal.nix → hosts/fajita/minimal.nix b/nixos/hosts/fajita/minimal.nix → hosts/fajita/minimal.nix
@@ -17,13 +17,13 @@
     inputs.sops-nix.nixosModules.sops
     inputs.srvos.nixosModules.mixins-nix-experimental
     inputs.srvos.nixosModules.mixins-trusted-nix-caches
-    ../../profiles/locale
-    #../../profiles/mobile
-    #../../profiles/nix
-    ../../profiles/shell
-    ../../profiles/users
-    ../../profiles/adb.nix
-    ../../profiles/sshd.nix
+    ../../profiles/nixos/locale
+    #../../profiles/nixos/mobile
+    #../../profiles/nixos/nix
+    ../../profiles/nixos/shell
+    ../../profiles/nixos/users
+    ../../profiles/nixos/adb.nix
+    ../../profiles/nixos/sshd.nix
   ];
 
   #home-manager = {

diff --git a/hosts/fajita/profiles.nix b/hosts/fajita/profiles.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    ../../profiles/nixos
+    ../../profiles/nixos/desktop/flatpak.nix
+    ../../profiles/nixos/mobile
+    #../../profiles/nixos/desktop
+    #../../profiles/nixos/desktop/de/gnome
+    #../../profiles/nixos/virt/emulators/slippi.nix
+    # --- Disabled ---
+    #../../profiles/nixos/hardware/fprintd.nix
+    #../../profiles/nixos/virt/windows
+    #../../profiles/common:editor
+    # --- Imported by profiles/nixos ---
+    #../../profiles/nixos/boot
+    #../../profiles/nixos/hardware
+    #../../profiles/nixos/locale
+    #../../profiles/nixos/network
+    #../../profiles/nixos/security
+    #../../profiles/nixos/security/sops.nix
+    #../../profiles/nixos/shell
+    #../../profiles/nixos/users
+  ];
+}
diff --git a/nixos/hosts/fajita/secrets/default.yaml → hosts/fajita/secrets/default.yaml b/nixos/hosts/fajita/secrets/default.yaml → hosts/fajita/secrets/default.yaml
diff --git a/nixos/hosts/fw/configuration.nix → hosts/fw/configuration.nix b/nixos/hosts/fw/configuration.nix → hosts/fw/configuration.nix
diff --git a/nixos/hosts/fw/default.nix → hosts/fw/default.nix b/nixos/hosts/fw/default.nix → hosts/fw/default.nix
diff --git a/nixos/hosts/fw/displays.nix → hosts/fw/displays.nix b/nixos/hosts/fw/displays.nix → hosts/fw/displays.nix
diff --git a/nixos/hosts/fw/hardware-configuration.nix → hosts/fw/hardware-configuration.nix b/nixos/hosts/fw/hardware-configuration.nix → hosts/fw/hardware-configuration.nix
@@ -12,9 +12,9 @@
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
-    ../../profiles/hardware/bluetooth.nix
-    ../../profiles/hardware/fprintd.nix
-    ../../profiles/hardware/peripherals/logitech.nix
+    ../../profiles/nixos/hardware/bluetooth.nix
+    ../../profiles/nixos/hardware/fprintd.nix
+    ../../profiles/nixos/hardware/peripherals/logitech.nix
   ];
 
   boot = {

diff --git a/nixos/hosts/fw/managed.nix → hosts/fw/managed.nix b/nixos/hosts/fw/managed.nix → hosts/fw/managed.nix
Original file line number	Diff line number	Diff line change
Expand Up		@@ -113,9 +113,6 @@ in






		#boot.kernelPatches = [
		# {
		# name = "fix-oneplus-fajita-screen";
Expand Down