Fix recursion on self

.sops.yaml

@@ -1,17 +1,15 @@
 keys:
   - &primary age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg
   - &aspi-ssh age1q8lc5340gz5xw2f57nglrss68wv0j0hf36py2pdtrl6ky3yrq9qqk0njr4
-  - &pianonix-ssh age1tguyu2yd5xv8rgjjl50cq6dq5rr7umqgv098dgre4u9wyj30ea7sexw62c
   - &builder-ssh age1kw4kmdm45zprvdkrrpvgq966l7585vhusmum083qlwnr0xxgd3uqatcyja
   - &kardorf-ssh age15lxw97z03q40xrdscnxqqugh5ky5aqrerg2t2rphkcqm6rnllurq8v98q5
 
 creation_rules:
-  - path_regex: hosts/common/secrets.yaml$
+  - path_regex: hosts/secrets-common.yaml$
     key_groups:
     - age:
       - *primary
       - *aspi-ssh
-      - *pianonix-ssh
       - *kardorf-ssh
 
   - path_regex: hosts/builder/secrets.yaml$
@@ -19,9 +17,3 @@ creation_rules:
     - age:
       - *primary
       - *builder-ssh
-
-  - path_regex: hosts/pianonix/secrets*
-    key_groups:
-    - age:
-      - *primary
-      - *pianonix-ssh

features-nixos/base/auto-upgrade.nix

@@ -1,18 +0,0 @@
-{
-  flake.nixosModules.base = {
-    inputs,
-    config,
-    ...
-  }: {
-    system.hydraAutoUpgrade = {
-      # Only enable if not dirty
-      enable = inputs.self ? rev;
-      dates = "*:0/10"; # Every 10 minutes
-      instance = "http://hydra.julian-mutter.de";
-      project = "dotfiles";
-      jobset = "main";
-      job = "hosts.${config.networking.hostName}";
-      oldFlakeRef = "self";
-    };
-  };
-}

features-nixos/base/default.nix

@@ -1,40 +0,0 @@
-# Common config for all hosts
-{
-  flake.nixosModules.base = {
-    inputs,
-    outputs,
-    pkgs,
-    lib,
-    ...
-  }: {
-    imports = [
-      inputs.home-manager.nixosModules.home-manager
-    ];
-
-    # Replaces the (modulesPath + "/installer/scan/not-detected.nix") from default hardware-configuration.nix
-    # Enables non-free firmware
-    hardware.enableRedistributableFirmware = true;
-
-    # Networking
-    networking.networkmanager = {
-      enable = true;
-      plugins = with pkgs; [
-        networkmanager-openconnect
-      ];
-    };
-    services.resolved.enable = false;
-    # MDNS Taken by avahi
-    # networking.networkmanager.dns = "none";
-    networking.nameservers = lib.mkDefault [
-      "1.1.1.1"
-      "8.8.8.8"
-    ];
-
-    # HM module
-    home-manager.useGlobalPkgs = true; # hm module uses the pkgs of the nixos config
-    home-manager.backupFileExtension = "hm-backup"; # backup conflicting files. So hm activation never fails
-    home-manager.extraSpecialArgs = {
-      inherit inputs outputs;
-    };
-  };
-}

features-nixos/base/fish.nix

@@ -1,12 +0,0 @@
-{
-  flake.nixosModules.base = {
-    programs.fish = {
-      enable = true;
-      vendor = {
-        completions.enable = true;
-        config.enable = true;
-        functions.enable = true;
-      };
-    };
-  };
-}

features-nixos/base/locale.nix

@@ -1,28 +0,0 @@
-{
-  flake.nixosModules.base = {
-    # Select internationalisation properties.
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    i18n.extraLocaleSettings = {
-      LC_ADDRESS = "de_DE.UTF-8";
-      LC_IDENTIFICATION = "de_DE.UTF-8";
-      LC_MEASUREMENT = "de_DE.UTF-8";
-      LC_MONETARY = "de_DE.UTF-8";
-      LC_NAME = "de_DE.UTF-8";
-      LC_NUMERIC = "en_US.UTF-8";
-      LC_PAPER = "de_DE.UTF-8";
-      LC_TELEPHONE = "de_DE.UTF-8";
-      LC_TIME = "de_DE.UTF-8";
-    };
-
-    # Keymap
-    services.xserver.xkb = {
-      layout = "de";
-      variant = "";
-    };
-
-    console.keyMap = "de";
-
-    time.timeZone = "Europe/Berlin";
-  };
-}

