nix flake update

2026-08-21 09:17:12 +02:00
93 changed files with 515 additions and 747 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1785119570,
-        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "lastModified": 1787146702,
+        "narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c",
        "type": "github"
      },
      "original": {
@@ -38,11 +38,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1786430034,
-        "narHash": "sha256-Vux08kA5PICwS2sViCMfwVLAHNoH8TkKAeBo25LjpMI=",
+        "lastModified": 1787101114,
+        "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "70cc4559b10a6062b05ff1af17e0add065ccaed9",
+        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
        "type": "github"
      },
      "original": {
@@ -54,11 +54,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1786348146,
-        "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
+        "lastModified": 1787172299,
+        "narHash": "sha256-PShzS87awOlE5XWkxUGBd/58/F+AtE2ZMgFffKj4r8s=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
+        "rev": "07e1d92cdc0ed416cfa11ff3ca40d17e61cfba7a",
        "type": "github"
      },
      "original": {
--- a/hosts/balrog/default.nix
+++ b/hosts/balrog/default.nix
@@ -1,3 +1,7 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
 { config
 , lib
 , pkgs
@@ -6,24 +10,32 @@

 {
  imports = [
+    # Include the results of the hardware scan.
    ./hardware-configuration.nix
+    ../../modules/home-manager.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/docker.nix
+    ../../modules/printing.nix
+    ../../modules/bambu-studio-flatpak.nix
+    ../../modules/arduino-ide.nix
+    ../../modules/devenv.nix
+    ../../modules/vlc.nix
+    ../../modules/btop.nix
+    ../../modules/lazygit.nix
+    #    ../../modules/bitwarden.nix
  ];

-  features.modules = {
-    core.enable = true;
-    development.enable = true;
-    hardware.enable = true;
-    multimedia.enable = true;
-    system.enable = true;
-  };
-
  boot.kernelPackages = pkgs.linuxPackages_latest;

  boot.loader.systemd-boot.enable = false;
  boot.loader = {
    efi = {
      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi";
+      efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
    };
    grub = {
      efiSupport = true;
@@ -64,5 +76,5 @@
    }
  ];

-  system.stateVersion = "25.11";
+  system.stateVersion = "25.11"; # Did you read the comment?
 }
--- a/hosts/frodo/default.nix
+++ b/hosts/frodo/default.nix
@@ -1,19 +1,26 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
 { config, pkgs, ... }:

 {
  imports = [
+    # Include the results of the hardware scan.
    ./hardware-configuration.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
  ];

-  features.modules = {
-    core.enable = true;
-  };
-
+  # Bootloader.
  boot.loader.grub.enable = true;
  boot.loader.grub.device = "/dev/vda";
  boot.loader.grub.useOSProber = true;

-  networking.hostName = "frodo";
+  networking.hostName = "frodo"; # Define your hostname.

-  system.stateVersion = "25.11";
+  system.stateVersion = "25.11"; # Did you read the comment?
 }
--- a/hosts/gandalf/default.nix
+++ b/hosts/gandalf/default.nix
@@ -3,22 +3,37 @@
 {
  imports = [
    ./hardware-configuration.nix
+    ../../modules/home-manager.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/gaming.nix
+    ../../modules/obs-studio.nix
+    ../../modules/garbage-collection.nix
+    ../../modules/printing.nix
+    ../../modules/docker.nix
+    ../../modules/matrix.nix
+    ../../modules/kdenlive.nix
+    ../../modules/audacity.nix
+    ../../modules/ollama.nix
+    ../../modules/wireguard.nix
+    ../../modules/qbittorrent.nix
+    ../../modules/gimp.nix
+    ../../modules/openscad.nix
+    ../../modules/bambu-studio-flatpak.nix
+    ../../modules/arduino-ide.nix
+    ../../modules/bitwarden.nix
+    ../../modules/vlc.nix
+    ../../modules/devenv.nix
+    ../../modules/btop.nix
+    ../../modules/discord.nix
+    ../../modules/lazygit.nix
+    ../../modules/yazi.nix
    ./mtp-fix.nix
  ];

-  features.modules = {
-    core.enable = true;
-    ai.enable = true;
-    desktop.enable = true;
-    development.enable = true;
-    gaming.enable = true;
-    hardware.enable = true;
-    multimedia.enable = true;
-    networking.enable = true;
-    security.enable = true;
-    system.enable = true;
-  };
-
  boot.kernelPackages = pkgs.linuxPackages_latest;

  boot.loader.systemd-boot.enable = true;
@@ -54,5 +69,5 @@

  virtualisation.libvirtd.enable = true;

-  system.stateVersion = "25.11";
+  system.stateVersion = "25.11"; # Did you read the comment?
 }
--- a/hosts/legolas/default.nix
+++ b/hosts/legolas/default.nix
@@ -3,13 +3,14 @@
 {
  imports = [
    ./hardware-configuration.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/gaming.nix
  ];

-  features.modules = {
-    core.enable = true;
-    gaming.enable = true;
-  };
-
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;

@@ -33,5 +34,5 @@

  virtualisation.libvirtd.enable = true;

-  system.stateVersion = "25.11";
+  system.stateVersion = "25.11"; # Did you read the comment?
 }
--- a/hosts/work/default.nix
+++ b/hosts/work/default.nix
@@ -3,20 +3,34 @@
 {
  imports = [
    ./hardware-configuration.nix
+    ../../modules/home-manager.nix
+    ../../modules/common.nix
+    ../../modules/users.nix
+    ../../modules/locales.nix
+    ../../modules/services.nix
+    ../../modules/programs.nix
+    ../../modules/garbage-collection.nix
+    ../../modules/printing.nix
+    ../../modules/docker.nix
+    ../../modules/teams-for-linux.nix
+    ../../modules/azure-data-studio.nix
+    ../../modules/filezilla.nix
+    ../../modules/wireguard.nix
+    ../../modules/remmina.nix
+    ../../modules/postman.nix
+    ../../modules/gimp.nix
+    ../../modules/jq.nix
+    ../../modules/enova.nix
+    ../../modules/devenv.nix
+    ../../modules/bitwarden.nix
+    ../../modules/btop.nix
+    ../../modules/vlc.nix
+    ../../modules/lazygit.nix
+    ../../modules/yazi.nix
+    ../../modules/bubblewrap.nix
+    ../../modules/socat.nix
  ];

-  features.modules = {
-    core.enable = true;
-    desktop.enable = true;
-    development.enable = true;
-    hardware.enable = true;
-    multimedia.enable = true;
-    networking.enable = true;
-    security.enable = true;
-    system.enable = true;
-    work.enable = true;
-  };
-
  boot.kernelPackages = pkgs.linuxPackages_latest;

  boot.loader.systemd-boot.enable = true;
@@ -78,5 +92,5 @@
    "149.210.174.226" = [ "kindertelefoon" ];
  };

-  system.stateVersion = "25.11";
+  system.stateVersion = "25.11"; # Did you read the comment?
 }
--- a/modules/ai/default.nix
+++ b/modules/ai/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/ai/ollama.nix
+++ b/modules/ai/ollama.nix
@@ -1,13 +0,0 @@
-{ config, lib, pkgsUnstable, ... }:
-
-let
-  dirModules = config.features.modules.ai or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.ollama.enable or true)) {
-    services.ollama = {
-      enable = true;
-      package = pkgsUnstable.ollama-cuda;
-    };
-  };
-}
--- a/modules/arduino-ide.nix
+++ b/modules/arduino-ide.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    arduino-ide
+  ];
+}
--- a/modules/audacity.nix
+++ b/modules/audacity.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    audacity
+  ];
+}
--- a/modules/azure-data-studio.nix
+++ b/modules/azure-data-studio.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    azuredatastudio
+  ];
+}
--- a/modules/bambu-studio-flatpak.nix
+++ b/modules/bambu-studio-flatpak.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  services.flatpak.update.onActivation = true;
+  services.flatpak.enable = true;
+  services.flatpak.packages = [
+    "com.bambulab.BambuStudio"
+  ];
+}
--- a/modules/bitwarden.nix
+++ b/modules/bitwarden.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-39.8.10"
+  ];
+
+  environment.systemPackages = with pkgs; [
+    bitwarden-desktop
+  ];
+}
--- a/modules/btop.nix
+++ b/modules/btop.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    btop
+  ];
+}
--- a/modules/bubblewrap.nix
+++ b/modules/bubblewrap.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    bubblewrap
+  ];
+}
+
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.config.allowUnfree = true;
+
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
+  users.defaultUserShell = pkgs.zsh;
+
+  environment.systemPackages = with pkgs; [
+    chromium
+    gnumake
+    jetbrains-toolbox
+    fastfetch
+    jq
+  ];
+
+  security.rtkit.enable = true;
+
+  system.stateVersion = "25.11";
+}
--- a/modules/core/common.nix
+++ b/modules/core/common.nix
@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.core or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.common.enable or true)) {
-    nixpkgs.config.allowUnfree = true;
-
-    nix.settings.experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-
-    users.defaultUserShell = pkgs.zsh;
-
-    environment.systemPackages = with pkgs; [
-      chromium
-      gnumake
-      jetbrains-toolbox
-      fastfetch
-      jq
-    ];
-
-    security.rtkit.enable = true;
-
-    system.stateVersion = "25.11";
-  };
-}
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/core/home-manager.nix
+++ b/modules/core/home-manager.nix
@@ -1,18 +0,0 @@
-{ config, lib, pkgs, pkgsUnstable, ... }:
-
-let
-  dirModules = config.features.modules.core or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.home-manager.enable or true)) {
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-      extraSpecialArgs = {
-        inherit pkgsUnstable;
-      };
-
-      users.avravels = import ../home/home.nix;
-    };
-  };
-}
--- a/modules/core/locales.nix
+++ b/modules/core/locales.nix
@@ -1,23 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.core or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.locales.enable or true)) {
-    time.timeZone = "Europe/Amsterdam";
-
-    i18n.defaultLocale = "en_US.UTF-8";
-    i18n.extraLocaleSettings = {
-      LC_ADDRESS = "nl_NL.UTF-8";
-      LC_IDENTIFICATION = "nl_NL.UTF-8";
-      LC_MEASUREMENT = "nl_NL.UTF-8";
-      LC_MONETARY = "nl_NL.UTF-8";
-      LC_NAME = "nl_NL.UTF-8";
-      LC_NUMERIC = "nl_NL.UTF-8";
-      LC_PAPER = "nl_NL.UTF-8";
-      LC_TELEPHONE = "nl_NL.UTF-8";
-      LC_TIME = "nl_NL.UTF-8";
-    };
-  };
-}
--- a/modules/core/programs.nix
+++ b/modules/core/programs.nix
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.core or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.programs.enable or true)) {
-    programs = {
-      zsh.enable = true;
-
-      hyprland.enable = true;
-      hyprland.xwayland.enable = true;
-
-      virt-manager.enable = true;
-    };
-  };
-}
--- a/modules/core/services.nix
+++ b/modules/core/services.nix
@@ -1,28 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.core or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.services.enable or true)) {
-    services.openssh.enable = true;
-
-    services = {
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-
-      xserver = {
-        enable = true;
-        xkb.layout = "us";
-        xkb.variant = "";
-      };
-
-      pulseaudio.enable = false;
-
-      pipewire.enable = true;
-      pipewire.alsa.enable = true;
-      pipewire.alsa.support32Bit = true;
-      pipewire.pulse.enable = true;
-    };
-  };
-}
--- a/modules/core/users.nix
+++ b/modules/core/users.nix
@@ -1,27 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.core or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.users.enable or true)) {
-    users.users.avravels = {
-      initialPassword = "welcome";
-      isNormalUser = true;
-      description = "Armel van Ravels";
-      extraGroups = [
-        "networkmanager"
-        "wheel"
-        "libvirtd"
-        "dialout"
-      ];
-      packages = with pkgs; [
-        home-manager
-        spotify
-        proton-vpn
-        fzf
-      ];
-      shell = pkgs.zsh;
-    };
-  };
-}
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/desktop/discord.nix
+++ b/modules/desktop/discord.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.desktop or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.discord.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      discord
-    ];
-  };
-}
--- a/modules/desktop/matrix.nix
+++ b/modules/desktop/matrix.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.desktop or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.matrix.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      element-desktop
-    ];
-  };
-}
--- a/modules/desktop/teams-for-linux.nix
+++ b/modules/desktop/teams-for-linux.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.desktop or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.teams-for-linux.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      teams-for-linux
-    ];
-  };
-}
--- a/modules/development/azure-data-studio.nix
+++ b/modules/development/azure-data-studio.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.development or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.azure-data-studio.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      azuredatastudio
-    ];
-  };
-}
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/development/devenv.nix
+++ b/modules/development/devenv.nix
@@ -1,17 +0,0 @@
-{ config, lib, pkgsUnstable, ... }:
-
-let
-  dirModules = config.features.modules.development or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.devenv.enable or true)) {
-    environment.systemPackages = with pkgsUnstable; [
-      devenv
-    ];
-
-    nix.settings.trusted-users = [
-      "root"
-      "avravels"
-    ];
-  };
-}
--- a/modules/development/docker.nix
+++ b/modules/development/docker.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.development or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.docker.enable or true)) {
-    virtualisation.docker.enable = true;
-
-    users.users.avravels.extraGroups = [ "docker" ];
-  };
-}
--- a/modules/development/jq.nix
+++ b/modules/development/jq.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.development or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.jq.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      jq
-    ];
-  };
-}
--- a/modules/development/lazygit.nix
+++ b/modules/development/lazygit.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.development or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.lazygit.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      lazygit
-    ];
-  };
-}
--- a/modules/development/postman.nix
+++ b/modules/development/postman.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.development or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.postman.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      postman
-    ];
-  };
-}
--- a/modules/devenv.nix
+++ b/modules/devenv.nix
@@ -0,0 +1,12 @@
+{ config, pkgsUnstable, ... }:
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    devenv
+  ];
+
+  nix.settings.trusted-users = [
+    "root"
+    "avravels"
+  ];
+}
--- a/modules/discord.nix
+++ b/modules/discord.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    discord
+  ];
+}
+
--- a/modules/docker.nix
+++ b/modules/docker.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  virtualisation.docker.enable = true;
+
+  users.users.avravels.extraGroups = [ "docker" ];
+}
--- a/modules/enova.nix
+++ b/modules/enova.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  services.dnsmasq = {
+    enable = true;
+
+    settings = {
+      server = [
+        "1.1.1.1"
+        "8.8.8.8"
+      ];
+      address = [ "/.enova.local/127.0.0.1" ];
+    };
+  };
+}
--- a/modules/features/default.nix
+++ b/modules/features/default.nix
@@ -1,18 +0,0 @@
-{ lib, ... }:
-let
-  modulesDir = ../.;
-  moduleDirs = builtins.readDir modulesDir;
-
-  excludeDirs = [ "home" "features" ];
-
-  dirEntries = lib.filterAttrs
-    (name: type: type == "directory" && !builtins.elem name excludeDirs)
-    moduleDirs;
-in
-{
-  options.features.modules = lib.mkOption {
-    type = lib.types.attrs;
-    default = { };
-    description = "Auto-generated feature module options tree";
-  };
-}
--- a/modules/filezilla.nix
+++ b/modules/filezilla.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    filezilla
+  ];
+}
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    localNetworkGameTransfers.openFirewall = true;
+    package = pkgs.steam.override {
+      extraEnv = {
+        MANGOHUD = "1";
+        WINE_VK_VULKAN_ONLY = "1";
+      };
+    };
+  };
+
+  environment.systemPackages = [
+    pkgs.mangohud
+  ];
+}
--- a/modules/gaming/default.nix
+++ b/modules/gaming/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/gaming/gaming.nix
+++ b/modules/gaming/gaming.nix
@@ -1,24 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.gaming or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.gaming.enable or true)) {
-    programs.steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-      localNetworkGameTransfers.openFirewall = true;
-      package = pkgs.steam.override {
-        extraEnv = {
-          MANGOHUD = "1";
-          WINE_VK_VULKAN_ONLY = "1";
-        };
-      };
-    };
-
-    environment.systemPackages = [
-      pkgs.mangohud
-    ];
-  };
-}
--- a/modules/garbage-collection.nix
+++ b/modules/garbage-collection.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  nix = {
+    settings.auto-optimise-store = true;
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+  };
+}
--- a/modules/gimp.nix
+++ b/modules/gimp.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    gimp
+  ];
+}
--- a/modules/hardware/arduino-ide.nix
+++ b/modules/hardware/arduino-ide.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.hardware or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.arduino-ide.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      arduino-ide
-    ];
-  };
-}
--- a/modules/hardware/bambu-studio-flatpak.nix
+++ b/modules/hardware/bambu-studio-flatpak.nix
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.hardware or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.bambu-studio-flatpak.enable or true)) {
-    services.flatpak.update.onActivation = true;
-    services.flatpak.enable = true;
-    services.flatpak.packages = [
-      "com.bambulab.BambuStudio"
-    ];
-  };
-}
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/hardware/openscad.nix
+++ b/modules/hardware/openscad.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.hardware or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.openscad.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      openscad
-    ];
-  };
-}
--- a/modules/hardware/printing.nix
+++ b/modules/hardware/printing.nix
@@ -1,47 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.hardware or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.printing.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      cnijfilter2
-    ];
-
-    services.printing = {
-      enable = true;
-      drivers = [ pkgs.cnijfilter2 ];
-    };
-
-    services.avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
-    hardware.printers = {
-      ensurePrinters = [
-        {
-          name = "CanonTS3100";
-          location = "Home";
-          deviceUri = "dnssd://Canon%20TS3100%20series._ipp._tcp.local/?uuid=00000000-0000-1000-8000-0018271a7e44";
-          model = "canonts3100.ppd";
-          ppdOptions = {
-            PageSize = "A4";
-          };
-        }
-      ];
-
-      ensureDefaultPrinter = "CanonTS3100";
-    };
-
-    # for samba
-    networking.hosts = {
-      "192.168.68.60" = [
-        "2C2919000000.local"
-        "2C2919000000"
-      ];
-    };
-  };
-}
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -0,0 +1,13 @@
+{ pkgs, pkgsUnstable, ... }:
+
+{
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit pkgsUnstable;
+    };
+
+    users.avravels = import home/home.nix;
+  };
+}
--- a/modules/jq.nix
+++ b/modules/jq.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    jq
+  ];
+}
--- a/modules/kdenlive.nix
+++ b/modules/kdenlive.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    kdePackages.kdenlive
+  ];
+}
--- a/modules/lazygit.nix
+++ b/modules/lazygit.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    lazygit
+  ];
+}
--- a/modules/locales.nix
+++ b/modules/locales.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+
+{
+  time.timeZone = "Europe/Amsterdam";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "nl_NL.UTF-8";
+    LC_IDENTIFICATION = "nl_NL.UTF-8";
+    LC_MEASUREMENT = "nl_NL.UTF-8";
+    LC_MONETARY = "nl_NL.UTF-8";
+    LC_NAME = "nl_NL.UTF-8";
+    LC_NUMERIC = "nl_NL.UTF-8";
+    LC_PAPER = "nl_NL.UTF-8";
+    LC_TELEPHONE = "nl_NL.UTF-8";
+    LC_TIME = "nl_NL.UTF-8";
+  };
+}
--- a/modules/matrix.nix
+++ b/modules/matrix.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    element-desktop
+  ];
+}
--- a/modules/multimedia/audacity.nix
+++ b/modules/multimedia/audacity.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.multimedia or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.audacity.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      audacity
-    ];
-  };
-}
--- a/modules/multimedia/default.nix
+++ b/modules/multimedia/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/multimedia/gimp.nix
+++ b/modules/multimedia/gimp.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.multimedia or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.gimp.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      gimp
-    ];
-  };
-}
--- a/modules/multimedia/kdenlive.nix
+++ b/modules/multimedia/kdenlive.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.multimedia or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.kdenlive.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      kdePackages.kdenlive
-    ];
-  };
-}
--- a/modules/multimedia/obs-studio.nix
+++ b/modules/multimedia/obs-studio.nix
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.multimedia or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.obs-studio.enable or true)) {
-    programs.obs-studio = {
-      enable = true;
-      package = pkgs.obs-studio.override {
-        cudaSupport = true;
-      };
-    };
-  };
-}
--- a/modules/multimedia/vlc.nix
+++ b/modules/multimedia/vlc.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.multimedia or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.vlc.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      vlc
-    ];
-  };
-}
--- a/modules/networking/default.nix
+++ b/modules/networking/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/networking/filezilla.nix
+++ b/modules/networking/filezilla.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.networking or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.filezilla.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      filezilla
-    ];
-  };
-}
--- a/modules/networking/qbittorrent.nix
+++ b/modules/networking/qbittorrent.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.networking or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.qbittorrent.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      qbittorrent
-    ];
-  };
-}
--- a/modules/networking/remmina.nix
+++ b/modules/networking/remmina.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.networking or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.remmina.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      remmina
-    ];
-  };
-}
--- a/modules/networking/socat.nix
+++ b/modules/networking/socat.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.networking or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.socat.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      socat
-    ];
-  };
-}
--- a/modules/networking/wireguard.nix
+++ b/modules/networking/wireguard.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.networking or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.wireguard.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      wireguard-tools
-    ];
-  };
-}
--- a/modules/obs-studio.nix
+++ b/modules/obs-studio.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  programs.obs-studio = {
+    enable = true;
+    package = pkgs.obs-studio.override {
+      cudaSupport = true;
+    };
+  };
+}
--- a/modules/ollama.nix
+++ b/modules/ollama.nix
@@ -0,0 +1,8 @@
+{ pkgsUnstable, ... }:
+
+{
+  services.ollama = {
+    enable = true;
+    package = pkgsUnstable.ollama-cuda;
+  };
+}
--- a/modules/openscad.nix
+++ b/modules/openscad.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    openscad
+  ];
+}
--- a/modules/postman.nix
+++ b/modules/postman.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    postman
+  ];
+}
--- a/modules/printing.nix
+++ b/modules/printing.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    cnijfilter2
+  ];
+
+  services.printing = {
+    enable = true;
+    drivers = [ pkgs.cnijfilter2 ];
+  };
+
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
+  hardware.printers = {
+    ensurePrinters = [
+      {
+        name = "CanonTS3100";
+        location = "Home";
+        deviceUri = "dnssd://Canon%20TS3100%20series._ipp._tcp.local/?uuid=00000000-0000-1000-8000-0018271a7e44";
+        model = "canonts3100.ppd";
+        ppdOptions = {
+          PageSize = "A4";
+        };
+      }
+    ];
+
+    ensureDefaultPrinter = "CanonTS3100";
+  };
+
+  # for samba
+  networking.hosts = {
+    "192.168.68.60" = [
+      "2C2919000000.local"
+      "2C2919000000"
+    ];
+  };
+}
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  programs = {
+    zsh.enable = true;
+
+    hyprland.enable = true;
+    hyprland.xwayland.enable = true;
+
+    virt-manager.enable = true;
+  };
+}
--- a/modules/qbittorrent.nix
+++ b/modules/qbittorrent.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    qbittorrent
+  ];
+}
--- a/modules/remmina.nix
+++ b/modules/remmina.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    remmina
+  ];
+}
--- a/modules/security/bitwarden.nix
+++ b/modules/security/bitwarden.nix
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.security or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.bitwarden.enable or true)) {
-    nixpkgs.config.permittedInsecurePackages = [
-      "electron-39.8.10"
-    ];
-
-    environment.systemPackages = with pkgs; [
-      bitwarden-desktop
-    ];
-  };
-}
--- a/modules/security/default.nix
+++ b/modules/security/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+{
+  services.openssh.enable = true;
+
+  services = {
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+
+    xserver = {
+      enable = true;
+      xkb.layout = "us";
+      xkb.variant = "";
+    };
+
+    pulseaudio.enable = false;
+
+    pipewire.enable = true;
+    pipewire.alsa.enable = true;
+    pipewire.alsa.support32Bit = true;
+    pipewire.pulse.enable = true;
+  };
+}
--- a/modules/socat.nix
+++ b/modules/socat.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    socat
+  ];
+}
+
--- a/modules/system/btop.nix
+++ b/modules/system/btop.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.system or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.btop.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      btop
-    ];
-  };
-}
--- a/modules/system/bubblewrap.nix
+++ b/modules/system/bubblewrap.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.system or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.bubblewrap.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      bubblewrap
-    ];
-  };
-}
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/system/garbage-collection.nix
+++ b/modules/system/garbage-collection.nix
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.system or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.garbage-collection.enable or true)) {
-    nix = {
-      settings.auto-optimise-store = true;
-      gc = {
-        automatic = true;
-        dates = "weekly";
-        options = "--delete-older-than 7d";
-      };
-    };
-  };
-}
--- a/modules/system/yazi.nix
+++ b/modules/system/yazi.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.system or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.yazi.enable or true)) {
-    environment.systemPackages = with pkgs; [
-      yazi
-    ];
-  };
-}
--- a/modules/teams-for-linux.nix
+++ b/modules/teams-for-linux.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    teams-for-linux
+  ];
+}
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+  users.users.avravels = {
+    initialPassword = "welcome";
+    isNormalUser = true;
+    description = "Armel van Ravels";
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "libvirtd"
+      "dialout"
+    ];
+    packages = with pkgs; [
+      home-manager
+      spotify
+      proton-vpn
+      fzf
+    ];
+    shell = pkgs.zsh;
+  };
+}
--- a/modules/vlc.nix
+++ b/modules/vlc.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vlc
+  ];
+}
--- a/modules/wireguard.nix
+++ b/modules/wireguard.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    wireguard-tools
+  ];
+}
--- a/modules/work/default.nix
+++ b/modules/work/default.nix
@@ -1,6 +0,0 @@
-{ lib, ... }: {
-  imports = lib.mapAttrsToList
-    (file: _: ./. + "/${file}")
-    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
-      (builtins.readDir ./.));
-}
--- a/modules/work/enova.nix
+++ b/modules/work/enova.nix
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  dirModules = config.features.modules.work or { };
-in
-{
-  config = lib.mkIf ((dirModules.enable or false) && (dirModules.enova.enable or true)) {
-    services.dnsmasq = {
-      enable = true;
-
-      settings = {
-        server = [
-          "1.1.1.1"
-          "8.8.8.8"
-        ];
-        address = [ "/.enova.local/127.0.0.1" ];
-      };
-    };
-  };
-}
--- a/modules/yazi.nix
+++ b/modules/yazi.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    yazi
+  ];
+}
--- a/outputs.nix
+++ b/outputs.nix
@@ -13,21 +13,6 @@ let
    config.allowUnfree = true;
  };

-  moduleNames = [
-    "ai"
-    "core"
-    "desktop"
-    "development"
-    "features"
-    "gaming"
-    "hardware"
-    "multimedia"
-    "networking"
-    "security"
-    "system"
-    "work"
-  ];
-
  mkHost =
    name:
    nixpkgs.lib.nixosSystem {
@@ -42,7 +27,7 @@ let
        nix-flatpak.nixosModules.nix-flatpak
        home-manager.nixosModules.home-manager
        ./hosts/${name}
-      ] ++ (map (mod: ./modules/${mod}) moduleNames);
+      ];
    };

 in