Merge pull request 'Pin Linux Kernel for gandalf to 7.1' (#19) from chore/gandalf-pin-linux-kernel into master

Reviewed-on: #19

.devcontainer/devcontainer.json

@@ -0,0 +1,15 @@
+{
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "mkhl.direnv"
+      ]
+    },
+    "zed": {
+      "extensions": []
+    }
+  },
+  "image": "ghcr.io/cachix/devenv/devcontainer:latest",
+  "overrideCommand": false,
+  "updateContentCommand": "devenv test"
+}

.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

devenv.lock

@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1781800860,
+        "lastModified": 1787244866,
-        "narHash": "sha256-LrEo0eC5ckMvjpBRCuk5q5/vjItKlxnb4n/clHNRZlk=",
+        "narHash": "sha256-yRtH4Vs49zZE+u3CR1iBs6jTUp1o/4SdCyshZ5+ojbw=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "d59d872d80876d9eeb3e214d3b088bc4a14a9c4f",
+        "rev": "4b10b32036245a13efdb0d77d69d6990d1c8a3f5",
         "type": "github"
       },
       "original": {
@@ -36,17 +36,16 @@
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1781733627,
+        "lastModified": 1784288435,
-        "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
+        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
+        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
         "type": "github"
       },
       "original": {
@@ -55,37 +54,16 @@
         "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,
+        "lastModified": 1787002832,
-        "narHash": "sha256-UF6scQlG+6lRkZBUpn/3KNavhOo5G8kDWhjVHcno8uc=",
+        "narHash": "sha256-DGkHh88/7YLVGZ7HzSVN4YmUmR+wGKudIp6H9UsUNT0=",
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "2df109b343d3c68efd752e32a444a1d9b9f89afa",
+        "rev": "ee3d58d53cfcddfc0ae6fc7f04f4fe2a0c7cf0ed",
         "type": "github"
       },
       "original": {
@@ -98,11 +76,11 @@
     "nixpkgs-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1781454065,
+        "lastModified": 1786858016,
-        "narHash": "sha256-d2xfDjnfRuf/xYGdu9VVRHiav/2w5hDL/5cw2TuVAXw=",
+        "narHash": "sha256-Vczr2zxD0orq6N2QQe5uqOGF7TRDcQJRRuAcsdHr4kg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9eac87a12312b8f60dd52e1c6e1a265f6fc7f5fc",
+        "rev": "54ba4bcec4043e72a4006d825e0d7aff5562008f",
         "type": "github"
       },
       "original": {
@@ -127,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780220602,
+        "lastModified": 1786901030,
-        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
+        "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
         "type": "github"
       },
       "original": {

devenv.nix

@@ -5,6 +5,8 @@
 }:
 
 {
+  devcontainer.enable = true;
+
   treefmt.enable = true;
 
   treefmt.config.programs.nixpkgs-fmt.enable = true;

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781319724,
+        "lastModified": 1788642154,
-        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
+        "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
+        "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1780908363,
+        "lastModified": 1783368811,
-        "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
+        "narHash": "sha256-0H8jDwR4Kegb3heaTrH1ftbgKfZVDT8JE+46uXxDy/Q=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
+        "rev": "20d42f0ee98c9fe9f85e8d1de474f1409ed10d05",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781216227,
+        "lastModified": 1788807765,
-        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
+        "narHash": "sha256-J9oC0bKnkXUrMegqRTXVkyDFJ0gn2U/Qpoo9HgGMQmA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+        "rev": "93108a538f079596c9a16c72cf03e9322782b6dd",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1781359544,
+        "lastModified": 1788865024,
-        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
+        "narHash": "sha256-3YkAzvtt4LoE11IcBDzPshIF3fJ0aIoILqE7dAg8CLI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
+        "rev": "422d1ae605d7fcd9896412b37dc065c456c0eefb",
         "type": "github"
       },
       "original": {

hosts/balrog/default.nix

@@ -12,18 +12,21 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../modules/home-manager.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/docker.nix
+    ../../modules/docker.nix
-    ../modules/printing.nix
+    ../../modules/printing.nix
-    ../modules/bambu-studio-flatpak.nix
+    ../../modules/bambu-studio-flatpak.nix
-    ../modules/arduino-ide.nix
+    ../../modules/arduino-ide.nix
-    ../modules/devenv.nix
+    ../../modules/devenv.nix
-    #      ../modules/bitwarden.nix
+    ../../modules/vlc.nix
+    ../../modules/btop.nix
+    ../../modules/lazygit.nix
+    #    ../../modules/bitwarden.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -65,5 +68,13 @@
   };
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
+
+  home-manager.users.avravels.home.hyprland.monitors = [
+    {
+      output = "eDP-1";
+      mode = "1920x1200";
+    }
+  ];
+
   system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/frodo/default.nix

