Add VLC

Reviewed-on: #18

.gitignore

@@ -0,0 +1,10 @@
+# Devenv
+.devenv*
+devenv.local.nix
+devenv.local.yaml
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml

README.md

@@ -0,0 +1,26 @@
+# NixOS Configurations (Flakes)
+
+This repository manages multiple **NixOS system configurations** using **flakes** and **Home Manager**. 
+Each system has its own dedicated configuration module.
+
+## Supported Systems
+
+| System Name | Description |
+|-------------|-------------|
+| **gandalf** | Personal system configuration for `gandalf`. |
+| **frodo**   | Personal system configuration for `frodo`. |
+| **legolas** | Personal system configuration for `legolas`. |
+| **balrog**  | Personal system configuration for `balrog`. |
+| **work**    | Work-oriented system configuration for `work`. |
+
+
+## Rebuild a System
+
+To rebuild and switch to a specific system:
+
+```bash
+# Replace <system> with gandalf, frodo, legolas, balrog or work
+sudo nixos-rebuild switch --flake .#<system>
+```
+
+

devenv.lock

@@ -0,0 +1,146 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1781800860,
+        "narHash": "sha256-LrEo0eC5ckMvjpBRCuk5q5/vjItKlxnb4n/clHNRZlk=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "d59d872d80876d9eeb3e214d3b088bc4a14a9c4f",
+        "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",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781733627,
+        "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "inputs": {
+        "nixpkgs-src": "nixpkgs-src"
+      },
+      "locked": {
+        "lastModified": 1781620901,
+        "narHash": "sha256-UF6scQlG+6lRkZBUpn/3KNavhOo5G8kDWhjVHcno8uc=",
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "2df109b343d3c68efd752e32a444a1d9b9f89afa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1781454065,
+        "narHash": "sha256-d2xfDjnfRuf/xYGdu9VVRHiav/2w5hDL/5cw2TuVAXw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9eac87a12312b8f60dd52e1c6e1a265f6fc7f5fc",
+        "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": 1780220602,
+        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

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

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

flake.lock

@@ -7,32 +7,63 @@
         ]
       },
       "locked": {
-        "lastModified": 1770260404,
+        "lastModified": 1781319724,
-        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
+        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
+        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1780908363,
+        "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770770419,
+        "lastModified": 1781216227,
-        "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1781359544,
+        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -40,7 +71,9 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nix-flatpak": "nix-flatpak",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },

flake.nix

@@ -3,11 +3,20 @@
 
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-25.11";
+      url = "github:nixos/nixpkgs/nixos-26.05";
+    };
+
+    nixpkgs-unstable = {
+      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nix-flatpak = {
+      url = "github:gmodena/nix-flatpak";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

outputs.nix

@@ -1,27 +1,80 @@
-{ nixpkgs, home-manager, ... }:
+{ nixpkgs
+, nixpkgs-unstable
+, home-manager
+, nix-flatpak
+, ...
+}:
+
+let
+  mkPkgsUnstable =
+    system:
+    import nixpkgs-unstable {
+      inherit system;
+      config.allowUnfree = true;
+    };
+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
+      ];
+    };
   };
 }

systems/balrog/default.nix

@@ -0,0 +1,69 @@
+# 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
+    ../modules/devenv.nix
+    #      ../modules/bitwarden.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?
+}

systems/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;
+}

systems/frodo/default.nix