features-nixos/base/nix.nix

@@ -1,48 +0,0 @@
-{
-  flake.nixosModules.base = {outputs, ...}: {
-    # Apply overlays
-    nixpkgs = {
-      # TODO: apply this to hm and nixos without duplicate code
-      overlays = builtins.attrValues outputs.overlays;
-      config = {
-        nvidia.acceptLicense = true;
-        allowUnfree = true;
-        allowUnfreePredicate = _: true; # TODO: what is this
-        warn-dirty = false;
-        permittedInsecurePackages = [
-          "olm-3.2.16"
-        ];
-      };
-    };
-
-    # optimize at every build, slows down builds
-    # better to do optimise.automatic for regular optimising
-    # nix.settings.auto-optimise-store = lib.mkDefault true;
-    nix.settings.experimental-features = [
-      "nix-command"
-      "flakes"
-      "ca-derivations"
-    ];
-    # warn-dirty = false;
-
-    nix.gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 30d";
-      persistent = true;
-    };
-    nix.optimise = {
-      automatic = true;
-      dates = ["weekly"]; # Optional; allows customizing optimisation schedule
-      persistent = true;
-    };
-
-    programs.nix-ld.enable = true;
-
-    # TODO: is this useful?, what does it do?
-    # nix.settings.flake-registry = ""; # Disable global flake registry
-    # Add each flake input as a registry and nix_path
-    # registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
-    # nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
-  };
-}

features-nixos/base/root.nix

@@ -1,11 +0,0 @@
-{
-  flake.nixosModules.base = {pkgs, ...}: {
-    # Packages needed as root
-    environment.systemPackages = with pkgs; [
-      vim
-      htop
-      mc
-      gparted-xhost # needs to be installed as system package so it can be actually opened
-    ];
-  };
-}

features-nixos/base/sops/sops.nix

@@ -1,24 +0,0 @@
-{
-  flake.nixosModules.base = {
-    inputs,
-    config,
-    ...
-  }: let
-    isEd25519 = k: k.type == "ed25519";
-    getKeyPath = k: k.path;
-    keys = builtins.filter isEd25519 config.services.openssh.hostKeys;
-  in {
-    imports = [inputs.sops-nix.nixosModules.sops];
-
-    sops.age = {
-      sshKeyPaths = map getKeyPath keys;
-
-      # TODO: remove? only rely on ssh or pgp keys (e.g. ubikey like misterio is using!!!)
-      # keyFile = "/home/julian/.config/sops/age/keys.txt";
-      # Generate key if none of the above worked. With this, building will still work, just without secrets
-      generateKey = false; # TODO: building should not work without secrets!?
-    };
-
-    sops.defaultSopsFile = ./secrets.yaml;
-  };
-}

features-nixos/global/auto-upgrade.nix

@@ -0,0 +1,16 @@
+{
+  inputs,
+  config,
+  ...
+}: {
+  system.hydraAutoUpgrade = {
+    # Only enable if not dirty
+    enable = inputs.self ? rev;
+    dates = "*:0/10"; # Every 10 minutes
+    instance = "http://hydra.julian-mutter.de";
+    project = "dotfiles";
+    jobset = "main";
+    job = "hosts.${config.networking.hostName}";
+    oldFlakeRef = "self";
+  };
+}

features-nixos/global/default.nix