@@ -8,11 +8,11 @@
   imports = [
     # Include the results of the hardware scan.
     ./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.

hosts/gandalf/default.nix

@@ -3,33 +3,38 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../modules/home-manager.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/kdenlive.nix
-    ../modules/audacity.nix
+    ../../modules/audacity.nix
-    ../modules/ollama.nix
+    ../../modules/ollama.nix
-    ../modules/wireguard.nix
+    ../../modules/wireguard.nix
-    ../modules/qbittorrent.nix
+    ../../modules/qbittorrent.nix
-    ../modules/gimp.nix
+    ../../modules/gimp.nix
-    ../modules/openscad.nix
+    ../../modules/openscad.nix
-    ../modules/bambu-studio-flatpak.nix
+    ../../modules/bambu-studio-flatpak.nix
-    ../modules/arduino-ide.nix
+    ../../modules/arduino-ide.nix
-    ../modules/bitwarden.nix
+    ../../modules/bitwarden.nix
-    ../modules/vlc.nix
+    ../../modules/vlc.nix
+    ../../modules/devenv.nix
+    ../../modules/btop.nix
+    ../../modules/discord.nix
+    ../../modules/lazygit.nix
+    ../../modules/yazi.nix
     ./mtp-fix.nix
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_7_1;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -43,13 +48,6 @@
   ];
   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 ];
 

hosts/legolas/default.nix

@@ -3,12 +3,12 @@
 {
   imports = [
     ./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;

hosts/work/default.nix

@@ -0,0 +1,96 @@
+{ 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
+    ../../modules/vlc.nix
+    ../../modules/lazygit.nix
+    ../../modules/yazi.nix
+    ../../modules/bubblewrap.nix
+    ../../modules/socat.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.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"; # Did you read the comment?
+}

modules/bambu-studio-flatpak.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  services.flatpak.update.onActivation = true;
   services.flatpak.enable = true;
   services.flatpak.packages = [
     "com.bambulab.BambuStudio"

modules/bubblewrap.nix

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

modules/discord.nix

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

modules/gaming.nix

@@ -14,7 +14,6 @@
   };
 
   environment.systemPackages = [
-    pkgs.heroic
     pkgs.mangohud
   ];
 }

modules/home/programs/nvim.nix

@@ -10,6 +10,7 @@
     extraPackages = [
       pkgs.ueberzugpp
       pkgs.imagemagick
+      pkgs.intelephense
     ];
 
     plugins = with pkgs.vimPlugins; [

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
+    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;
+    "workbench.activityBar.orientation" = "vertical";
+    "direnv.restart.automatic" = true;
+    "terminal.integrated.defaultProfile.linux" = "zsh";
+    "terminal.integrated.profiles.linux".zsh = {
+      path = "${pkgs.zsh}/bin/zsh";
+    };
+    # PHPUnit
+    "phpunit.command" =
+      "docker compose exec laravel.test \${php} \${phpargs} \${phpunit} \${phpunitargs}";
+    "phpunit.phpunit" = "artisan test";
+    "phpunit.paths" = {
+      "\${workspaceFolder}" = "/var/www/html";
+    };
+    "LaravelExtraIntellisense.basePathForCode" = "/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;
+}

modules/home/programs/zsh.nix

@@ -2,9 +2,11 @@
 
 {
   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";
@@ -13,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
     '';
   };
 }

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

modules/home/wm/hyprland.nix

@@ -6,16 +6,30 @@
 
 let
   cfg = config.home.hyprland;
+  toggleRecorder = import ./scripts/toggle-recorder.nix { inherit pkgs; };
 in
