update flake.lock drop legcord

.gitignore

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

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,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781319724,
+        "lastModified": 1782704057,
-        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
+        "narHash": "sha256-G1I1gd32F7mp9LAe1DaZ4ZL7NX5gyiKwdCMwro1Vrck=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
+        "rev": "868d0a692de703c2de98fab61968e4e310b7c28e",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781216227,
+        "lastModified": 1782535326,
-        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
+        "narHash": "sha256-ZeRxu4yn6shd3SNF5ZUQb4r7BaVo1zBKMjRhfoNSBmw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+        "rev": "714a5f8c4ead6b31148d829288440ed033ccc041",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1781359544,
+        "lastModified": 1782636521,
-        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
+        "narHash": "sha256-OG8laCOGtkxlB1JH3XqOnXxnkGJme4mQdXo5hkhCQIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
+        "rev": "e1c1b84752fb0897897380a3cae9dc7fcab91ca3",
         "type": "github"
       },
       "original": {

outputs.nix

@@ -1,7 +1,14 @@
-{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
+{ nixpkgs
+, nixpkgs-unstable
+, home-manager
+, nix-flatpak
+, ...
+}:
 
 let
-  mkPkgsUnstable = system: import nixpkgs-unstable {
+  mkPkgsUnstable =
+    system:
+    import nixpkgs-unstable {
       inherit system;
       config.allowUnfree = true;
     };

systems/balrog/default.nix

@@ -2,11 +2,15 @@
 # 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, ... }:
+{ config
+, lib
+, pkgs
+, ...
+}:
 
 {
-  imports =
+  imports = [
-    [ # Include the results of the hardware scan.
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../modules/home-manager.nix
     ../modules/common.nix
@@ -19,7 +23,9 @@
     ../modules/bambu-studio-flatpak.nix
     ../modules/arduino-ide.nix
     ../modules/devenv.nix
-#      ../modules/bitwarden.nix
+    ../modules/vlc.nix
+    ../modules/btop.nix
+    #    ../modules/bitwarden.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -38,20 +44,36 @@
 
   networking.hostName = "balrog";
   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"
+  ];
 
   hardware.enableAllFirmware = true;
 
-  boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
+  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"]; 
+    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"; # Did you read the comment?
 }

systems/balrog/hardware-configuration.nix

@@ -1,27 +1,41 @@
 # 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" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
+    device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/A202-E19C";
+    device = "/dev/disk/by-uuid/A202-E19C";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [ ];

systems/frodo/default.nix

@@ -5,8 +5,8 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [ # Include the results of the hardware scan.
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../modules/common.nix
     ../modules/users.nix

systems/frodo/hardware-configuration.nix

@@ -1,20 +1,31 @@
 # 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";
   };
 

systems/gandalf/default.nix

@@ -1,8 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [
     ./hardware-configuration.nix
     ../modules/home-manager.nix
     ../modules/common.nix
@@ -26,6 +25,10 @@
     ../modules/bambu-studio-flatpak.nix
     ../modules/arduino-ide.nix
     ../modules/bitwarden.nix
+    ../modules/vlc.nix
+    ../modules/devenv.nix
+    ../modules/btop.nix
+    ./mtp-fix.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -35,20 +38,17 @@
 
   networking.hostName = "gandalf";
   networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
+  networking.nameservers = [
-  networking.firewall.enable = false;
+    "192.168.68.56"
-
+    "1.1.1.1"
-  home-manager.users.avravels.home.hyprland.execOnce = [
+    "8.8.8.8"
-    "waybar"
-    "[workspace 1 silent] kitty"
-    "[workspace 1 silent] spotify"
-    "[workspace 2 silent] firefox"
   ];
+  networking.firewall.enable = false;
 
   networking.interfaces.enp130s0.wakeOnLan.enable = true;
   networking.firewall.allowedUDPPorts = [ 9 ];
 
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
   services.openssh.settings.X11Forwarding = true;
 
   hardware = {
@@ -66,19 +66,5 @@
 
   virtualisation.libvirtd.enable = true;
 
-  services = {
-    # Bluetooth fixes
-    # Can be removed when https://github.com/NixOS/nixpkgs/pull/499670 is merged and in 25.11
-    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,27 +1,42 @@
 # 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";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/01E4-5DD7";
+    device = "/dev/disk/by-uuid/01E4-5DD7";
     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,8 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [
     ./hardware-configuration.nix
     ../modules/common.nix
     ../modules/users.nix
@@ -17,9 +16,13 @@
 
   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;

systems/legolas/hardware-configuration.nix

@@ -1,31 +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, ... }:
+{ 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";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/C4C8-E90E";
+    device = "/dev/disk/by-uuid/C4C8-E90E";
     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";
   };
 

systems/modules/arduino-ide.nix

@@ -5,4 +5,3 @@
     arduino-ide
   ];
 }
-

systems/modules/bambu-studio-flatpak.nix

@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 {
   services.flatpak.enable = true;

systems/modules/bitwarden.nix

@@ -9,4 +9,3 @@
     bitwarden-desktop
   ];
 }
-

systems/modules/btop.nix

@@ -5,4 +5,3 @@
     btop
   ];
 }
-

systems/modules/common.nix

@@ -3,7 +3,10 @@
 {
   nixpkgs.config.allowUnfree = true;
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
 
   users.defaultUserShell = pkgs.zsh;
 

systems/modules/devenv.nix

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

systems/modules/enova.nix

@@ -5,7 +5,10 @@
     enable = true;
 
     settings = {
-      server = [ "1.1.1.1" "8.8.8.8" ];
+      server = [
+        "1.1.1.1"
+        "8.8.8.8"
+      ];
       address = [ "/.enova.local/127.0.0.1" ];
     };
   };

systems/modules/gaming.nix

@@ -8,7 +8,7 @@
     package = pkgs.steam.override {
       extraEnv = {
         MANGOHUD = "1";
-        WINE_VK_VULKAN_ONLY="1";
+        WINE_VK_VULKAN_ONLY = "1";
       };
     };
   };

systems/modules/gimp.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [

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

systems/modules/home/programs/bitwarden.nix

@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 {
   home.packages = [

systems/modules/home/programs/firefox.nix

@@ -12,15 +12,18 @@
 
     policies = {
       # From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
-      ExtensionSettings = with builtins;
+      ExtensionSettings =
-        let extension = shortId: uuid: {
+        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 [
+        in
+        listToAttrs [
           (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
           (extension "ublock-origin" "uBlock0@raymondhill.net")
           (extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack")

systems/modules/home/programs/git.nix

@@ -1,4 +1,8 @@
-{ lib, pkgsUnstable, config, ... }:
+{ lib
+, pkgsUnstable
+, config
+, ...
+}:
 
 {
   options.home.git = {

systems/modules/home/programs/ripgrep.nix

@@ -5,4 +5,3 @@
     ripgrep
   ];
 }
-

systems/modules/home/programs/vscode.nix

@@ -13,6 +13,7 @@
       catppuccin.catppuccin-vsc
       bmewburn.vscode-intelephense-client
       continue.continue
+      vue.volar
     ];
 
     profiles.default.userSettings = {

systems/modules/home/programs/zsh.nix

@@ -1,8 +1,7 @@
 { pkgs, ... }:
 
 {
-  home.file.".zsh/fastfetch.jsonc".source =
+  home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
-    ./fastfetch/config.jsonc;
 
   programs.zsh = {
     enable = true;

systems/modules/home/wm/cursor.nix

@@ -2,8 +2,8 @@
 
 {
   home.pointerCursor = {
-#    name = "Bibata-Modern-Ice";   # change to your cursor theme
+    #    name = "Bibata-Modern-Ice";   # change to your cursor theme
-#    package = pkgs.bibata-cursors;
+    #    package = pkgs.bibata-cursors;
     name = "Adwaita";
     package = pkgs.adwaita-icon-theme;
     size = 24;

systems/modules/home/wm/hyprland.nix

@@ -1,17 +1,35 @@
-{ lib, pkgs, config, ... }:
+{ lib
+, pkgs
+, config
+, ...
+}:
 
 let
   cfg = config.home.hyprland;
 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
@@ -29,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 [
@@ -100,7 +124,8 @@ in
           };
 
           bind = lib.flatten [
-          (bind "${mod} + Q" (dsp.window.kill) { })
+            (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") { })
@@ -120,25 +145,25 @@ in
             (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
             (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
 
-          (bind "${mod} + 1" (dsp.focus { workspace = 1; }) {})
+            (bind "${mod} + 1" (dsp.focus { workspace = 1; }) { })
-          (bind "${mod} + 2" (dsp.focus { workspace = 2; }) {})
+            (bind "${mod} + 2" (dsp.focus { workspace = 2; }) { })
-          (bind "${mod} + 3" (dsp.focus { workspace = 3; }) {})
+            (bind "${mod} + 3" (dsp.focus { workspace = 3; }) { })
-          (bind "${mod} + 4" (dsp.focus { workspace = 4; }) {})
+            (bind "${mod} + 4" (dsp.focus { workspace = 4; }) { })
-          (bind "${mod} + 5" (dsp.focus { workspace = 5; }) {})
+            (bind "${mod} + 5" (dsp.focus { workspace = 5; }) { })
-          (bind "${mod} + 6" (dsp.focus { workspace = 6; }) {})
+            (bind "${mod} + 6" (dsp.focus { workspace = 6; }) { })
-          (bind "${mod} + 7" (dsp.focus { workspace = 7; }) {})
+            (bind "${mod} + 7" (dsp.focus { workspace = 7; }) { })
-          (bind "${mod} + 8" (dsp.focus { workspace = 8; }) {})
+            (bind "${mod} + 8" (dsp.focus { workspace = 8; }) { })
-          (bind "${mod} + 9" (dsp.focus { workspace = 9; }) {})
+            (bind "${mod} + 9" (dsp.focus { workspace = 9; }) { })
 
-          (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) {})
+            (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) { })
-          (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) {})
+            (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) { })
-          (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) {})
+            (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) { })
-          (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) {})
+            (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) { })
-          (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) {})
+            (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) { })
-          (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) {})
+            (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) { })
-          (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) {})
+            (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) { })
-          (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) {})
+            (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) { })
-          (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) {})
+            (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) { })
 
             (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
               repeating = true;
@@ -155,19 +180,34 @@ in
             (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
             (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
           ];
-
+          on = [
-        on = mkArgs [
+            (mkArgs [
               "hyprland.start"
               (mkLuaInline ''
                 function()
                   hl.exec_cmd("waybar")
-              hl.monitor({
+
-                output = "",
+                  hl.monitor(${toLua {} defaultMonitor})
-                mode = "preferred",
+
-                position = "auto",
+                  ${lib.concatMapStringsSep "\n"
-                scale = 1,
+                    (m: "hl.monitor(${toLua {} m})")
-              })
+                    cfg.monitors}
-            end'')
+                end
+              '')
+            ])
+
+            (mkArgs [
+              "config.reloaded"
+              (mkLuaInline ''
+                function()
+                  hl.monitor(${toLua {} defaultMonitor})
+
+                  ${lib.concatMapStringsSep "\n"
+                    (m: "hl.monitor(${toLua {} m})")
+                    cfg.monitors}
+                end
+              '')
+            ])
           ];
         };
     };

systems/modules/home/wm/hyprpaper.nix

@@ -26,4 +26,3 @@ in
     };
   };
 }