@@ -0,0 +1,47 @@
+# Common config for all hosts
+{
+  inputs,
+  outputs,
+  pkgs,
+  lib,
+  ...
+}: {
+  imports =
+    [
+      ./fish.nix # fish for admin
+      ./locale.nix
+      ./nix.nix
+      ./sops.nix
+      ./root.nix
+    ]
+    ++ [
+      inputs.home-manager.nixosModules.home-manager
+    ]
+    ++ (builtins.attrValues outputs.nixosModules);
+
+  # Replaces the (modulesPath + "/installer/scan/not-detected.nix") from default hardware-configuration.nix
+  # Enables non-free firmware
+  hardware.enableRedistributableFirmware = true;
+
+  # Networking
+  networking.networkmanager = {
+    enable = true;
+    plugins = with pkgs; [
+      networkmanager-openconnect
+    ];
+  };
+  services.resolved.enable = false;
+  # MDNS Taken by avahi
+  # networking.networkmanager.dns = "none";
+  networking.nameservers = lib.mkDefault [
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
+
+  # HM module
+  home-manager.useGlobalPkgs = true; # hm module uses the pkgs of the nixos config
+  home-manager.backupFileExtension = "hm-backup"; # backup conflicting files. So hm activation never fails
+  home-manager.extraSpecialArgs = {
+    inherit inputs outputs;
+  };
+}

features-nixos/global/fish.nix

@@ -0,0 +1,10 @@
+{
+  programs.fish = {
+    enable = true;
+    vendor = {
+      completions.enable = true;
+      config.enable = true;
+      functions.enable = true;
+    };
+  };
+}

features-nixos/global/locale.nix

@@ -0,0 +1,26 @@
+{
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+
+  # Keymap
+  services.xserver.xkb = {
+    layout = "de";
+    variant = "";
+  };
+
+  console.keyMap = "de";
+
+  time.timeZone = "Europe/Berlin";
+}

features-nixos/global/nix.nix

@@ -0,0 +1,46 @@
+{outputs, ...}: {
+  # Apply overlays
+  nixpkgs = {
+    # TODO: apply this to hm and nixos without duplicate code
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      nvidia.acceptLicense = true;
+      allowUnfree = true;
+      allowUnfreePredicate = _: true; # TODO: what is this
+      warn-dirty = false;
+      permittedInsecurePackages = [
+        "olm-3.2.16"
+      ];
+    };
+  };
+
+  # optimize at every build, slows down builds
+  # better to do optimise.automatic for regular optimising
+  # nix.settings.auto-optimise-store = lib.mkDefault true;
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+    "ca-derivations"
+  ];
+  # warn-dirty = false;
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 30d";
+    persistent = true;
+  };
+  nix.optimise = {
+    automatic = true;
+    dates = ["weekly"]; # Optional; allows customizing optimisation schedule
+    persistent = true;
+  };
+
+  programs.nix-ld.enable = true;
+
+  # TODO: is this useful?, what does it do?
+  # nix.settings.flake-registry = ""; # Disable global flake registry
+  # Add each flake input as a registry and nix_path
+  # registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
+  # nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
+}

features-nixos/global/root.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  # Packages needed as root
+  environment.systemPackages = with pkgs; [
+    vim
+    htop
+    mc
+    gparted-xhost # needs to be installed as system package so it can be actually opened
+  ];
+}

features-nixos/global/sops.nix

@@ -0,0 +1,23 @@
+{
+  pwd,
+  inputs,
+  config,
+  ...
+}: let
+  isEd25519 = k: k.type == "ed25519";
+  getKeyPath = k: k.path;
+  keys = builtins.filter isEd25519 config.services.openssh.hostKeys;
+in {
+  imports = [inputs.sops-nix.nixosModules.sops];
+
+  sops.age = {
+    sshKeyPaths = map getKeyPath keys;
+
+    # TODO: remove? only rely on ssh or pgp keys (e.g. ubikey like misterio is using!!!)
+    # keyFile = "/home/julian/.config/sops/age/keys.txt";
+    # Generate key if none of the above worked. With this, building will still work, just without secrets
+    generateKey = false; # TODO: building should not work without secrets!?
+  };
+
+  sops.defaultSopsFile = "${pwd}/hosts/secrets-common.yaml";
+}

features-nixos/optional/authentication.nix