@@ -5,15 +5,15 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [ # Include the results of the hardware scan.
+    # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+    ./hardware-configuration.nix
-      ../modules/common.nix
+    ../modules/common.nix
-      ../modules/users.nix
+    ../modules/users.nix
-      ../modules/locales.nix
+    ../modules/locales.nix
-      ../modules/services.nix
+    ../modules/services.nix
-      ../modules/programs.nix
+    ../modules/programs.nix
-    ];
+  ];
 
   # Bootloader.
   boot.loader.grub.enable = true;

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 =
+  imports = [
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    (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."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
+    device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
   swapDevices = [ ];
 

systems/gandalf/default.nix

@@ -1,35 +1,60 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ../modules/home-manager.nix
-      ../modules/common.nix
+    ../modules/common.nix
-      ../modules/users.nix
+    ../modules/users.nix
-      ../modules/locales.nix
+    ../modules/locales.nix
-      ../modules/services.nix
+    ../modules/services.nix
-      ../modules/programs.nix
+    ../modules/programs.nix
-      ../modules/gaming.nix
+    ../modules/gaming.nix
-      ../modules/obs-studio.nix
+    ../modules/obs-studio.nix
-      ../modules/garbage-collection.nix
+    ../modules/garbage-collection.nix
-      ../modules/printing.nix
+    ../modules/printing.nix
-      ../modules/docker.nix
+    ../modules/docker.nix
-      ../modules/matrix.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
+    ./mtp-fix.nix
+  ];
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-#  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   networking.hostName = "gandalf";
   networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
+  networking.firewall.enable = false;
+
+  home-manager.users.avravels.home.hyprland.execOnce = [
+    "waybar"
+    "[workspace 1 silent] kitty"
+    "[workspace 1 silent] spotify"
+    "[workspace 2 silent] firefox"
+  ];
 
   networking.interfaces.enp130s0.wakeOnLan.enable = true;
   networking.firewall.allowedUDPPorts = [ 9 ];
 
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
+  services.openssh.settings.X11Forwarding = true;
 
   hardware = {
     graphics.enable = true;
@@ -45,19 +70,6 @@
   systemd.targets.hybrid-sleep.enable = false;
 
   virtualisation.libvirtd.enable = true;
-  
-  services = {
-    # Bluetooth fixes
-    udev.extraRules = ''
-      SUBSYSTEM=="usb", ENV{ID_VENDOR_ID}=="0489", ENV{ID_MODEL_ID}=="e111", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{ID_INPUT}="", ENV{SOLID_IGNORE}="1", TAG-="uaccess"
-
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="0489", ATTRS{idProduct}=="e111", ENV{DEVTYPE}=="usb_interface", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{ID_INPUT}="", ENV{SOLID_IGNORE}="1", TAG-="uaccess"
-
-      SUBSYSTEM=="usb", KERNEL=="3-14:*", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{ID_INPUT}="", ENV{SOLID_IGNORE}="1", TAG-="uaccess"
-
-      SUBSYSTEM=="usb", KERNELS=="3-14", ENV{UDISKS_IGNORE}="1", ENV{ID_MEDIA_PLAYER}="", ENV{ID_MTP_DEVICE}="", ENV{ID_GPHOTO2}="", ENV{SOLID_IGNORE}="1"
-    '';
-  };
 
   system.stateVersion = "25.11"; # Did you read the comment?
 }

systems/gandalf/hardware-configuration.nix

@@ -1,28 +1,43 @@
 # 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 =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363";
+    device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/01E4-5DD7";
+    device = "/dev/disk/by-uuid/01E4-5DD7";
-      fsType = "vfat";
+    fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = [
-    };
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];
 

systems/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 = [ ];
+              });
+        }
+    )
+  ];
+}

systems/legolas/default.nix

@@ -1,25 +1,28 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ../modules/common.nix
-      ../modules/common.nix
+    ../modules/users.nix
-      ../modules/users.nix
+    ../modules/locales.nix
-      ../modules/locales.nix
+    ../modules/services.nix
-      ../modules/services.nix
+    ../modules/programs.nix
-      ../modules/programs.nix
+    ../modules/gaming.nix
-      ../modules/gaming.nix
+  ];
-    ];
 
   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" ];
+  networking.nameservers = [
+    "192.168.68.56"
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
 
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
 
   hardware = {
     graphics.enable = true;
@@ -30,6 +33,6 @@
   };
 
   virtualisation.libvirtd.enable = true;
-  
+
   system.stateVersion = "25.11"; # Did you read the comment?
 }

systems/legolas/hardware-configuration.nix

@@ -1,33 +1,47 @@
 # 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 =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b";
+    device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/C4C8-E90E";
+    device = "/dev/disk/by-uuid/C4C8-E90E";
-      fsType = "vfat";
+    fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
-    };
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
-  fileSystems."/media" =
+  fileSystems."/media" = {
-    { device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232";
+    device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
   swapDevices = [ ];
 

systems/modules/arduino-ide.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    arduino-ide
+  ];
+}

systems/modules/audacity.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    audacity
+  ];
+}

