Fix recursion on self

.sops.yaml

@@ -5,7 +5,7 @@ keys:
   - &kardorf-ssh age15lxw97z03q40xrdscnxqqugh5ky5aqrerg2t2rphkcqm6rnllurq8v98q5
 
 creation_rules:
-  - path_regex: hosts/common/secrets.yaml$
+  - path_regex: hosts/secrets-common.yaml$
     key_groups:
     - age:
       - *primary

features-nixos/global/sops.nix

@@ -1,4 +1,5 @@
 {
+  pwd,
   inputs,
   config,
   ...
@@ -18,5 +19,5 @@ in {
     generateKey = false; # TODO: building should not work without secrets!?
   };
 
-  sops.defaultSopsFile = ../secrets.yaml;
+  sops.defaultSopsFile = "${pwd}/hosts/secrets-common.yaml";
 }

features-nixos/users/julian/default.nix

@@ -1,4 +1,5 @@
 {
+  pwd,
   pkgs,
   config,
   lib,
@@ -29,7 +30,7 @@ in {
     ];
 
     openssh.authorizedKeys.keys = lib.splitString "\n" (
-      builtins.readFile ../../../../homes/julian/ssh.pub
+      builtins.readFile ./ssh.pub
     );
     # hashedPasswordFile = config.sops.secrets.julian-password.path;
     hashedPassword = "$y$j9T$N33kLJQbV8soUoCbDkpwA1$r/yahJDgOPo4GGOrAi6BUG5zLTzmaBrA5NQ4nno561A";
@@ -40,11 +41,11 @@ in {
   };
 
   sops.secrets.julian-password = {
-    sopsFile = ../../secrets.yaml;
+    sopsFile = "${pwd}/hosts/secrets-common.yaml";
     neededForUsers = true;
   };
 
-  home-manager.users.julian = import ../../../../homes/julian/${config.networking.hostName}.nix;
+  home-manager.users.julian = import "${pwd}/homes/julian/${config.networking.hostName}.nix";
 
   security.pam.services.swaylock = {}; # Make swaylock unlocking work
 }

flake.nix