-
 {
-  options.home.hyprland = {
+  options.home.hyprland.monitors = lib.mkOption {
-    execOnce = lib.mkOption {
+    type = lib.types.listOf (lib.types.submodule {
-      type = lib.types.listOf lib.types.str;
+      options = {
-      default = [ "waybar" ];
+        output = lib.mkOption { type = lib.types.str; };
-      description = "Commands to run once when Hyprland starts (maps to Hyprland `exec-once`).";
+        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
@@ -23,8 +37,8 @@ in
       hyprlock
       playerctl
       speedcrunch
+      toggleRecorder
     ];
-
     wayland.windowManager.hyprland = {
       enable = true;
       configType = "lua";
@@ -33,6 +47,12 @@ in
           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 [
@@ -69,7 +89,7 @@ in
             animations.enabled = true;
 
             decoration = {
-              inactive_opacity = 0.8;
+              inactive_opacity = 0.7;
               active_opacity = 0.9;
               rounding = 5;
               rounding_power = 2.5;
@@ -105,12 +125,13 @@ in
 
           bind = lib.flatten [
             (bind "${mod} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") { })
-            (bind "${mod} + Q" (dsp.window.kill) { })
+            (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") { })
@@ -160,25 +181,34 @@ in
             (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")
 
-          on = mkArgs [
+                  hl.monitor(${toLua {} defaultMonitor})
-            "hyprland.start"
+
-            (mkLuaInline ''
+                  ${lib.concatMapStringsSep "\n"
-              function()
+                    (m: "hl.monitor(${toLua {} m})")
-                hl.exec_cmd("waybar")
+                    cfg.monitors}
-                hl.monitor({
+                end
-                  output = "",
+              '')
-                  mode = "preferred",
+            ])
-                  position = "auto",
+
-                  scale = 1,
+            (mkArgs [
-                })
+              "config.reloaded"
-                hl.monitor({
+              (mkLuaInline ''
-                  output = "eDP-1",
+                function()
-                  mode = "1920x1200",
+                  hl.monitor(${toLua {} defaultMonitor})
-                  position = "auto",
+
-                  scale = 1,
+                  ${lib.concatMapStringsSep "\n"
-                })
+                    (m: "hl.monitor(${toLua {} m})")
-              end'')
+                    cfg.monitors}
+                end
+              '')
+            ])
           ];
         };
     };

modules/home/wm/hyprpaper.nix

@@ -4,6 +4,7 @@ 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 = {
@@ -15,12 +16,13 @@ in
         wallpaper
         wallpaper2
         wallpaper3
+        wallpaper4
       ];
 
       wallpaper = [
         {
           monitor = "";
-          path = wallpaper3;
+          path = wallpaper4;
         }
       ];
     };

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

modules/home/wm/waybar.nix

@@ -21,12 +21,23 @@
       ];
 
       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";

modules/lazygit.nix

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

modules/socat.nix

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

modules/users.nix

@@ -13,9 +13,9 @@
     ];
     packages = with pkgs; [
       home-manager
-      legcord
       spotify
       proton-vpn
+      fzf
     ];
     shell = pkgs.zsh;
   };

modules/yazi.nix

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

outputs.nix

@@ -6,75 +6,37 @@
 }:
 
 let
-  mkPkgsUnstable =
+  system = "x86_64-linux";
-    system:
-    import nixpkgs-unstable {
-      inherit system;
-      config.allowUnfree = true;
-    };
-in
 
+  pkgsUnstable = import nixpkgs-unstable {
+    inherit system;
+    config.allowUnfree = true;
+  };
+
+  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}
+      ];
+    };
+
+in
 {
   nixosConfigurations = {
-    "gandalf" = nixpkgs.lib.nixosSystem {
+    gandalf = mkHost "gandalf";
-      system = "x86_64-linux";
+    frodo = mkHost "frodo";
-      specialArgs = {
+    legolas = mkHost "legolas";
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+    balrog = mkHost "balrog";
-        nixFlatpak = nix-flatpak;
+    work = mkHost "work";
-      };
-      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/modules/home/programs/vscode.nix

@@ -1,31 +0,0 @@
-{ 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/work/default.nix

@@ -1,77 +0,0 @@
-{ 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?
-}