@@ -43,43 +43,43 @@ "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1723510904,
-        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
-        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
+        "lastModified": 1737237494,
+        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
+        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
       }
     },
     "lix_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1723503926,
-        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
-        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
+        "lastModified": 1737234286,
+        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
+        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728328465,
-        "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=",
+        "lastModified": 1737569578,
+        "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
+        "rev": "47addd76727f42d351590c905d9d1905ca895b82",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

@@ -5,7 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     lix = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

@@ -1,19 +1,4 @@
 { pkgs }:
 {
   berkeley-mono = pkgs.callPackage ./berkeley-mono/package.nix { };
-
-  /*
-    deskflow =
-    let
-      deskflow = pkgs.callPackage ./deskflow/package.nix { };
-      libei = pkgs.callPackage ./libs/libei.nix { };
-      libportal = pkgs.callPackage ./libs/libportal.nix { };
-    in
-    deskflow.override (oldDeps: {
-      libei = libei;
-      libportal = libportal;
-    });
-  */
-
-  deskflow = pkgs.callPackage ./deskflow/package.nix { };
 }

@@ -1,72 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchFromGitLab,
-  libevdev,
-  libxkbcommon,
-  meson,
-  ninja,
-  pkg-config,
-  protobuf,
-  protobufc,
-  systemd,
-  buildPackages,
-}:
-let
-  munit = fetchFromGitHub {
-    owner = "nemequ";
-    repo = "munit";
-    rev = "fbbdf1467eb0d04a6ee465def2e529e4c87f2118";
-    hash = "sha256-qm30C++rpLtxBhOABBzo+6WILSpKz2ibvUvoe8ku4ow=";
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "libei";
-  version = "1.3.0";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.freedesktop.org";
-    owner = "libinput";
-    repo = "libei";
-    rev = version;
-    hash = "sha256-yKeMHgR3s83xwoXgLW28ewF2tvs6l0Hq0cCAroCgq0U=";
-  };
-
-  buildInputs = [
-    libevdev
-    libxkbcommon
-    protobuf
-    protobufc
-    systemd
-  ];
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    (buildPackages.python3.withPackages (
-      ps: with ps; [
-        attrs
-        jinja2
-        pytest
-        python-dbusmock
-        strenum
-        structlog
-      ]
-    ))
-  ];
-
-  postPatch = ''
-    ln -s "${munit}" ./subprojects/munit
-    patchShebangs ./proto/ei-scanner
-  '';
-
-  meta = with lib; {
-    description = "Library for Emulated Input";
-    mainProgram = "ei-debug-events";
-    homepage = "https://gitlab.freedesktop.org/libinput/libei";
-    license = licenses.mit;
-    maintainers = [ maintainers.pedrohlc ];
-    platforms = platforms.linux;
-  };
-}

@@ -1,97 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  meson,
-  ninja,
-  pkg-config,
-  gobject-introspection,
-  vala,
-  gi-docgen,
-  glib,
-  gtk3,
-  gtk4,
-  libsForQt5,
-  qt6Packages,
-  variant ? null,
-}:
-
-assert
-  variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5" || variant == "qt6";
-
-stdenv.mkDerivation rec {
-  pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
-  version = "0.8.1";
-
-  outputs = [
-    "out"
-    "dev"
-  ] ++ lib.optional (variant != "qt5") "devdoc";
-
-  src = fetchFromGitHub {
-    owner = "flatpak";
-    repo = "libportal";
-    rev = version;
-    sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc=";
-  };
-
-  depsBuildBuild = [
-    pkg-config
-  ];
-
-  nativeBuildInputs =
-    [
-      meson
-      ninja
-      pkg-config
-      gi-docgen
-    ]
-    ++ lib.optionals (variant != "qt5") [
-      gobject-introspection
-      vala
-    ];
-
-  propagatedBuildInputs =
-    [
-      glib
-    ]
-    ++ lib.optionals (variant == "gtk3") [
-      gtk3
-    ]
-    ++ lib.optionals (variant == "gtk4") [
-      gtk4
-    ]
-    ++ lib.optionals (variant == "qt5") [
-      libsForQt5.qtbase
-      libsForQt5.qtx11extras
-    ]
-    ++ lib.optionals (variant == "qt6") [
-      qt6Packages.qtbase
-    ];
-
-  mesonFlags = [
-    (lib.mesonEnable "backend-gtk3" (variant == "gtk3"))
-    (lib.mesonEnable "backend-gtk4" (variant == "gtk4"))
-    (lib.mesonEnable "backend-qt5" (variant == "qt5"))
-    (lib.mesonEnable "backend-qt6" (variant == "qt6"))
-    (lib.mesonBool "vapi" (variant != "qt5"))
-    (lib.mesonBool "introspection" (variant != "qt5"))
-    (lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true
-  ];
-
-  postFixup = ''
-    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
-    moveToOutput "share/doc" "$devdoc"
-  '';
-
-  # we don't have any binaries
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    description = "Flatpak portal library";
-    homepage = "https://github.com/flatpak/libportal";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.unix;
-  };
-}

