Update flake.lock 2025-04-28

.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,30 +1,28 @@
 {
-  flake.nixosModules.authentication = {
-    pkgs,
-    lib,
-    ...
-  }: {
-    # Make programs like nextcloud client access saved passwords
-    services.gnome.gnome-keyring.enable = true;
+  pkgs,
+  lib,
+  ...
+}: {
+  # Make programs like nextcloud client access saved passwords
+  services.gnome.gnome-keyring.enable = true;
 
-    programs.seahorse.enable = true;
-    programs.ssh.askPassword = lib.mkForce "${pkgs.seahorse}/libexec/seahorse/ssh-askpass"; # Solve conflicting definition in seahorse and plasma6
+  programs.seahorse.enable = true;
+  programs.ssh.askPassword = lib.mkForce "${pkgs.seahorse}/libexec/seahorse/ssh-askpass"; # Solve conflicting definition in seahorse and plasma6
 
-    # Make authentication work for e.g. gparted
-    security.polkit.enable = true;
-    systemd = {
-      user.services.polkit-gnome-authentication-agent-1 = {
-        description = "polkit-gnome-authentication-agent-1";
-        wantedBy = ["graphical-session.target"];
-        wants = ["graphical-session.target"];
-        after = ["graphical-session.target"];
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-          Restart = "on-failure";
-          RestartSec = 1;
-          TimeoutStopSec = 10;
-        };
+  # Make authentication work for e.g. gparted
+  security.polkit.enable = true;
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = ["graphical-session.target"];
+      wants = ["graphical-session.target"];
+      after = ["graphical-session.target"];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+        Restart = "on-failure";
+        RestartSec = 1;
+        TimeoutStopSec = 10;
       };
     };
   };

features-nixos/optional/avahi.nix

@@ -1,14 +1,12 @@
 {
-  flake.nixosModules.avahi = {
-    # MDNS on local network
-    services.avahi = {
-      enable = true;
-      nssmdns4 = true;
-      nssmdns6 = true;
-      publish.enable = true;
-      publish.addresses = true;
-      ipv4 = true;
-      ipv6 = true;
-    };
+  # MDNS on local network
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    nssmdns6 = true;
+    publish.enable = true;
+    publish.addresses = true;
+    ipv4 = true;
+    ipv6 = true;
   };
 }

features-nixos/optional/binarycaches.nix

@@ -1,33 +1,31 @@
 {
-  flake.nixosModules.binarycaches = {
-    lib,
-    outputs,
-    ...
-  }: {
-    # Setup binary caches
-    nix.settings = {
-      substituters = [
-        "https://nix-community.cachix.org"
-        "https://cache.nixos.org/"
-        "https://hyprland.cachix.org"
-        "http://binarycache.julian-mutter.de"
-        "https://devenv.cachix.org"
-      ];
-      trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
-      ];
+  lib,
+  outputs,
+  ...
+}: {
+  # Setup binary caches
+  nix.settings = {
+    substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+      "http://binarycache.julian-mutter.de"
+      "https://devenv.cachix.org"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
+    ];
 
-      trusted-users = [
-        "root"
-        "@wheel"
-      ]; # needed for devenv to add custom caches
+    trusted-users = [
+      "root"
+      "@wheel"
+    ]; # needed for devenv to add custom caches
 
-      # Ensure we can still build when missing-server is not accessible
-      fallback = true;
-    };
+    # Ensure we can still build when missing-server is not accessible
+    fallback = true;
   };
 }

features-nixos/optional/boot-efi.nix

@@ -1,19 +1,17 @@
 {
-  flake.nixosModules.boot-efi = {
-    # Bootloader
-    # Use this for simple nix boot menu, if no dual boot required
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.systemd-boot.configurationLimit = 10;
-    boot.loader.efi.canTouchEfiVariables = true;
+  # Bootloader
+  # Use this for simple nix boot menu, if no dual boot required
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.configurationLimit = 10;
+  boot.loader.efi.canTouchEfiVariables = true;
 
-    # https://github.com/NixOS/nixpkgs/blob/c32c39d6f3b1fe6514598fa40ad2cf9ce22c3fb7/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix#L66
-    boot.loader.systemd-boot.editor = false;
+  # https://github.com/NixOS/nixpkgs/blob/c32c39d6f3b1fe6514598fa40ad2cf9ce22c3fb7/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix#L66
+  boot.loader.systemd-boot.editor = false;
 
-    boot.supportedFilesystems = [
-      "btrfs"
-      "ntfs"
-      "nfs"
-      "cifs"
-    ];
-  };
+  boot.supportedFilesystems = [
+    "btrfs"
+    "ntfs"
+    "nfs"
+    "cifs"
+  ];
 }