@@ -1,9 +1,8 @@
 {
-  flake.nixosModules.authentication = {
   pkgs,
   lib,
   ...
-  }: {
+}: {
   # Make programs like nextcloud client access saved passwords
   services.gnome.gnome-keyring.enable = true;
 
@@ -27,5 +26,4 @@
       };
     };
   };
-  };
 }

features-nixos/optional/avahi.nix

@@ -1,5 +1,4 @@
 {
-  flake.nixosModules.avahi = {
   # MDNS on local network
   services.avahi = {
     enable = true;
@@ -10,5 +9,4 @@
     ipv4 = true;
     ipv6 = true;
   };
-  };
 }

features-nixos/optional/binarycaches.nix

@@ -1,9 +1,8 @@
 {
-  flake.nixosModules.binarycaches = {
   lib,
   outputs,
   ...
-  }: {
+}: {
   # Setup binary caches
   nix.settings = {
     substituters = [
@@ -29,5 +28,4 @@
     # Ensure we can still build when missing-server is not accessible
     fallback = true;
   };
-  };
 }

features-nixos/optional/boot-efi.nix

@@ -1,5 +1,4 @@
 {
-  flake.nixosModules.boot-efi = {
   # Bootloader
   # Use this for simple nix boot menu, if no dual boot required
   boot.loader.systemd-boot.enable = true;
@@ -15,5 +14,4 @@
     "nfs"
     "cifs"
   ];
-  };
 }

features-nixos/optional/docker.nix

@@ -1,7 +1,5 @@
 {
-  flake.nixosModules.docker = {
   virtualisation.docker = {
     enable = true;
   };
-  };
 }

features-nixos/optional/flatpak.nix

@@ -1,8 +1,6 @@
-{
-  flake.nixosModules.flatpak = {pkgs, ...}: {
+{pkgs, ...}: {
   services.flatpak.enable = true;
   xdg.portal.enable = true;
   xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
   xdg.portal.config.common.default = "*"; # Use first portal implementation found
-  };
 }

features-nixos/optional/gamemode.nix

@@ -1,5 +1,4 @@
-{
-  flake.nixosModules.gamemode = {pkgs, ...}: {
+{pkgs, ...}: {
   programs.gamemode = {
     enable = true;
     settings = {
@@ -19,5 +18,4 @@
       };
     };
   };
-  };
 }

features-nixos/optional/gdm.nix

@@ -1,15 +1,13 @@
 {
-  flake.nixosModules.gdm = {
   config,
   lib,
   pkgs,
   ...
-  }: {
+}: {
   services.xserver.displayManager.gdm = {
     enable = true;
   };
 
   # unlock GPG keyring on login
   security.pam.services.gdm.enableGnomeKeyring = true;
-  };
 }

features-nixos/optional/greetd.nix

@@ -1,8 +1,7 @@
-{
-  flake.nixosModules.greetd = {config, ...}: let
+{config, ...}: let
   homeCfgs = config.home-manager.users;
   julianCfg = homeCfgs.julian;
-  in {
+in {
   users.extraUsers.greeter = {
     # For caching
     home = "/tmp/greeter-home";
@@ -35,5 +34,4 @@
     #   };
     # };
   };
-  };
 }

features-nixos/optional/i3.nix

@@ -1,10 +1,9 @@
 {
-  flake.nixosModules.i3 = {
   config,
   lib,
   pkgs,
   ...
-  }: {
+}: {
   services.xserver.windowManager.i3.enable = true;
   services.xserver.windowManager.i3.package = pkgs.i3-gaps;
   services.displayManager.defaultSession = "none+i3";
@@ -14,5 +13,4 @@
     enable = true;
     lockerCommand = "${pkgs.i3lock}/bin/i3lock --ignore-empty-password --color=000000";
   };
-  };
 }

features-nixos/optional/kerberos.nix

@@ -1,5 +1,4 @@
 {
-  flake.nixosModules.kerberos = {
   security.krb5.enable = true;
   security.krb5.settings = {
     # domain_realm = {
@@ -21,5 +20,4 @@
       };
     };
   };
-  };
 }

