diff --git a/flake.lock b/flake.lock
index f14db77..66feb3f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -228,11 +228,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1720402578,
-        "narHash": "sha256-Zw+4iAKfIaSu0x8HZeQzC8r8Gktz8+HdZSdVdZ8buqs=",
+        "lastModified": 1720834574,
+        "narHash": "sha256-VBJLs1yX4CsG3mr5nPjm6Z7NBStyJlGRNdmr2IoWU70=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "bbd44e1198e9a998af04b6973d3f3a2c9950ae46",
+        "rev": "733919b05babc978b0c015987a6c4de499ff27cc",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720031269,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "lastModified": 1720542800,
+        "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1720244366,
-        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
+        "lastModified": 1720691131,
+        "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4",
         "type": "github"
       },
       "original": {
@@ -342,7 +342,6 @@
         "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix",
-        "stable-nixpkgs": "stable-nixpkgs",
         "stylix": "stylix"
       }
     },
@@ -365,21 +364,6 @@
         "type": "github"
       }
     },
-    "stable-nixpkgs": {
-      "locked": {
-        "lastModified": 1719957072,
-        "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.11",
-        "type": "indirect"
-      }
-    },
     "stylix": {
       "inputs": {
         "base16": "base16",
diff --git a/flake.nix b/flake.nix
index 492787f..fe18f81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,14 +3,15 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    stable-nixpkgs.url = "nixpkgs/nixos-23.11";
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     stylix.url = "github:danth/stylix";
     sops-nix.url = "github:Mic92/sops-nix";
-    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+    };
   };
 
   outputs = inputs: let
@@ -93,10 +94,7 @@
         [
           ./hardware/vm.nix
           ./nixos/workstation.nix
-          {
-            services.desktopManager.cosmic.enable = true;
-            services.displayManager.cosmic-greeter.enable = true;
-          }
+          ./nixos/programs/cosmic.nix
         ] [
           ./home/workstation.nix
         ];
diff --git a/hardware/vm.nix b/hardware/vm.nix
index f71fc8c..878ef4e 100644
--- a/hardware/vm.nix
+++ b/hardware/vm.nix
@@ -1,7 +1,7 @@
 {config, ...}: let
   user = config.user;
 in {
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   boot.kernelModules = ["kvm-amd" "qxl" "bochs_drm"];
 
   system.stateVersion = "24.05";
diff --git a/home/default.nix b/home/default.nix
index 2f4091e..c75a258 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -35,7 +35,7 @@
     libsixel
     yt-dlp
     ytfzf
-    neofetch
+    fastfetch
     tree
     ansible
   ];
diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix
index 3c3823e..a10397a 100644
--- a/home/programs/graphical.nix
+++ b/home/programs/graphical.nix
@@ -32,7 +32,7 @@
     shortwave
 
     # other
-    element-desktop
+    nheko
     brave
     vieb
     bitwarden
diff --git a/home/workstation.nix b/home/workstation.nix
index 8d0da1a..0a6c574 100644
--- a/home/workstation.nix
+++ b/home/workstation.nix
@@ -34,7 +34,7 @@
     notify = true;
   };
 
-  programs.rbw.settings.pinentry = pkgs.pinentry-qt;
+  programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
 
   home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
   home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = ''
diff --git a/nixos/programs/cosmic.nix b/nixos/programs/cosmic.nix
new file mode 100644
index 0000000..6372038
--- /dev/null
+++ b/nixos/programs/cosmic.nix
@@ -0,0 +1,11 @@
+{inputs, ...}: {
+  imports = [
+    inputs.nixos-cosmic.nixosModules.default
+  ];
+  nix.settings = {
+    substituters = [ "https://cosmic.cachix.org/" ];
+    trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+  };
+  services.desktopManager.cosmic.enable = true;
+  services.displayManager.cosmic-greeter.enable = true;
+}
diff --git a/nixos/workstation.nix b/nixos/workstation.nix
index a62914e..cf8ef14 100644
--- a/nixos/workstation.nix
+++ b/nixos/workstation.nix
@@ -6,16 +6,11 @@
 }: {
   imports = [
     inputs.stylix.nixosModules.stylix
-    inputs.nixos-cosmic.nixosModules.default
   ];
   nixpkgs.config.permittedInsecurePackages = [
     "electron-27.3.11"
   ];
 
-  programs.hyprland = {
-    enable = true;
-  };
-
   # use pipewire
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -53,7 +48,10 @@
 
   services.printing.enable = true;
 
-  services.dbus.enable = true;
+  services.dbus = {
+    enable = true;
+    packages = [pkgs.gcr];
+  };
   programs.light.enable = true;
   programs.dconf.enable = true;