systems/modules/azure-data-studio.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    azuredatastudio
+  ];
+}

systems/modules/bambu-studio-flatpak.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  services.flatpak.enable = true;
+  services.flatpak.packages = [
+    "com.bambulab.BambuStudio"
+  ];
+}

systems/modules/bitwarden.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-39.8.10"
+  ];
+
+  environment.systemPackages = with pkgs; [
+    bitwarden-desktop
+  ];
+}

systems/modules/btop.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    btop
+  ];
+}

systems/modules/common.nix

@@ -3,15 +3,19 @@
 {
   nixpkgs.config.allowUnfree = true;
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   users.defaultUserShell = pkgs.zsh;
 
   environment.systemPackages = with pkgs; [
+    chromium
     gnumake
-    git
     jetbrains-toolbox
     fastfetch
+    jq
   ];
 
   security.rtkit.enable = true;

systems/modules/devenv.nix

@@ -0,0 +1,12 @@
+{ config, pkgsUnstable, ... }:
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    devenv
+  ];
+
+  nix.settings.trusted-users = [
+    "root"
+    "avravels"
+  ];
+}

systems/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" ];
+    };
+  };
+}

systems/modules/filezilla.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    filezilla
+  ];
+}

systems/modules/gaming.nix

@@ -1,13 +1,20 @@
 { config, pkgs, ... }:
 
 {
-  programs = {
+  programs.steam = {
-    steam.enable = true;
+    enable = true;
-    steam.remotePlay.openFirewall = true;
+    remotePlay.openFirewall = true;
-    steam.localNetworkGameTransfers.openFirewall = true;
+    localNetworkGameTransfers.openFirewall = true;
+    package = pkgs.steam.override {
+      extraEnv = {
+        MANGOHUD = "1";
+        WINE_VK_VULKAN_ONLY = "1";
+      };
+    };
   };
 
   environment.systemPackages = [
     pkgs.heroic
+    pkgs.mangohud
   ];
 }

systems/modules/gimp.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    gimp
+  ];
+}

systems/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;
+  };
+}

systems/modules/home/home.nix

@@ -0,0 +1,32 @@
+{ pkgs, lib, ... }:
+
+{
+  # Home Manager state version
+  home.stateVersion = "25.11";
+
+  home.username = "avravels";
+  home.homeDirectory = "/home/avravels";
+
+  imports = [
+    ./other/fonts.nix
+    #    ./programs/bitwarden.nix
+    ./programs/kitty.nix
+    ./programs/zsh.nix
+    ./programs/direnv.nix
+    ./programs/firefox.nix
+    ./programs/tmux.nix
+    ./programs/git.nix
+    ./programs/libreoffice.nix
+    ./programs/nvim.nix
+    ./programs/ripgrep.nix
+    ./programs/vscode.nix
+    ./wm/rofi.nix
+    ./wm/cursor.nix
+    ./wm/dconf.nix
+    ./wm/gtk.nix
+    ./wm/waybar.nix
+    ./wm/hyprland.nix
+    ./wm/hyprpaper.nix
+  ];
+
+}

systems/modules/home/other/fonts.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  fonts.fontconfig.enable = true;
+
+  home.packages = with pkgs; [
+    nerd-fonts.fira-code
+    nerd-fonts.droid-sans-mono
+    nerd-fonts.noto
+    nerd-fonts.hack
+    nerd-fonts.ubuntu
+  ];
+}

systems/modules/home/programs/bitwarden.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = [
+    pkgs.bitwarden-desktop
+  ];
+}

systems/modules/home/programs/direnv.nix

@@ -0,0 +1,13 @@
+{ pkgs, config, ... }:
+
+{
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    nix-direnv.enable = true;
+  };
+
+  home.file.".config/direnv/direnvrc" = {
+    source = ./direnv/direnvrc;
+  };
+}

systems/modules/home/programs/direnv/direnvrc

