diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
index d9481e1e..f0008d65 100644
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@@ -6,10 +6,7 @@
   nixpkgs-nixos-stable-and-unfree,
   nixpkgs-nixos-unstable-and-unfree,
   ...
-}: let
-  unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
-  nixpkgs-master = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
-in {
+}: {
   security.chromiumSuidSandbox.enable = true;
 
   home-manager.users.cyryl = {...}: {
@@ -31,67 +28,65 @@ in {
 
     programs.chromium.enable = true;
     programs.firefox.enable = true;
-    home.packages = with pkgs;
-    with pkgs.gnome3;
-    with pkgs.python38Packages;
-      [
-        anarchism
-        calibre
-        cheese
-        digikam
-        electrum
-        element-desktop
-        eog
-        evince
-        fontconfig
-        freecad
-        ghidra-bin
-        gimp
-        glxinfo
-        gnome-screenshot
-        gparted
-        inkscape
-        kdenlive
-        koreader
-        krusader
-        libreoffice
-        mediainfo
-        mindforger
-        modem-manager-gui
-        nautilus
-        nyxt
-        obs-studio
-        openscad
-        passff-host
-        pdfarranger
-        pkgs.gsettings-desktop-schemas
-        pkgs.shotwell
-        qcad
-        qemu
-        remmina
-        signal-desktop
-        simple-scan
-        spotify
-        ssb-patchwork
-        tigervnc
-        tlaplusToolbox
-        tlaps
-        uefitool
-        vlc
-        winePackages.full
-        wireshark
-        wsjtx
-        xclip
-        xidlehook
-        yubico-piv-tool
-        yubikey-manager-qt
-        yubikey-personalization
-        yubikey-personalization-gui
-      ]
-      ++ (with unstable; [glaxnimate gnucash kicad thunderbird])
-      ++ [
-        nixpkgs-nixos-stable-and-unfree.discord
-        nixpkgs-nixos-unstable-and-unfree.hopper
-      ];
+    home.packages =
+      (with pkgs;
+        with pkgs.gnome3;
+        with pkgs.python38Packages; [
+          anarchism
+          calibre
+          cheese
+          digikam
+          electrum
+          element-desktop
+          eog
+          evince
+          fontconfig
+          freecad
+          ghidra-bin
+          gimp
+          glxinfo
+          gnome-screenshot
+          gparted
+          inkscape
+          kdenlive
+          koreader
+          krusader
+          libreoffice
+          mediainfo
+          mindforger
+          modem-manager-gui
+          nautilus
+          nyxt
+          obs-studio
+          openscad
+          passff-host
+          pdfarranger
+          pkgs.gsettings-desktop-schemas
+          pkgs.shotwell
+          qcad
+          qemu
+          remmina
+          signal-desktop
+          simple-scan
+          spotify
+          ssb-patchwork
+          tigervnc
+          tlaplusToolbox
+          tlaps
+          uefitool
+          vlc
+          winePackages.full
+          wireshark
+          wsjtx
+          xclip
+          xidlehook
+          yubico-piv-tool
+          yubikey-manager-qt
+          yubikey-personalization
+          yubikey-personalization-gui
+        ])
+      ++ (with pkgs.unstable; [gnucash kicad thunderbird])
+      ++ (with nixpkgs-nixos-stable-and-unfree; [discord])
+      ++ (with nixpkgs-nixos-unstable-and-unfree; [hopper]);
   };
 }
diff --git a/nixos/gui/vscode/home.nix b/nixos/gui/vscode/home.nix
index 109315e3..1ca51735 100644
--- a/nixos/gui/vscode/home.nix
+++ b/nixos/gui/vscode/home.nix
@@ -11,6 +11,7 @@
       editor.formatOnType = true;
       editor.fontSize = 16;
       files.autoSave = "onFocusChange";
+      rust-analyzer.checkOnSave.command = "clippy";
       platformio-ide = {
         useBuiltinPIOCore = true;
         useBuiltinPython = true;
@@ -41,12 +42,6 @@
           version = "1.25.2";
           sha256 = "sha256-hy2Ks6oRc9io6vfgql9aFGjUiRzBCS4mGdDO3NqIFEg=";
         }
-        {
-          publisher = "platformio";
-          name = "platformio-ide";
-          version = "3.3.1";
-          sha256 = "sha256-zBZFpOWJ4JEv6qu9XT1u0uspZ+N2wKrpL3joC+/t/zs=";
-        }
         {
           publisher = "bierner";
           name = "markdown-mermaid";
@@ -80,8 +75,8 @@
         {
           publisher = "ms-vscode";
           name = "cpptools";
-          version = "1.17.5";
-          sha256 = "sha256-LAAEw8goAw3x1MU/TkIdLgPYa0f5b6Hv4GkeiPTVbdY=";
+          version = "1.18.1";
+          sha256 = "sha256-TRIEdlJI1QQMV6I9CFBjlw9ZfKvUJrmE2YoO/InX39E=";
         }
         {
           publisher = "ms-vscode";
diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix
index b793a7ec..5ed6c6ac 100644
--- a/nixos/home-manager/cli.nix
+++ b/nixos/home-manager/cli.nix
@@ -22,9 +22,10 @@
     bitwarden-cli
     bottom
     curl
+    dive
+    dmidecode
     dnsutils
     docker-compose
-    dive
     du-dust
     esptool
     exercism
@@ -42,10 +43,10 @@
     jpeginfo
     jq
     nix-du
-    nix-index
-    nix-top
     nixfmt
+    nix-index
     nixpkgs-fmt
+    nix-top
     nmap
     nvd
     ripgrep-all
diff --git a/nixos/home-manager/programs.nix b/nixos/home-manager/programs.nix
index 645757d7..e8283f82 100644
--- a/nixos/home-manager/programs.nix
+++ b/nixos/home-manager/programs.nix
@@ -35,5 +35,12 @@
     browserpass.enable = true;
     lsd.enable = true;
     lsd.enableAliases = true;
+
+    #eza = {
+    #  enable = true;
+    #  enableAliases = true;
+    #  git = true;
+    #  icons = true;
+    #};
   };
 }