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

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,27 +7,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1777851538,
+        "lastModified": 1781319724,
-        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
+        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
+        "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": 1777402031,
+        "lastModified": 1780908363,
-        "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=",
+        "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8",
+        "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
         "type": "github"
       },
       "original": {
@@ -38,27 +38,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778003029,
+        "lastModified": 1781216227,
-        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1778274207,
+        "lastModified": 1781359544,
-        "narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=",
+        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7",
+        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
         "type": "github"
       },
       "original": {

flake.nix

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

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
@@ -18,6 +22,8 @@
     ../modules/printing.nix
     ../modules/bambu-studio-flatpak.nix
     ../modules/arduino-ide.nix
+    ../modules/devenv.nix
+    #      ../modules/bitwarden.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -36,18 +42,26 @@
 
   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;

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
@@ -25,6 +24,9 @@
     ../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;
@@ -34,7 +36,12 @@
 
   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"
@@ -46,7 +53,7 @@
   networking.interfaces.enp130s0.wakeOnLan.enable = true;
   networking.firewall.allowedUDPPorts = [ 9 ];
 
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
   services.openssh.settings.X11Forwarding = true;
 
   hardware = {
@@ -64,19 +71,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

@@ -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,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

@@ -0,0 +1,12 @@
+{ config, pkgsUnstable, ... }:
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    devenv
+  ];
+
+  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

@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 {
   programs.firefox = {
     enable = true;
-
+    configPath = "${config.xdg.configHome}/mozilla/firefox";
     profiles.default = {
       settings = {
         "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
@@ -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/nvim.nix

@@ -3,6 +3,8 @@
 {
   programs.neovim = {
     enable = true;
+    withRuby = false;
+    withPython3 = false;
     defaultEditor = true;
     extraLuaPackages = ps: [ ps.magick ];
     extraPackages = [
@@ -27,7 +29,7 @@
       image-nvim
     ];
 
-    extraLuaConfig = ''
+    initLua = ''
         vim.cmd("colorscheme catppuccin-mocha")
         -- Basic settings
         vim.o.number = true

systems/modules/home/programs/ripgrep.nix

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

systems/modules/home/programs/vscode.nix

@@ -11,12 +11,14 @@
       ms-dotnettools.vscode-dotnet-runtime
       mkhl.direnv # Direnv integration for VSCode
       catppuccin.catppuccin-vsc
-      vscodevim.vim
+      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" = {

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

@@ -15,6 +15,7 @@
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
+    gtk4.theme = null;
   };
 
   home.sessionVariables = {

systems/modules/home/wm/hyprland.nix

@@ -1,4 +1,8 @@
-{ lib, pkgs, config, ... }:
+{ lib
+, pkgs
+, config
+, ...
+}:
 
 let
   cfg = config.home.hyprland;
@@ -23,27 +27,46 @@ in
 
     wayland.windowManager.hyprland = {
       enable = true;
-
+      configType = "lua";
-      settings = {
+      settings =
-        ### MONITOR
+        let
-        monitor = [
+          mkLuaInline = lib.generators.mkLuaInline;
-          "eDP-1,1920x1200,auto,1"
+          toLua = lib.generators.toLua;
-          "DP-3,2440x1440,auto,1"
+          mkArgs = args: { _args = args; };
-          ",preferred,auto,1"
+          bind =
+            keys: dispatcher: options:
+            mkArgs [
+              keys
+              dispatcher
+              options
             ];
-
+          dsp = {
-        ### VARIABLES
+            exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
-        "$mod" = "SUPER";
+            focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
-        "$terminal" = "kitty";
+            window = {
-        "$menu" = "rofi -show drun";
+              move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
-        "$bluetoothMenu" = "bzmenu --launcher rofi";
+              drag = mkLuaInline "hl.dsp.window.drag()";
-        "$files" = "rofi -show filebrowser";
+              resize = mkLuaInline "hl.dsp.window.resize()";
-
+              close = mkLuaInline "hl.dsp.window.close()";
-        ### BASIC LAYOUT
+              kill = mkLuaInline "hl.dsp.window.kill()";
-        general = {
+              fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
-          layout = "dwindle";
-          resize_on_border = true;
             };
+            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;
@@ -65,11 +88,9 @@ in
                 popups = true;
                 popups_ignorealpha = 0.2;
               };
-
               shadow = {
                 enabled = true;
                 color = "rgba(00000055)";
-            ignore_window = true;
                 offset = "0 15";
                 range = 100;
                 render_power = 2;
@@ -77,79 +98,87 @@ in
               };
             };
 
-        # Use the configurable option here (default `[ "waybar" ]`)
+            misc = {
-        exec-once = (if cfg == null then { execOnce = [ "waybar" ]; } else cfg).execOnce;
+              focus_on_activate = true;
-
+            };
-        ### INPUT
-        input = {
-          kb_layout = "us";
           };
 
-        ### KEYBINDINGS
+          bind = lib.flatten [
-        bind = [
+            (bind "${mod} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") { })
-          # Apps
+            (bind "${mod} + Q" (dsp.window.kill) { })
-          "$mod, RETURN, exec, $terminal"
+            (bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
-          "$mod, D, exec, $menu"
+            (bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
-          "$mod, B, exec, $bluetoothMenu"
+            (bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
-          "$mod, G, exec, $files"
+            (bind "${mod} + F" (dsp.window.fullscreen) { })
-          "$mod, Q, killactive"
+            (bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
-          "$mod, F, fullscreen"
+            (bind "${mod} + M" (dsp.exit) { })
-          "$mod, M, exit"
+            (bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
-          "$mod, L, exec, hyprlock"
+            (bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
 
-          # show/hide waybar
+            (bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
-          "$mod, W, exec, pkill -SIGUSR1 -f '^waybar$'"
+            (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"; }) { })
 
-          # Focus
+            (bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
-          "$mod, LEFT,  movefocus, l"
+            (bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
-          "$mod, RIGHT, movefocus, r"
+            (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
-          "$mod, UP,    movefocus, u"
+            (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
-          "$mod, DOWN,  movefocus, d"
 
-          # Workspaces
+            (bind "${mod} + 1" (dsp.focus { workspace = 1; }) { })
-          "$mod, 1, workspace, 1"
+            (bind "${mod} + 2" (dsp.focus { workspace = 2; }) { })
-          "$mod, 2, workspace, 2"
+            (bind "${mod} + 3" (dsp.focus { workspace = 3; }) { })
-          "$mod, 3, workspace, 3"
+            (bind "${mod} + 4" (dsp.focus { workspace = 4; }) { })
-          "$mod, 4, workspace, 4"
+            (bind "${mod} + 5" (dsp.focus { workspace = 5; }) { })
-          "$mod, 5, workspace, 5"
+            (bind "${mod} + 6" (dsp.focus { workspace = 6; }) { })
-          "$mod, 6, workspace, 6"
+            (bind "${mod} + 7" (dsp.focus { workspace = 7; }) { })
-          "$mod, 7, workspace, 7"
+            (bind "${mod} + 8" (dsp.focus { workspace = 8; }) { })
-          "$mod, 8, workspace, 8"
+            (bind "${mod} + 9" (dsp.focus { workspace = 9; }) { })
-          "$mod, 9, workspace, 9"
 
-          "$mod SHIFT, 1, movetoworkspace, 1"
+            (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) { })
-          "$mod SHIFT, 2, movetoworkspace, 2"
+            (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) { })
-          "$mod SHIFT, 3, movetoworkspace, 3"
+            (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) { })
-          "$mod SHIFT, 4, movetoworkspace, 4"
+            (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) { })
-          "$mod SHIFT, 5, movetoworkspace, 5"
+            (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) { })
-          "$mod SHIFT, 6, movetoworkspace, 6"
+            (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) { })
-          "$mod SHIFT, 7, movetoworkspace, 7"
+            (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) { })
-          "$mod SHIFT, 8, movetoworkspace, 8"
+            (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) { })
-          "$mod SHIFT, 9, movetoworkspace, 9"
+            (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) { })
 
-          # Window movement
+            (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
-          "$mod SHIFT, LEFT,  movewindow, l"
+              repeating = true;
-          "$mod SHIFT, RIGHT, movewindow, r"
+              locked = true;
-          "$mod SHIFT, UP,    movewindow, u"
+            })
-          "$mod SHIFT, DOWN,  movewindow, d"
+            (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; })
 
-          # Hyprshot
+            (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
-          "$mod, Z, exec, hyprshot -m region"
+            (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
-
-          # Media keys
-          ", XF86AudioPlay,        exec, playerctl play-pause"
-          ", XF86AudioMute,        exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-          ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
-          ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-          ", XF86AudioNext,        exec, playerctl next"
-          ", XF86AudioPrev,        exec, playerctl previous"
-
-          ", XF86Calculator,       exec, speedcrunch"
           ];
 
-        bindm = [
+          on = mkArgs [
-          "$mod, mouse:272, movewindow"
+            "hyprland.start"
-          "$mod, mouse:273, resizewindow"
+            (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

@@ -10,13 +10,18 @@ in
     enable = true;
 
     settings = {
+      splash = false;
       preload = [
         wallpaper
         wallpaper2
         wallpaper3
       ];
+
       wallpaper = [
-        ",${wallpaper3}"
+        {
+          monitor = "";
+          path = wallpaper3;
+        }
       ];
     };
   };

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

@@ -5,6 +5,4 @@
     enable = true;
     package = pkgsUnstable.ollama-cuda;
   };
-
-  services.open-webui.enable = true;
 }

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,12 +5,17 @@
     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
-      protonvpn-gui
+      proton-vpn
     ];
     shell = pkgs.zsh;
   };

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
@@ -22,6 +21,9 @@
     ../modules/gimp.nix
     ../modules/jq.nix
     ../modules/enova.nix
+    ../modules/devenv.nix
+    ../modules/bitwarden.nix
+    ../modules/btop.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -34,7 +36,6 @@
   boot.initrd.systemd.enable = true;
 
   programs.nix-ld.enable = true;
-
   networking.hostName = "laptop-armel";
 
   home-manager.users.avravels.home.hyprland.execOnce = [
@@ -49,7 +50,12 @@
   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;
@@ -58,7 +64,12 @@
   virtualisation.libvirtd.enable = true;
 
   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 = [ ];