@@ -1,97 +0,0 @@
-# i got this from a nixpkgs pr and i will delete it when the pr lands but thank u pr person
-
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  ninja,
-  pkg-config,
-  tomlplusplus,
-  cli11,
-  gtest,
-  libX11,
-  libxkbfile,
-  libXtst,
-  libXinerama,
-  libXi,
-  libXrandr,
-  libxkbcommon,
-  pugixml,
-  python3,
-  gdk-pixbuf,
-  libnotify,
-  qt6,
-  callPackage,
-}:
-
-let
-  libei = callPackage ./libs/libei.nix { };
-  libportal = callPackage ./libs/libportal.nix { };
-in
-stdenv.mkDerivation rec {
-  pname = "deskflow";
-
-  version = "1.17.0";
-
-  src = fetchFromGitHub {
-    owner = "deskflow";
-    repo = "deskflow";
-    rev = "${version}+r1";
-    hash = "sha256-OXgL3AmN5s38tlp3yYcMc6y9y8Gf48FuaD0ilKnoKiE=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    pkg-config
-    qt6.wrapQtAppsHook
-  ];
-
-  postPatch = ''
-    substituteInPlace cmake/Packaging.cmake --replace-warn "set(CMAKE_INSTALL_PREFIX /usr)" ""
-  '';
-
-  cmakeFlags = [
-    "-DCMAKE_SKIP_RPATH=ON"
-  ];
-
-  buildInputs = [
-    tomlplusplus
-    cli11
-    gtest
-    libei
-    libportal
-    libX11
-    libxkbfile
-    libXinerama
-    libXi
-    libXrandr
-    libXtst
-    libxkbcommon
-    pugixml
-    gdk-pixbuf
-    libnotify
-    python3
-    qt6.qtbase
-  ];
-
-  postInstall = ''
-    substituteInPlace $out/share/applications/deskflow.desktop \
-        --replace-fail "Path=/usr/bin" "Path=$out/bin" \
-        --replace-fail "Exec=/usr/bin/deskflow" "Exec=deskflow"
-  '';
-
-  meta = {
-    homepage = "https://github.com/deskflow/deskflow";
-    description = "Deskflow lets you share one mouse and keyboard between multiple computers on Windows, macOS and Linux";
-    mainProgram = "deskflow";
-    maintainers = with lib.maintainers; [ aucub ];
-    license = lib.licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "aarch64-darwin"
-    ];
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-}

@@ -38,7 +38,10 @@
   programs.zsh.enable = true;
   programs.git.enable = true;
 
-  programs.vim.defaultEditor = true;
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
 
   environment.shells = [ pkgs.zsh ];
   environment.variables = {

@@ -8,14 +8,14 @@ {
   networking.hostName = "runestone";
   time.timeZone = "Europe/London";
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver
       intel-vaapi-driver
       libvdpau-va-gl
       libva
-      onevpl-intel-gpu
+      vpl-gpu-rt
     ];
   };
 
@@ -51,6 +51,5 @@ stow
     ])
     ++ [
       unstable-pkgs.lan-mouse
-      user-pkgs.deskflow
     ];
 }