features-nixos/optional/openssh.nix

@@ -1,12 +1,11 @@
 {
-  flake.nixosModules.openssh = {
   outputs,
   lib,
   config,
   ...
-  }: let
+}: let
   hosts = lib.attrNames outputs.nixosConfigurations;
-  in {
+in {
   services.openssh = {
     enable = true;
     settings = {
@@ -47,5 +46,4 @@
   #       ]);
   #   });
   # };
-  };
 }

features-nixos/optional/pcmanfm.nix

@@ -1,5 +1,4 @@
-{
-  flake.nixosModules.pcmanfm = {pkgs, ...}: {
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     shared-mime-info # extended mimetype support
     lxmenu-data # open with "Installed Applications"
@@ -7,5 +6,4 @@
   ];
 
   services.gvfs.enable = true; # Mount, trash, and other functionalities
-  };
 }

features-nixos/optional/pipewire.nix

@@ -1,5 +1,4 @@
 {
-  flake.nixosModules.pipewire = {
   security.rtkit.enable = true;
   services.pulseaudio.enable = false;
   services.pipewire = {
@@ -26,5 +25,4 @@
       };
     };
   };
-  };
 }

features-nixos/optional/podman.nix

@@ -1,12 +1,10 @@
-{
-  flake.nixosModules.podman = {config, ...}: let
+{config, ...}: let
   dockerEnabled = config.virtualisation.docker.enable;
-  in {
+in {
   virtualisation.podman = {
     enable = true;
     dockerCompat = !dockerEnabled;
     dockerSocket.enable = !dockerEnabled;
     defaultNetwork.settings.dns_enabled = true;
   };
-  };
 }

features-nixos/optional/redshift.nix

@@ -1,14 +1,12 @@
 {
-  flake.nixosModules.redshift = {
   config,
   lib,
   pkgs,
   ...
-  }: {
+}: {
   # Set location used by redshift
   location.provider = "manual";
   location.latitude = 47.92;
   location.longitude = 10.12;
   services.redshift.enable = true;
-  };
 }

features-nixos/optional/remote-builder.nix

@@ -1,5 +1,4 @@
 {
-  flake.nixosModules.remote-builder = {
   nix.distributedBuilds = true;
   nix.settings.builders-use-substitutes = true;
 
@@ -32,5 +31,4 @@
     #   speedFactor = 1;
     # }
   ];
-  };
 }

features-nixos/optional/thunar.nix

@@ -1,10 +1,9 @@
 {
-  flake.nixosModules.thunar = {
   config,
   lib,
   pkgs,
   ...
-  }: {
+}: {
   programs.thunar.enable = true;
   programs.xfconf.enable = true; # Persist saved preferences
   programs.thunar.plugins = with pkgs.xfce; [
@@ -14,5 +13,4 @@
   ];
   services.gvfs.enable = true; # Mount, trash, and other functionalities
   services.tumbler.enable = true; # Thumbnail support for images
-  };
 }

features-nixos/optional/virtualbox.nix

@@ -1,14 +1,12 @@
 {
-  flake.nixosModules.virtualbox = {
   config,
   lib,
   pkgs,
   ...
-  }: {
+}: {
   virtualisation.virtualbox.host.enable = true;
   # virtualisation.virtualbox.host.enableExtensionPack = true;
   # virtualisation.virtualbox.guest.enable = true;
   # virtualisation.virtualbox.guest.x11 = true;
   users.extraGroups.vboxusers.members = ["julian"];
-  };
 }

features-nixos/optional/wireguard.nix

@@ -1,5 +1,4 @@
 {
-  flake.nixosModules.wireguard = {
   networking.wg-quick.interfaces = {
     julian = {
       configFile = "/etc/wireguard/julian.conf";
@@ -10,5 +9,4 @@
       autostart = false;
     };
   };
-  };
 }

features-nixos/optional/wireshark.nix

@@ -1,5 +1,4 @@
 {
-  flake.nixosModules.wireshark = {
   programs.wireshark = {
     enable = true;
     dumpcap.enable = true;
@@ -7,5 +6,4 @@
   };
 
   users.users.julian.extraGroups = ["wireshark"];
-  };
 }

