add den pattern

devenv update
nix flake update
2026-08-14 15:08:14 +02:00 · 2026-08-13 09:26:43 +02:00 · 2026-08-13 08:18:03 +02:00 · 2026-08-11 14:11:21 +02:00 · 2026-08-10 08:56:17 +02:00 · 2026-07-30 10:24:07 +02:00
138 changed files with 2041 additions and 1202 deletions
--- a/.envrc
+++ b/.envrc
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+eval "$(devenv direnvrc)"
+
+# You can pass flags to the devenv command
+# For example: use devenv --impure --option services.postgres.enable:bool true
+use devenv
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,10 @@
+# Devenv
+.devenv*
+devenv.local.nix
+devenv.local.yaml
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
--- a/devenv.lock
+++ b/devenv.lock
@@ -0,0 +1,124 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1786490576,
+        "narHash": "sha256-TH5K1TBi5YNUEEVXoPe99Wzy6XOxsuzkypEJofWc/fU=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "5706f600b4b6799d5dade8602f85cfd2e060b2f3",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1784288435,
+        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "inputs": {
+        "nixpkgs-src": "nixpkgs-src"
+      },
+      "locked": {
+        "lastModified": 1786472144,
+        "narHash": "sha256-W1wLGKZKGtnTWGRFgjbsVQleuO6jgMweaSAbFltLkN0=",
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "ea21d30f66a051c7cd750692a2af8d56e0ec4bfb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1786098110,
+        "narHash": "sha256-shi1tjDhCGGd0kIgVPNY03V8NBWSTzhMSFDb7IqSoec=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "afb4584a80bbf779ce0f691509ff902d188c2b3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs",
+        "treefmt-nix": "treefmt-nix"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785945821,
+        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/devenv.nix
+++ b/devenv.nix
@@ -0,0 +1,19 @@
+{ pkgs
+, lib
+, config
+, ...
+}:
+
+{
+  treefmt.enable = true;
+
+  treefmt.config.programs.nixpkgs-fmt.enable = true;
+
+  git-hooks = {
+    enable = true;
+
+    hooks = {
+      treefmt.enable = true;
+    };
+  };
+}
--- a/devenv.yaml
+++ b/devenv.yaml
@@ -0,0 +1,11 @@
+inputs:
+  git-hooks:
+    url: github:cachix/git-hooks.nix
+    inputs:
+      nixpkgs:
+        follows: nixpkgs
+  treefmt-nix:
+    url: github:numtide/treefmt-nix
+    inputs:
+      nixpkgs:
+        follows: nixpkgs
--- a/flake.lock
+++ b/flake.lock
@@ -7,27 +7,27 @@
        ]
      },
      "locked": {
-        "lastModified": 1779506708,
-        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
+        "lastModified": 1785119570,
+        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
+        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "nix-flatpak": {
      "locked": {
-        "lastModified": 1777402031,
-        "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=",
+        "lastModified": 1783368811,
+        "narHash": "sha256-0H8jDwR4Kegb3heaTrH1ftbgKfZVDT8JE+46uXxDy/Q=",
        "owner": "gmodena",
        "repo": "nix-flatpak",
-        "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8",
+        "rev": "20d42f0ee98c9fe9f85e8d1de474f1409ed10d05",
        "type": "github"
      },
      "original": {
@@ -38,27 +38,27 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1779467186,
-        "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
+        "lastModified": 1786430034,
+        "narHash": "sha256-Vux08kA5PICwS2sViCMfwVLAHNoH8TkKAeBo25LjpMI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
+        "rev": "70cc4559b10a6062b05ff1af17e0add065ccaed9",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1779694939,
-        "narHash": "sha256-Ly4j75O8ICaSQx3uxPnwk2x7PMF0XQvn5r0c3yBA7FI=",
+        "lastModified": 1786348146,
+        "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f9d8b65950353691ab56561e7c73d2e1063d810b",
+        "rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@

  inputs = {
    nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-25.11";
+      url = "github:nixos/nixpkgs/nixos-26.05";
    };

    nixpkgs-unstable = {
@@ -11,7 +11,7 @@
    };

    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

--- a/hosts/balrog/default.nix
+++ b/hosts/balrog/default.nix
@@ -0,0 +1,68 @@
+{ config
+, lib
+, pkgs
+, ...
+}:
+
+{
+  imports = [
+    ./hardware-configuration.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";
+    };
+    grub = {
+      efiSupport = true;
+      device = "nodev";
+    };
+  };
+
+  networking.hostName = "balrog";
+  networking.networkmanager.enable = true;
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
+
+  hardware.enableAllFirmware = true;
+
+  boot.initrd.kernelModules = [ "wl" ];
+  boot.kernelModules = [
+    "wl"
+    "kvm-intel"
+  ];
+
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    broadcom_sta
+  ];
+
+  nixpkgs.config = {
+    allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ "broadcom-sta" ];
+  };
+  hardware.bluetooth.enable = true;
+  services.blueman.enable = true;
+
+  home-manager.users.avravels.home.hyprland.monitors = [
+    {
+      output = "eDP-1";
+      mode = "1920x1200";
+    }
+  ];
+
+  system.stateVersion = "25.11";
+}
--- a/hosts/balrog/hardware-configuration.nix
+++ b/hosts/balrog/hardware-configuration.nix
@@ -0,0 +1,45 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config
+, lib
+, pkgs
+, modulesPath
+, ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A202-E19C";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/hosts/frodo/default.nix
+++ b/hosts/frodo/default.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  features.modules = {
+    core.enable = true;
+  };
+
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/vda";
+  boot.loader.grub.useOSProber = true;
+
+  networking.hostName = "frodo";
+
+  system.stateVersion = "25.11";
+}
--- a/systems/frodo/hardware-configuration.nix
+++ b/systems/frodo/hardware-configuration.nix
@@ -1,22 +1,33 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config
+, lib
+, pkgs
+, modulesPath
+, ...
+}:

 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];