-

systems/modules/home/wm/waybar.nix

@@ -35,7 +35,11 @@
         scroll-step = 5;
 
         format-icons = {
-          default = [ "󰕿" "󰖀" "󰕾" ];
+          default = [
+            "󰕿"
+            "󰖀"
+            "󰕾"
+          ];
         };
 
         on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
@@ -46,7 +50,10 @@
         format = "{player_icon} {artist} - {title}";
         format-paused = "{player_icon} ⏸ {title}";
         tooltip = true;
-        ignored-players = [ "firefox" "vlc" ];
+        ignored-players = [
+          "firefox"
+          "vlc"
+        ];
       };
 
       cpu = {

systems/modules/jq.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [

systems/modules/kdenlive.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... } :
+{ config, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [

systems/modules/openscad.nix

@@ -1,5 +1,4 @@
-
+{ config, pkgs, ... }:
-{ config, pkgs, ... } :
 
 {
   environment.systemPackages = with pkgs; [

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/users.nix

@@ -5,10 +5,14 @@
     initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "libvirtd"
+      "dialout"
+    ];
     packages = with pkgs; [
       home-manager
-      legcord
       spotify
       proton-vpn
     ];

systems/modules/vlc.nix

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

systems/work/default.nix

@@ -1,8 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [
     ./hardware-configuration.nix
     ../modules/home-manager.nix
     ../modules/common.nix
@@ -25,6 +24,7 @@
     ../modules/devenv.nix
     ../modules/bitwarden.nix
     ../modules/btop.nix
+    ../modules/vlc.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -39,19 +39,16 @@
   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.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;
@@ -59,8 +56,35 @@
 
   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" ];
+    "127.0.0.1" = [
+      "local.wormundco.de"
+      "local.wormundco.nl"
+      "local.wormenco.nl"
+      "local.wurmundco.de"
+    ];
     "149.210.174.226" = [ "kindertelefoon" ];
   };
 

systems/work/hardware-configuration.nix

@@ -1,29 +1,44 @@
 # 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" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba";
+    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";
+  boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device =
+    "/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba";
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/3892-6129";
+    device = "/dev/disk/by-uuid/3892-6129";
     fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
   };
 
   swapDevices = [ ];