features-nixos/optional/xserver.nix

@@ -1,8 +1,6 @@
 {
-  flake.nixosModules.xserver = {
   services.xserver = {
     enable = true;
     wacom.enable = true;
   };
-  };
 }

features-nixos/users/julian/default.nix

@@ -1,12 +1,12 @@
 {
-  flake.nixosModules.users.julian = {
+  pwd,
   pkgs,
   config,
   lib,
   ...
-  }: let
+}: let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  in {
+in {
   users.mutableUsers = false;
   users.users.julian = {
     description = "Julian";
@@ -30,7 +30,7 @@
     ];
 
     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";
@@ -41,12 +41,11 @@
   };
 
   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
-  };
 }

features-nixos/users/pob/default.nix

@@ -1,30 +0,0 @@
-{
-  flake.nixosModules.users.pob = {
-    pkgs,
-    config,
-    ...
-  }: let
-    ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  in {
-    users.mutableUsers = false;
-    users.users.pob = {
-      description = "A helper user to use another profile for some applications";
-      group = "pob";
-      isNormalUser = true;
-      shell = pkgs.fish;
-      extraGroups = ifTheyExist [
-        "networkmanager"
-      ];
-      packages = with pkgs; [
-        firefox
-        wineWowPackages.stable # 32-bit and 64-bit wine
-        winetricks
-      ];
-    };
-    users.groups.pob = {};
-
-    security.sudo.extraConfig = ''
-      julian ALL=(pob) NOPASSWD: ALL
-    '';
-  };
-}

features-nixos/users/wolfi/default.nix

@@ -1,11 +1,10 @@
 {
-  flake.nixosModules.users.wolfi = {
   pkgs,
   config,
   ...
-  }: let
+}: let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  in {
+in {
   users.mutableUsers = false;
   users.users.wolfi = {
     description = "Wolfi";
@@ -28,5 +27,4 @@
     packages = [pkgs.home-manager];
   };
   users.groups.wolfi = {};
-  };
 }

features-nixos/users/yukari/default.nix

@@ -1,99 +0,0 @@
-{
-  flake.nixosModules.users.yukari = {
-    pkgs,
-    config,
-    lib,
-    outputs,
-    ...
-  }: let
-    ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  in {
-    users.mutableUsers = false;
-    users.users.yukari = {
-      description = "Yukari";
-      group = "yukari";
-      isNormalUser = true;
-      shell = pkgs.fish;
-      extraGroups = ifTheyExist [
-        "networkmanager"
-        "audio"
-        "network"
-        "video"
-        "podman"
-        "docker"
-        "git"
-        "gamemode"
-      ];
-
-      createHome = true;
-      hashedPassword = "$y$j9T$rGuTL0rfiy7ht8L58BGCw0$fN.KwHjYlIitFEPHndKvV06ezgeWzP3/58o1kkviZwB";
-      packages = [pkgs.home-manager];
-    };
-    users.groups.yukari = {};
-
-    home-manager.users.yukari = {
-      imports =
-        [
-          ../../../../homes/julian/features/fonts
-          ../../../../homes/julian/features/suites/cli
-        ]
-        ++ (builtins.attrValues outputs.homeManagerModules);
-
-      home = {
-        username = lib.mkDefault "yukari";
-        homeDirectory = lib.mkDefault "/home/${config.home.username}";
-        stateVersion = lib.mkDefault "23.11";
-
-        sessionPath = ["$HOME/.local/bin"];
-
-        packages = with pkgs; [
-          arandr
-          calibre # ebook manager and viewer
-          # digikam
-          discord
-          discord-ptb # in case discord updates take their time
-          # dvdisaster
-          # element-desktop
-          # rocketchat-desktop
-          thunderbird
-          telegram-desktop # telegram
-          # schildichat-desktop # not updated regularly
-          nheko
-          evince # Simple pdf reader, good for focusing on document content
-          firefox
-          vivaldi
-          # geogebra
-          cheese
-          handbrake
-          # kitty # Terminal, already available as feature
-          libnotify
-          libreoffice
-          mate.engrampa
-          nomacs # Image viewer
-          kdePackages.okular # Pdf reader with many features, good for commenting documents
-          pavucontrol
-          qalculate-gtk # Nice gui calculator
-          qpdfview
-          # qutebrowser
-          # realvnc-vnc-viewer
-          # rustdesk
-          tor-browser
-          # frajul.pob-dev-version # Path of Building
-          vlc
-          wineWowPackages.stable # 32-bit and 64-bit wine
-          winetricks
-          xclip # x11 clipboard access from terminal
-          xfce.mousepad # simple text editor
-          xournalpp # Edit pdf files
-          zoom-us # Video conferencing
-          zotero # Manage papers and other sources
-          pdfpc # Present slides in pdf form
-        ];
-      };
-      programs = {
-        home-manager.enable = true;
-        git.enable = true;
-      };
-    };
-  };
-}