-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];

-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
+    fsType = "ext4";
+  };

  swapDevices = [ ];

--- a/hosts/gandalf/default.nix
+++ b/hosts/gandalf/default.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.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;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "gandalf";
+  networking.networkmanager.enable = true;
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
+  networking.firewall.enable = false;
+
+  networking.interfaces.enp130s0.wakeOnLan.enable = true;
+  networking.firewall.allowedUDPPorts = [ 9 ];
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+  services.openssh.settings.X11Forwarding = true;
+
+  hardware = {
+    graphics.enable = true;
+
+    nvidia.modesetting.enable = true;
+    nvidia.open = true;
+    nvidia.nvidiaSettings = true;
+  };
+
+  systemd.targets.sleep.enable = false;
+  systemd.targets.suspend.enable = false;
+  systemd.targets.hibernate.enable = false;
+  systemd.targets.hybrid-sleep.enable = false;
+
+  virtualisation.libvirtd.enable = true;
+
+  system.stateVersion = "25.11";
+}
--- a/hosts/gandalf/hardware-configuration.nix
+++ b/hosts/gandalf/hardware-configuration.nix
@@ -0,0 +1,46 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config
+, lib
+, pkgs
+, modulesPath
+, ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/01E4-5DD7";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/hosts/gandalf/mtp-fix.nix
+++ b/hosts/gandalf/mtp-fix.nix
@@ -0,0 +1,30 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.overlays = [
+    (
+      final: prev:
+        let
+          targetVersion = "1.1.23";
+        in
+        {
+          libmtp =
+            if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then
+              prev.libmtp
+            else
+              prev.libmtp.overrideAttrs (_: {
+                version = targetVersion;
+
+                src = final.fetchFromGitHub {
+                  owner = "libmtp";
+                  repo = "libmtp";
+                  rev = "v${targetVersion}";
+                  hash = "sha256-FlPj9PEeOAWabU11dFTzDgY9TBbgmJclbeL0iULYw6A=";
+                };
+
+                patches = [ ];
+              });
+        }
+    )
+  ];
+}
--- a/hosts/legolas/default.nix
+++ b/hosts/legolas/default.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  features.modules = {
+    core.enable = true;
+    gaming.enable = true;
+  };
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "legolas";
+  networking.networkmanager.enable = true;
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+
+  hardware = {
+    graphics.enable = true;
+
+    nvidia.modesetting.enable = true;
+    nvidia.open = true;
+    nvidia.nvidiaSettings = true;
+  };
+
+  virtualisation.libvirtd.enable = true;
+
+  system.stateVersion = "25.11";
+}
--- a/hosts/legolas/hardware-configuration.nix
+++ b/hosts/legolas/hardware-configuration.nix
@@ -0,0 +1,50 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config
+, lib
+, pkgs
+, modulesPath
+, ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/C4C8-E90E";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
+
+  fileSystems."/media" = {
+    device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232";
+    fsType = "ext4";
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/hosts/work/default.nix
+++ b/hosts/work/default.nix
@@ -0,0 +1,82 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.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;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  boot.plymouth.enable = true;
+  boot.plymouth.theme = "spinner";
+  boot.initrd.systemd.enable = true;
+
+  programs.nix-ld.enable = true;
+  networking.hostName = "laptop-armel";
+
+  home-manager.users.avravels.home.git.userName = "Armel van Ravels";
+  home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl";
+
+  networking.networkmanager.enable = true;
+  networking.nameservers = [
+    "127.0.0.1"
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
+  networking.firewall.enable = false;
+
+  hardware.graphics.enable = true;
+  services.xserver.videoDrivers = [ "intel" ];
+
+  virtualisation.libvirtd.enable = true;
+
+  specialisation = {
+    "top floor".configuration = {
+      home-manager.users.avravels.home.hyprland.monitors = [
+        {
+          output = "DP-3";
+          mode = "2560x1440";
+          position = "0x0";
+        }
+        {
+          output = "DP-1";
+          mode = "2560x1440";
+          position = "2560x0";
+        }
+        {
+          output = "eDP-1";
+          mode = "1920x1200";
+          position = "5120x0";
+        }
+      ];
+    };
+  };
+
+  networking.hosts = {
+    "127.0.0.1" = [
+      "local.wormundco.de"
+      "local.wormundco.nl"
+      "local.wormenco.nl"
+      "local.wurmundco.de"
+    ];
+    "149.210.174.226" = [ "kindertelefoon" ];
+  };
+
+  system.stateVersion = "25.11";
+}
--- a/hosts/work/hardware-configuration.nix
+++ b/hosts/work/hardware-configuration.nix
@@ -0,0 +1,48 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config
+, lib
+, pkgs
+, modulesPath
+, ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba";
+    fsType = "ext4";
+  };
+
+  boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device =
+    "/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba";
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/3892-6129";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/modules/ai/default.nix
+++ b/modules/ai/default.nix
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,13 @@
+{ 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/core/common.nix
+++ b/modules/core/common.nix
@@ -0,0 +1,29 @@
+{ 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
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,18 @@
+{ 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
@@ -0,0 +1,23 @@
+{ 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
@@ -0,0 +1,17 @@
+{ 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
@@ -0,0 +1,28 @@
+{ 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
@@ -0,0 +1,27 @@
+{ 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
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,17 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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/features/default.nix
+++ b/modules/features/default.nix
@@ -0,0 +1,18 @@
+{ 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/gaming/default.nix
+++ b/modules/gaming/default.nix
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,24 @@
+{ 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/hardware/arduino-ide.nix
+++ b/modules/hardware/arduino-ide.nix
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,14 @@
+{ 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
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,47 @@
+{ 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/systems/modules/home/backgrounds/bird.jpg
+++ b/systems/modules/home/backgrounds/bird.jpg
--- a/modules/home/backgrounds/catppucin.png
+++ b/modules/home/backgrounds/catppucin.png
--- a/systems/modules/home/backgrounds/monkey.jpg
+++ b/systems/modules/home/backgrounds/monkey.jpg
--- a/systems/modules/home/backgrounds/nix.png
+++ b/systems/modules/home/backgrounds/nix.png
--- a/systems/modules/home/home.nix
+++ b/systems/modules/home/home.nix
@@ -9,7 +9,7 @@

  imports = [
    ./other/fonts.nix
-    ./programs/bitwarden.nix
+    #    ./programs/bitwarden.nix
    ./programs/kitty.nix
    ./programs/zsh.nix
    ./programs/direnv.nix
--- a/systems/modules/home/other/fonts.nix
+++ b/systems/modules/home/other/fonts.nix
--- a/systems/modules/home/programs/bitwarden.nix
+++ b/systems/modules/home/programs/bitwarden.nix
@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ pkgs, ... }:

 {
  home.packages = [
--- a/systems/modules/home/programs/direnv.nix
+++ b/systems/modules/home/programs/direnv.nix
@@ -6,7 +6,7 @@
    enableZshIntegration = true;
    nix-direnv.enable = true;
  };
-  
+
  home.file.".config/direnv/direnvrc" = {
    source = ./direnv/direnvrc;
  };
--- a/systems/modules/home/programs/direnv/direnvrc
+++ b/systems/modules/home/programs/direnv/direnvrc
--- a/systems/modules/home/programs/fastfetch/config.jsonc
+++ b/systems/modules/home/programs/fastfetch/config.jsonc
--- a/modules/home/programs/firefox.nix
+++ b/modules/home/programs/firefox.nix
@@ -0,0 +1,39 @@
+{ pkgs, config, ... }:
+
+{
+  programs.firefox = {
+    enable = true;
+    configPath = "${config.xdg.configHome}/mozilla/firefox";
+    profiles.default = {
+      settings = {
+        "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
+      };
+    };
+
+    policies = {
+      # From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
+      ExtensionSettings =
+        with builtins;
+        let
+          extension = shortId: uuid: {
+            name = uuid;
+            value = {
+              install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
+              installation_mode = "normal_installed";
+            };
+          };
+        in
+        listToAttrs [
+          (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
+          (extension "ublock-origin" "uBlock0@raymondhill.net")
+          (extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack")
+          (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack")
+        ];
+      # To add additional extensions, find it on addons.mozilla.org, find
+      # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
+      # Then, download the XPI by filling it in to the install_url template, unzip it,
+      # run `jq .browser_specific_settings.gecko.id manifest.json` or
+      # `jq .applications.gecko.id manifest.json` to get the UUID
+    };
+  };
+}
--- a/systems/modules/home/programs/git.nix
+++ b/systems/modules/home/programs/git.nix
@@ -1,4 +1,8 @@
-{ lib, pkgsUnstable, config, ... }:
+{ lib
+, pkgsUnstable
+, config
+, ...
+}:

 {
  options.home.git = {
--- a/systems/modules/home/programs/kitty.nix
+++ b/systems/modules/home/programs/kitty.nix
--- a/systems/modules/home/programs/libreoffice.nix
+++ b/systems/modules/home/programs/libreoffice.nix
--- a/modules/home/programs/nvim.nix
+++ b/modules/home/programs/nvim.nix
@@ -0,0 +1,162 @@
+{ pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+    withRuby = false;
+    withPython3 = false;
+    defaultEditor = true;
+    extraLuaPackages = ps: [ ps.magick ];
+    extraPackages = [
+      pkgs.ueberzugpp
+      pkgs.imagemagick
+      pkgs.intelephense
+    ];
+
+    plugins = with pkgs.vimPlugins; [
+      neo-tree-nvim
+      catppuccin-nvim
+      tokyonight-nvim
+      nvim-lspconfig
+      nvim-cmp
+      cmp-nvim-lsp
+      cmp-buffer
+      cmp-path
+      plenary-nvim
+      telescope-nvim
+      (nvim-treesitter.withAllGrammars)
+      vim-nix
+      lualine-nvim
+      image-nvim
+    ];
+
+    initLua = ''
+        vim.cmd("colorscheme catppuccin-mocha")
+        -- Basic settings
+        vim.o.number = true
+        vim.o.relativenumber = true
+
+        -- =========================
+        -- LSP (Neovim 0.11+ way)
+        -- =========================
+
+        -- Add cmp capabilities
+        local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+        vim.lsp.config("nil_ls", {
+          capabilities = capabilities,
+        })
+
+        -- PHP LSP
+        vim.lsp.config("intelephense", {
+          capabilities = capabilities,
+        })
+
+        vim.lsp.enable("intelephense")
+
+
+        vim.lsp.enable("nil_ls")
+
+        -- =========================
+        -- nvim-cmp
+        -- =========================
+
+        local cmp = require("cmp")
+
+        cmp.setup({
+          mapping = cmp.mapping.preset.insert({
+            ["<C-Space>"] = cmp.mapping.complete(),
+            ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          }),
+          sources = {
+            { name = "nvim_lsp" },
+            { name = "buffer" },
+            { name = "path" },
+          }
+        })
+
+        -- =========================
+        -- Telescope
+        -- =========================
+
+        local builtin = require("telescope.builtin")
+        vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+        vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+
+        -- =========================
+        -- Lualine (status line with Git branch)
+        -- =========================
+        require('lualine').setup {
+          options = {
+            theme = 'catppuccin',  -- match your colorscheme
+            section_separators = {'', ''},
+            component_separators = {'', ''},
+          },
+          sections = {
+            lualine_a = {'mode'},
+            lualine_b = {'branch'},  -- shows Git branch here
+            lualine_c = {'filename'},
+            lualine_x = {'encoding', 'fileformat', 'filetype'},
+            lualine_y = {'progress'},
+            lualine_z = {'location'}
+          }
+        }
+
+        -- =========================
+        -- image-nvim
+        -- ========================= 
+        require("image").setup({
+          backend = "ueberzug", -- or "ueberzug" or "sixel"
+          processor = "magick_cli", -- or "magick_rock"
+          integrations = {
+          markdown = {
+            enabled = true,
+            clear_in_insert_mode = false,
+            download_remote_images = true,
+            only_render_image_at_cursor = false,
+            only_render_image_at_cursor_mode = "popup", -- or "inline"
+            floating_windows = false, -- if true, images will be rendered in floating markdown windows
+            filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
+          },
+          asciidoc = {
+            enabled = true,
+            clear_in_insert_mode = false,
+            download_remote_images = true,
+            only_render_image_at_cursor = false,
+            only_render_image_at_cursor_mode = "popup",
+            floating_windows = false,
+            filetypes = { "asciidoc", "adoc" },
+          },
+          neorg = {
+            enabled = true,
+            filetypes = { "norg" },
+          },
+          rst = {
+            enabled = true,
+          },
+          typst = {
+            enabled = true,
+            filetypes = { "typst" },
+          },
+          html = {
+            enabled = false,
+          },
+          css = {
+            enabled = false,
+          },
+        },
+        max_width = nil,
+        max_height = nil,
+        max_width_window_percentage = nil,
+        max_height_window_percentage = 50,
+        scale_factor = 1.0,
+        window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
+        window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
+        editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
+        tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
+        hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
+      })
+
+    '';
+  };
+}
--- a/systems/modules/home/programs/ripgrep.nix
+++ b/systems/modules/home/programs/ripgrep.nix
@@ -1,8 +1,7 @@
-{ pkgs, ... }: 
+{ pkgs, ... }:

 {
  home.packages = with pkgs; [
    ripgrep
  ];
 }
-
--- a/systems/modules/home/programs/tmux.nix
+++ b/systems/modules/home/programs/tmux.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:

 {
-  programs.tmux = { 
+  programs.tmux = {
    enable = true;
    mouse = true;
  };
--- a/modules/home/programs/vscode.nix
+++ b/modules/home/programs/vscode.nix
@@ -0,0 +1,86 @@
+{ pkgs, pkgsUnstable, ... }:
+
+let
+  extensions = with pkgs.vscode-extensions; [
+    ms-dotnettools.csharp
+    ms-dotnettools.csdevkit
+    ms-dotnettools.vscode-dotnet-runtime
+    mkhl.direnv
+    catppuccin.catppuccin-vsc
+    bmewburn.vscode-intelephense-client
+    continue.continue
+    vue.volar
+    ms-vscode-remote.remote-containers
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "ryanluker";
+        name = "vscode-coverage-gutters";
+        version = "2.14.0"; # use the current version
+        sha256 = "sha256-waF3FmncUsXqWFWGRy9X7RQ29BDRYlaqyFhEXg4HXNo";
+      };
+    })
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "laravel";
+        name = "vscode-laravel";
+        version = "1.7.0"; # use the current version
+        sha256 = "sha256-5PVbv5hWIdsOHvYttnf2BPeqfPXsOVENrnRyiUf/Hlg=";
+      };
+    })
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "amiralizadeh9480";
+        name = "laravel-extra-intellisense";
+        version = "0.7.4"; # use the current version
+        sha256 = "sha256-EoyKm2YYfEZDmI1mqRU/SaNk0bNLPrWVINpIhglnL80=";
+      };
+    })
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "recca0120";
+        name = "vscode-phpunit";
+        version = "3.9.40"; # use the current version
+        sha256 = "sha256-EVyDT5aXu1KsGr8xrBQlIRCMOtiCyHgU7aDjl9d9ldY=";
+      };
+    })
+  ];
+
+  userSettings = {
+    "editor.lineNumbers" = "relative";
+    "workbench.colorTheme" = "Catppuccin Mocha";
+    "workbench.editor.enablePreview" = false;
+    "direnv.restart.automatic" = true;
+    "terminal.integrated.defaultProfile.linux" = "zsh";
+    "terminal.integrated.profiles.linux".zsh = {
+      path = "${pkgs.zsh}/bin/zsh";
+    };
+    "coverage-gutters.coverageBaseDir" = "test-reports";
+    # PHPUnit
+    "phpunit.command" =
+      "docker compose exec laravel.test \${php} \${phpargs} \${phpunit} \${phpunitargs}";
+    "phpunit.phpunit" = "artisan test";
+    "phpunit.paths" = {
+      "\${workspaceFolder}" = "/var/www/html";
+    };
+  };
+
+  editors = {
+    vscode = pkgsUnstable.vscode.fhs;
+    cursor = pkgsUnstable.code-cursor-fhs;
+    vscodium = pkgsUnstable.vscodium-fhs;
+  };
+
+  mkEditor = package: {
+    enable = true;
+    inherit package;
+
+    profiles.default = {
+      inherit extensions;
+      inherit userSettings;
+    };
+  };
+
+in
+{
+  programs = builtins.mapAttrs (_: mkEditor) editors;
+}
--- a/systems/modules/home/programs/zsh.nix
+++ b/systems/modules/home/programs/zsh.nix
@@ -1,11 +1,12 @@
 { pkgs, ... }:

 {
-  home.file.".zsh/fastfetch.jsonc".source =
-    ./fastfetch/config.jsonc;
+  home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
+  home.file.".zsh/functions/dex.zsh".source = ./zsh/functions/dex.zsh;

  programs.zsh = {
    enable = true;
+
    oh-my-zsh = {
      enable = true;
      theme = "agnoster";
@@ -14,6 +15,8 @@
    initContent = ''
      # Use kitty's ssh helper if running inside kitty
      [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+
+      source ~/.zsh/functions/dex.zsh
    '';
  };
 }
--- a/modules/home/programs/zsh/functions/dex.zsh
+++ b/modules/home/programs/zsh/functions/dex.zsh
@@ -0,0 +1,59 @@
+dex() {
+  clear
+  local container
+
+  container=$(
+    docker ps --format '{{.Names}}\t{{.Image}}\t{{.Status}}' |
+      sort |
+      fzf \
+        --delimiter=$'\t' \
+        --with-nth=1,2,3 \
+        --header=$'Ctrl-I: Inspect | Ctrl-L: Logs | Ctrl-R: Refresh | ?: Toggle Preview\n\nNAME\tIMAGE\tSTATUS' \
+        --tabstop=4 \
+        --height=100% \
+        --layout=reverse \
+        --border=rounded \
+        --info=inline-right \
+        --prompt='🐳 Container > ' \
+        --pointer='▶' \
+        --marker='✓' \
+        --preview 'docker logs -f --tail=50 {1} 2>&1' \
+        --preview-label=' Logs ' \
+        --preview-window='right,65%,follow,border-left,wrap' \
+        --bind 'ctrl-r:reload(docker ps --format "{{.Names}}\t{{.Image}}\t{{.Status}}" | sort)' \
+        --bind 'ctrl-u:preview-half-page-up' \
+        --bind 'ctrl-d:preview-half-page-down' \
+        --bind '?:toggle-preview' \
+        --bind 'ctrl-l:change-preview(docker logs -f --tail=50 {1} 2>&1)+change-preview-label(Logs)' \
+        --bind 'ctrl-i:change-preview(
+          docker inspect --format "
+Name:      {{.Name}}
+Image:     {{.Config.Image}}
+Status:    {{.State.Status}}
+Running:   {{.State.Running}}
+Started:   {{.State.StartedAt}}
+Finished:  {{.State.FinishedAt}}
+PID:       {{.State.Pid}}
+Exit Code: {{.State.ExitCode}}
+
+Networks:
+{{range .NetworkSettings.Networks}}  • {{.IPAddress}}
+{{end}}
+
+Mounts:
+{{range .Mounts}}  • {{.Source}} -> {{.Destination}}
+{{end}}
+" {1}
+        )+change-preview-label(Inspect)' |
+      cut -f1
+  ) || return
+
+  docker exec -it "$container" sh -c '
+    for shell in bash ash zsh sh; do
+      command -v "$shell" >/dev/null 2>&1 && exec "$shell"
+    done
+
+    echo "No suitable shell found." >&2
+    exit 1
+  '
+}
--- a/systems/modules/home/wm/cursor.nix
+++ b/systems/modules/home/wm/cursor.nix
@@ -2,8 +2,8 @@

 {
  home.pointerCursor = {
-#    name = "Bibata-Modern-Ice";   # change to your cursor theme
-#    package = pkgs.bibata-cursors;
+    #    name = "Bibata-Modern-Ice";   # change to your cursor theme
+    #    package = pkgs.bibata-cursors;
    name = "Adwaita";
    package = pkgs.adwaita-icon-theme;
    size = 24;
--- a/systems/modules/home/wm/dconf.nix
+++ b/systems/modules/home/wm/dconf.nix
--- a/systems/modules/home/wm/gtk.nix
+++ b/systems/modules/home/wm/gtk.nix
@@ -15,6 +15,7 @@
      name = "Adwaita";
      package = pkgs.adwaita-icon-theme;
    };
+    gtk4.theme = null;
  };

  home.sessionVariables = {
--- a/modules/home/wm/hyprland.nix
+++ b/modules/home/wm/hyprland.nix
@@ -0,0 +1,216 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+let
+  cfg = config.home.hyprland;
+  toggleRecorder = import ./scripts/toggle-recorder.nix { inherit pkgs; };
+in
+{
+  options.home.hyprland.monitors = lib.mkOption {
+    type = lib.types.listOf (lib.types.submodule {
+      options = {
+        output = lib.mkOption { type = lib.types.str; };
+        mode = lib.mkOption {
+          type = lib.types.str;
+          default = "preferred";
+        };
+        position = lib.mkOption {
+          type = lib.types.str;
+          default = "auto";
+        };
+        scale = lib.mkOption {
+          type = lib.types.number;
+          default = 1;
+        };
+      };
+    });
+    default = [ ];
+  };
+
+  config = {
+    home.packages = with pkgs; [
+      bzmenu
+      hyprshot
+      hyprlock
+      playerctl
+      speedcrunch
+      toggleRecorder
+    ];
+    wayland.windowManager.hyprland = {
+      enable = true;
+      configType = "lua";
+      settings =
+        let
+          mkLuaInline = lib.generators.mkLuaInline;
+          toLua = lib.generators.toLua;
+          mkArgs = args: { _args = args; };
+          defaultMonitor = {
+            output = "";
+            mode = "preferred";
+            position = "auto";
+            scale = 1;
+          };
+          bind =
+            keys: dispatcher: options:
+            mkArgs [
+              keys
+              dispatcher
+              options
+            ];
+          dsp = {
+            exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
+            focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
+            window = {
+              move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
+              drag = mkLuaInline "hl.dsp.window.drag()";
+              resize = mkLuaInline "hl.dsp.window.resize()";
+              close = mkLuaInline "hl.dsp.window.close()";
+              kill = mkLuaInline "hl.dsp.window.kill()";
+              fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
+            };
+            exit = mkLuaInline "hl.dsp.exit()";
+            workspace = {
+              move = arg: mkLuaInline "hl.dsp.workspace.move(${toLua { } arg})";
+            };
+          };
+          mod = "SUPER";
+          workspaces = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
+        in
+        {
+          config = {
+            general = {
+              resize_on_border = true;
+              allow_tearing = true;
+            };
+
+            animations.enabled = true;
+
+            decoration = {
+              inactive_opacity = 0.7;
+              active_opacity = 0.9;
+              rounding = 5;
+              rounding_power = 2.5;
+              blur = {
+                enabled = true;
+                brightness = 1.0;
+                contrast = 1.0;
+                noise = 0.01;
+
+                vibrancy = 0.2;
+                vibrancy_darkness = 0.5;
+
+                passes = 4;
+                size = 7;
+
+                popups = true;
+                popups_ignorealpha = 0.2;
+              };
+              shadow = {
+                enabled = true;
+                color = "rgba(00000055)";
+                offset = "0 15";
+                range = 100;
+                render_power = 2;
+                scale = 0.97;
+              };
+            };
+
+            misc = {
+              focus_on_activate = true;
+            };
+          };
+
+          bind = lib.flatten [
+            (bind "${mod} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") { })
+            (bind "${mod} + Q" (dsp.window.close) { })
+            (bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
+            (bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
+            (bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
+            (bind "${mod} + F" (dsp.window.fullscreen) { })
+            (bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
+            (bind "${mod} + SHIFT + Z" (dsp.exec_cmd "toggle-recorder") { })
+            (bind "${mod} + M" (dsp.exit) { })
+            (bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
+            (bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
+
+            (bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
+            (bind "${mod} + SHIFT + DOWN" (dsp.window.move { direction = "d"; }) { })
+            (bind "${mod} + SHIFT + UP" (dsp.window.move { direction = "u"; }) { })
+            (bind "${mod} + SHIFT + RIGHT" (dsp.window.move { direction = "r"; }) { })
+
+            (bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
+            (bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
+            (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
+            (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
+
+            (bind "${mod} + 1" (dsp.focus { workspace = 1; }) { })
+            (bind "${mod} + 2" (dsp.focus { workspace = 2; }) { })
+            (bind "${mod} + 3" (dsp.focus { workspace = 3; }) { })
+            (bind "${mod} + 4" (dsp.focus { workspace = 4; }) { })
+            (bind "${mod} + 5" (dsp.focus { workspace = 5; }) { })
+            (bind "${mod} + 6" (dsp.focus { workspace = 6; }) { })
+            (bind "${mod} + 7" (dsp.focus { workspace = 7; }) { })
+            (bind "${mod} + 8" (dsp.focus { workspace = 8; }) { })
+            (bind "${mod} + 9" (dsp.focus { workspace = 9; }) { })
+
+            (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) { })
+            (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) { })
+            (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) { })
+            (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) { })
+            (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) { })
+            (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) { })
+            (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) { })
+            (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) { })
+            (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) { })
+
+            (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
+              repeating = true;
+              locked = true;
+            })
+            (bind "XF86AudioRaiseVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+") {
+              repeating = true;
+              locked = true;
+            })
+            (bind "XF86AudioPlay" (dsp.exec_cmd "playerctl play-pause") { locked = true; })
+            (bind "XF86AudioPrev" (dsp.exec_cmd "playerctl previous") { locked = true; })
+            (bind "XF86AudioNext" (dsp.exec_cmd "playerctl next") { locked = true; })
+
+            (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
+            (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
+          ];
+          on = [
+            (mkArgs [
+              "hyprland.start"
+              (mkLuaInline ''
+                function()
+                  hl.exec_cmd("waybar")
+
+                  hl.monitor(${toLua {} defaultMonitor})
+
+                  ${lib.concatMapStringsSep "\n"
+                    (m: "hl.monitor(${toLua {} m})")
+                    cfg.monitors}
+                end
+              '')
+            ])
+
+            (mkArgs [
+              "config.reloaded"
+              (mkLuaInline ''
+                function()
+                  hl.monitor(${toLua {} defaultMonitor})
+
+                  ${lib.concatMapStringsSep "\n"
+                    (m: "hl.monitor(${toLua {} m})")
+                    cfg.monitors}
+                end
+              '')
+            ])
+          ];
+        };
+    };
+  };
+}
--- a/systems/modules/home/wm/hyprpaper.nix
+++ b/systems/modules/home/wm/hyprpaper.nix
@@ -4,19 +4,26 @@ let
  wallpaper = builtins.toString ../backgrounds/monkey.jpg;
  wallpaper2 = builtins.toString ../backgrounds/bird.jpg;
  wallpaper3 = builtins.toString ../backgrounds/nix.png;
+  wallpaper4 = builtins.toString ../backgrounds/catppucin.png;
 in
 {
  services.hyprpaper = {
    enable = true;

    settings = {
+      splash = false;
      preload = [
        wallpaper
        wallpaper2
        wallpaper3
+        wallpaper4
      ];
+
      wallpaper = [
-        ",${wallpaper3}"
+        {
+          monitor = "";
+          path = wallpaper4;
+        }
      ];
    };
  };
--- a/systems/modules/home/wm/rofi.nix
+++ b/systems/modules/home/wm/rofi.nix
--- a/modules/home/wm/scripts/toggle-recorder.nix
+++ b/modules/home/wm/scripts/toggle-recorder.nix
@@ -0,0 +1,22 @@
+{ pkgs }:
+
+pkgs.writeShellApplication {
+  name = "toggle-recorder";
+
+  runtimeInputs = with pkgs; [
+    wf-recorder
+    slurp
+    procps
+    coreutils
+  ];
+
+  text = ''
+    if pgrep -x wf-recorder >/dev/null; then
+      pkill -INT wf-recorder
+    else
+      wf-recorder \
+        -g "$(slurp)" \
+        -f "$HOME/Videos/recording-$(date +%F-%H%M%S).mp4"
+    fi
+  '';
+}
--- a/systems/modules/home/wm/waybar.nix
+++ b/systems/modules/home/wm/waybar.nix
@@ -15,18 +15,29 @@
        "hyprland/workspaces"
        "mpris"
      ];
-      
+
      modules-center = [
        "wlr/taskbar"
      ];

      modules-right = [
+        "custom/recording"
        "pulseaudio"
        "cpu"
        "tray"
        "clock"
      ];

+      "custom/recording" = {
+        exec = ''
+          if pgrep -x wf-recorder >/dev/null; then
+            echo "🔴 REC"
+          fi
+        '';
+        interval = 1;
+        tooltip = false;
+      };
+
      pulseaudio = {
        format = "{icon} {volume}%";
        format-muted = "󰝟 muted";
@@ -35,7 +46,11 @@
        scroll-step = 5;

        format-icons = {
-          default = [ "󰕿" "󰖀" "󰕾" ];
+          default = [
+            "󰕿"
+            "󰖀"
+            "󰕾"
+          ];
        };

        on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
@@ -46,7 +61,10 @@
        format = "{player_icon} {artist} - {title}";
        format-paused = "{player_icon} ⏸ {title}";
        tooltip = true;
-        ignored-players = [ "firefox" "vlc" ];
+        ignored-players = [
+          "firefox"
+          "vlc"
+        ];
      };

      cpu = {
--- a/systems/modules/home/wm/waybar/waybar-style.css
+++ b/systems/modules/home/wm/waybar/waybar-style.css
--- a/modules/multimedia/audacity.nix
+++ b/modules/multimedia/audacity.nix
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,15 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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/security/bitwarden.nix
+++ b/modules/security/bitwarden.nix
@@ -0,0 +1,16 @@
+{ 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
@@ -0,0 +1,6 @@
+{ lib, ... }: {
+  imports = lib.mapAttrsToList
+    (file: _: ./. + "/${file}")
+    (lib.filterAttrs (file: _: lib.hasSuffix ".nix" file && file != "default.nix")
+      (builtins.readDir ./.));
+}
--- a/modules/system/btop.nix
+++ b/modules/system/btop.nix
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,17 @@
+{ 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
@@ -0,0 +1,12 @@
+{ 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/work/default.nix
+++ b/modules/work/default.nix
@@ -0,0 +1,6 @@
+{ 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
@@ -0,0 +1,20 @@
+{ 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/outputs.nix
+++ b/outputs.nix
@@ -1,73 +1,57 @@
-{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
+{ nixpkgs
+, nixpkgs-unstable
+, home-manager
+, nix-flatpak
+, ...
+}:

 let
-  mkPkgsUnstable = system: import nixpkgs-unstable {
+  system = "x86_64-linux";
+
+  pkgsUnstable = import nixpkgs-unstable {
    inherit system;
    config.allowUnfree = true;
  };
-in

+  moduleNames = [
+    "ai"
+    "core"
+    "desktop"
+    "development"
+    "features"
+    "gaming"
+    "hardware"
+    "multimedia"
+    "networking"
+    "security"
+    "system"
+    "work"
+  ];
+
+  mkHost =
+    name:
+    nixpkgs.lib.nixosSystem {
+      inherit system;
+
+      specialArgs = {
+        inherit pkgsUnstable;
+        nixFlatpak = nix-flatpak;
+      };
+
+      modules = [
+        nix-flatpak.nixosModules.nix-flatpak
+        home-manager.nixosModules.home-manager
+        ./hosts/${name}
+      ] ++ (map (mod: ./modules/${mod}) moduleNames);
+    };
+
+in
 {
  nixosConfigurations = {
-    "gandalf" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/gandalf
-      ];
-    };
-    "frodo" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/frodo
-      ];
-    };
-    "legolas" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/legolas
-      ];
-    };
-    "balrog" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/balrog
-      ];
-    };
-    "work" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/work
-      ];
-    };
+    gandalf = mkHost "gandalf";
+    frodo = mkHost "frodo";
+    legolas = mkHost "legolas";
+    balrog = mkHost "balrog";
+    work = mkHost "work";
  };
 }
--- a/systems/balrog/default.nix
+++ b/systems/balrog/default.nix
@@ -1,55 +0,0 @@
-# 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, ... }:
-
-{
-  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
-    ];
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  boot.loader.systemd-boot.enable = false;
-  boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
-    };
-    grub = {
-       efiSupport = true;
-       device = "nodev";
-    };
-  };
-
-  networking.hostName = "balrog";
-  networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
-
-  hardware.enableAllFirmware = true;
-
-  boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
-
-  boot.extraModulePackages = with config.boot.kernelPackages; [
-    broadcom_sta
-  ];
-
-  nixpkgs.config = {
-    allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"]; 
-  };
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-  system.stateVersion = "25.11"; # Did you read the comment?
-}
--- a/systems/balrog/hardware-configuration.nix
+++ b/systems/balrog/hardware-configuration.nix
@@ -1,31 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/A202-E19C";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/systems/frodo/default.nix
+++ b/systems/frodo/default.nix
@@ -1,26 +0,0 @@
-# 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
-    ];
-
-  # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.grub.useOSProber = true;
-
-  networking.hostName = "frodo"; # Define your hostname.
-
-  system.stateVersion = "25.11"; # Did you read the comment?
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Armel van Ravels	00a8168ef5	add den pattern	2026-08-14 15:08:14 +02:00
Armel van Ravels	6c1074e3fd	devenv update	2026-08-13 09:26:43 +02:00
Armel van Ravels	63360dd275	nix flake update	2026-08-13 08:18:03 +02:00
Armel van Ravels	c8c49bb238	Add bubblewrap and socat	2026-08-11 14:11:21 +02:00
Armel van Ravels	b4ef190034	Add vscode laravel	2026-08-10 08:56:17 +02:00
Armel van Ravels	010031b3d8	Add phpunit in vscode	2026-07-30 10:24:07 +02:00
Armel van Ravels	a1b6ccec7d	Intelephense for php	2026-07-29 10:10:10 +02:00
Armel van Ravels	5bfee98cc8	Add direnv	2026-07-24 09:54:37 +02:00
Armel van Ravels	bc16b994a0	Reorganize modules	2026-07-23 17:55:54 +02:00
Armel van Ravels	bb3115f637	Add codium	2026-07-23 17:02:54 +02:00
Armel van Ravels	3f446ddbd0	Add cursor with same vscode settings	2026-07-23 13:29:49 +02:00
Armel van Ravels	e2dec8d94d	nix flake update	2026-07-21 09:21:32 +02:00
Armel van Ravels	b4fed26fdd	Add screen recording	2026-07-15 10:24:38 +02:00
Armel van Ravels	7add559324	Add yazi	2026-07-13 16:21:19 +02:00
Armel van Ravels	1e201aa9c6	update bambu studio and flake update	2026-07-13 16:16:30 +02:00
Armel van Ravels	6d81332af3	Fullscreen dex and flake update	2026-07-08 10:39:17 +02:00
Armel van Ravels	93f98b0bd9	Moved dex to seperate file	2026-07-07 09:53:33 +02:00
Armel van Ravels	fb978f98e5	New wallpaper plus cosmetics	2026-07-07 09:03:04 +02:00
Armel van Ravels	916dd01079	flake update	2026-07-02 14:20:11 +02:00
Armel van Ravels	711e593018	Add lazygit	2026-07-02 14:10:29 +02:00
Armel van Ravels	7aaec79d03	add dex	2026-07-01 11:00:51 +02:00
Armel van Ravels	322d786f1a	flake update	2026-06-29 23:08:13 +02:00
Armel van Ravels	61eb3d663e	drop heroic and add discord	2026-06-29 23:07:07 +02:00
Armel van Ravels	af4175f5db	update flake.lock drop legcord	2026-06-29 09:56:47 +02:00
Armel van Ravels	84f149fe88	reconfigure monitors after config.reloaded event	2026-06-26 18:23:34 +02:00
Armel van Ravels	73601c9423	Add work specialization for monitor configuration	2026-06-26 14:20:24 +02:00
Armel van Ravels	239f5832c6	Add btop.nix to Gandalf	2026-06-23 07:41:00 +02:00
Armel van Ravels	b6059c8608	Add devenv.nix to Gandalf	2026-06-23 07:37:46 +02:00
Armel van Ravels	83210c012c	Configure monitor per host	2026-06-22 11:06:20 +02:00
Armel van Ravels	0af25f781c	Super + Q should close instead of kill	2026-06-22 10:24:03 +02:00
Armel van Ravels	edfb61be35	Add Vue exgtension to vscode	2026-06-22 10:10:39 +02:00
Armel van Ravels	cf9c121269	Some cleanup add btop and vlc to some systems	2026-06-21 13:21:11 +02:00
Armel van Ravels	f440336d5b	Add VLC	2026-06-20 22:21:51 +02:00
Armel van Ravels	cec7516cdf	Set resolution for eDP-1	2026-06-19 19:13:58 +02:00
Armel van Ravels	cbf96db004	Add devenv nix	2026-06-19 09:02:41 +02:00
Armel van Ravels	49b7373ce1	nix-fmt	2026-06-16 18:13:56 +02:00
Armel van Ravels	ef0aef2178	Remove comment	2026-06-16 18:07:07 +02:00
Armel van Ravels	954271b115	Fix MTP	2026-06-16 15:30:45 +02:00
Armel van Ravels	b62e9d4d52	Add keybind to hide waybar	2026-06-16 14:33:28 +02:00
Armel van Ravels	c0c85c4763	Merge branch 'feature/btop'	2026-06-15 10:25:56 +02:00
Armel van Ravels	55ed89d73b	Fix resolution	2026-06-15 10:25:29 +02:00
Armel van Ravels	1dcda6d75e	flake update and add btop to work machine	2026-06-15 09:55:01 +02:00
armel	31b10d3cec	Merge pull request 'Various fixes and move to hyprland lua config' (#18 ) from feature/hyprland-lua into master Reviewed-on: #18	2026-06-13 23:08:08 +02:00
Armel van Ravels	105fa3a0ae	Various fixes and move to hyprland lua config	2026-06-13 23:05:38 +02:00
Armel van Ravels	a353993421	feature/26-05 (#17 ) Reviewed-on: #17 Co-authored-by: Armel van Ravels <armel@armel.nl> Co-committed-by: Armel van Ravels <armel@armel.nl>	2026-06-12 15:47:01 +02:00
Armel van Ravels	93d29bbdb3	Install continue.continue in vscode	2026-06-08 10:51:47 +02:00
Armel van Ravels	e01ac689f2	remove vim style from vscode	2026-06-05 23:11:38 +02:00
Armel van Ravels	5ff41ad33b	enable devenv on work, and some vscode settings	2026-06-05 14:32:42 +02:00
armel	c20adcd820	Merge pull request 'add devenv to blarog' (#16 ) from feature/devenv into master Reviewed-on: #16	2026-05-31 20:54:55 +02:00
Armel van Ravels	71dd48ff08	add devenv to blarog	2026-05-31 20:51:24 +02:00