features-nixos/optional/docker.nix

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

features-nixos/optional/flatpak.nix

@@ -1,8 +1,6 @@
-{
-  flake.nixosModules.flatpak = {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
-  };
+{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,22 +1,20 @@
-{
-  flake.nixosModules.gamemode = {pkgs, ...}: {
-    programs.gamemode = {
-      enable = true;
-      settings = {
-        general = {
-          softrealtime = "auto";
-          inhibit_screensaver = 1;
-          renice = 5;
-        };
-        # gpu = {
-        #   apply_gpu_optimisations = "accept-responsibility";
-        #   gpu_device = 1;
-        #   amd_performance_level = "high";
-        # };
-        custom = {
-          start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
-          end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
-        };
+{pkgs, ...}: {
+  programs.gamemode = {
+    enable = true;
+    settings = {
+      general = {
+        softrealtime = "auto";
+        inhibit_screensaver = 1;
+        renice = 5;
+      };
+      # gpu = {
+      #   apply_gpu_optimisations = "accept-responsibility";
+      #   gpu_device = 1;
+      #   amd_performance_level = "high";
+      # };
+      custom = {
+        start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
+        end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
       };
     };
   };

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;
+  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,39 +1,37 @@
-{
-  flake.nixosModules.greetd = {config, ...}: let
-    homeCfgs = config.home-manager.users;
-    julianCfg = homeCfgs.julian;
-  in {
-    users.extraUsers.greeter = {
-      # For caching
-      home = "/tmp/greeter-home";
-      createHome = true;
-    };
+{config, ...}: let
+  homeCfgs = config.home-manager.users;
+  julianCfg = homeCfgs.julian;
+in {
+  users.extraUsers.greeter = {
+    # For caching
+    home = "/tmp/greeter-home";
+    createHome = true;
+  };
 
-    programs.regreet = {
-      enable = true;
-      iconTheme = julianCfg.gtk.iconTheme;
-      theme = julianCfg.gtk.theme;
-      # font = julianCfg.fontProfiles.regular; # TODO: do
-      cursorTheme = {
-        inherit (julianCfg.gtk.cursorTheme) name package;
-      };
-      cageArgs = [
-        "-s"
-        "-m"
-        "last"
-      ]; # multimonitor use last monitor
-      # settings.background = {
-      #   path = julianCfg.wallpaper;
-      #   fit = "Cover";
-      # }; # TODO: fix
-
-      # TODO: setting keyboard language does not work
-      # settings = {
-      #   env = {
-      #     XKB_DEFAULT_LAYOUT = "de";
-      #     # XKB_DEFAULT_VARIANT = "altgr-intl";
-      #   };
-      # };
+  programs.regreet = {
+    enable = true;
+    iconTheme = julianCfg.gtk.iconTheme;
+    theme = julianCfg.gtk.theme;
+    # font = julianCfg.fontProfiles.regular; # TODO: do
+    cursorTheme = {
+      inherit (julianCfg.gtk.cursorTheme) name package;
     };
+    cageArgs = [
+      "-s"
+      "-m"
+      "last"
+    ]; # multimonitor use last monitor
+    # settings.background = {
+    #   path = julianCfg.wallpaper;
+    #   fit = "Cover";
+    # }; # TODO: fix
+
+    # TODO: setting keyboard language does not work
+    # settings = {
+    #   env = {
+    #     XKB_DEFAULT_LAYOUT = "de";
+    #     # XKB_DEFAULT_VARIANT = "altgr-intl";
+    #   };
+    # };
   };
 }

features-nixos/optional/i3.nix

@@ -1,18 +1,16 @@
 {
-  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";
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  services.xserver.windowManager.i3.enable = true;
+  services.xserver.windowManager.i3.package = pkgs.i3-gaps;
+  services.displayManager.defaultSession = "none+i3";
 
-    programs.xss-lock = {
-      # responds to "loginctl lock-session" via dbus
-      enable = true;
-      lockerCommand = "${pkgs.i3lock}/bin/i3lock --ignore-empty-password --color=000000";
-    };
+  programs.xss-lock = {
+    # responds to "loginctl lock-session" via dbus
+    enable = true;
+    lockerCommand = "${pkgs.i3lock}/bin/i3lock --ignore-empty-password --color=000000";
   };
 }

features-nixos/optional/kerberos.nix

@@ -1,24 +1,22 @@
 {
-  flake.nixosModules.kerberos = {
-    security.krb5.enable = true;
-    security.krb5.settings = {
-      # domain_realm = {
-      #   ".julian-mutter.de" = "julian-mutter.de";
-      #   "julian-mutter.de" = "julian-mutter.de";
-      # };
-      libdefaults = {
-        default_realm = "julian-mutter.de";
-        #   dns_lookup_realm = true;
-        #   dns_lookup_kdc = true;
-        #   ticket_lifetime = "24h";
-        #   renew_lifetime = "7d";
-      };
-      realms = {
-        "julian-mutter.de" = {
-          kdc = ["kerberos.julian-mutter.de"];
-          admin_server = "kerberos-admin.julian-mutter.de";
-          default_domain = "julian-mutter.de";
-        };
+  security.krb5.enable = true;
+  security.krb5.settings = {
+    # domain_realm = {
+    #   ".julian-mutter.de" = "julian-mutter.de";
+    #   "julian-mutter.de" = "julian-mutter.de";
+    # };
+    libdefaults = {
+      default_realm = "julian-mutter.de";
+      #   dns_lookup_realm = true;
+      #   dns_lookup_kdc = true;
+      #   ticket_lifetime = "24h";
+      #   renew_lifetime = "7d";
+    };
+    realms = {
+      "julian-mutter.de" = {
+        kdc = ["kerberos.julian-mutter.de"];
+        admin_server = "kerberos-admin.julian-mutter.de";
+        default_domain = "julian-mutter.de";
       };
     };
   };

features-nixos/optional/openssh.nix

@@ -1,51 +1,49 @@
 {
-  flake.nixosModules.openssh = {
-    outputs,
-    lib,
-    config,
-    ...
-  }: let
-    hosts = lib.attrNames outputs.nixosConfigurations;
-  in {
-    services.openssh = {
-      enable = true;
-      settings = {
-        # Harden
-        PasswordAuthentication = false;
-        PermitRootLogin = "no";
+  outputs,
+  lib,
+  config,
+  ...
+}: let
+  hosts = lib.attrNames outputs.nixosConfigurations;
+in {
+  services.openssh = {
+    enable = true;
+    settings = {
+      # Harden
+      PasswordAuthentication = false;
+      PermitRootLogin = "no";
 
-        # TODO: what does this do
-        # Let WAYLAND_DISPLAY be forwarded
-        AcceptEnv = "WAYLAND_DISPLAY";
-        X11Forwarding = true;
-      };
-
-      hostKeys = [
-        {
-          path = "/etc/ssh/ssh_host_ed25519_key";
-          type = "ed25519";
-        }
-      ];
+      # TODO: what does this do
+      # Let WAYLAND_DISPLAY be forwarded
+      AcceptEnv = "WAYLAND_DISPLAY";
+      X11Forwarding = true;
     };
 
-    # TODO: is automatic known hosts file even necessary?
-    # programs.ssh = {
-    #   # Each hosts public key
-    #   knownHosts = lib.genAttrs hosts (hostname: {
-    #     publicKeyFile = ../../${hostname}/ssh_host_ed25519_key.pub;
-    #     extraHostNames =
-    #       [
-    #         # "${hostname}.m7.rs"
-    #       ]
-    #       ++
-    #         # Alias for localhost if it's the same host
-    #         (lib.optional (hostname == config.networking.hostName) "localhost")
-    #       # Alias to m7.rs and git.m7.rs if it's alcyone
-    #       ++ (lib.optionals (hostname == "alcyone") [
-    #         "m7.rs"
-    #         "git.m7.rs"
-    #       ]);
-    #   });
-    # };
+    hostKeys = [
+      {
+        path = "/etc/ssh/ssh_host_ed25519_key";
+        type = "ed25519";
+      }
+    ];
   };
+
+  # TODO: is automatic known hosts file even necessary?
+  # programs.ssh = {
+  #   # Each hosts public key
+  #   knownHosts = lib.genAttrs hosts (hostname: {
+  #     publicKeyFile = ../../${hostname}/ssh_host_ed25519_key.pub;
+  #     extraHostNames =
+  #       [
+  #         # "${hostname}.m7.rs"
+  #       ]
+  #       ++
+  #         # Alias for localhost if it's the same host
+  #         (lib.optional (hostname == config.networking.hostName) "localhost")
+  #       # Alias to m7.rs and git.m7.rs if it's alcyone
+  #       ++ (lib.optionals (hostname == "alcyone") [
+  #         "m7.rs"
+  #         "git.m7.rs"
+  #       ]);
+  #   });
+  # };
 }

features-nixos/optional/pcmanfm.nix

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

features-nixos/optional/pipewire.nix

@@ -1,28 +1,26 @@
 {
-  flake.nixosModules.pipewire = {
-    security.rtkit.enable = true;
-    services.pulseaudio.enable = false;
-    services.pipewire = {
-      enable = true;
-      wireplumber.enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      jack.enable = true;
-      extraConfig.pipewire = {
-        "99-no-bell" = {
-          # Disable bell sound
-          "context.properties" = {
-            "module.x11.bell" = false;
-          };
+  security.rtkit.enable = true;
+  services.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    wireplumber.enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+    extraConfig.pipewire = {
+      "99-no-bell" = {
+        # Disable bell sound
+        "context.properties" = {
+          "module.x11.bell" = false;
         };
-        "10-increase-buffer" = {
-          "context.properties" = {
-            "default.clock.rate" = 48000;
-            "default.clock.quantum" = 1024;
-            "default.clock.min-quantum" = 1024;
-            "default.clock.max-quantum" = 2048;
-          };
+      };
+      "10-increase-buffer" = {
+        "context.properties" = {
+          "default.clock.rate" = 48000;
+          "default.clock.quantum" = 1024;
+          "default.clock.min-quantum" = 1024;
+          "default.clock.max-quantum" = 2048;
         };
       };
     };

features-nixos/optional/podman.nix

@@ -1,12 +1,10 @@
-{
-  flake.nixosModules.podman = {config, ...}: let
-    dockerEnabled = config.virtualisation.docker.enable;
-  in {
-    virtualisation.podman = {
-      enable = true;
-      dockerCompat = !dockerEnabled;
-      dockerSocket.enable = !dockerEnabled;
-      defaultNetwork.settings.dns_enabled = true;
-    };
+{config, ...}: let
+  dockerEnabled = config.virtualisation.docker.enable;
+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;
-  };
+  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,36 +1,34 @@
 {
-  flake.nixosModules.remote-builder = {
-    nix.distributedBuilds = true;
-    nix.settings.builders-use-substitutes = true;
+  nix.distributedBuilds = true;
+  nix.settings.builders-use-substitutes = true;
 
-    nix.buildMachines = [
-      {
-        hostName = "builder.julian-mutter.de";
-        protocol = "ssh";
-        sshUser = "nix";
-        systems = [
-          "x86_64-linux"
-          "aarch64-linux"
-        ];
-        maxJobs = 4;
-        speedFactor = 3;
-        supportedFeatures = [
-          "nixos-test"
-          "benchmark"
-          "big-parallel"
-          "kvm"
-        ];
-        mandatoryFeatures = [];
-      }
-      # {
-      #   hostName = "localhost";
-      #   protocol = null;
-      #   systems = [
-      #     "x86_64-linux"
-      #   ];
-      #   maxJobs = 4;
-      #   speedFactor = 1;
-      # }
-    ];
-  };
+  nix.buildMachines = [
+    {
+      hostName = "builder.julian-mutter.de";
+      protocol = "ssh";
+      sshUser = "nix";
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+      maxJobs = 4;
+      speedFactor = 3;
+      supportedFeatures = [
+        "nixos-test"
+        "benchmark"
+        "big-parallel"
+        "kvm"
+      ];
+      mandatoryFeatures = [];
+    }
+    # {
+    #   hostName = "localhost";
+    #   protocol = null;
+    #   systems = [
+    #     "x86_64-linux"
+    #   ];
+    #   maxJobs = 4;
+    #   speedFactor = 1;
+    # }
+  ];
 }

features-nixos/optional/thunar.nix

@@ -1,18 +1,16 @@
 {
-  flake.nixosModules.thunar = {
-    config,
-    lib,
-    pkgs,
-    ...
-  }: {
-    programs.thunar.enable = true;
-    programs.xfconf.enable = true; # Persist saved preferences
-    programs.thunar.plugins = with pkgs.xfce; [
-      thunar-archive-plugin
-      thunar-volman
-      thunar-media-tags-plugin
-    ];
-    services.gvfs.enable = true; # Mount, trash, and other functionalities
-    services.tumbler.enable = true; # Thumbnail support for images
-  };
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  programs.thunar.enable = true;
+  programs.xfconf.enable = true; # Persist saved preferences
+  programs.thunar.plugins = with pkgs.xfce; [
+    thunar-archive-plugin
+    thunar-volman
+    thunar-media-tags-plugin
+  ];
+  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"];
-  };
+  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,14 +1,12 @@
 {
-  flake.nixosModules.wireguard = {
-    networking.wg-quick.interfaces = {
-      julian = {
-        configFile = "/etc/wireguard/julian.conf";
-        autostart = true; # This interface is started on boot
-      };
-      comu = {
-        configFile = "/etc/wireguard/comu.conf";
-        autostart = false;
-      };
+  networking.wg-quick.interfaces = {
+    julian = {
+      configFile = "/etc/wireguard/julian.conf";
+      autostart = true; # This interface is started on boot
+    };
+    comu = {
+      configFile = "/etc/wireguard/comu.conf";
+      autostart = false;
     };
   };
 }

features-nixos/optional/wireshark.nix

@@ -1,11 +1,9 @@
 {
-  flake.nixosModules.wireshark = {
-    programs.wireshark = {
-      enable = true;
-      dumpcap.enable = true;
-      usbmon.enable = true;
-    };
-
-    users.users.julian.extraGroups = ["wireshark"];
+  programs.wireshark = {
+    enable = true;
+    dumpcap.enable = true;
+    usbmon.enable = true;
   };
+
+  users.users.julian.extraGroups = ["wireshark"];
 }

features-nixos/optional/xserver.nix

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

features-nixos/users/julian/default.nix

@@ -1,52 +1,51 @@
 {
-  flake.nixosModules.users.julian = {
-    pkgs,
-    config,
-    lib,
-    ...
-  }: let
-    ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  in {
-    users.mutableUsers = false;
-    users.users.julian = {
-      description = "Julian";
-      group = "julian";
-      isNormalUser = true;
-      uid = 1000;
-      shell = pkgs.fish;
-      extraGroups = ifTheyExist [
-        "networkmanager"
-        "wheel"
-        "audio"
-        "realtime"
-        "rtkit"
-        "network"
-        "video"
-        "podman"
-        "docker"
-        "git"
-        "gamemode"
-        "dialout"
-      ];
+  pwd,
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in {
+  users.mutableUsers = false;
+  users.users.julian = {
+    description = "Julian";
+    group = "julian";
+    isNormalUser = true;
+    uid = 1000;
+    shell = pkgs.fish;
+    extraGroups = ifTheyExist [
+      "networkmanager"
+      "wheel"
+      "audio"
+      "realtime"
+      "rtkit"
+      "network"
+      "video"
+      "podman"
+      "docker"
+      "git"
+      "gamemode"
+      "dialout"
+    ];
 
-      openssh.authorizedKeys.keys = lib.splitString "\n" (
-        builtins.readFile ../../../../homes/julian/ssh.pub
-      );
-      # hashedPasswordFile = config.sops.secrets.julian-password.path;
-      hashedPassword = "$y$j9T$N33kLJQbV8soUoCbDkpwA1$r/yahJDgOPo4GGOrAi6BUG5zLTzmaBrA5NQ4nno561A";
-      packages = [pkgs.home-manager];
-    };
-    users.groups.julian = {
-      gid = 1000;
-    };
-
-    sops.secrets.julian-password = {
-      sopsFile = ../../secrets.yaml;
-      neededForUsers = true;
-    };
-
-    home-manager.users.julian = import ../../../../homes/julian/${config.networking.hostName}.nix;
-
-    security.pam.services.swaylock = {}; # Make swaylock unlocking work
+    openssh.authorizedKeys.keys = lib.splitString "\n" (
+      builtins.readFile ./ssh.pub
+    );
+    # hashedPasswordFile = config.sops.secrets.julian-password.path;
+    hashedPassword = "$y$j9T$N33kLJQbV8soUoCbDkpwA1$r/yahJDgOPo4GGOrAi6BUG5zLTzmaBrA5NQ4nno561A";
+    packages = [pkgs.home-manager];
   };
+  users.groups.julian = {
+    gid = 1000;
+  };
+
+  sops.secrets.julian-password = {
+    sopsFile = "${pwd}/hosts/secrets-common.yaml";
+    neededForUsers = true;
+  };
+
+  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,32 +1,30 @@
 {
-  flake.nixosModules.users.wolfi = {
-    pkgs,
-    config,
-    ...
-  }: let
-    ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  in {
-    users.mutableUsers = false;
-    users.users.wolfi = {
-      description = "Wolfi";
-      group = "wolfi";
-      isNormalUser = true;
-      shell = pkgs.fish;
-      extraGroups = ifTheyExist [
-        "networkmanager"
-        "wheel"
-        "audio"
-        "network"
-        "video"
-        "podman"
-        "docker"
-        "git"
-        "gamemode"
-      ];
+  pkgs,
+  config,
+  ...
+}: let
+  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in {
+  users.mutableUsers = false;
+  users.users.wolfi = {
+    description = "Wolfi";
+    group = "wolfi";
+    isNormalUser = true;
+    shell = pkgs.fish;
+    extraGroups = ifTheyExist [
+      "networkmanager"
+      "wheel"
+      "audio"
+      "network"
+      "video"
+      "podman"
+      "docker"
+      "git"
+      "gamemode"
+    ];
 
-      hashedPassword = "$y$j9T$ifzWjoZaRtPUOOfMYnbJ20$uFOO1EyDApL52vRUicZYgupaTA/a6sGNUj3imZ/lcb6";
-      packages = [pkgs.home-manager];
-    };
-    users.groups.wolfi = {};
+    hashedPassword = "$y$j9T$ifzWjoZaRtPUOOfMYnbJ20$uFOO1EyDApL52vRUicZYgupaTA/a6sGNUj3imZ/lcb6";
+    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.lock

@@ -1,5 +1,54 @@
 {
   "nodes": {
+    "alacritty-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1745230862,
+        "narHash": "sha256-TFomYP13Wa2VSoxKGKaTDyIj8K1/Oi4LOhR93z07Ot4=",
+        "owner": "alacritty",
+        "repo": "alacritty-theme",
+        "rev": "0520b1f8f3eb25678444c0817a97636b6601ac85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "alacritty",
+        "repo": "alacritty-theme",
+        "type": "github"
+      }
+    },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744289235,
+        "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "base16-schemes": {
       "flake": false,
       "locked": {
@@ -51,6 +100,48 @@
         "type": "github"
       }
     },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-topology",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728330715,
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "devshell_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -58,11 +149,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769524058,
-        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
+        "lastModified": 1745502102,
+        "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
+        "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
         "type": "github"
       },
       "original": {
@@ -196,6 +287,116 @@
         "type": "github"
       }
     },
+    "flake-utils_5": {
+      "inputs": {
+        "systems": "systems_7"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_3",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-topology",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -203,11 +404,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770260404,
-        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
+        "lastModified": 1745557122,
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
         "type": "github"
       },
       "original": {
@@ -244,16 +445,306 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1769548169,
-        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
+        "lastModified": 1744743431,
+        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
         "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
+        "repo": "home-manager",
+        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "impermanence",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742215578,
+        "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745015490,
+        "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": "nixpkgs_2",
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems_2",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1745795931,
+        "narHash": "sha256-i4zlEa2lnANuOZA1aA/X0cNGM7x9MLZqqmKP6fwfPEA=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "f5c5cfa960c157c8df50b496f621290234ac4505",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745610646,
+        "narHash": "sha256-R8rWH3oFV5/jwl87t7HyVoFgndrPw8QR/2pLwyKJLYM=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "61ab0385c8d9d456bf89539c76dd9e73becefde3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743714874,
+        "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-qt-support": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-qtutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-qtutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634706,
+        "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "8810df502cdee755993cb803eba7b23f189db795",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739048983,
+        "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744468525,
+        "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743950287,
+        "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739870480,
+        "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
         "type": "github"
       }
     },
@@ -345,7 +836,29 @@
         "type": "github"
       }
     },
-    "nix-gl": {
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743127615,
+        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "nix-darwin-24.11",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "nix-ld": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
@@ -353,11 +866,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762090880,
-        "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
-        "owner": "nix-community",
-        "repo": "nixgl",
-        "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
+        "lastModified": 1744621833,
+        "narHash": "sha256-II6a32kRc+KbLhU/jS8EbuXYt1PNCvsRvuBw2becgQM=",
+        "owner": "Mic92",
+        "repo": "nix-ld",
+        "rev": "9a3812797e25def1d4aed62b517606b7b93989dc",
         "type": "github"
       },
       "original": {
@@ -394,11 +907,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754476755,
-        "narHash": "sha256-vSF0VMEmPMzwNkrXIZwkhOSYmKES9BaDK/LlEe7/q8E=",
+        "lastModified": 1745506915,
+        "narHash": "sha256-ZonLQ5fDqRRbvHVwf4P53ktwUG2e+OTexXvbxyxForI=",
         "owner": "doronbehar",
         "repo": "nix-matlab",
-        "rev": "0e9c9fb660f9e1a1e4d59fd083e0212a15b513e2",
+        "rev": "68da9ca66d2e6c51c45e71d624c8bf0ca20846fb",
         "type": "gitlab"
       },
       "original": {
@@ -407,49 +920,36 @@
         "type": "gitlab"
       }
     },
-    "nixlib": {
-      "locked": {
-        "lastModified": 1736643958,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixos-generators": {
+    "nix-topology": {
       "inputs": {
-        "nixlib": "nixlib",
+        "devshell": "devshell",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
-        "lastModified": 1769813415,
-        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
+        "lastModified": 1744142264,
+        "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=",
+        "owner": "oddlama",
+        "repo": "nix-topology",
+        "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
-        "repo": "nixos-generators",
+        "owner": "oddlama",
+        "repo": "nix-topology",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1770882871,
-        "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=",
-        "owner": "nixos",
+        "lastModified": 1745503349,
+        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b",
+        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
         "type": "github"
       },
       "original": {
@@ -491,11 +991,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1770841267,
-        "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
+        "lastModified": 1745526057,
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
         "type": "github"
       },
       "original": {
@@ -507,15 +1007,15 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768564909,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
-        "owner": "nixos",
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -535,11 +1035,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1770770419,
-        "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
+        "lastModified": 1745487689,
+        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
+        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
         "type": "github"
       },
       "original": {
@@ -559,11 +1059,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1769049374,
-        "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=",
+        "lastModified": 1745068593,
+        "narHash": "sha256-YuQRMvqLVu+ghl2XzqXyVg/YevH/t3XHVCl7w+UrCH8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95",
+        "rev": "d35dc6dfcae3ff1a0c72f2d59491a7d83e5505a3",
         "type": "github"
       },
       "original": {
@@ -583,11 +1083,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768249818,
-        "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
+        "lastModified": 1745046075,
+        "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
+        "rev": "066afe8643274470f4a294442aadd988356a478f",
         "type": "github"
       },
       "original": {
@@ -596,6 +1096,56 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "nix-topology",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nix-topology",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730797577,
+        "narHash": "sha256-SrID5yVpyUfknUTGWgYkTyvdr9J1LxUym4om3SVGPkg=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "1864030ed24a2b8b4e4d386a5eeaf0c5369e50a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "deploy-rs": "deploy-rs",
@@ -647,11 +1197,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770683991,
-        "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
+        "lastModified": 1745310711,
+        "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
+        "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
         "type": "github"
       },
       "original": {
@@ -761,7 +1311,58 @@
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744961264,
+        "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
         "type": "github"
       }
     },
@@ -783,6 +1384,47 @@
         "type": "github"
       }
     },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744644585,
+        "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
+    },
     "yazi-flavors": {
       "flake": false,
       "locked": {

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
   ];
 }