@@ -0,0 +1,15 @@
+# Place in ~/.config/direnv/direnvrc
+
+# Two things to know:
+# * `direnv_layour_dir` is called once for every {.direnvrc,.envrc} sourced
+# * The indicator for a different direnv file being sourced is a different $PWD value
+# This means we can hash $PWD to get a fully unique cache path for any given environment
+
+: ${XDG_CACHE_HOME:=$HOME/.cache}
+declare -A direnv_layout_dirs
+direnv_layout_dir() {
+	echo "${direnv_layout_dirs[$PWD]:=$(
+		echo -n "$XDG_CACHE_HOME"/direnv/layouts/
+		echo -n "$PWD" | sha1sum | cut -d ' ' -f 1
+	)}"
+}

systems/modules/home/programs/fastfetch/config.jsonc

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/master/doc/json_schema.json",
+  "modules": [
+    "os",
+    "uptime",
+    "cpu",
+    "gpu",
+    "memory",
+    "swap",
+    "disk",
+  ]
+}

systems/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
+    };
+  };
+}

systems/modules/home/programs/git.nix

@@ -0,0 +1,32 @@
+{ lib
+, pkgsUnstable
+, config
+, ...
+}:
+
+{
+  options.home.git = {
+    userName = lib.mkOption {
+      type = lib.types.str;
+      default = "Armel van Ravels";
+      description = "Default git user.name for this user";
+    };
+
+    userEmail = lib.mkOption {
+      type = lib.types.str;
+      default = "armel@armel.nl";
+      description = "Default git user.email for this user";
+    };
+  };
+
+  config = {
+    programs.git = {
+      enable = true;
+      package = pkgsUnstable.git;
+      settings.user = {
+        name = config.home.git.userName;
+        email = config.home.git.userEmail;
+      };
+    };
+  };
+}

systems/modules/home/programs/kitty.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  programs.kitty = {
+    enable = true;
+    settings.confirm_quit = false;
+  };
+}

systems/modules/home/programs/libreoffice.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    libreoffice
+
+    hunspell
+    hunspellDicts.en_US
+    hunspellDicts.nl_NL
+  ];
+}

systems/modules/home/programs/nvim.nix

@@ -0,0 +1,161 @@
+{ pkgs, ... }:
+
+{
+  programs.neovim = {
+    enable = true;
+    withRuby = false;
+    withPython3 = false;
+    defaultEditor = true;
+    extraLuaPackages = ps: [ ps.magick ];
+    extraPackages = [
+      pkgs.ueberzugpp
+      pkgs.imagemagick
+    ];
+
+    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
+      })
+
+    '';
+  };
+}

systems/modules/home/programs/ripgrep.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    ripgrep
+  ];
+}

systems/modules/home/programs/tmux.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  programs.tmux = {
+    enable = true;
+    mouse = true;
+  };
+}

systems/modules/home/programs/vscode.nix

@@ -0,0 +1,31 @@
+{ pkgs, pkgsUnstable, ... }:
+
+{
+  programs.vscode = {
+    enable = true;
+
+    package = pkgsUnstable.vscode.fhs;
+    profiles.default.extensions = with pkgs.vscode-extensions; [
+      ms-dotnettools.csharp
+      ms-dotnettools.csdevkit
+      ms-dotnettools.vscode-dotnet-runtime
+      mkhl.direnv # Direnv integration for VSCode
+      catppuccin.catppuccin-vsc
+      bmewburn.vscode-intelephense-client
+      continue.continue
+    ];
+
+    profiles.default.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;
+        };
+      };
+    };
+  };
+}

systems/modules/home/programs/zsh.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+  home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
+
+  programs.zsh = {
+    enable = true;
+    oh-my-zsh = {
+      enable = true;
+      theme = "agnoster";
+    };
+
+    initContent = ''
+      # Use kitty's ssh helper if running inside kitty
+      [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+    '';
+  };
+}

systems/modules/home/wm/cursor.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  home.pointerCursor = {
+    #    name = "Bibata-Modern-Ice";   # change to your cursor theme
+    #    package = pkgs.bibata-cursors;
+    name = "Adwaita";
+    package = pkgs.adwaita-icon-theme;
+    size = 24;
+    gtk.enable = true;
+    x11.enable = true;
+  };
+}

systems/modules/home/wm/dconf.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    dconf
+  ];
+
+  dconf = {
+    enable = true;
+    settings = {
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+      };
+    };
+  };
+}

systems/modules/home/wm/gtk.nix