flake.nix

@@ -36,9 +36,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    flake-parts.url = "github:hercules-ci/flake-parts";
-    import-tree.url = "github:vic/import-tree";
-
     # Various flakes
     yazi-flavors = {
       url = "github:yazi-rs/flavors";
@@ -64,163 +61,99 @@
     };
   };
 
-  outputs = inputs:
-    inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree
-      [
-        ./hosts
-        ./features-nixos
-        ./homes
-        ./features-home-manager
-        # ./modules
-        # ./overlays
-        # ./packages
-      ]);
-  # let
-  #   inherit (self) outputs;
-  #   lib = nixpkgs.lib // home-manager.lib;
-  #   forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
-  #   pkgsFor = lib.genAttrs (import systems) (
-  #     system:
-  #       import nixpkgs {
-  #         inherit system;
-  #         config.allowUnfree = true;
-  #         config.permittedInsecurePackages = [
-  #           "olm-3.2.16"
-  #         ];
-  #         warn-dirty = false;
-  #       }
-  #   );
-  # in {
-  #   inherit lib;
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    systems,
+    ...
+  } @ inputs: let
+    inherit (self) outputs;
+    lib = nixpkgs.lib // home-manager.lib;
+    forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
+    pkgsFor = lib.genAttrs (import systems) (
+      system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        }
+    );
+  in {
+    inherit lib;
 
-  #   nixosModules = import ./modules/nixos;
-  #   homeManagerModules = import ./modules/home-manager;
+    nixosModules = import ./modules/nixos;
+    homeManagerModules = import ./modules/home-manager;
 
-  #   overlays = import ./overlays {inherit inputs outputs;};
-  #   # hydraJobs = import ./hydra.nix { inherit inputs outputs; }; # TODO add hydra jobs here?
+    overlays = import ./overlays {inherit inputs outputs;};
 
-  #   packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;});
-  #   devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
-  #   formatter = forEachSystem (pkgs: pkgs.alejandra); # nix fmt *
+    packages = forEachSystem (pkgs: import ./packages {inherit pkgs;});
+    devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
+    formatter = forEachSystem (pkgs: pkgs.alejandra); # nix fmt *
 
-  #   nixosConfigurations = {
-  #     # Main laptop
-  #     aspi = lib.nixosSystem {
-  #       modules = [
-  #         ./hosts/aspi
-  #       ];
-  #       specialArgs = {
-  #         inherit inputs outputs;
-  #       };
-  #     };
-  #     # Piano raspberry pi
-  #     # pianonix = lib.nixosSystem {
-  #     #   modules = [./hosts/pianonix];
-  #     #   specialArgs = {
-  #     #     inherit inputs outputs;
-  #     #   };
-  #     # };
-  #     kardorf = lib.nixosSystem {
-  #       modules = [./hosts/kardorf];
-  #       specialArgs = {
-  #         inherit inputs outputs;
-  #       };
-  #     };
-  #     builder = lib.nixosSystem {
-  #       modules = [./hosts/builder];
-  #       specialArgs = {
-  #         inherit inputs outputs;
-  #       };
-  #     };
-  #   };
+    nixosConfigurations = {
+      # Main laptop
+      aspi = lib.nixosSystem {
+        modules = [
+          ./hosts/aspi
+        ];
+        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;
-  #       };
-  #     };
-  #     # Media server (RPi)
-  #     # "julian@pianonix" = lib.homeManagerConfiguration {
-  #     #   modules = [
-  #     #     ./homes/julian/pianonix.nix
-  #     #     ./homes/julian/hm-standalone-config.nix
-  #     #   ];
-  #     #   pkgs = pkgsFor.aarch64-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
-  #         ./homes/julian/hm-standalone-config.nix
-  #       ];
-  #       pkgs = pkgsFor.x86_64-linux;
-  #       extraSpecialArgs = {
-  #         inherit inputs outputs;
-  #       };
-  #     };
-  #     "julian@quickstart" = lib.homeManagerConfiguration {
-  #       modules = [
-  #         ./homes/julian/quickstart.nix
-  #         ./homes/julian/hm-standalone-config.nix
-  #       ];
-  #       pkgs = pkgsFor.x86_64-linux;
-  #       extraSpecialArgs = {
-  #         inherit inputs outputs;
-  #       };
-  #     };
-  #   };
+    # Standalone HM
+    homeConfigurations = {
+      "julian@v3ms" = lib.homeManagerConfiguration {
+        modules = [
+          ./homes/julian/v3ms
+          ./homes/julian/hm-standalone-config.nix
+        ];
+        pkgs = pkgsFor.x86_64-linux;
+        extraSpecialArgs = {
+          inherit inputs outputs;
+          pwd = "${self}";
+        };
+      };
+      "julian@quickstart" = lib.homeManagerConfiguration {
+        modules = [
+          ./homes/julian/quickstart.nix
+          ./homes/julian/hm-standalone-config.nix
+        ];
+        pkgs = pkgsFor.x86_64-linux;
+        extraSpecialArgs = {
+          inherit inputs outputs;
+          pwd = "${self}";
+        };
+      };
+    };
 
-  #   # deploy-rs node configuration
-  #   deploy.nodes = {
-  #     # pianonix = {
-  #     #   hostname = "pianonix.local";
-  #     #   profiles.system = {
-  #     #     sshUser = "root";
-  #     #     user = "root";
-  #     #     path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pianonix;
-  #     #     confirmTimeout = 90; # default: 30s; raspberrypi takes a little longer restarting services
-  #     #   };
-  #     # };
-
-  #     builder = {
-  #       hostname = "builder.julian-mutter.de";
-  #       profiles.system = {
-  #         sshUser = "root";
-  #         user = "root";
-  #         path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.builder;
-  #         remoteBuild = true;
-  #       };
-  #     };
-  #   };
-
-  #   # substitutes: nixos-generate --flake .#pianonix -f sd-aarch64 --system aarch64-linux
-  #   pianonix-image = inputs.nixos-generators.nixosGenerate {
-  #     system = "aarch64-linux";
-  #     format = "sd-aarch64";
-  #     modules = [./hosts/pianonix];
-  #     specialArgs = {
-  #       inherit inputs outputs;
-  #     };
-  #   };
-  # };
+    # deploy-rs node configuration
+    deploy.nodes = {
+      builder = {
+        hostname = "builder.julian-mutter.de";
+        profiles.system = {
+          sshUser = "root";
+          user = "root";
+          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.builder;
+          remoteBuild = true;
+        };
+      };
+    };
+  };
 }

homes/julian/features/suites/desktop/default.nix

@@ -52,7 +52,6 @@
     # rustdesk
     tor-browser
     rusty-path-of-building # Path of Building for poe1 and poe2
-    # frajul.pob-dev-version # Path of Building
     vlc
     wineWowPackages.stable # 32-bit and 64-bit wine
     winetricks
@@ -69,6 +68,5 @@
     ## My scripts
     frajul.open-messaging
     frajul.xwacomcalibrate
-    frajul.pob2-frajul
   ];
 }