@@ -76,10 +76,6 @@
         import nixpkgs {
           inherit system;
           config.allowUnfree = true;
-          config.permittedInsecurePackages = [
-            "olm-3.2.16"
-          ];
-          warn-dirty = false;
         }
     );
   in {
@@ -89,7 +85,6 @@
     homeManagerModules = import ./modules/home-manager;
 
     overlays = import ./overlays {inherit inputs outputs;};
-    # hydraJobs = import ./hydra.nix { inherit inputs outputs; }; # TODO add hydra jobs here?
 
     packages = forEachSystem (pkgs: import ./packages {inherit pkgs;});
     devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
@@ -103,45 +98,27 @@
         ];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
       kardorf = lib.nixosSystem {
         modules = [./hosts/kardorf];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
       builder = lib.nixosSystem {
         modules = [./hosts/builder];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
     };
 
     # Standalone HM
     homeConfigurations = {
-      # Main laptop
-      "julian@aspi" = lib.homeManagerConfiguration {
-        modules = [
-          ./homes/julian/aspi.nix
-          ./homes/julian/hm-standalone-config.nix
-        ];
-        pkgs = pkgsFor.x86_64-linux;
-        extraSpecialArgs = {
-          inherit inputs outputs;
-        };
-      };
-      "julian@kardorf" = lib.homeManagerConfiguration {
-        modules = [
-          ./homes/julian/kardorf.nix
-          ./homes/julian/hm-standalone-config.nix
-        ];
-        pkgs = pkgsFor.x86_64-linux;
-        extraSpecialArgs = {
-          inherit inputs outputs;
-        };
-      };
       "julian@v3ms" = lib.homeManagerConfiguration {
         modules = [
           ./homes/julian/v3ms
@@ -150,6 +127,7 @@
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
       "julian@quickstart" = lib.homeManagerConfiguration {
@@ -160,6 +138,7 @@
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
     };

hosts/aspi/default.nix

@@ -1,28 +1,28 @@
-{
+{pwd, ...}: {
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global
+    "${pwd}/features-nixos/global"
-    ../common/users/julian
+    "${pwd}/features-nixos/users/julian"
-    ../common/optional/binarycaches.nix
+    "${pwd}/features-nixos/optional/binarycaches.nix"
 
-    ../common/optional/remote-builder.nix
+    "${pwd}/features-nixos/optional/remote-builder.nix"
-    ../common/optional/boot-efi.nix
+    "${pwd}/features-nixos/optional/boot-efi.nix"
 
-    ../common/optional/greetd.nix
+    "${pwd}/features-nixos/optional/greetd.nix"
-    ../common/optional/authentication.nix
+    "${pwd}/features-nixos/optional/authentication.nix"
-    ../common/optional/pcmanfm.nix
+    "${pwd}/features-nixos/optional/pcmanfm.nix"
-    ../common/optional/pipewire.nix
+    "${pwd}/features-nixos/optional/pipewire.nix"
 
-    ../common/optional/gamemode.nix
+    "${pwd}/features-nixos/optional/gamemode.nix"
-    ../common/optional/virtualbox.nix
+    "${pwd}/features-nixos/optional/virtualbox.nix"
 
-    ../common/optional/podman.nix
+    "${pwd}/features-nixos/optional/podman.nix"
-    ../common/optional/wireguard.nix
+    "${pwd}/features-nixos/optional/wireguard.nix"
-    ../common/optional/wireshark.nix
+    "${pwd}/features-nixos/optional/wireshark.nix"
-    ../common/optional/flatpak.nix
+    "${pwd}/features-nixos/optional/flatpak.nix"
 
-    ../common/optional/avahi.nix
+    "${pwd}/features-nixos/optional/avahi.nix"
   ];
 
   networking.hostName = "aspi";

hosts/builder/default.nix

@@ -2,6 +2,7 @@
 # or
 # deploy .#builder
 {
+  pwd,
   config,
   pkgs,
   ...
@@ -9,11 +10,11 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global/fish.nix # fish for admin
+    "${pwd}/features-nixos/global/fish.nix" # fish for admin
-    ../common/global/locale.nix
+    "${pwd}/features-nixos/global/locale.nix"
-    ../common/global/nix.nix
+    "${pwd}/features-nixos/global/nix.nix"
-    ../common/global/sops.nix
+    "${pwd}/features-nixos/global/sops.nix"
-    ../common/global/root.nix
+    "${pwd}/features-nixos/global/root.nix"
   ];
 
   networking.hostName = "builder";
@@ -176,7 +177,7 @@
     minimumDiskFreeEvaluator = 4; # in GB
   };
 
-  # add builder itself as build machine so system emulation is properly supported
+  # add builder itpwd as build machine so system emulation is properly supported
   # nix.distributedBuilds = true;
   nix.buildMachines = [
     {

hosts/kardorf/default.nix

@@ -1,30 +1,31 @@
-{pkgs, ...}: {
+{
+  pwd,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global
+    "${pwd}/features-nixos/global"
-    ../common/users/julian
+    "${pwd}/features-nixos/users/julian"
-    ../common/users/wolfi
+    "${pwd}/features-nixos/users/wolfi"
-    ../common/optional/binarycaches.nix
+    "${pwd}/features-nixos/optional/binarycaches.nix"
 
-    # ../common/optional/xserver.nix
+    "${pwd}/features-nixos/optional/remote-builder.nix"
-    ../common/optional/remote-builder.nix
+    "${pwd}/features-nixos/optional/boot-efi.nix"
-    ../common/optional/boot-efi.nix
 
-    ../common/optional/greetd.nix
+    "${pwd}/features-nixos/optional/greetd.nix"
-    ../common/optional/authentication.nix
+    "${pwd}/features-nixos/optional/authentication.nix"
-    ../common/optional/pcmanfm.nix
+    "${pwd}/features-nixos/optional/pcmanfm.nix"
-    ../common/optional/pipewire.nix
+    "${pwd}/features-nixos/optional/pipewire.nix"
 
-    ../common/optional/virtualbox.nix
+    "${pwd}/features-nixos/optional/openssh.nix"
 
-    # ../common/optional/gdm.nix
+    "${pwd}/features-nixos/optional/virtualbox.nix"
-    # ../common/optional/i3.nix
 
-    ../common/optional/openssh.nix
+    "${pwd}/features-nixos/optional/podman.nix"
-
+    "${pwd}/features-nixos/optional/wireshark.nix"
-    ../common/optional/podman.nix
+    "${pwd}/features-nixos/optional/flatpak.nix"
-    ../common/optional/flatpak.nix
   ];
 
   networking.hostName = "kardorf";

overlays/default.nix

@@ -22,7 +22,7 @@
   };
 
   # Adds my custom packages, available as pkgs.frajul.xyz
-  my-pkgs = final: prev: {frajul = import ../pkgs {pkgs = final;};};
+  frajul-pkgs = final: prev: {frajul = import ../packages {pkgs = final;};};
 
   nixpkgs-stable-unstable = final: prev: {
     unstable = import inputs.nixpkgs-unstable {