@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+
+{
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Orchis-dark";
+      package = pkgs.orchis-theme;
+    };
+    iconTheme = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+    };
+    cursorTheme = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+    };
+    gtk4.theme = null;
+  };
+
+  home.sessionVariables = {
+    GTK_THEME = "Adwaita:dark"; # GTK apps dark theme
+    MOZ_GTK_THEME = "Adwaita:dark"; # Firefox respects this
+    GDK_DARK_THEME = "1"; # GTK4 apps dark mode
+    CHROME_FORCE_DARK_MODE = "1"; # Chromium / Chrome dark mode
+  };
+}

systems/modules/home/wm/hyprland.nix

@@ -0,0 +1,186 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+let
+  cfg = config.home.hyprland;
+in
+
+{
+  options.home.hyprland = {
+    execOnce = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ "waybar" ];
+      description = "Commands to run once when Hyprland starts (maps to Hyprland `exec-once`).";
+    };
+  };
+  config = {
+    home.packages = with pkgs; [
+      bzmenu
+      hyprshot
+      hyprlock
+      playerctl
+      speedcrunch
+    ];
+
+    wayland.windowManager.hyprland = {
+      enable = true;
+      configType = "lua";
+      settings =
+        let
+          mkLuaInline = lib.generators.mkLuaInline;
+          toLua = lib.generators.toLua;
+          mkArgs = args: { _args = args; };
+          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.8;
+              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.kill) { })
+            (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} + 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({
+                  output = "",
+                  mode = "preferred",
+                  position = "auto",
+                  scale = 1,
+                })
+                hl.monitor({
+                  output = "eDP-1",
+                  mode = "1920x1200",
+                  position = "auto",
+                  scale = 1,
+                })
+              end'')
+          ];
+        };
+    };
+  };
+}

systems/modules/home/wm/hyprpaper.nix

@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+
+let
+  wallpaper = builtins.toString ../backgrounds/monkey.jpg;
+  wallpaper2 = builtins.toString ../backgrounds/bird.jpg;
+  wallpaper3 = builtins.toString ../backgrounds/nix.png;
+in
+{
+  services.hyprpaper = {
+    enable = true;
+
+    settings = {
+      splash = false;
+      preload = [
+        wallpaper
+        wallpaper2
+        wallpaper3
+      ];
+
+      wallpaper = [
+        {
+          monitor = "";
+          path = wallpaper3;
+        }
+      ];
+    };
+  };
+}

systems/modules/home/wm/rofi.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  home.packages = [
+    pkgs.rofi-file-browser
+  ];
+
+  programs.rofi = {
+    enable = true;
+    theme = "material";
+    terminal = "${pkgs.kitty}/bin/kitty";
+  };
+}

systems/modules/home/wm/waybar.nix

@@ -0,0 +1,74 @@
+{ pkgs, ... }:
+
+{
+  programs.waybar = {
+    enable = true;
+
+    style = builtins.readFile ./waybar/waybar-style.css;
+
+    settings.mainBar = {
+      layer = "top";
+      position = "top";
+      height = 30;
+
+      modules-left = [
+        "hyprland/workspaces"
+        "mpris"
+      ];
+
+      modules-center = [
+        "wlr/taskbar"
+      ];
+
+      modules-right = [
+        "pulseaudio"
+        "cpu"
+        "tray"
+        "clock"
+      ];
+
+      pulseaudio = {
+        format = "{icon} {volume}%";
+        format-muted = "󰝟 muted";
+        tooltip = false;
+
+        scroll-step = 5;
+
+        format-icons = {
+          default = [
+            "󰕿"
+            "󰖀"
+            "󰕾"
+          ];
+        };
+
+        on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+      };
+
+      mpris = {
+        player = "spotify";
+        format = "{player_icon} {artist} - {title}";
+        format-paused = "{player_icon} ⏸ {title}";
+        tooltip = true;
+        ignored-players = [
+          "firefox"
+          "vlc"
+        ];
+      };
+
+      cpu = {
+        format = "  {usage}%";
+        tooltip = false;
+      };
+
+      clock = {
+        tooltip = false;
+      };
+
+      "wlr/taskbar" = {
+        format = "{icon} {name}";
+        on-click = "activate";
+      };
+    };
+  };
+}

