diff --git a/configuration.nix b/configuration.nix
index 626a3f7..52b9565 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 {
   imports =
@@ -56,11 +56,6 @@
 
   services = {
     # Enable X11 and configure Wayland support
-      # Desktop Managers Configuration
-    xserver.desktopManager.gnome.enable = true;
-    desktopManager = {
-      plasma6.enable = true;     # Use plasma5 for KDE6 as well
-    };
     xserver = {
       enable = true;
       xkb.layout = "gb";
@@ -70,6 +65,11 @@
       # Enable GDM as the display manager
       displayManager.gdm.enable = true;
 
+      # Desktop Managers Configuration
+      desktopManager = {
+        gnome.enable = true;       # GNOME
+        plasma6.enable = true;     # Use plasma5 for KDE6 as well
+      };
 
       # Window Managers Configuration
       windowManager = {
@@ -90,9 +90,9 @@
   # XDG Portals Configuration for Wayland
   xdg.portal = {
     enable = true;
-    #extraPortals = [
-    #  pkgs.xdg-desktop-portal
-    #];
+    extraPortals = [
+      pkgs.xdg-desktop-portal
+    ];
   };
 
   # Configure console keymap
@@ -102,7 +102,7 @@
   services.printing.enable = true;
 
   # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = false;
   #sound.enable = true;
   services.flatpak.enable = true;
   services.blueman.enable = true;
@@ -164,7 +164,7 @@
   #services.desktopManager.cosmic.enable = true;
   #services.displayManager.cosmic-greeter.enable = true;
 
-  hardware.graphics = {
+  hardware.opengl = {
     enable = true;
     #driSupport = true;
     #driSupport32Bit = true;
@@ -172,6 +172,9 @@
       vulkan-loader
       vulkan-validation-layers
       vulkan-extension-layer
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+      libvdpau-va-gl
     ];
   };
 
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index de7bb06..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717312683,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "nixos-cosmic": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1735955646,
-        "narHash": "sha256-9KMkTtDYkZmqSZP6iKTY3zAcDK3xaD5gmiFG5siB8kE=",
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "rev": "f8b8aa18abde0b84c84da69a86b7fb3761a4ddf7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1735669367,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixos-cosmic": "nixos-cosmic",
-        "nixpkgs": [
-          "nixos-cosmic",
-          "nixpkgs-stable"
-        ]
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixos-cosmic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735871325,
-        "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "a599f011db521766cbaf7c2f5874182485554f00",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index 7cde94a..0000000
--- a/flake.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  inputs = {
-    # This points to the same nixpkgs that nixos-cosmic is using by default.
-    # If you want to stick to a stable channel, you can switch "nixpkgs" to "nixpkgs-stable".
-    nixpkgs.follows = "nixos-cosmic/nixpkgs-stable";
-
-    # The main input: NixOS COSMIC
-    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
-  };
-
-  outputs = { self, nixpkgs, nixos-cosmic }:
-    {
-      nixosConfigurations = {
-        # Replace "my-hostname" with your actual hostname
-        hypr-nix = nixpkgs.lib.nixosSystem {
-          # Point to an existing configuration file or create a new one
-          modules = [
-            # Set up the COSMIC binary cache (substituter)
-            {
-              nix.settings = {
-                substituters = [ "https://cosmic.cachix.org/" ];
-                trusted-public-keys = [
-                  "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-                ];
-              };
-            }
-
-            # Import the default COSMIC NixOS module
-            nixos-cosmic.nixosModules.default
-
-            # Your existing configuration – typically you’d have:
-            ./configuration.nix
-
-            # Optionally, you could enable COSMIC right here:
-            {
-              services.desktopManager.cosmic.enable = true;
-              services.displayManager.cosmic-greeter.enable = true;
-            }
-          ];
-        };
-      };
-    };
-}
-
diff --git a/nixos-cosmic b/nixos-cosmic
deleted file mode 160000
index d1d9af0..0000000
--- a/nixos-cosmic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d1d9af0bb706e0bcbf4dcb6b1009208409d12505
diff --git a/packages.nix b/packages.nix
index 61caa20..215c591 100644
--- a/packages.nix
+++ b/packages.nix
@@ -11,6 +11,7 @@ in
   vim
   neovim
   ngrok
+  clang-tools
   fish
   zsh
   curl
@@ -73,8 +74,11 @@ in
   libcap
   gcc
   unstable.go
+  unstable.tilt
   telegram-desktop
   falkon
+  unstable.bun
+  unstable.nodejs_23
   firefox
   php
   rcon
@@ -112,6 +116,7 @@ in
   gparted
   parted
   amdgpu_top
+  unstable.amdenc
   #unstable.zed-editor
   unstable.hyprshot
   guacamole-client
@@ -130,6 +135,7 @@ in
   unityhub
   cmake
   SDL2
+  SDL2_image
   vulkan-loader
   vulkan-tools
   vulkan-headers
@@ -165,6 +171,7 @@ in
   protontricks
   unstable.zed-editor
   unstable.ghostty
+  libsForQt5.kdenlive
   ];
 
 }