systems/modules/home/wm/waybar/waybar-style.css

@@ -0,0 +1,82 @@
+/* ---------------------------
+   Default Waybar Styling
+--------------------------- */
+
+* {
+  color: #ffffff;
+}
+
+
+menu {
+  background-color: #222222;
+  border-radius: 8px;
+  border: 1px solid #313244;
+}
+
+menu menuitem {
+  padding: 6px 12px;
+  color: #cdd6f4;
+}
+
+menu menuitem:hover {
+  background-color: #45475a;
+}
+
+/* General bar */
+#waybar {
+    background-color: #222222;  /* Default dark gray bar */
+    color: #ffffff;             /* Default text color */
+}
+
+/* Modules */
+.module {
+    margin: 0 4px;
+}
+
+/* Hover effect (minimal) */
+.module:hover {
+    opacity: 0.8;
+}
+
+/* Separators */
+.separator {
+    margin: 0 2px;
+}
+
+#taskbar button {
+  background: transparent;
+  border: none;
+  box-shadow: none;
+}
+
+#taskbar button:hover {
+  background-color: rgba(180, 190, 254, 0.15);
+  border-radius: 6px;
+}
+
+#taskbar button.active {
+  background-color: rgba(180, 190, 254, 0.3);
+}
+
+/* Workspace buttons */
+#workspaces button {
+  background: transparent;
+  border: none;
+  box-shadow: none;
+}
+
+/* Hover */
+#workspaces button:hover {
+  background-color: rgba(180, 190, 254, 0.15);
+  border-radius: 6px;
+}
+
+/* Active workspace */
+#workspaces button.active {
+  background-color: rgba(180, 190, 254, 0.35);
+}
+
+/* Icons */
+i {
+    margin-right: 2px;
+}

systems/modules/jq.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    jq
+  ];
+}

systems/modules/kdenlive.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    kdePackages.kdenlive
+  ];
+}

systems/modules/obs-studio.nix

@@ -1,5 +1,10 @@
 { config, pkgs, ... }:
 
 {
-  programs.obs-studio.enable = true;
+  programs.obs-studio = {
+    enable = true;
+    package = pkgs.obs-studio.override {
+      cudaSupport = true;
+    };
+  };
 }

systems/modules/ollama.nix

@@ -0,0 +1,8 @@
+{ pkgsUnstable, ... }:
+
+{
+  services.ollama = {
+    enable = true;
+    package = pkgsUnstable.ollama-cuda;
+  };
+}

systems/modules/openscad.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    openscad
+  ];
+}

systems/modules/postman.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    postman
+  ];
+}

systems/modules/printing.nix

@@ -34,6 +34,9 @@
 
   # for samba
   networking.hosts = {
-    "192.168.68.60" = [ "2C2919000000.local" "2C2919000000" ];
+    "192.168.68.60" = [
+      "2C2919000000.local"
+      "2C2919000000"
+    ];
   };
 }

systems/modules/programs.nix

@@ -10,4 +10,3 @@
     virt-manager.enable = true;
   };
 }
-

systems/modules/qbittorrent.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    qbittorrent
+  ];
+}

systems/modules/remmina.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    remmina
+  ];
+}

systems/modules/teams-for-linux.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    teams-for-linux
+  ];
+}

systems/modules/users.nix

@@ -2,14 +2,20 @@
 
 {
   users.users.avravels = {
+    initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "libvirtd"
+      "dialout"
+    ];
     packages = with pkgs; [
       home-manager
-      discord
+      legcord
       spotify
-      protonvpn-gui
+      proton-vpn
     ];
     shell = pkgs.zsh;
   };

systems/modules/vlc.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vlc
+  ];
+}

systems/modules/wireguard.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    wireguard-tools
+  ];
+}

systems/work/default.nix

@@ -0,0 +1,77 @@
+{ config, pkgs, ... }:
+
+{
+  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
+  ];
+
+  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.hyprland.execOnce = [
+    "waybar"
+    "[workspace 1 silent] kitty"
+    "[workspace 2 silent] firefox"
+    "[workspace 2 silent] teams-for-linux"
+    "[workspace 3 silent] spotify"
+  ];
+
+  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;
+
+  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"; # Did you read the comment?
+}

systems/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;
+}